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

This commit is contained in:
ntr
2019-12-18 17:17:27 +10:00
2 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ class SiphonTick extends Component {
anime({
targets: '#siphon',
r: 600,
duration: TIMES.TARGET_DURATION_MS * 2 / 3,
duration: TIMES.TARGET_DURATION_MS,
easing: 'easeInSine',
});
+2 -3
View File
@@ -90,7 +90,6 @@ class Slay extends Component {
translateY: 0,
translateX: 0,
loop: false,
duration: (TIMES.TARGET_DURATION_MS * 0.5),
easing: 'easeInQuad',
}));
@@ -98,7 +97,7 @@ class Slay extends Component {
targets: ['#slayFilter feTurbulence', '#slayFilter feDisplacementMap'],
baseFrequency: 10,
scale: 100,
delay: TIMES.TARGET_DURATION_MS * 0.4,
delay: TIMES.TARGET_DURATION_MS * 0.6,
duration: TIMES.TARGET_DURATION_MS * 0.3,
easing: 'easeInQuad',
}));
@@ -106,7 +105,7 @@ class Slay extends Component {
this.animations.push(anime({
targets: '#sword',
opacity: 0,
delay: TIMES.TARGET_DURATION_MS * 0.7,
delay: TIMES.TARGET_DURATION_MS * 0.9,
}));
const projectiles = document.querySelectorAll('#slay circle');