From ab67714238c162646af10334715c6de41939c83f Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Mon, 13 Apr 2020 13:26:43 +0200
Subject: renamed grow to timer

---
 src/systems/growth.rs  | 55 --------------------------------------------------
 src/systems/mod.rs     |  4 ++--
 src/systems/timeout.rs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 src/systems/growth.rs
 create mode 100644 src/systems/timeout.rs

(limited to 'src/systems')

diff --git a/src/systems/growth.rs b/src/systems/growth.rs
deleted file mode 100644
index 7daa3d7..0000000
--- a/src/systems/growth.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-
-use rand;
-
-use specs::{
-	WriteStorage,
-	Entities,
-	System,
-	Join,
-	Read
-};
-
-use crate::{
-	components::{
-		Grow,
-		TimeOffset,
-		TriggerBox
-	},
-	resources::{Time}
-};
-
-
-pub struct Growth;
-impl <'a> System<'a> for Growth{
-	type SystemData = (
-		Entities<'a>,
-		WriteStorage<'a, Grow>,
-		WriteStorage<'a, TriggerBox>,
-		Read<'a, Time>,
-		WriteStorage<'a, TimeOffset>
-	);
-	
-	fn run(&mut self, (entities, mut grows, mut triggerboxes, time, mut time_offsets): Self::SystemData) {
-		for (entity, grow) in (&entities, &mut grows).join(){
-			if grow.target_time == None {
-				let creation_time = time.time + time_offsets.get(entity).map(|ct| ct.dtime).unwrap_or(0);
-				let mut r = 1.0 - rand::random::<f64>() * grow.spread;
-				if rand::random() {
-					r = 1.0 / r;
-				}
-				let duration = (grow.delay as f64 * r + 0.4) as i64;
-				grow.target_time = Some(creation_time + duration);
-			}
-			let target_time = grow.target_time.unwrap();
-			if target_time <= time.time {
-				if target_time < time.time {
-					time_offsets.insert(entity, TimeOffset{dtime: target_time.0 - time.time.0}).unwrap();
-				} else {
-					time_offsets.remove(entity);
-				}
-				TriggerBox::add_message(&mut triggerboxes, entity, grow.trigger);
-				grow.target_time = None;
-			}
-		}
-	}
-}
diff --git a/src/systems/mod.rs b/src/systems/mod.rs
index fbd5c64..d45fc38 100644
--- a/src/systems/mod.rs
+++ b/src/systems/mod.rs
@@ -18,7 +18,7 @@ mod die;
 mod spawn;
 mod interact;
 mod droploot;
-mod growth;
+mod timeout;
 mod clear;
 mod building;
 
@@ -42,7 +42,7 @@ pub use self::{
 	spawn::Spawn,
 	interact::Interact,
 	droploot::DropLoot,
-	growth::Growth,
+	timeout::Timeout,
 	clear::Clear,
 	building::Building
 };
diff --git a/src/systems/timeout.rs b/src/systems/timeout.rs
new file mode 100644
index 0000000..087ffa9
--- /dev/null
+++ b/src/systems/timeout.rs
@@ -0,0 +1,55 @@
+
+use rand;
+
+use specs::{
+	WriteStorage,
+	Entities,
+	System,
+	Join,
+	Read
+};
+
+use crate::{
+	components::{
+		Timer,
+		TimeOffset,
+		TriggerBox
+	},
+	resources::{Time}
+};
+
+
+pub struct Timeout;
+impl <'a> System<'a> for Timeout {
+	type SystemData = (
+		Entities<'a>,
+		WriteStorage<'a, Timer>,
+		WriteStorage<'a, TriggerBox>,
+		Read<'a, Time>,
+		WriteStorage<'a, TimeOffset>
+	);
+	
+	fn run(&mut self, (entities, mut timers, mut triggerboxes, time, mut time_offsets): Self::SystemData) {
+		for (entity, timer) in (&entities, &mut timers).join(){
+			if timer.target_time == None {
+				let creation_time = time.time + time_offsets.get(entity).map(|ct| ct.dtime).unwrap_or(0);
+				let mut r = 1.0 - rand::random::<f64>() * timer.spread;
+				if rand::random() {
+					r = 1.0 / r;
+				}
+				let duration = (timer.delay as f64 * r + 0.4) as i64;
+				timer.target_time = Some(creation_time + duration);
+			}
+			let target_time = timer.target_time.unwrap();
+			if target_time <= time.time {
+				if target_time < time.time {
+					time_offsets.insert(entity, TimeOffset{dtime: target_time.0 - time.time.0}).unwrap();
+				} else {
+					time_offsets.remove(entity);
+				}
+				TriggerBox::add_message(&mut triggerboxes, entity, timer.trigger);
+				timer.target_time = None;
+			}
+		}
+	}
+}
-- 
cgit