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

MMerge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core

Browse Source
This commit is contained in:
ntr 2019-12-18 17:17:27 +10:00
commit c878a2cd4e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/anims/siphon.tick.jsx
View File

@ -73,7 +73,7 @@ class SiphonTick extends Component {
anime({ anime({
targets: '#siphon', targets: '#siphon',
r: 600, r: 600,
duration: TIMES.TARGET_DURATION_MS * 2 / 3, duration: TIMES.TARGET_DURATION_MS,
easing: 'easeInSine', easing: 'easeInSine',
}); });

5
client/src/components/anims/slay.jsx
View File

@ -90,7 +90,6 @@ class Slay extends Component {
translateY: 0, translateY: 0,
translateX: 0, translateX: 0,
loop: false, loop: false,
duration: (TIMES.TARGET_DURATION_MS * 0.5),
easing: 'easeInQuad', easing: 'easeInQuad',
})); }));
@ -98,7 +97,7 @@ class Slay extends Component {
targets: ['#slayFilter feTurbulence', '#slayFilter feDisplacementMap'], targets: ['#slayFilter feTurbulence', '#slayFilter feDisplacementMap'],
baseFrequency: 10, baseFrequency: 10,
scale: 100, scale: 100,
delay: TIMES.TARGET_DURATION_MS * 0.4, delay: TIMES.TARGET_DURATION_MS * 0.6,
duration: TIMES.TARGET_DURATION_MS * 0.3, duration: TIMES.TARGET_DURATION_MS * 0.3,
easing: 'easeInQuad', easing: 'easeInQuad',
})); }));
@ -106,7 +105,7 @@ class Slay extends Component {
this.animations.push(anime({ this.animations.push(anime({
targets: '#sword', targets: '#sword',
opacity: 0, opacity: 0,
delay: TIMES.TARGET_DURATION_MS * 0.7, delay: TIMES.TARGET_DURATION_MS * 0.9,
})); }));
const projectiles = document.querySelectorAll('#slay circle'); const projectiles = document.querySelectorAll('#slay circle');