Merge

y2015/src/days/d13.rs

@@ -63,7 +63,6 @@ pub fn process_part1(input: &str) -> i32 {
 
     highest_happiness
 }
-
 pub fn process_part2(input: &str) -> i32 {
     let mut happiness_table = HashMap::new();
     let mut people = Vec::new();

y2015/src/days/d22.rs

@@ -36,6 +36,36 @@ pub fn process_part1(input: &str) -> u32 {
             if leaf.state == State::Playing {
                 //println!("try for leaf");
                 for spell in Spell::get_all() {
+                    match spell.name {
+                        SpellID::MagicMissile | SpellID::Drain => {}
+                        SpellID::Shield => {
+                            if !leaf
+                                .player
+                                .status_effects
+                                .iter()
+                                .any(|effect| effect.name == SpellID::Shield && effect.duration > 1)
+                            {
+                                continue;
+                            }
+                        }
+                        SpellID::Poison => {
+                            if !leaf
+                                .player
+                                .status_effects
+                                .iter()
+                                .any(|effect| effect.name == SpellID::Poison && effect.duration > 1)
+                            {
+                                continue;
+                            }
+                        }
+                        SpellID::Recharge => {
+                            if !leaf.player.status_effects.iter().any(|effect| {
+                                effect.name == SpellID::Recharge && effect.duration > 1
+                            }) {
+                                continue;
+                            }
+                        }
+                    }
                     leafs.push(leaf.use_spell(spell));
                 }
             }