From a06f3a75ae4783c5733b62abaa987b28bf2ce033 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Sun, 18 Aug 2019 21:46:30 +1000
Subject: [PATCH 1/3] worklog

---
 WORKLOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WORKLOG.md b/WORKLOG.md
index 8514baf8..dc8801dc 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -22,6 +22,9 @@
 * make our own toasts / msg pane
 * send account_instances on players update
 
+* convert PlusPlus to ++ or rename
+* clear skill (if currently targetted)
+* increase power to speed up early rounds
 * only clear effects on post_resolve
   electrify doesn't work if you ko the construct
 

From d995e936ada524d89a05a3ac3645603becf1c7b3 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Mon, 19 Aug 2019 18:21:01 +1000
Subject: [PATCH 2/3] fix ko electrify (effect removal in post effect)

---
 server/src/construct.rs | 16 ----------------
 server/src/game.rs      |  3 +++
 server/src/skill.rs     |  5 +++++
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/server/src/construct.rs b/server/src/construct.rs
index 6a9824ac..5abb3614 100644
--- a/server/src/construct.rs
+++ b/server/src/construct.rs
@@ -599,11 +599,6 @@ impl Construct {
             }
         }
 
-        if self.is_ko() {
-            events.push(Event::Ko ());
-            self.effects.clear();
-        }
-
         return events;
     }
 
@@ -677,12 +672,6 @@ impl Construct {
             }
         };
 
-        if self.is_ko() {
-            events.push(Event::Ko ());
-            self.effects.clear();
-        }
-
-
         return events;
     }
 
@@ -752,11 +741,6 @@ impl Construct {
             }
         };
 
-        if self.is_ko() {
-            events.push(Event::Ko ());
-            self.effects.clear();
-        }
-
         return events;
     }
 
diff --git a/server/src/game.rs b/server/src/game.rs
index 6cdeda4c..2c64d05f 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -1165,6 +1165,9 @@ mod tests {
         let x_construct = x_player.constructs[0].clone();
         let y_construct = y_player.constructs[0].clone();
 
+        // one shot the target construct (should still get debuffed)
+        game.player_by_id(y_player.id).unwrap().construct_by_id(y_construct.id).unwrap().red_power.force(1000000000);
+
         game.construct_by_id(x_construct.id).unwrap().learn_mut(Skill::Electrify);
 
         while game.construct_by_id(x_construct.id).unwrap().skill_on_cd(Skill::Electrify).is_some() {
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 97cbeacb..e00d86e9 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -344,6 +344,11 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
             _ => (),
         };
 
+        if target.is_ko() {
+            resolutions.push(Resolution::new(&source, &target).event(Event::Ko()));
+            target.effects.clear();
+        }
+
         game.update_construct(&mut source);
         game.update_construct(&mut target);
     };

From 12ec8a41422b8f5cc1529e61a656157793403e8c Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Mon, 19 Aug 2019 18:21:33 +1000
Subject: [PATCH 3/3] log

---
 WORKLOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index dc8801dc..10c36631 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -25,8 +25,6 @@
 * convert PlusPlus to ++ or rename
 * clear skill (if currently targetted)
 * increase power to speed up early rounds
-* only clear effects on post_resolve
-  electrify doesn't work if you ko the construct
 
 ## SOON
 *SERVER*