diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less
index f89cecb0..7150057e 100644
--- a/client/assets/styles/styles.less
+++ b/client/assets/styles/styles.less
@@ -204,6 +204,7 @@ table .highlight {
button[disabled] {
color: #222;
border-color: #222;
+ animation: 0;
}
#mnml input, #mnml select {
diff --git a/client/src/components/animations.jsx b/client/src/components/animations.jsx
index f72b356b..84953719 100644
--- a/client/src/components/animations.jsx
+++ b/client/src/components/animations.jsx
@@ -118,6 +118,7 @@ class ConstructAnimation extends Component {
case 'Electrocute': return ;
case 'ElectrocuteTick': return ;
case 'Counter': return ;
+ case 'CounterAttack': return ;
case 'Purify': return ;
case 'Recharge': return ;
case 'Reflect': return ;
diff --git a/client/src/components/anims/chaos.jsx b/client/src/components/anims/chaos.jsx
index 8250af93..447ea3f0 100644
--- a/client/src/components/anims/chaos.jsx
+++ b/client/src/components/anims/chaos.jsx
@@ -20,6 +20,7 @@ function projectile(x, y, radius, colour) {
cy={y}
r={radius}
fill={colour}
+ filter={colour === '#a52a2a' ? 'url(#chaosRedFilter)' : 'url(#chaosBlueFilter)'}
/>
);
}
@@ -43,6 +44,19 @@ class Chaos extends Component {
id="Layer_1"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 300 400">
+
+
+
+
+
+
+
+
+
+
+
+
+
{this.charges}
);
@@ -75,6 +89,17 @@ class Chaos extends Component {
easing: 'easeInQuad',
}));
+ this.animations.push(anime({
+ targets: ['#chaosRedFilter feTurbulence', '#chaosRedFilter feDisplacementMap'],
+ baseFrequency: 2,
+ scale: 20,
+ numOctaves: 5,
+ easing: 'easeOutSine',
+
+ delay: TIMES.TARGET_DELAY_MS,
+ duration: TIMES.TARGET_DURATION_MS,
+ }));
+
projectiles.forEach(proj => this.animations.push(anime({
targets: proj,
cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)),
diff --git a/client/src/components/anims/siphon.tick.jsx b/client/src/components/anims/siphon.tick.jsx
index 5d0faaf9..43155c07 100644
--- a/client/src/components/anims/siphon.tick.jsx
+++ b/client/src/components/anims/siphon.tick.jsx
@@ -93,7 +93,7 @@ class SiphonTick extends Component {
cy: 150 + (Math.random() * 300 * (Math.random() < 0.5 ? -1 : 1)),
delay: (Math.random() * duration * 1 / 2),
duration,
- easing: 'easeInQuad',
+ easing: 'easeOutQuad',
});
});
}
diff --git a/client/src/components/anims/slay.jsx b/client/src/components/anims/slay.jsx
index fe07c228..68654ea8 100644
--- a/client/src/components/anims/slay.jsx
+++ b/client/src/components/anims/slay.jsx
@@ -28,7 +28,7 @@ function projectile(x, y, radius, colour) {
function sword(colour) {
return (
-
+
);
}