From b368ada693ca536672e79d5f4ecd9c0419b3759d Mon Sep 17 00:00:00 2001 From: Mashy Date: Thu, 2 May 2019 12:19:29 +1000 Subject: [PATCH] combat phase fixes to decay, siphon tick --- client/src/utils.jsx | 3 +++ server/src/skill.rs | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100755 => 100644 server/src/skill.rs diff --git a/client/src/utils.jsx b/client/src/utils.jsx index e6c52928..a5918fa7 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -218,6 +218,9 @@ function getCombatSequence(event) { if (['Immunity'].includes(event[0])) return ['START_SKILL', 'POST_SKILL']; if (['Healing'].includes(event[0]) && event[1].skill === 'Slay') return ['POST_SKILL']; + if (['Effect'].includes(event[0]) + && event[1].skill === 'Decay' && event[1].effect === 'Wither') return ['POST_SKILL']; + if (['Damage'].includes(event[0]) && event[1].skill === 'Chaos' && event[1].colour === 'RedDamage') return ['POST_SKILL']; diff --git a/server/src/skill.rs b/server/src/skill.rs old mode 100755 new mode 100644 index 4ad50e93..2e0418ff --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -651,7 +651,7 @@ impl Skill { Skill::Chaos => None, Skill::Amplify => Some(1), Skill::Invert => Some(2), - Skill::Decay => None, // dot + Skill::Decay => Some(1), // dot Skill::DecayTick => None, Skill::Siphon => None, Skill::SiphonTick => None, @@ -1155,7 +1155,7 @@ fn siphon_tick(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions, s match e { Event::Damage { amount, mitigation: _, colour: _, skill: _ } => { results.push(Resolution::new(source, target).event(e)); - let heal = source.deal_green_damage(Skill::Siphon, amount); + let heal = source.deal_green_damage(Skill::SiphonTick, amount); for h in heal { results.push(Resolution::new(source, source).event(h)); };