From e6e7713539e5c18fb6899231503b5441978a9142 Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 23 Oct 2019 19:17:57 +1000 Subject: [PATCH] remove inversion event --- client/src/animations.utils.jsx | 2 -- server/src/construct.rs | 6 +++--- server/src/skill.rs | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/client/src/animations.utils.jsx b/client/src/animations.utils.jsx index 2e525c86..09cf7fa8 100644 --- a/client/src/animations.utils.jsx +++ b/client/src/animations.utils.jsx @@ -75,8 +75,6 @@ function getObjects(resolution, stages, game, account) { function getSequence(resolution) { if (!resolution.event) return []; - if (resolution.event[0] === 'Inversion') return []; - switch (resolution.stages) { case 'AllStages': return ['START_SKILL', 'END_SKILL', 'POST_SKILL']; case 'StartEnd': return ['START_SKILL', 'END_SKILL']; diff --git a/server/src/construct.rs b/server/src/construct.rs index d1f5eab9..325e6d5e 100644 --- a/server/src/construct.rs +++ b/server/src/construct.rs @@ -606,7 +606,7 @@ impl Construct { }); }, true => { - events.push(Event::Inversion { skill }); + // events.push(Event::Inversion { skill }); // there is no green shield (yet) let current_green_life = self.green_life(); @@ -669,7 +669,7 @@ impl Construct { }); }, true => { - events.push(Event::Inversion { skill }); + // events.push(Event::Inversion { skill }); let current_green_life = self.green_life(); self.green_life.increase(modified_power); @@ -738,7 +738,7 @@ impl Construct { }); }, true => { - events.push(Event::Inversion { skill }); + // events.push(Event::Inversion { skill }); let current_green_life = self.green_life(); self.green_life.increase(modified_power); diff --git a/server/src/skill.rs b/server/src/skill.rs index ed594c4d..3aab4aa8 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -2004,10 +2004,10 @@ mod tests { // attack should heal and recharge red shield let mut results = attack(&mut x, &mut y, vec![], Skill::Attack); - match results.remove(0).event { - Event::Inversion { skill } => assert_eq!(skill, Skill::Attack), - _ => panic!("not inversion"), - }; + // match results.remove(0).event { + // Event::Inversion { skill } => assert_eq!(skill, Skill::Attack), + // _ => panic!("not inversion"), + //}; match results.remove(0).event { Event::Healing { skill: _, overhealing: _, amount } => assert!(amount > 0),