From 6b3a159988ac43fb1c70151aed0b33a791e13414 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 3 Jul 2019 00:00:55 +1000
Subject: [PATCH] fk discord

---
 client/src/components/anims/triage.tick.jsx | 9 +++++++--
 client/src/utils.jsx                        | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/components/anims/triage.tick.jsx b/client/src/components/anims/triage.tick.jsx
index e688605d..01f3a44d 100644
--- a/client/src/components/anims/triage.tick.jsx
+++ b/client/src/components/anims/triage.tick.jsx
@@ -52,7 +52,7 @@ class TriageTick extends Component {
         this.animations.push(anime({
             targets: ['#triageTick'],
             opacity: [
-                { value: 1, delay: TIMES.TARGET_DELAY_MS, duration: TIMES.TARGET_DURATION_MS * 0.2 },
+                { value: 1, duration: TIMES.TARGET_DURATION_MS * 0.2 },
                 { value: 0, delay: TIMES.TARGET_DURATION_MS * 0.6, duration: TIMES.TARGET_DURATION_MS * 0.2 },
             ],
             easing: 'easeInOutSine',
@@ -62,11 +62,16 @@ class TriageTick extends Component {
             targets: ['#triageTick circle'],
             cx: 150,
             cy: 200,
-            delay: TIMES.TARGET_DELAY_MS,
             duration: TIMES.TARGET_DURATION_MS,
             easing: 'easeInOutElastic',
         }));
     }
+
+    componentWillUnmount() {
+        for (let i = this.animations.length - 1; i >= 0; i--) {
+            this.animations[i].reset();
+        }
+    }
 }
 
 module.exports = TriageTick;
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index 1357c5b6..d068a749 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -332,12 +332,12 @@ function randomPoints(numPoints, radius, dimensions) {
 
 const removeTier = skill => {
 
-    if (skill.includes('SiphonTick')) return 'SiphonTick';
     if (skill.includes('Strike')) return 'Strike';
     if (skill.includes('Heal')) return 'Heal';
     if (skill.includes('Blast')) return 'Blast';
     if (skill.includes('Chaos')) return 'Chaos';
     if (skill.includes('Slay')) return 'Slay';
+    if (skill.includes('SiphonTick')) return 'SiphonTick';
     if (skill.includes('Siphon')) return 'Siphon';
 
     if (skill.includes('Snare')) return 'Snare';
@@ -348,6 +348,7 @@ const removeTier = skill => {
     if (skill.includes('Invert')) return 'Invert';
 
     if (skill.includes('Taunt')) return 'Taunt';
+    if (skill.includes('TriageTick')) return 'TriageTick';
     if (skill.includes('Triage')) return 'Triage';
     if (skill.includes('Scatter')) return 'Scatter';
     if (skill.includes('Haste')) return 'Haste';