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:
ntr 2019-07-05 17:56:14 +10:00
commit 84325c86f1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/animations.jsx
View File

@ -134,7 +134,7 @@ function animations(props) {
case 'Debuff': return <Debuff />;
case 'Curse': return <Curse />;
case 'Decay': return <Decay />;
case 'DecayTick': return false;
case 'DecayTick': return <Decay />;
case 'Invert': return <Invert id={construct.id} />;
case 'Purge': return false;
case 'Silence': return <Silence />;

6
client/src/components/anims/bash.jsx
View File

@ -75,7 +75,11 @@ class Bash extends Component {
targets: ['#bashFilter feTurbulence', '#bashFilter feDisplacementMap'],
baseFrequency: 2,
scale: 10,
numOctaves: 5,
numOctaves: [
{ value: 3, delay: TIMES.TARGET_DURATION_MS * 0.25, duration: 0 },
{ value: 4, delay: TIMES.TARGET_DURATION_MS * 0.25, duration: 0 },
{ value: 5, delay: TIMES.TARGET_DURATION_MS * 0.25, duration: 0 },
],
easing: 'easeOutSine',
delay: TIMES.TARGET_DELAY_MS,