From 2d4cabc768968a215556f7a4ed81a728d3b6e120 Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 13 Apr 2020 14:36:03 +0200 Subject: checking for specific messages is easier because of TriggerBox::has_message --- src/systems/droploot.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/systems/droploot.rs') diff --git a/src/systems/droploot.rs b/src/systems/droploot.rs index 33e71c0..2b0281d 100644 --- a/src/systems/droploot.rs +++ b/src/systems/droploot.rs @@ -30,17 +30,12 @@ impl <'a> System<'a> for DropLoot{ fn run(&mut self, (positions, mut new, triggerboxes, loots): Self::SystemData) { for (position, triggerbox, loot) in (&positions, &triggerboxes, &loots).join(){ - for message in triggerbox.messages.iter() { - match message { - Trigger::Die | Trigger::Loot => { - for (template, chance) in &loot.loot { - if *chance > rand::thread_rng().gen_range(0.0, 1.0) { - // todo: better error handling - new.create(position.pos, &template).unwrap(); - } - } + if triggerbox.has_message(&[Trigger::Die, Trigger::Loot]) { + for (template, chance) in &loot.loot { + if *chance > rand::thread_rng().gen_range(0.0, 1.0) { + // todo: better error handling + new.create(position.pos, &template).unwrap(); } - _ => {} } } } -- cgit