From adf6700049aee25dd7c15b1cd5c911c7530d016f Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 19 Jul 2019 19:07:03 +1000
Subject: [PATCH] ganba

---
 client/src/components/game.construct.jsx |  2 +-
 client/src/events.jsx                    |  7 ++++++-
 client/src/utils.jsx                     | 10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/src/components/game.construct.jsx b/client/src/components/game.construct.jsx
index 4569b4a1..41c30b8b 100644
--- a/client/src/components/game.construct.jsx
+++ b/client/src/components/game.construct.jsx
@@ -72,7 +72,7 @@ class GameConstruct extends Component {
         } = this.props;
 
         const ko = construct.green_life.value === 0 ? 'ko' : '';
-        const classes = eventClasses(game, account, resolution, construct);
+        const classes = eventClasses(game, account, resolution, construct, animText);
 
         const stats = ['RedLife', 'GreenLife', 'BlueLife'].map((s, j) => (
             <div key={j} alt={STATS[s].stat}>
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 074acd29..0c883262 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -66,7 +66,12 @@ function registerEvents(store) {
 
                     if (sequence.includes('START_SKILL')) store.dispatch(actions.setAnimSource(anims.animSource));
                     if (sequence.includes('END_SKILL')) store.dispatch(actions.setAnimTarget(anims.animTarget));
-                    if (sequence.includes('POST_SKILL')) store.dispatch(actions.setAnimText(text));
+                    if (sequence.includes('POST_SKILL')) {
+                        setTimeout(
+                            () => store.dispatch(actions.setAnimText(text)),
+                            timeout - 1000,
+                        );
+                    }
 
                     return setTimeout(() => {
                         store.dispatch(actions.setAnimSource(null));
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index 58340adf..ad99728f 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -85,7 +85,7 @@ const STATS = {
     },
 };
 
-function eventClasses(game, account, resolution, construct) {
+function eventClasses(game, account, resolution, construct, postSkill) {
     if (!resolution) return '';
     const source = construct.id === resolution.source.id;
     const target = construct.id === resolution.target.id;
@@ -130,7 +130,7 @@ function eventClasses(game, account, resolution, construct) {
     }
 
     if (type === 'Healing') {
-        if (target) {
+        if (target && postSkill) {
             construct.green_life.value = resolution.target.green;
             return 'green-damage';
         }
@@ -138,17 +138,17 @@ function eventClasses(game, account, resolution, construct) {
 
     if (type === 'Effect') {
         const { construct_effects: constructEffects } = event;
-        if (target) construct.effects = constructEffects;
+        if (target && postSkill) construct.effects = constructEffects;
     }
 
     if (type === 'Removal') {
         const { construct_effects: constructEffects } = event;
-        if (target) construct.effects = constructEffects;
+        if (target && postSkill) construct.effects = constructEffects;
     }
 
     if (type === 'Recharge') {
         const { red, blue } = event;
-        if (target) {
+        if (target && postSkill) {
             if (red > 0 && blue > 0) {
                 construct.red_life.value = resolution.target.red;
                 construct.blue_life.value = resolution.target.blue;