summaryrefslogtreecommitdiff
path: root/src/systems
diff options
context:
space:
mode:
Diffstat (limited to 'src/systems')
-rw-r--r--src/systems/mod.rs4
-rw-r--r--src/systems/timeout.rs (renamed from src/systems/growth.rs)26
2 files changed, 15 insertions, 15 deletions
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/growth.rs b/src/systems/timeout.rs
index 7daa3d7..087ffa9 100644
--- a/src/systems/growth.rs
+++ b/src/systems/timeout.rs
@@ -11,7 +11,7 @@ use specs::{
use crate::{
components::{
- Grow,
+ Timer,
TimeOffset,
TriggerBox
},
@@ -19,36 +19,36 @@ use crate::{
};
-pub struct Growth;
-impl <'a> System<'a> for Growth{
+pub struct Timeout;
+impl <'a> System<'a> for Timeout {
type SystemData = (
Entities<'a>,
- WriteStorage<'a, Grow>,
+ WriteStorage<'a, Timer>,
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 {
+ 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>() * grow.spread;
+ let mut r = 1.0 - rand::random::<f64>() * timer.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 duration = (timer.delay as f64 * r + 0.4) as i64;
+ timer.target_time = Some(creation_time + duration);
}
- let target_time = grow.target_time.unwrap();
+ 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, grow.trigger);
- grow.target_time = None;
+ TriggerBox::add_message(&mut triggerboxes, entity, timer.trigger);
+ timer.target_time = None;
}
}
}