diff --git a/client/src/components/anims/hybrid.jsx b/client/src/components/anims/hybrid.jsx index 6fc77d39..2787b6a3 100644 --- a/client/src/components/anims/hybrid.jsx +++ b/client/src/components/anims/hybrid.jsx @@ -30,7 +30,7 @@ class Hybrid extends Component { + + + + ); @@ -75,7 +100,7 @@ class Hybrid extends Component { })); this.animations.push(anime({ - targets: ['#hybrid circle.green'], + targets: ['#hybrid circle.green-one'], cx: [50, 250, 50, 250], delay: TIMES.TARGET_DELAY_MS, duration: TIMES.TARGET_DURATION_MS, @@ -84,7 +109,16 @@ class Hybrid extends Component { })); this.animations.push(anime({ - targets: ['#hybrid circle.bluewhite'], + targets: ['#hybrid circle.green-two'], + cy: [250, 50, 250, 50], + delay: TIMES.TARGET_DELAY_MS, + duration: TIMES.TARGET_DURATION_MS, + easing: 'easeInOutSine', + loop: true, + })); + + this.animations.push(anime({ + targets: ['#hybrid circle.bluewhite-one'], cy: [50, 250, 50, 250], delay: TIMES.TARGET_DELAY_MS, duration: TIMES.TARGET_DURATION_MS, @@ -92,6 +126,16 @@ class Hybrid extends Component { loop: true, })); + this.animations.push(anime({ + targets: ['#hybrid circle.bluewhite-two'], + cx: [250, 50, 250, 50], + delay: TIMES.TARGET_DELAY_MS, + duration: TIMES.TARGET_DURATION_MS, + easing: 'easeInOutSine', + loop: true, + })); + + } } diff --git a/client/src/utils.jsx b/client/src/utils.jsx index d068a749..c330c6c5 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -332,12 +332,14 @@ function randomPoints(numPoints, radius, dimensions) { const removeTier = skill => { + if (skill.includes('SiphonTick')) return 'SiphonTick'; + if (skill.includes('TriageTick')) return 'TriageTick'; + if (skill.includes('Strike')) return 'Strike'; if (skill.includes('Heal')) return 'Heal'; if (skill.includes('Blast')) return 'Blast'; if (skill.includes('Chaos')) return 'Chaos'; if (skill.includes('Slay')) return 'Slay'; - if (skill.includes('SiphonTick')) return 'SiphonTick'; if (skill.includes('Siphon')) return 'Siphon'; if (skill.includes('Snare')) return 'Snare'; @@ -348,7 +350,6 @@ const removeTier = skill => { if (skill.includes('Invert')) return 'Invert'; if (skill.includes('Taunt')) return 'Taunt'; - if (skill.includes('TriageTick')) return 'TriageTick'; if (skill.includes('Triage')) return 'Triage'; if (skill.includes('Scatter')) return 'Scatter'; if (skill.includes('Haste')) return 'Haste';