From 388cf2400c2a9d457f3354b10de24748cc8740a4 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 18 Dec 2019 16:44:53 +1000
Subject: [PATCH] electrocute effect, move decay effect first

---
 core/src/skill.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/src/skill.rs b/core/src/skill.rs
index b75ddeca..cf39c658 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -1580,12 +1580,13 @@ impl Decay {
 fn decay(cast: Cast, game: &mut Game, values: Decay) {
     let amount = game.value(Value::Stat { construct: cast.source, stat: Stat::BluePower }).pct(values.decay_dmg_multiplier());
     game.action(cast,
-        Action::Damage {
+        Action::Effect {
             construct: cast.target,
-            colour: Colour::Blue,
-            amount,
+            effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta:
+                Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) },
         }
     );
+
     game.action(cast,
         Action::Effect {
             construct: cast.target,
@@ -1596,13 +1597,15 @@ fn decay(cast: Cast, game: &mut Game, values: Decay) {
             },
         }
     );
+
     game.action(cast,
-        Action::Effect {
+        Action::Damage {
             construct: cast.target,
-            effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta:
-                Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) },
+            colour: Colour::Blue,
+            amount,
         }
     );
+
     game.action(cast,
         Action::Effect {
             construct: cast.target,
@@ -1685,7 +1688,7 @@ fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) {
     game.action(cast,
         Action::Remove {
             construct: cast.source,
-            effect: Effect::Electric,
+            effect: Effect::Electrocute,
         }
     );
     game.action(cast,