more ++ fixes, shows + during anims

client/src/animations.utils.jsx

@@ -1,4 +1,3 @@
-const { removeTier } = require('./utils');
 const { TIMES } = require('./constants');
 
 function none() {
@@ -60,10 +59,8 @@ function getObjects(resolution, stages, game, account) {
         ? null
         : createSourceAnim();
 
-    const skill = removeTier(event.skill);
-
     const animTarget = {
-        skill,
+        skill: event.skill,
         constructId: targetting(),
         player: playerTeamIds.includes(resolution.target.id),
         direction,

client/src/components/animations.jsx

@@ -40,6 +40,8 @@ const Triage = require('./anims/triage');
 const TriageTick = require('./anims/triage.tick');
 
 const actions = require('../actions');
+const { removeTier } = require('../utils');
+
 
 const addState = connect(
     function receiveState(state) {
@@ -63,12 +65,12 @@ class ConstructAnimation extends Component {
             direction,
             constructId,
         } = animTarget;
-
+        const animSkill = removeTier(skill);
         if (!constructId.includes(construct.id)) return false;
 
         // find target animation
-        const chooseAnim = (skill) => {
-            switch (skill) {
+        const chooseAnim = (animSkill) => {
+            switch (animSkill) {
             // Attack base
             case 'Attack': return <Attack direction={direction}/>;
             case 'Blast': return <Blast direction={direction}/>;
@@ -123,7 +125,7 @@ class ConstructAnimation extends Component {
             };
         };
 
-        const anim = chooseAnim(skill);
+        const anim = chooseAnim(animSkill);
         if (!anim) return false;
 
         return (

client/src/events.jsx

@@ -3,7 +3,7 @@ const eachSeries = require('async/eachSeries');
 const actions = require('./actions');
 const { TIMES } = require('./constants');
 const animations = require('./animations.utils');
-const { infoToast, errorToast } = require('./utils');
+const { infoToast, errorToast, removeTier } = require('./utils');
 
 function registerEvents(store) {
     function notify(msg) {
@@ -69,13 +69,12 @@ function registerEvents(store) {
                     const timeout = animations.getTime(sequence);
                     const anims = animations.getObjects(r, sequence, game, account);
                     const text = animations.getText(r, sequence);
-
                     store.dispatch(actions.setAnimFocus(animations.getFocusTargets(r, game)));
 
                     if (sequence.includes('START_SKILL')) store.dispatch(actions.setAnimSource(anims.animSource));
                     if (sequence.includes('END_SKILL')) {
                         store.dispatch(actions.setAnimTarget(anims.animTarget));
-                        if (!['Banish', 'Invert'].includes(anims.animTarget.skill)) store.dispatch(actions.setAnimCb(cb));
+                        if (!['Banish', 'Invert'].includes(removeTier(anims.animTarget.skill))) store.dispatch(actions.setAnimCb(cb));
                     }
                     if (sequence.includes('POST_SKILL')) {
                         // timeout to prevent text classes from being added too soon
@@ -90,7 +89,7 @@ function registerEvents(store) {
                         store.dispatch(actions.setAnimText(null));
                         store.dispatch(actions.setAnimFocus([]));
                         if (!sequence.includes('END_SKILL')
-                            || ['Banish', 'Invert'].includes(anims.animTarget.skill)) return cb();
+                            || ['Banish', 'Invert'].includes(removeTier(anims.animTarget.skill))) return cb();
                         return true;
                     }, timeout);
                 }, err => {