From 3dec7111ece3984d26c6946d0c25335fb315961e Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Tue, 5 Nov 2019 16:11:10 +1000
Subject: [PATCH 1/4] normal mode reduce z-index of avatar (collision with
 buttons)

---
 client/assets/styles/game.less     | 2 ++
 client/assets/styles/instance.less | 2 ++
 client/assets/styles/styles.less   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less
index 59b6cf32..38b643ff 100644
--- a/client/assets/styles/game.less
+++ b/client/assets/styles/game.less
@@ -133,6 +133,7 @@
     }
 
     .skills {
+        z-index: 2;
         button {
             width: 100%;
             height: 2em;
@@ -144,6 +145,7 @@
     }
 
     .effects {
+        z-index: 2;
         grid-area: effects;
         white-space: nowrap;
         width: 100%;
diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less
index b6fc4c3f..7c5ea17c 100644
--- a/client/assets/styles/instance.less
+++ b/client/assets/styles/instance.less
@@ -195,6 +195,7 @@
         grid-area: skills;
         padding: 0 0.5em;
         margin-bottom: 0.75em;
+        z-index: 2;
 
         display: grid;
         grid-template-columns: repeat(3, 1fr);
@@ -212,6 +213,7 @@
         grid-area: specs;
         padding: 0 0.5em;
         margin-bottom: 0.75em;
+        z-index: 2;
 
         display: grid;
         grid-template-columns: repeat(3, 1fr);
diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less
index 86ea5d38..43db0711 100644
--- a/client/assets/styles/styles.less
+++ b/client/assets/styles/styles.less
@@ -309,6 +309,7 @@ li {
     background-size: contain;
     background-repeat: no-repeat;
     background-position: center;
+    z-index: 0;
     // pointer-events: none;
 }
 

From c50bb97aa94779d61b962bb7a3c117ca8e1965cb Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 6 Nov 2019 09:51:58 +1000
Subject: [PATCH 2/4] mobile drag fixes

---
 client/src/components/instance.constructs.jsx |  5 ++++-
 client/src/components/vbox.component.jsx      | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index 0012c1b8..da843f8f 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -217,7 +217,10 @@ function Construct(props) {
 
 
         return (
-            <label onDragStart={specClick} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
+            <label onDragStart={ev => {
+                ev.dataTransfer.setData('text', '');
+                specClick(ev);
+            }} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
                 <button
                     key={i}
                     onClick={specClick}
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index c09e07f1..4fd8932d 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -215,7 +215,10 @@ class Vbox extends preact.Component {
             const vboxObject = shapes[v] ? shapes[v]() : v;
             return (
                 <label draggable='true'
-                    onDragStart={ev => ev.dataTransfer.setData('text', '')}
+                    onDragStart={ev => {
+                        onClick(ev);
+                        ev.dataTransfer.setData('text', '')
+                    }}
                     onDragEnd={clearVboxSelected}>
                     <button
                         class={classes}
@@ -328,7 +331,10 @@ class Vbox extends preact.Component {
             return (
                 <label
                     draggable='true'
-                    onDragStart={ev => ev.dataTransfer.setData('text', '')}
+                    onDragStart={ev => {
+                        onClick(ev);
+                        ev.dataTransfer.setData('text', '');
+                    }}
                     onDragEnd={() => {
                         if (combiner.length === 1) combinerChange([]);
                     }}>

From 59e1c9673bea29554c4726a4d4fbd9fc7b2701b0 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 6 Nov 2019 10:58:59 +1000
Subject: [PATCH 3/4] changelog

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7a23a1a..8e7fa3ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,36 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.8.0] - 2019-10-31
+# Added
+- Drag and drop for vbox interactions can be used instead of single click / double click
+
+- Base white items and be directly equipped from vbox rather than going through the inventory
+    - Useful if you want to equip an item without further combining with colours
+
+- You can swap skills and specs between constructs without using the inventory
+
+# Changed
+
+- Construct life changed
+    - You now start with 800 green life (down from 950)
+    - You now start with 125 red life and blue life (up from 0)
+
+- Game phase layout
+    - Enemy team effects appear under your construct instead of next to it
+    - Game phase constructs line up symmetrically now
+
+- Mobile
+    - Tutorial is disabled for mobile view
+    - Landscape is now default view
+    - Vbox phase everything is now in one view
+    - Game constructs and animations are much larger in mobile view
+
+- Intercept
+    - Reduced duration to 1T down from 2T
+    - Reduced cooldown to 1T down from 2T
+
+
 ## [1.7.0] - 2019-10-31
 # Added
 - Step by step tutorial

From b3ba8825e4a53c47d29134cb6f44e40d44b68587 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 6 Nov 2019 13:10:00 +1000
Subject: [PATCH 4/4] absorb changes

---
 CHANGELOG.md                   |  5 +++++
 client/assets/styles/game.less |  1 -
 server/src/item.rs             | 11 ++++++-----
 server/src/skill.rs            | 27 ++++++++++++++++++++++-----
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e7fa3ae..6b53bb46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - Vbox phase everything is now in one view
     - Game constructs and animations are much larger in mobile view
 
+- Absorb
+    - Reduced duration and cooldown from 2T -> 1T (Absorption duration unchanged)
+    - Absorption damage is now based on all damage taken (previously only green damage taken)
+    - Now recharges blue life based on 95 / 120 / 155 blue power
+
 - Intercept
     - Reduced duration to 1T down from 2T
     - Reduced cooldown to 1T down from 2T
diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less
index 38b643ff..408769e6 100644
--- a/client/assets/styles/game.less
+++ b/client/assets/styles/game.less
@@ -232,7 +232,6 @@
     padding-left: 1em;
     padding-right: 1em;
     text-align: center;
-    font-size: 0.8em;
     svg {
         display: inline;
         height: 1em;
diff --git a/server/src/item.rs b/server/src/item.rs
index 4d5604f0..a57b489c 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -719,7 +719,7 @@ impl Item {
             Item::Banish|
             Item::BanishPlus |
             Item::BanishPlusPlus => format!("Banish target for {:?}T.
-                Deal blue damage and red damage equal to {:?}% target red and blue life.
+                Deal {:?}% target RedLife and BlueLife as red and blue damage respectively.
                 Banished constructs are immune to all skills and effects.",
                 self.into_skill().unwrap().effect()[0].get_duration(),
                 self.into_skill().unwrap().multiplier()),
@@ -773,11 +773,12 @@ impl Item {
             Item::Absorb|
             Item::AbsorbPlus |
             Item::AbsorbPlusPlus => format!(
-                "Gain Absorb for {:?}T. When attacked with Absorb you gain Absorption.
-                Absorption increases RedPower and BluePower based on Damage taken.
-                Absorption lasts {:?}T.",
+                "Gain Absorb for {:?}T. Taking damage replaces Absorb with Absorption.
+                Absorption increases RedPower and BluePower based on damage taken.
+                Absorption lasts {:?}T. Recharges BlueLife based on {:?}% BluePower.",
                 self.into_skill().unwrap().effect()[0].get_duration(),
-                self.into_skill().unwrap().effect()[0].get_skill().unwrap().effect()[0].get_duration()),
+                self.into_skill().unwrap().effect()[0].get_skill().unwrap().effect()[0].get_duration(),
+                self.into_skill().unwrap().multiplier()),
 
             Item::Haste|
             Item::HastePlus |
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 849a4e0c..790bebb8 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -293,7 +293,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
         let mut target = game.construct_by_id(target.id).unwrap().clone();
 
         match event {
-            Event::Damage { amount, skill, mitigation: _, colour: c } => {
+            Event::Damage { amount, skill, mitigation, colour: c } => {
                 if target.affected(Effect::Electric) && !skill.is_tick() {
                     let ConstructEffect { effect: _, duration: _, meta, tick: _ } = target.effects.iter()
                         .find(|e| e.effect == Effect::Electric).unwrap().clone();
@@ -320,7 +320,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
                         .find(|e| e.effect == Effect::Absorb).unwrap().clone();
                     match meta {
                         Some(EffectMeta::Skill(s)) => {
-                            resolutions = absorption(&mut source, &mut target, resolutions, skill, amount, s);
+                            resolutions = absorption(&mut source, &mut target, resolutions, skill, amount + mitigation, s);
                         },
                         _ => panic!("no absorb skill"),
                     };
@@ -833,6 +833,10 @@ impl Skill {
             Skill::HybridBlast => 50,
 
             Skill::HasteStrike => 60,
+            
+            Skill::Absorb=> 95,
+            Skill::AbsorbPlus => 120,
+            Skill::AbsorbPlusPlus => 155,
 
             Skill::Intercept=> 80,
             Skill::InterceptPlus => 110,
@@ -911,11 +915,11 @@ impl Skill {
             Skill::HastePlusPlus => vec![ConstructEffect {effect: Effect::Haste, duration: 5,
                                             meta: Some(EffectMeta::Multiplier(225)), tick: None }],
 
-            Skill::Absorb   => vec![ConstructEffect {effect: Effect::Absorb, duration: 2,
+            Skill::Absorb   => vec![ConstructEffect {effect: Effect::Absorb, duration: 1,
                                         meta: Some(EffectMeta::Skill(Skill::Absorption)), tick: None}],
-            Skill::AbsorbPlus   => vec![ConstructEffect {effect: Effect::Absorb, duration: 3,
+            Skill::AbsorbPlus   => vec![ConstructEffect {effect: Effect::Absorb, duration: 1,
                                         meta: Some(EffectMeta::Skill(Skill::AbsorptionPlus)), tick: None}],
-            Skill::AbsorbPlusPlus  => vec![ConstructEffect {effect: Effect::Absorb, duration: 4,
+            Skill::AbsorbPlusPlus  => vec![ConstructEffect {effect: Effect::Absorb, duration: 1,
                                         meta: Some(EffectMeta::Skill(Skill::AbsorptionPlusPlus)), tick: None}],
 
             Skill::Absorption         => vec![ConstructEffect {effect: Effect::Absorption, duration: 3, meta: None, tick: None}],
@@ -1675,6 +1679,19 @@ fn ruin(source: &mut Construct, target: &mut Construct, mut results: Resolutions
 
 fn absorb(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions {
     results.push(Resolution::new(source, target).event(target.add_effect(skill, skill.effect()[0])));
+    let blue_amount = source.blue_power().pct(skill.multiplier());
+    let e = target.recharge(skill, 0, blue_amount);
+    let stages = match e {
+        Event::Recharge { red, blue, skill: _ } => {
+            if red > 0 || blue > 0 { EventStages::PostOnly }
+            else { EventStages::NoStages }
+        }
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            EventStages::NoStages
+        }
+    };
+    results.push(Resolution::new(source, target).event(e).stages(stages));
     return results;;
 }