From 7d34b1b4acaaa1162e410d5f97dece777a4ad3bf Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Tue, 15 Oct 2019 09:09:21 +1000
Subject: [PATCH 1/2] purge bug fix

---
 server/src/skill.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/skill.rs b/server/src/skill.rs
index 06fc7b38..c5287088 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -1804,7 +1804,8 @@ fn purge(source: &mut Construct, target: &mut Construct, mut results: Resolution
         }) {
             let ce = target.effects.remove(i);
             results.push(Resolution::new(source, target)
-                .event(Event::Removal { effect: ce.effect, construct_effects: target.effects.clone() }));
+                .event(Event::Removal { effect: ce.effect, construct_effects: target.effects.clone() })
+                .stages(EventStages::PostOnly));
         }
 
     let effect = skill.effect()[0];

From 8e03248844ed9e8d041305eaf8a7410fadcfc3cc Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Tue, 15 Oct 2019 09:40:05 +1000
Subject: [PATCH 2/2] worklog / changelog increase purge cd

---
 CHANGELOG.md        |  9 +++++----
 WORKLOG.md          | 18 ++++++++++++------
 server/src/skill.rs |  6 +++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6a2090e..cb28802a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.0.0] - YYYY-MM-DD
-### Added
-### Fixed
+## [1.5.6] - YYYY-MM-DD
 ### Changed
+`Purge` Fixed bug where client animations would freeze when clearing a buff
+`Purge` Cooldown increased to 1T
 
-## [0.1.5] - YYYY-MM-DD
+
+## [0.1.5] - 2019-10-10
 ### Changed
 `Recharge` Skill multiplier reduced 85/130/200 -> 70/110/170
 `Absorption` Skill duration reduced 5/7/9 -> 3/5/7
diff --git a/WORKLOG.md b/WORKLOG.md
index 1dd73284..90b71e3a 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -1,20 +1,26 @@
 # WORK WORK
-## NOW (Before PAX)
+## NOW 
 
 *PRODUCTION*
 
+* border colours for skills e.g. strike red border, slay half red half green
+* rename vbox to shop
+* combat phase info system
+* drag and drop buy / equip / unequip items
+* no combiner overflow (reset above 3)
+
 * mobile styles
 * mobile info page
 
 * fix info page for tablet layout
 
-* Add TOS and accept to register page
-
 * can't reset password without knowing password =\
-
-## SOON (Before or After PAX)
-
 * Invert recharge
+
+## SOON 
+
+* equip from shop (buy and equip without putting in your inventory) for bases
+
 * bot game grind
 * ACP
   * essential
diff --git a/server/src/skill.rs b/server/src/skill.rs
index c5287088..a0f324d6 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -1080,9 +1080,9 @@ impl Skill {
             Skill::PurifyPlus |
             Skill::PurifyPlusPlus => None,
 
-            Skill::Purge=> None,
-            Skill::PurgePlus => None,
-            Skill::PurgePlusPlus => None,
+            Skill::Purge=> Some(1),
+            Skill::PurgePlus => Some(1),
+            Skill::PurgePlusPlus => Some(1),
 
             Skill::Banish |
             Skill::BanishPlus |