From 89e7b49304aec79653dad42afa33ad12353dd283 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 11 Dec 2019 18:51:58 +1000
Subject: [PATCH] move decay dmg to top

---
 .../components/game.construct.anim.text.jsx    |  2 +-
 core/src/skill.rs                              | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/src/components/game.construct.anim.text.jsx b/client/src/components/game.construct.anim.text.jsx
index e8ac9de9..1311d744 100644
--- a/client/src/components/game.construct.anim.text.jsx
+++ b/client/src/components/game.construct.anim.text.jsx
@@ -56,7 +56,7 @@ class AnimText extends preact.Component {
                 }
                 if (type === 'Healing') {
                     const { amount, overhealing, colour } = event;
-                    return <h1><span class={colour.toLowerCase()}>{amount} ({overhealing}OH)</span></h1>;
+                    return <h1><span class={colour.toLowerCase()}>{amount} ({overhealing} OH)</span></h1>;
                 }
                 if (type === 'Inversion') return <h1><span>INVERT</span></h1>;
                 if (type === 'Reflection') return <h1><span>REFLECT</span></h1>;
diff --git a/core/src/skill.rs b/core/src/skill.rs
index dd3eba6a..792038cc 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -354,6 +354,11 @@ impl Cast {
             ],
 
             Skill::Decay => vec![
+                Action::Damage {
+                    construct: self.target,
+                    colour: Colour::Blue,
+                    values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
+                },
                 Action::Effect {
                     construct: self.target,
                     effect: ConstructEffect { effect: Effect::Wither, duration: 3, meta: Some(EffectMeta::Multiplier(50)) },
@@ -367,13 +372,13 @@ impl Cast {
                     construct: self.target,
                     effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks
                 },
+            ],
+            Skill::DecayPlus => vec![
                 Action::Damage {
                     construct: self.target,
                     colour: Colour::Blue,
                     values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
                 },
-            ],
-            Skill::DecayPlus => vec![
                 Action::Effect {
                     construct: self.target,
                     effect: ConstructEffect { effect: Effect::Wither, duration: 3, meta: Some(EffectMeta::Multiplier(35)) },
@@ -387,13 +392,13 @@ impl Cast {
                     construct: self.target,
                     effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks
                 },
+            ],
+            Skill::DecayPlusPlus => vec![
                 Action::Damage {
                     construct: self.target,
                     colour: Colour::Blue,
                     values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
                 },
-            ],
-            Skill::DecayPlusPlus => vec![
                 Action::Effect {
                     construct: self.target,
                     effect: ConstructEffect { effect: Effect::Wither, duration: 4, meta: Some(EffectMeta::Multiplier(20)) },
@@ -407,11 +412,6 @@ impl Cast {
                     construct: self.target,
                     effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks
                 },
-                Action::Damage {
-                    construct: self.target,
-                    colour: Colour::Blue,
-                    values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
-                },
             ],
             Skill::DecayTick |
             Skill::DecayTickPlus |