From 6997a7a7c9d0c3714d9a7d98cf266a96c584c4f8 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Mon, 23 Sep 2019 14:23:22 +1000
Subject: [PATCH] item descriptions and worklog

---
 WORKLOG.md         | 88 ++++++++++++++++++++++------------------------
 server/src/item.rs | 16 ++++-----
 2 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index f4230f25..8f93a003 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -1,65 +1,56 @@
 # WORK WORK
-## NOW
-*PRODUCTION*
-* ACP
-  * essential
-    * serde serialize privatise
-    * mobile styles
-    * can't reset password without knowing password =\
+## NOW (Before PAX)
 
-  * treats
-    * client animation bpm
-    * background colour changes depending on time of day
-    * susbcriber gold name in instance
+*PRODUCTION*
+
+* mobile styles
+* mobile info page
+
+* Add TOS and accept to register page
+
+* can't reset password without knowing password =\
+
+## SOON (Before or After PAX)
 
 * bot game grind
-
-* msg pane
-
+* ACP
+  * essential
+  * serde serialize privatise
+* msg pane / chatwheel
 * audio
-
-## SOON
-*SERVER*
-* modules
-  * troll life -> dmg
-  * prince of peace
-    * bonus healing / no damage
-  * fuck magic
-  * empower on ko
+  * treats
+    * susbcriber gold name in instance
+    * client animation bpm
+    * background colour changes depending on time of day
 
 * rework vecs into sets
 * remove names so games/instances are copy
 
 *$$$*
-* chatwheel
-* eth adapter
-* illusions
-* vaporwave
-* crop circles
-* insects
-* sacred geometry
-* skulls / day of the dead
-* Aztec
-* youkai
-* Industrial
+  * chatwheel
+  * eth adapter
+  * illusions
+  * vaporwave
+  * crop circles
+  * insects
+  * sacred geometry
+  * skulls / day of the dead
+  * Aztec
+  * youkai
+  * Industrial
 
 *CLIENT*
-fix info highlighting
-theme toasts
-mobile info page
-reconnect based on time delta
-consolidate game and instance
+  theme toasts
 
-*SERVER*
-* vbox drops chances
-  * 50% spec, 25% colour etc
+  reconnect based on time delta
+  consolidate game and instance
 
-* mnml tv
+  * elo + leaderboards
+
+  * mnml tv
 
 ## LATER
-* elo + leaderboards
 * constants
-* change to ownership pattern
 
 $$$
 * Items
@@ -69,6 +60,13 @@ $$$
   * Highlight (dota) colour
   * fx colours + styles
 
+* modules
+  * troll life -> dmg
+  * prince of peace
+    * bonus healing / no damage
+  * fuck magic
+  * empower on ko
+
 # Mechanics
 * 10d chaos maths, not rock paper scissors
 * phys is faster and chaotic
diff --git a/server/src/item.rs b/server/src/item.rs
index 581c6b5f..95734c38 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -737,8 +737,8 @@ impl Item {
             Item::Electrify|
             Item::ElectrifyPlus |
             Item::ElectrifyPlusPlus => format!(
-                "Self targetting defensive for {:?}T. Applies Electric to attackers dealing BlueDamage {:?}% \
-                BluePower per turn for {:?}T.",
+                "Applies electrify for {:?}T. If a construct with electrify takes damage they will apply an electrocute debuff to the caster dealing {:?}% \
+                BluePower as BlueDamage per turn for {:?}T.",
                 self.into_skill().unwrap().effect()[0].get_duration(),
                 self.into_skill().unwrap().effect()[0].get_skill().unwrap().effect()[0].get_skill().unwrap().multiplier(),
                 self.into_skill().unwrap().effect()[0].get_skill().unwrap().effect()[0].get_duration()),
@@ -790,20 +790,20 @@ impl Item {
             Item::Invert|
             Item::InvertPlus |
             Item::InvertPlusPlus => format!(
-                "Reverse healing into damage and damage into healing.
-                Any excess red or blue damage is converted into shield recharge."),
+                "Reverse healing into damage and damage into healing. Any excess red or blue damage is converted into shield recharge. Lasts {:?}T.",
+                self.into_skill().unwrap().effect()[0].get_duration()),
 
             Item::Counter|
             Item::CounterPlus |
-            Item::CounterPlusPlus => format!("Self targetting skill. Recharges RedLife for {:?}% RedPower and blocks red skills for {:?}T.
-                If a red skill is parried the construct will riposte the source dealing {:?}% RedPower as red damage.",
-                self.into_skill().unwrap().multiplier(),
+            Item::CounterPlusPlus => format!("Applies counter and block {:?}T. Block reduces incoming red damage by {:?}%.
+                Red damage taken during counter will trigger a counter attack dealing {:?}% RedPower as red damage.",
                 self.into_skill().unwrap().effect()[0].get_duration(),
+                100 - self.into_skill().unwrap().effect()[1].get_multiplier(),
                 self.into_skill().unwrap().effect()[0].get_skill().unwrap().multiplier()),
 
             Item::Purge|
             Item::PurgePlus |
-            Item::PurgePlusPlus => format!("Remove buffs from target construct. Applies purge which disables target green skills for {:?}T.",
+            Item::PurgePlusPlus => format!("Remove buffs from target construct. Applies purge disabling target green skills for {:?}T.",
                 self.into_skill().unwrap().effect()[0].get_duration()),
 
             Item::Purify|