From d307241f7552c04861cbf1bac9264361e7ab4034 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Fri, 20 Dec 2019 11:06:33 +1000
Subject: [PATCH] fix electrocute action order

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

diff --git a/core/src/skill.rs b/core/src/skill.rs
index 42cf8dd1..0f8c15bd 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -1675,12 +1675,6 @@ impl Electrocute {
 fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) {
     let amount = game.value(Value::Stat { construct: cast.source, stat: Stat::BluePower }).pct(values.damage_multiplier());
 
-    game.action(cast,
-        Action::Remove {
-            construct: cast.source,
-            effect: Effect::Electric,
-        }
-    );
     game.action(cast,
         Action::Effect {
             construct: cast.target,
@@ -1695,6 +1689,13 @@ fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) {
             amount,
         },
     );
+
+    game.action(cast,
+        Action::Remove {
+            construct: cast.source,
+            effect: Effect::Electric,
+        }
+    );
 }
 
 fn electrocute_tick(cast: Cast, game: &mut Game) {
@@ -1853,7 +1854,7 @@ fn link(cast: Cast, game: &mut Game, values: Link) {
         Action::Damage {
             construct: cast.target,
             colour: Colour::Blue,
-            amount: amount,
+            amount,
         },
     );
 }