grow is now also using build trigger/component

9 files changed, 53 insertions, 45 deletions

diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json
index 5ebc106..c47f738 100644
--- a/content/encyclopediae/default_encyclopedia.json
+++ b/content/encyclopediae/default_encyclopedia.json
@@ -234,8 +234,9 @@
 				["Grow", {
 					"delay": 600,
 					"target_time": ["arg", "target_time"],
-					"into": ["template", "radishseedling"]
-				}]
+					"trigger": "change"
+				}],
+				["Build", {"obj": ["template", "radishseedling"]}]
 			],
 			"extract": {
 				"target_time": ["Grow", "target_time"]
@@ -251,8 +252,9 @@
 				["Grow", {
 					"delay": 600,
 					"target_time": ["arg", "target_time"],
-					"into": ["template", "youngradishplant"]
-				}]
+					"trigger": "change"
+				}],
+				["Build", {"obj": ["template", "youngradishplant"]}]
 			],
 			"extract": {
 				"target_time": ["Grow", "target_time"]
@@ -268,8 +270,9 @@
 				["Grow", {
 					"delay": 600,
 					"target_time": ["arg", "target_time"],
-					"into": ["template", "radishplant"]
-				}]
+					"trigger": "change"
+				}],
+				["Build", {"obj": ["template", "radishplant"]}]
 			],
 			"extract": {
 				"target_time": ["Grow", "target_time"]
@@ -330,8 +333,9 @@
 				["Grow", {
 					"delay": ["arg", "delay"],
 					"target_time": ["arg", "target_time"],
-					"into": ["arg", "next"]
-				}]
+					"trigger": "change"
+				}],
+				["Build", {"obj": ["arg", "next"]}]
 			],
 			"extract": {
 				"target_time": ["Grow", "target_time"]
@@ -347,8 +351,9 @@
 				["Grow", {
 					"delay": ["arg", "delay"],
 					"target_time": ["arg", "target_time"],
-					"into": ["arg", "next"]
-				}]
+					"trigger": "change"
+				}],
+				["Build", {"obj": ["arg", "next"]}]
 			],
 			"extract": {
 				"target_time": ["Grow", "target_time"]
@@ -361,8 +366,9 @@
 				["Grow", {
 					"delay": ["arg", "delay"],
 					"target_time": ["arg", "target_time"],
-					"into": ["arg", "next"]
+					"trigger": "change"
 				}],
+				["Build", {"obj": ["arg", "next"]}],
 				["Visible", {
 					"name": ["concat", [["string", "young"], ["arg", "crop"], ["string", "plant"]]],
 					"sprite": "youngplant",
diff --git a/content/maps/room.json b/content/maps/room.json
index d092485..728ee4d 100644
--- a/content/maps/room.json
+++ b/content/maps/room.json
@@ -25,7 +25,7 @@
 		"1.......,,,,,VVV,,,~~~'''''''''''ffffff'''X",
 		" X/,,,,.,,,,,VVV,,,~~~''''''''''''''''''''X",
 		" XXXXX,.,XXXXXXXXXX~~~XXXXXXXXXXXXXXXXXXXXX",
-		"     %%%                                  "
+		"      %%%                                  "
 	],
 	"mapping": {
 		"#": "wall",
diff --git a/src/assemblage.rs b/src/assemblage.rs
index 82cb119..348f5c2 100644
--- a/src/assemblage.rs
+++ b/src/assemblage.rs
@@ -142,7 +142,7 @@ impl Assemblage {
 	pub fn validate(&self) -> Result<()> {
 		for (comptype, parameters) in &self.components {
 			for (paramname, paramtype) in comptype.parameters() {
-				let param = parameters.get(paramname).ok_or(aerr!("missing parameter {} in {:?}", paramname, self))?;
+				let param = parameters.get(paramname).ok_or(aerr!("missing parameter {} for component {:?} in {:?}", paramname, comptype, self))?;
 				let actualtype = param.get_type(&self.arguments)?;
 				if actualtype != paramtype {
 					return Err(aerr!("parameter type incorrect"));
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 347bb40..53de41c 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -213,12 +213,12 @@ pub struct Loot {
 pub struct Grow {
 	pub delay: i64,
 	pub target_time: Option<Timestamp>,
-	pub into: Template
+	pub trigger: Trigger
 }
 
 #[derive(Component, Debug, Clone)]
 #[storage(HashMapStorage)]
-pub struct CreationTime {
+pub struct OwnTime {
 	pub time: Timestamp
 }
 
diff --git a/src/componentwrapper.rs b/src/componentwrapper.rs
index 4615d53..7a9f2a0 100644
--- a/src/componentwrapper.rs
+++ b/src/componentwrapper.rs
@@ -12,7 +12,8 @@ use crate::{
 	components::{
 		AttackType,
 		Clan,
-		Flag
+		Flag,
+		Trigger
 	},
 	parameter::{Parameter, ParameterType},
 	Timestamp,
@@ -203,7 +204,7 @@ components!(
 		}
 	};
 	Grow (
-			into: Template (Grow.into.clone()),
+			trigger: String (panic!("can't turn trigger to string")),
 			delay: Int (Grow.delay),
 			target_time: Int ({
 				if let Some(time) = Grow.target_time {
@@ -214,13 +215,13 @@ components!(
 			})
 		)
 		Grow {
-			into,
+			trigger: Trigger::from_str(&trigger).ok_or(aerr!("invalid trigger name {}", trigger))?,
 			delay,
 			target_time: if target_time == 0 { None } else { Some(Timestamp(target_time)) }
 			// please forgive me for using 0 as null
 		};
 	Equipment () {panic!("equipment from parameters not implemented")};
-	CreationTime (time: Int) {CreationTime{time: Timestamp(time)}};
+	OwnTime (time: Int) {OwnTime{time: Timestamp(time)}};
 	Flags (flags: List) {
 		Flags(
 			flags
diff --git a/src/main.rs b/src/main.rs
index 3f2cc90..20e498d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -49,6 +49,7 @@ use self::{
 	template::Template,
 	encyclopedia::Encyclopedia,
 	timestamp::Timestamp,
+	componentwrapper::ComponentWrapper,
 	
 	gameserver::GameServer,
 	server::Server,
diff --git a/src/room.rs b/src/room.rs
index 8e847cf..1051e28 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -120,7 +120,7 @@ impl <'a, 'b>Room<'a, 'b> {
 		world.insert(NewEntities::new(encyclopedia));
 		register_insert!(
 			world,
-			(Position, Visible, Controller, Movable, New, Removed, Moved, Player, Inventory, Health, Serialise, RoomExit, Entered, TriggerBox, Trap, Fighter, Healing, Volatile, ControlCooldown, Autofight, MonsterAI, Home, AttackInbox, Item, Spawner, Clan, Faction, Interactable, Loot, Grow, Equipment, CreationTime, Flags, Ear, Build), 
+			(Position, Visible, Controller, Movable, New, Removed, Moved, Player, Inventory, Health, Serialise, RoomExit, Entered, TriggerBox, Trap, Fighter, Healing, Volatile, ControlCooldown, Autofight, MonsterAI, Home, AttackInbox, Item, Spawner, Clan, Faction, Interactable, Loot, Grow, Equipment, OwnTime, Flags, Ear, Build), 
 			(Ground, Input, Output, Size, Spawn, Players, Emigration, Time)
 		);	
 		
diff --git a/src/systems/building.rs b/src/systems/building.rs
index 876554e..8459144 100644
--- a/src/systems/building.rs
+++ b/src/systems/building.rs
@@ -7,13 +7,15 @@ use specs::{
 };
 
 use crate::{
+	ComponentWrapper,
 	components::{
 		Position,
 		Build,
 		Trigger,
-		TriggerBox
+		TriggerBox,
+		OwnTime
 	},
-	resources::{NewEntities}
+	resources::{NewEntities},
 };
 
 
@@ -23,16 +25,21 @@ impl <'a> System<'a> for Building{
 		ReadStorage<'a, Position>,
 		Write<'a, NewEntities>,
 		ReadStorage<'a, TriggerBox>,
-		ReadStorage<'a, Build>
+		ReadStorage<'a, Build>,
+		ReadStorage<'a, OwnTime>
 	);
 	
-	fn run(&mut self, (positions, mut new, triggerboxes, builds): Self::SystemData) {
-		for (position, triggerbox, build) in (&positions, &triggerboxes, &builds).join(){
+	fn run(&mut self, (positions, mut new, triggerboxes, builds, own_times): Self::SystemData) {
+		for (position, triggerbox, build, own_time) in (&positions, &triggerboxes, &builds, (&own_times).maybe()).join(){
 			for message in triggerbox.messages.iter() {
 				match message {
 					Trigger::Build | Trigger::Change => {
 						// todo: better error handling
-						new.create(position.pos, &build.obj).unwrap();
+						let mut preent = new.encyclopedia.construct(&build.obj).unwrap();
+						if let Some(time) = own_time {
+							preent.push(ComponentWrapper::OwnTime(time.clone()));
+						}
+						new.to_build.push((position.pos, preent));
 					}
 					_ => {}
 				}
diff --git a/src/systems/growth.rs b/src/systems/growth.rs
index 97ae5f3..b1b1af5 100644
--- a/src/systems/growth.rs
+++ b/src/systems/growth.rs
@@ -2,24 +2,20 @@
 use rand;
 
 use specs::{
-	ReadStorage,
 	WriteStorage,
 	Entities,
 	System,
 	Join,
-	Write,
 	Read
 };
 
 use crate::{
 	components::{
-		Position,
 		Grow,
-		Removed,
-		CreationTime
+		OwnTime,
+		TriggerBox
 	},
-	resources::{NewEntities, Time},
-	componentwrapper::ComponentWrapper
+	resources::{Time}
 };
 
 
@@ -27,28 +23,25 @@ pub struct Growth;
 impl <'a> System<'a> for Growth{
 	type SystemData = (
 		Entities<'a>,
-		ReadStorage<'a, Position>,
-		Write<'a, NewEntities>,
 		WriteStorage<'a, Grow>,
-		WriteStorage<'a, Removed>,
+		WriteStorage<'a, TriggerBox>,
 		Read<'a, Time>,
-		ReadStorage<'a, CreationTime>
+		WriteStorage<'a, OwnTime>
 	);
 	
-	fn run(&mut self, (entities, positions, mut new, mut grows, mut removeds, time, creation_times): Self::SystemData) {
-		for (entity, position, grow) in (&entities, &positions, &mut grows).join(){
-			let creation_time = creation_times.get(entity).map(|ct| ct.time).unwrap_or(time.time);
+	fn run(&mut self, (entities, mut grows, mut triggerboxes, time, mut own_times): Self::SystemData) {
+		for (entity, grow) in (&entities, &mut grows).join(){
 			if grow.target_time == None {
+				let creation_time = own_times.get(entity).map(|ct| ct.time).unwrap_or(time.time);
 				let duration = grow.delay as f64 * (1.0 + rand::random::<f64>()) / (if rand::random() {1.0} else {2.0});
 				grow.target_time = Some(creation_time + duration as i64);
 			}
 			let target_time = grow.target_time.unwrap();
 			if target_time <= time.time {
-				removeds.insert(entity, Removed).unwrap();
-				// todo: error handling
-				let mut preent = new.encyclopedia.construct(&grow.into).unwrap();
-				preent.push(ComponentWrapper::CreationTime(CreationTime{time: target_time + 1}));
-				new.to_build.push((position.pos, preent));
+				if target_time + 1 < time.time {
+					own_times.insert(entity, OwnTime{time: target_time + 1}).unwrap();
+				}
+				TriggerBox::add_message(&mut triggerboxes, entity, grow.trigger);
 			}
 		}
 	}