diff options
Diffstat (limited to 'src/systems')
| -rw-r--r-- | src/systems/building.rs | 12 | ||||
| -rw-r--r-- | src/systems/growth.rs | 15 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/systems/building.rs b/src/systems/building.rs index 8459144..0f23467 100644 --- a/src/systems/building.rs +++ b/src/systems/building.rs @@ -13,7 +13,7 @@ use crate::{ Build, Trigger, TriggerBox, - OwnTime + TimeOffset }, resources::{NewEntities}, }; @@ -26,18 +26,18 @@ impl <'a> System<'a> for Building{ Write<'a, NewEntities>, ReadStorage<'a, TriggerBox>, ReadStorage<'a, Build>, - ReadStorage<'a, OwnTime> + ReadStorage<'a, TimeOffset> ); - 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(){ + fn run(&mut self, (positions, mut new, triggerboxes, builds, time_offsets): Self::SystemData) { + for (position, triggerbox, build, time_offset) in (&positions, &triggerboxes, &builds, (&time_offsets).maybe()).join(){ for message in triggerbox.messages.iter() { match message { Trigger::Build | Trigger::Change => { // todo: better error handling let mut preent = new.encyclopedia.construct(&build.obj).unwrap(); - if let Some(time) = own_time { - preent.push(ComponentWrapper::OwnTime(time.clone())); + if let Some(time) = time_offset { + preent.push(ComponentWrapper::TimeOffset(time.clone())); } new.to_build.push((position.pos, preent)); } diff --git a/src/systems/growth.rs b/src/systems/growth.rs index b1b1af5..3baa3e8 100644 --- a/src/systems/growth.rs +++ b/src/systems/growth.rs @@ -12,7 +12,7 @@ use specs::{ use crate::{ components::{ Grow, - OwnTime, + TimeOffset, TriggerBox }, resources::{Time} @@ -26,22 +26,25 @@ impl <'a> System<'a> for Growth{ WriteStorage<'a, Grow>, WriteStorage<'a, TriggerBox>, Read<'a, Time>, - WriteStorage<'a, OwnTime> + WriteStorage<'a, TimeOffset> ); - fn run(&mut self, (entities, mut grows, mut triggerboxes, time, mut own_times): Self::SystemData) { + 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 = own_times.get(entity).map(|ct| ct.time).unwrap_or(time.time); + let creation_time = time.time + time_offsets.get(entity).map(|ct| ct.dtime).unwrap_or(0); 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 { - if target_time + 1 < time.time { - own_times.insert(entity, OwnTime{time: target_time + 1}).unwrap(); + 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; } } } |