diff --git a/client/assets/styles/game.css b/client/assets/styles/game.css index cd09e5c1..353f222f 100644 --- a/client/assets/styles/game.css +++ b/client/assets/styles/game.css @@ -212,6 +212,7 @@ .combat-text svg { height: 7em; + max-width: 100%; } .combat-anim { @@ -220,10 +221,12 @@ position: absolute; object-fit: contain; top: 15%; + max-width: 100%; } .combat-anim svg { height: 7em; + width: 100%; } .game-construct.active-skill { diff --git a/client/src/components/anims/block.jsx b/client/src/components/anims/block.jsx index 812b32cb..0bde891b 100644 --- a/client/src/components/anims/block.jsx +++ b/client/src/components/anims/block.jsx @@ -13,27 +13,20 @@ class Block extends Component { render() { return ( - - - - ); @@ -47,16 +40,6 @@ class Block extends Component { delay: TIMES.TARGET_DELAY_MS, duration: TIMES.TARGET_DELAY_MS, })); - - this.animations.push(anime({ - targets: ['#blockFilter feTurbulence', ' #blockFilter feDisplacementMap'], - baseFrequency: 0, - scale: 1, - easing: 'easeOutSine', - - delay: TIMES.TARGET_DELAY_MS, - duration: TIMES.TARGET_DURATION_MS, - })); } // this is necessary because diff --git a/client/src/components/anims/buff.jsx b/client/src/components/anims/buff.jsx index beca0500..80e682f9 100644 --- a/client/src/components/anims/buff.jsx +++ b/client/src/components/anims/buff.jsx @@ -17,12 +17,8 @@ class Buff extends Component { class="skill-animation" version="1.1" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 300 300"> - - - - - + viewBox="0 0 200 200"> + @@ -44,34 +40,29 @@ class Buff extends Component { this.animations.push(anime({ targets: ['#buff .buff-one'], points: '0,190 100,10 190,190', + easing: 'easeOutExpo', + delay: TIMES.TARGET_DELAY_MS, duration: TIMES.START_SKILL, })); this.animations.push(anime({ targets: ['#buff .buff-two'], points: '40,170 100,50 160,170', + easing: 'easeOutExpo', + delay: TIMES.TARGET_DELAY_MS, duration: TIMES.START_SKILL, })); this.animations.push(anime({ targets: ['#buff .buff-three'], points: '70,150 100,90 130,150', + easing: 'easeOutExpo', + delay: TIMES.TARGET_DELAY_MS, duration: TIMES.START_SKILL, })); - - this.animations.push(anime({ - targets: ['#buffFilter feTurbulence', ' #buffFilter feDisplacementMap'], - baseFrequency: 0, - scale: 1, - easing: 'easeOutSine', - - delay: TIMES.TARGET_DELAY_MS, - duration: TIMES.TARGET_DURATION_MS, - })); - } // this is necessary because diff --git a/client/src/components/anims/debuff.jsx b/client/src/components/anims/debuff.jsx index bf7efe98..7d5a1fda 100644 --- a/client/src/components/anims/debuff.jsx +++ b/client/src/components/anims/debuff.jsx @@ -18,12 +18,8 @@ class Debuff extends Component { version="1.1" xmlns="http://www.w3.org/2000/svg" style={{ transform: 'rotate(180deg)' }} - viewBox="0 0 300 300"> - - - - - + viewBox="0 0 200 200"> + @@ -46,6 +42,7 @@ class Debuff extends Component { targets: ['#debuff .debuff-one'], points: '0,190 100,10 190,190', easing: 'easeOutExpo', + delay: TIMES.TARGET_DELAY_MS, duration: TIMES.START_SKILL, })); @@ -53,6 +50,7 @@ class Debuff extends Component { targets: ['#debuff .debuff-two'], points: '40,170 100,50 160,170', easing: 'easeOutExpo', + delay: TIMES.TARGET_DELAY_MS, duration: TIMES.START_SKILL, })); @@ -60,17 +58,8 @@ class Debuff extends Component { targets: ['#debuff .debuff-three'], points: '70,150 100,90 130,150', easing: 'easeOutExpo', - duration: TIMES.START_SKILL, - })); - - this.animations.push(anime({ - targets: ['#debuffFilter feTurbulence', ' #debuffFilter feDisplacementMap'], - baseFrequency: 0, - scale: 1, - easing: 'easeOutSine', - delay: TIMES.TARGET_DELAY_MS, - duration: TIMES.TARGET_DURATION_MS, + duration: TIMES.START_SKILL, })); } diff --git a/client/src/components/anims/decay.jsx b/client/src/components/anims/decay.jsx index 206457eb..317f3d08 100644 --- a/client/src/components/anims/decay.jsx +++ b/client/src/components/anims/decay.jsx @@ -29,6 +29,10 @@ class Decay extends Component { + + + + ); @@ -46,7 +50,10 @@ class Decay extends Component { this.animations.push(anime({ targets: ['#decay rect'], - transform: () => `translate(${anime.random(-100, 100)} ${anime.random(-100, 100)}) rotate(${anime.random(-15, 15)})`, + x: () => anime.random(30, 270), + y: () => anime.random(30, 270), + transform: `rotate(${anime.random(-15, 15)})`, + filter: ['brightness(1)', 'brightness(1.5)'], opacity: 0, easing: 'linear', delay: TIMES.TARGET_DELAY_MS, diff --git a/client/src/components/anims/haste.jsx b/client/src/components/anims/haste.jsx index 1ba65274..e89cf07f 100644 --- a/client/src/components/anims/haste.jsx +++ b/client/src/components/anims/haste.jsx @@ -14,10 +14,10 @@ class Haste extends Component { return ( + viewBox="0 0 200 200">