From 86cdc6c567d0ca429d69bebbb2fb02f1d3754c8d Mon Sep 17 00:00:00 2001 From: troido Date: Sun, 23 Feb 2020 23:44:50 +0100 Subject: players can now attack other objects --- src/systems/trapping.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/systems/trapping.rs') diff --git a/src/systems/trapping.rs b/src/systems/trapping.rs index 144cd94..5e0921e 100644 --- a/src/systems/trapping.rs +++ b/src/systems/trapping.rs @@ -9,7 +9,7 @@ use specs::{ }; use crate::{ - components::{Health, Attacked, Moved, Entered, Trap, Position}, + components::{Health, Attacked, add_attack, Moved, Entered, Trap, Position}, resources::Ground }; @@ -31,13 +31,7 @@ impl <'a> System<'a> for Trapping { for (entity, _entered, trap, position) in (&entities, &entereds, &traps, &positions).join() { for ent in ground.cells.get(&position.pos).unwrap(){ if ent != &entity && moves.contains(*ent) && healths.contains(*ent) { - victims - .entry(*ent) - .unwrap() - .or_insert_with(Attacked::default) - .attacks - .push(trap.attack.clone()); - + add_attack(&mut victims, *ent, trap.attack.clone()); } } } -- cgit