From 3abdfe81d76065eab3fe0cb74ec0cde4acf519a1 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 5 Jul 2019 17:18:21 +1000
Subject: [PATCH] break

---
 client/src/animations.test.jsx        | 14 +++++++-------
 client/src/components/anims/break.jsx | 18 ++++++++++++++++--
 server/src/skill.rs                   |  4 ++--
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/client/src/animations.test.jsx b/client/src/animations.test.jsx
index 1cda0e2a..62b9b833 100644
--- a/client/src/animations.test.jsx
+++ b/client/src/animations.test.jsx
@@ -69,21 +69,21 @@ document.fonts.load('16pt "Jura"').then(() => {
 });
 
 const SKILLS = [
-    'Attack',
-    'Debuff',
-    'Buff',
-    'Block',
-    'Stun',
     'AbsorbI',
     'AbsorptionI',
     'AmplifyI',
+    'Attack',
     'BanishI',
     'BashI',
     'BlastI',
+    'Block',
+    'BreakI',
+    'Buff',
     'ChaosI',
     'CounterAttackI',
     'CounterI',
     'CurseI',
+    'Debuff',
     'DecayI',
     'DecayTickI',
     'ElectrifyI',
@@ -97,21 +97,21 @@ const SKILLS = [
     'HybridI',
     'InterceptI',
     'InvertI',
+    'LinkI',
     'PurgeI',
     'PurifyI',
     'RechargeI',
     'ReflectI',
     'RestrictI',
     'RuinI',
-    'LinkI',
     'SilenceI',
     'SiphonI',
     'SiphonTickI',
     'SlayI',
     'SleepI',
     'StrikeI',
+    'Stun',
     'SustainI',
-    'BreakI',
     'TriageI',
     'TriageTickI',
 ];
diff --git a/client/src/components/anims/break.jsx b/client/src/components/anims/break.jsx
index 8a984d6d..2585d82a 100644
--- a/client/src/components/anims/break.jsx
+++ b/client/src/components/anims/break.jsx
@@ -2,7 +2,7 @@ const preact = require('preact');
 const { Component } = require('preact');
 const anime = require('animejs').default;
 
-const { TIMES } = require('../../constants');
+const { TIMES, COLOURS } = require('../../constants');
 
 // logarithmic spiral lifted from
 // https://upload.wikimedia.org/wikipedia/commons/5/5b/Logarithmic_spiral_(1).svg
@@ -18,7 +18,7 @@ class Break extends Component {
 
         return (
             <svg
-                class='skill-animation red'
+                class='skill-animation green'
                 version="1.1"
                 id="break"
                 xmlns="http://www.w3.org/2000/svg"
@@ -43,6 +43,11 @@ class Break extends Component {
                         style="opacity: 0.5"
                     />
                 </g>
+                <g filter="url(#breakFilter)" stroke={COLOURS.RED}>
+                    <circle cx="0" cy="0" r="30" />
+                    <circle cx="0" cy="0" r="60" />
+                    <circle cx="0" cy="0" r="90" />
+                </g>
             </svg>
         );
     }
@@ -66,6 +71,15 @@ class Break extends Component {
             duration: TIMES.TARGET_DURATION_MS,
         }));
 
+        this.animations.push(anime({
+            targets: ['#break circle'],
+            easing: 'easeInSine',
+            strokeWidth: [10, 2],
+            r: 300,
+            delay: TIMES.TARGET_DELAY_MS,
+            duration: TIMES.TARGET_DURATION_MS,
+        }));
+
         this.animations.push(anime({
             targets: ['#breakFilter feTurbulence', '#breakFilter feDisplacementMap'],
             baseFrequency: 2,
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 5147ce00..addc0f1e 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -249,7 +249,7 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
 
         Skill::BreakI |
         Skill::BreakII |
-        Skill::BreakIII => break(source, target, resolutions, skill), // no damage stun, adds vulnerable
+        Skill::BreakIII => break_(source, target, resolutions, skill), // no damage stun, adds vulnerable
 
         Skill::TriageI |
         Skill::TriageII |
@@ -1296,7 +1296,7 @@ fn intercept(source: &mut Construct, target: &mut Construct, mut results: Resolu
     return results;
 }
 
-fn break(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions {
+fn break_(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions {
     let stun = skill.effect()[0];
     results.push(Resolution::new(source, target).event(target.add_effect(skill, stun)));
     let vuln = skill.effect()[1];