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

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source
This commit is contained in:
Mashy 2020-01-13 16:31:34 +10:00
commit cbc0846f4d
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/anims/amplify.jsx
View File

@ -22,7 +22,7 @@ class Amplify extends Component {
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 200 200">
<filter id="amplifyFilter">
<feTurbulence type="turbulence" baseFrequency="0.4" numOctaves="2" result="turbulence"></feTurbulence>
<feTurbulence type="turbulence" baseFrequency="0.1" numOctaves="2" result="turbulence"></feTurbulence>
<feDisplacementMap in2="turbulence" in="SourceGraphic" scale="2" xChannelSelector="R" yChannelSelector="G"></feDisplacementMap>
</filter>
<path filter='url("#amplifyFilter")' d={path} />

6
client/src/components/construct.jsx
View File

@ -69,7 +69,11 @@ class ConstructAvatar extends Component {
const type = resolution.event[0];
// only trigger the wiggle on damage and ko events rather than spam it on everything
// also stops wiggle triggering when invert effect is applied
if (['Damage', 'Ko'].includes(type)) return wiggle(construct.id, this.idle);
const wiggleEvents = [
'Damage',
// 'Ko'
];
if (wiggleEvents.includes(type)) return wiggle(construct.id, this.idle);
}
// different source object and source construct