diff --git a/client/assets/styles/styles.css b/client/assets/styles/styles.css index dce5f627..4c3ac69c 100644 --- a/client/assets/styles/styles.css +++ b/client/assets/styles/styles.css @@ -252,6 +252,10 @@ button[disabled] { stroke: #a52a2a; } +.red-fill { + fill: #a52a2a; +} + .blue { color: #3498db; stroke: #3498db; diff --git a/client/src/components/animations.jsx b/client/src/components/animations.jsx index 58e6e758..dcec77d2 100644 --- a/client/src/components/animations.jsx +++ b/client/src/components/animations.jsx @@ -6,6 +6,7 @@ const AttackCharge = require('./anims/attack.charge'); const Amplify = require('./anims/amplify'); const Blast = require('./anims/blast'); const banish = require('./anims/banish'); +const Bash = require('./anims/bash'); const Block = require('./anims/block'); const Buff = require('./anims/buff'); const Debuff = require('./anims/debuff'); @@ -45,6 +46,8 @@ function animations(props) { if (!event.skill) return false; if (!resolution.target) return false; + console.log(resolution); + // source animation if (resolution.source.id === construct.id) { const playerTeam = game.players.find(t => t.id === account.id); @@ -90,10 +93,13 @@ function animations(props) { console.log(text); if (!text) return false; const skill = removeTier(text); + + if (skill === 'Bash' && type === 'Damage') return false; switch (skill) { case 'Attack': return ; case 'Amplify': return ; case 'Banish': return banish(construct.id); + case 'Bash': return ; case 'Block': return ; case 'Buff': return ; case 'Blast': return ; diff --git a/client/src/components/anims/debuff.jsx b/client/src/components/anims/debuff.jsx index a1e32ba6..6fa300e7 100644 --- a/client/src/components/anims/debuff.jsx +++ b/client/src/components/anims/debuff.jsx @@ -72,7 +72,6 @@ class Debuff extends Component { delay: TIMES.TARGET_DELAY_MS, duration: TIMES.TARGET_DURATION_MS, })); - } // this is necessary because diff --git a/client/src/components/anims/hex.jsx b/client/src/components/anims/hex.jsx index c2404b17..aa206172 100644 --- a/client/src/components/anims/hex.jsx +++ b/client/src/components/anims/hex.jsx @@ -23,7 +23,10 @@ class Hex extends Component { xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"> - + +