diff options
Diffstat (limited to 'src/systems')
| -rw-r--r-- | src/systems/moving.rs | 23 | ||||
| -rw-r--r-- | src/systems/useitem.rs | 23 |
2 files changed, 21 insertions, 25 deletions
diff --git a/src/systems/moving.rs b/src/systems/moving.rs index 5232076..6ecf040 100644 --- a/src/systems/moving.rs +++ b/src/systems/moving.rs @@ -15,9 +15,9 @@ use crate::{ Pos, components::{ Controller, - Blocking, Position, - Floor, + Flags, + Flag, Moved, Entered, Movable, @@ -40,34 +40,23 @@ impl <'a> System<'a> for Move { ReadStorage<'a, Controller>, WriteStorage<'a, Position>, Read<'a, Size>, - ReadStorage<'a, Blocking>, + ReadStorage<'a, Flags>, Write<'a, Ground>, - ReadStorage<'a, Floor>, WriteStorage<'a, Moved>, WriteStorage<'a, Entered>, ReadStorage<'a, Movable>, WriteStorage<'a, ControlCooldown> ); - fn run(&mut self, (entities, controllers, mut positions, size, blocking, mut ground, floor, mut moved, mut entered, movables, mut cooldowns): Self::SystemData) { + fn run(&mut self, (entities, controllers, mut positions, size, flags, mut ground, mut moved, mut entered, movables, mut cooldowns): Self::SystemData) { moved.clear(); entered.clear(); for (ent, controller, mut pos, movable) in (&entities, &controllers, &mut positions.restrict_mut(), &movables).join(){ match &controller.control { Control::Move(direction) => { let newpos = (pos.get_unchecked().pos + direction.to_position()).clamp(Pos::new(0, 0), Pos::new(size.width - 1, size.height - 1)); - let mut blocked = false; - let mut on_floor = false; - for ent in ground.cells.get(&newpos).unwrap_or(&HashSet::new()) { - if blocking.get(*ent).is_some(){ - blocked = true; - break; - } - if floor.get(*ent).is_some(){ - on_floor = true; - } - } - if !blocked && on_floor { + let ground_flags = ground.flags_on(newpos, &flags); + if !ground_flags.contains(&Flag::Blocking) && ground_flags.contains(&Flag::Floor) { let mut pos_mut = pos.get_mut_unchecked(); moved.insert(ent, Moved{from: pos_mut.pos}).expect("can't insert Moved"); ground.cells.get_mut(&pos_mut.pos).unwrap().remove(&ent); diff --git a/src/systems/useitem.rs b/src/systems/useitem.rs index de9ed29..d96f6ef 100644 --- a/src/systems/useitem.rs +++ b/src/systems/useitem.rs @@ -6,7 +6,8 @@ use specs::{ WriteStorage, System, Join, - Write + Write, + Read }; use crate::{ @@ -16,9 +17,10 @@ use crate::{ Inventory, AttackInbox, AttackMessage, - AttackType + AttackType, + Flags }, - resources::{NewEntities}, + resources::{NewEntities, Ground}, components::item::ItemAction::{None, Build, Eat, Equip}, controls::Control, }; @@ -32,18 +34,23 @@ impl <'a> System<'a> for Use { ReadStorage<'a, Position>, WriteStorage<'a, Inventory>, Write<'a, NewEntities>, - WriteStorage<'a, AttackInbox> + WriteStorage<'a, AttackInbox>, + Read<'a, Ground>, + ReadStorage<'a, Flags> ); - fn run(&mut self, (entities, controllers, positions, mut inventories, mut new, mut attacked): Self::SystemData) { + fn run(&mut self, (entities, controllers, positions, mut inventories, mut new, mut attacked, ground, flags): Self::SystemData) { for (ent, controller, position, inventory) in (&entities, &controllers, &positions, &mut inventories).join(){ match &controller.control { Control::Use(rank) => { if let Some(entry) = inventory.items.get_mut(*rank) { match &entry.0.action { - Build(template) => { - new.create(position.pos, template.clone()).unwrap(); - inventory.items.remove(*rank); + Build(template, required_flags, blocking_flags) => { + let ground_flags = ground.flags_on(position.pos, &flags); + if required_flags.is_subset(&ground_flags) && blocking_flags.is_disjoint(&ground_flags){ + new.create(position.pos, template.clone()).unwrap(); + inventory.items.remove(*rank); + } } Eat(health_diff) => { AttackInbox::add_message(&mut attacked, ent, AttackMessage{typ: AttackType::Heal(*health_diff), attacker: Option::None}); |