Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.5.5

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

WORKLOG.md

@@ -1,16 +1,25 @@
 # WORK WORK
-## NOW (Before PAX)
+## NOW
 
 *PRODUCTION*
 
-* fix purge bug
-* add recipe book
+* 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
+
+* mobile styles
+* mobile info page
+
+* fix info page for tablet layout
 
 * 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

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 |
@@ -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];