From 6070df8bd0294c6224ad0157d45cc40443596f08 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 2 Jul 2019 22:26:02 +1000
Subject: [PATCH] parry fixes and curse change

---
 client/src/components/anims/curse.jsx | 27 +++++++++++++++------------
 client/src/components/anims/heal.jsx  | 10 ----------
 client/src/components/anims/parry.jsx | 12 ++++++------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/client/src/components/anims/curse.jsx b/client/src/components/anims/curse.jsx
index 8926bfae..186bc94f 100644
--- a/client/src/components/anims/curse.jsx
+++ b/client/src/components/anims/curse.jsx
@@ -17,7 +17,7 @@ class Curse extends Component {
         return (
             <svg
                 id='curse'
-                class="skill-animation blue"
+                class="skill-animation"
                 version="1.1"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 198 200">
@@ -30,10 +30,16 @@ class Curse extends Component {
                         </feMerge>
                     </filter>
                 </defs>
-                <g filter="url(#curseFilter)">
-                    <ellipse cx="100" cy="100" rx="30" ry="30"/>
-                    <ellipse cx="100" cy="100" rx="60" ry="60"/>
-                    <ellipse cx="100" cy="100" rx="90" ry="90"/>
+                <g filter="url(#curseFilter)" class="blue" >
+                    <circle cx="100" cy="100" r="30" />
+                    <circle cx="100" cy="100" r="60" />
+                    <circle cx="100" cy="100" r="90" />
+                </g>
+
+                <g class="white" style={{ strokeWidth: '2px' }}>
+                    <circle cx="100" cy="100" r="30" />
+                    <circle cx="100" cy="100" r="60" />
+                    <circle cx="100" cy="100" r="90" />
                 </g>
             </svg>
         );
@@ -50,13 +56,10 @@ class Curse extends Component {
         }));
 
         this.animations.push(anime({
-            targets: ['#curse'],
-            scale: [0.5, 1],
-            stroke: [COLOURS.WHITE, COLOURS.BLUE],
-            strokeWidth: [8, 0],
-            filter: [`drop-shadow(0 0 5px ${COLOURS.WHITE}`, `drop-shadow(0 0 5px ${COLOURS.BLUE}`],
-            easing: 'easeOutSine',
-            delay: TIMES.TARGET_DELAY_MS,
+            targets: ['#curse circle'],
+            r: 0,
+            easing: 'easeInSine',
+            delay: TIMES.TARGET_DURATION_MS * 0.4,
             duration: TIMES.TARGET_DURATION_MS,
         }));
     }
diff --git a/client/src/components/anims/heal.jsx b/client/src/components/anims/heal.jsx
index 052c2512..5ac0e755 100644
--- a/client/src/components/anims/heal.jsx
+++ b/client/src/components/anims/heal.jsx
@@ -58,16 +58,6 @@ class Heal extends Component {
             easing: 'easeInOutSine',
         }));
 
-        // this.animations.push(anime({
-        //     targets: '.skill-anim',
-        //     translateY: 0,
-        //     translateX: 0,
-        //     loop: false,
-        //     delay: TIMES.TARGET_DELAY_MS,
-        //     duration: (duration * 1 / 2),
-        //     easing: 'easeInQuad',
-        // }));
-
         this.animations.push(anime({
             targets: ['#heal circle'],
             cx: 150,
diff --git a/client/src/components/anims/parry.jsx b/client/src/components/anims/parry.jsx
index 1ea1f29e..0619b956 100644
--- a/client/src/components/anims/parry.jsx
+++ b/client/src/components/anims/parry.jsx
@@ -43,8 +43,8 @@ class Parry extends Component {
         this.animations.push(anime({
             targets: ['#parry'],
             opacity: [
-                { value: 1, delay: TIMES.TARGET_FADE_IN_DELAY, duration: TIMES.TARGET_FADE_IN_DURATION },
-                { value: 0, delay: TIMES.TARGET_FADE_OUT_DELAY, duration: TIMES.FADE_OUT_DURATION },
+                { value: 1, delay: TIMES.TARGET_DELAY_MS, 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',
         }));
@@ -52,20 +52,20 @@ class Parry extends Component {
         this.animations.push(anime({
             targets: ['#parry'],
             rotateX: 180,
-            delay: TIMES.TARGET_FADE_IN_DELAY * 3,
+            delay: TIMES.TARGET_DELAY_MS * 2,
             duration: TIMES.TARGET_DURATION_MS / 2,
             easing: 'easeOutSine',
         }));
 
         this.animations.push(anime({
-            targets: ['#parryFilter feTurbulence', ' #parryFilter feDisplacementMap'],
+            targets: ['#parryFilter feTurbulence', '#parryFilter feDisplacementMap'],
             baseFrequency: 2,
             scale: 10,
             numOctaves: 5,
             easing: 'easeOutSine',
 
-            delay: TIMES.TARGET_FADE_IN_DELAY,
-            duration: TIMES.RESOLUTION_TOTAL_MS,
+            delay: TIMES.TARGET_DELAY_MS,
+            duration: TIMES.TARGET_DURATION_MS,
         }));
     }