From 4173fb2385a07169d33f905c298490f77d7f45c4 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Thu, 7 Nov 2019 13:06:19 +1000
Subject: [PATCH] descriptions, recharge invert fix

---
 CHANGELOG.md            |  3 +++
 client/src/utils.jsx    |  8 +++++---
 server/src/construct.rs | 12 ++++++------
 server/src/item.rs      |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e82a2806..804e23a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - Background for text overlapping with avatars in game phase (mobile)
     - Fixed issue where effect text would show when not highlighted
 
+- Invert
+    Now reverses recharge into damage
+
 - Restrict
     Changed cooldown from 2T -> 1T
     Duration now 2T at all levels
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index 8cbbc11a..05513adb 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -240,6 +240,8 @@ function convertItem(v) {
 }
 
 function effectInfo(i) {
+    const hybridBlast = 25;
+    const hasteStrike = 30;
     function multiplier(s) { // Update later to use server info in future
         if (s === 'CounterAttack') return 120;
         if (s === 'CounterAttack+') return 160;
@@ -270,9 +272,9 @@ function effectInfo(i) {
     case 'Buff': return `Increases construct RedPower BluePower SpeedStat by ${i.meta[1] - 100}%`;
     case 'Sustain': return 'Construct cannot be KO while active. Additionally provides immunity to disables';
     case 'Curse': return `Construct will take ${i.meta[1] - 100}% increased red and blue damage`;
-    case 'Haste': return `Construct has  ${i.meta[1] - 100}% increased SpeedStat. Red attack skills will trigger a HasteStrike dealing 30% SpeedStat as red damage.`;
-    case 'Hybrid': return `Construct has  ${i.meta[1] - 100}% increased GreenPower. Blue attack skills will trigger a HybridBlast dealing 25% GreenPower as red damage.`;
-    case 'Invert': return 'Reverses damage and healing. Healing will damage this construct and damage will heal.';
+    case 'Haste': return `Construct has  ${i.meta[1] - 100}% increased SpeedStat. Red attack skills will trigger a HasteStrike dealing ${hasteStrike}% SpeedStat as red damage.`;
+    case 'Hybrid': return `Construct has  ${i.meta[1] - 100}% increased GreenPower. Blue attack skills will trigger a HybridBlast dealing ${hybridBlast}% GreenPower as red damage.`;
+    case 'Invert': return 'Reverse healing/recharge into damage and damage into healing/recharge.';
     case 'Counter': return `Red damage taken by this construct will trigger a CounterAttack. CounterAttack deals ${multiplier(i.meta[1])}% RedPower as red damage.`;
     case 'Purge': return 'Disable construct from casting any green skills';
     case 'Reflect': return 'Reflect blue skills back to caster';
diff --git a/server/src/construct.rs b/server/src/construct.rs
index b653e418..6d7c2ea8 100644
--- a/server/src/construct.rs
+++ b/server/src/construct.rs
@@ -591,16 +591,16 @@ impl Construct {
                     let red_mitigation = red_modified_power.saturating_sub(red_remainder);
 
                     // reduce red_life by mitigation amount
-                    self.red_life.reduce(red_remainder);
+                    self.red_life.reduce(red_mitigation);
 
                     // deal remainder to green_life
                     let red_current_green_life = self.green_life();
                     self.reduce_green_life(red_remainder);
-                    let red_amount = red_current_green_life - self.green_life();
+                    let red_damage_amount = red_current_green_life - self.green_life();
 
                     events.push(Event::Damage { 
                         skill,
-                        amount: red_amount,
+                        amount: red_damage_amount,
                         mitigation: red_mitigation,
                         colour: Colour::Red 
                     });
@@ -620,16 +620,16 @@ impl Construct {
                     let blue_mitigation = blue_modified_power.saturating_sub(blue_remainder);
 
                     // reduce blue_life by mitigation amount
-                    self.blue_life.reduce(blue_remainder);
+                    self.blue_life.reduce(blue_mitigation);
 
                     // deal remainder to green_life
                     let blue_current_green_life = self.green_life();
                     self.reduce_green_life(blue_remainder);
-                    let blue_amount = blue_current_green_life - self.green_life();
+                    let blue_damage_amount = blue_current_green_life - self.green_life();
 
                     events.push(Event::Damage { 
                         skill,
-                        amount: blue_amount,
+                        amount: blue_damage_amount,
                         mitigation: blue_mitigation,
                         colour: Colour::Blue 
                     });
diff --git a/server/src/item.rs b/server/src/item.rs
index 34bf9ed0..f4197a36 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -807,8 +807,8 @@ 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/recharge into damage and damage into healing/recharge.
+                Any excess red or blue damage is converted into shield recharge after healing.
                 Lasts {:?}T.",
                 self.into_skill().unwrap().effect()[0].get_duration()),