ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change

Browse Source
This commit is contained in:
Mashy 2019-07-03 00:02:23 +10:00
commit 7bdbdd2fd4
2 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
client/src/components/anims/hybrid.jsx
View File

@ -30,7 +30,7 @@ class Hybrid extends Component {
</defs> </defs>
<g filter="url(#hybridFilter)"> <g filter="url(#hybridFilter)">
<circle <circle
class="green" class="green-one"
cx='50' cx='50'
cy='150' cy='150'
r='10' r='10'
@ -38,7 +38,15 @@ class Hybrid extends Component {
stroke="none" stroke="none"
/> />
<circle <circle
class="bluewhite" class="green-two"
cx='250'
cy='150'
r='10'
fill={COLOURS.GREEN}
stroke="none"
/>
<circle
class="bluewhite-one"
cx='150' cx='150'
cy='50' cy='50'
r='10' r='10'
@ -46,13 +54,30 @@ class Hybrid extends Component {
stroke="none" stroke="none"
/> />
<circle <circle
class="bluewhite" class="bluewhite-one"
cx='150' cx='150'
cy='50' cy='50'
r='7' r='7'
fill={COLOURS.WHITE} fill={COLOURS.WHITE}
stroke="none" stroke="none"
/> />
<circle
class="bluewhite-two"
cx='150'
cy='250'
r='10'
fill={COLOURS.BLUE}
stroke="none"
/>
<circle
class="bluewhite-two"
cx='150'
cy='250'
r='7'
fill={COLOURS.WHITE}
stroke="none"
/>
</g> </g>
</svg> </svg>
); );
@ -75,7 +100,7 @@ class Hybrid extends Component {
})); }));
this.animations.push(anime({ this.animations.push(anime({
targets: ['#hybrid circle.green'], targets: ['#hybrid circle.green-one'],
cx: [50, 250, 50, 250], cx: [50, 250, 50, 250],
delay: TIMES.TARGET_DELAY_MS, delay: TIMES.TARGET_DELAY_MS,
duration: TIMES.TARGET_DURATION_MS, duration: TIMES.TARGET_DURATION_MS,
@ -84,7 +109,16 @@ class Hybrid extends Component {
})); }));
this.animations.push(anime({ 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], cy: [50, 250, 50, 250],
delay: TIMES.TARGET_DELAY_MS, delay: TIMES.TARGET_DELAY_MS,
duration: TIMES.TARGET_DURATION_MS, duration: TIMES.TARGET_DURATION_MS,
@ -92,6 +126,16 @@ class Hybrid extends Component {
loop: true, 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,
}));
} }
} }

5
client/src/utils.jsx
View File

@ -332,12 +332,14 @@ function randomPoints(numPoints, radius, dimensions) {
const removeTier = skill => { const removeTier = skill => {
if (skill.includes('SiphonTick')) return 'SiphonTick';
if (skill.includes('TriageTick')) return 'TriageTick';
if (skill.includes('Strike')) return 'Strike'; if (skill.includes('Strike')) return 'Strike';
if (skill.includes('Heal')) return 'Heal'; if (skill.includes('Heal')) return 'Heal';
if (skill.includes('Blast')) return 'Blast'; if (skill.includes('Blast')) return 'Blast';
if (skill.includes('Chaos')) return 'Chaos'; if (skill.includes('Chaos')) return 'Chaos';
if (skill.includes('Slay')) return 'Slay'; if (skill.includes('Slay')) return 'Slay';
if (skill.includes('SiphonTick')) return 'SiphonTick';
if (skill.includes('Siphon')) return 'Siphon'; if (skill.includes('Siphon')) return 'Siphon';
if (skill.includes('Snare')) return 'Snare'; if (skill.includes('Snare')) return 'Snare';
@ -348,7 +350,6 @@ const removeTier = skill => {
if (skill.includes('Invert')) return 'Invert'; if (skill.includes('Invert')) return 'Invert';
if (skill.includes('Taunt')) return 'Taunt'; if (skill.includes('Taunt')) return 'Taunt';
if (skill.includes('TriageTick')) return 'TriageTick';
if (skill.includes('Triage')) return 'Triage'; if (skill.includes('Triage')) return 'Triage';
if (skill.includes('Scatter')) return 'Scatter'; if (skill.includes('Scatter')) return 'Scatter';
if (skill.includes('Haste')) return 'Haste'; if (skill.includes('Haste')) return 'Haste';