From 388cf2400c2a9d457f3354b10de24748cc8740a4 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 18 Dec 2019 16:44:53 +1000
Subject: [PATCH 1/3] electrocute effect, move decay effect first

---
 core/src/skill.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/src/skill.rs b/core/src/skill.rs
index b75ddeca..cf39c658 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -1580,12 +1580,13 @@ impl Decay {
 fn decay(cast: Cast, game: &mut Game, values: Decay) {
     let amount = game.value(Value::Stat { construct: cast.source, stat: Stat::BluePower }).pct(values.decay_dmg_multiplier());
     game.action(cast,
-        Action::Damage {
+        Action::Effect {
             construct: cast.target,
-            colour: Colour::Blue,
-            amount,
+            effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta:
+                Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) },
         }
     );
+
     game.action(cast,
         Action::Effect {
             construct: cast.target,
@@ -1596,13 +1597,15 @@ fn decay(cast: Cast, game: &mut Game, values: Decay) {
             },
         }
     );
+
     game.action(cast,
-        Action::Effect {
+        Action::Damage {
             construct: cast.target,
-            effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta:
-                Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) },
+            colour: Colour::Blue,
+            amount,
         }
     );
+
     game.action(cast,
         Action::Effect {
             construct: cast.target,
@@ -1685,7 +1688,7 @@ fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) {
     game.action(cast,
         Action::Remove {
             construct: cast.source,
-            effect: Effect::Electric,
+            effect: Effect::Electrocute,
         }
     );
     game.action(cast,

From a8ec31fc971f37d11b657766cc0b5d5b46e95318 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 18 Dec 2019 16:59:18 +1000
Subject: [PATCH 2/3] absorption targetting fix

---
 core/src/skill.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/skill.rs b/core/src/skill.rs
index cf39c658..6599ba96 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -1309,19 +1309,19 @@ impl Absorption {
 fn absorption(cast: Cast, game: &mut Game, values: Absorption) {
     game.action(cast,
         Action::Remove {
-            construct: cast.source,
+            construct: cast.target,
             effect: Effect::Absorb,
         }
     );
     game.action(cast,
         Action::Effect {
-            construct: cast.source,
+            construct: cast.target,
             effect: ConstructEffect { effect: Effect::Absorption, duration: values.duration(), meta: Some(EffectMeta::AddedDamage(0)) },
         }
     );
     game.action(cast,
         Action::SetEffectMeta {
-            construct: cast.source,
+            construct: cast.target,
             effect: Effect::Absorption,
             amount: game.value(Value::DamageReceived { construct: cast.source, colour: Colour::Blue }).pct(100),
         },

From 24b5857d8653664fb2adab36a80d809e4d75ac79 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 18 Dec 2019 17:03:30 +1000
Subject: [PATCH 3/3] sleep fix

---
 client/src/components/anims/sleep.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/anims/sleep.jsx b/client/src/components/anims/sleep.jsx
index ba861d46..60d51982 100644
--- a/client/src/components/anims/sleep.jsx
+++ b/client/src/components/anims/sleep.jsx
@@ -83,7 +83,7 @@ class Sleep extends Component {
             rotate: 180,
             easing: 'linear',
             loop: true,
-            duration: TIMES.TARGET_DURATION_MS + TIMES.POST_SKILL_DURATION_MS,
+            duration: TIMES.TARGET_DURATION_MS,
         }));
 
         this.animations.push(anime({
@@ -97,7 +97,7 @@ class Sleep extends Component {
         this.animations.push(anime({
             targets: ['#charges'],
             opacity: 1,
-            delay: anime.stagger(TIMES.TARGET_DURATION_MS * 0.015, { start: TIMES.TARGET_DELAY_MS }),
+            delay: anime.stagger(TIMES.TARGET_DURATION_MS * 0.01),
             easing: 'easeInOutSine',
         }));