Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change
This commit is contained in:
ntr
commit
1a3260a359
@ -206,7 +206,7 @@
|
||||
font-size: 2em;
|
||||
font-family: 'Jura';
|
||||
position: absolute;
|
||||
top: 15%;
|
||||
top: 5%;
|
||||
}
|
||||
|
||||
.combat-text svg {
|
||||
|
||||
@ -9,30 +9,31 @@ const Banish = require('./anims/banish');
|
||||
const Bash = require('./anims/bash');
|
||||
const Block = require('./anims/block');
|
||||
const Buff = require('./anims/buff');
|
||||
const Chaos = require('./anims/chaos');
|
||||
const Clutch = require('./anims/clutch');
|
||||
const Curse = require('./anims/curse');
|
||||
const Debuff = require('./anims/debuff');
|
||||
const Decay = require('./anims/decay');
|
||||
const Curse = require('./anims/curse');
|
||||
const Electrify = require('./anims/electrify');
|
||||
const Electrocute = require('./anims/electrocute');
|
||||
const Haste = require('./anims/haste');
|
||||
const Stun = require('./anims/stun');
|
||||
const Heal = require('./anims/heal');
|
||||
const Hex = require('./anims/hex');
|
||||
const Hybrid = require('./anims/hybrid');
|
||||
const Strike = require('./anims/strike');
|
||||
const Intercept = require('./anims/intercept');
|
||||
const Invert = require('./anims/invert');
|
||||
const Parry = require('./anims/parry');
|
||||
const Purify = require('./anims/purify');
|
||||
const Recharge = require('./anims/recharge');
|
||||
const Refl = require('./anims/reflect');
|
||||
const Chaos = require('./anims/chaos');
|
||||
const Invert = require('./anims/invert');
|
||||
const Slay = require('./anims/slay');
|
||||
const Intercept = require('./anims/intercept');
|
||||
const Sleep = require('./anims/sleep');
|
||||
const Triage = require('./anims/triage');
|
||||
const TriageTick = require('./anims/triage.tick');
|
||||
const Siphon = require('./anims/siphon');
|
||||
const SiphonTick = require('./anims/siphon.tick');
|
||||
const Strike = require('./anims/strike');
|
||||
const Stun = require('./anims/stun');
|
||||
const Triage = require('./anims/triage');
|
||||
const TriageTick = require('./anims/triage.tick');
|
||||
|
||||
// const Test = require('./anims/test');
|
||||
|
||||
@ -145,7 +146,7 @@ function animations(props) {
|
||||
|
||||
// Block Base
|
||||
case 'Block': return <Block />;
|
||||
case 'Clutch': return false;
|
||||
case 'Clutch': return <Clutch team={player} />;
|
||||
case 'Electrify': return <Electrify />;
|
||||
case 'Electrocute': return <Electrocute />;
|
||||
case 'ElectrocuteTick': return <Electrocute />;
|
||||
|
||||
140
client/src/components/anims/clutch.jsx
Normal file
140
client/src/components/anims/clutch.jsx
Normal file
@ -0,0 +1,140 @@
|
||||
const preact = require('preact');
|
||||
const { Component } = require('preact');
|
||||
const anime = require('animejs').default;
|
||||
|
||||
const { TIMES, COLOURS } = require('../../constants');
|
||||
|
||||
class Clutch extends Component {
|
||||
constructor() {
|
||||
super();
|
||||
this.animations = [];
|
||||
}
|
||||
|
||||
render({ team }) {
|
||||
return (
|
||||
<svg
|
||||
class='skill-animation green'
|
||||
version="1.1"
|
||||
id="clutch"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
style={{ transform: team ? 'rotate3d(1, 0, 0, 180deg)' : '' }}
|
||||
viewBox="0 0 300 300">
|
||||
<filter id='clutchFilter'>
|
||||
<feTurbulence type="turbulence" baseFrequency="0" numOctaves="1" result="turbulence"></feTurbulence>
|
||||
<feDisplacementMap in2="turbulence" in="SourceGraphic" scale="1" xChannelSelector="R" yChannelSelector="G"></feDisplacementMap>
|
||||
</filter>
|
||||
<polyline
|
||||
id="stageOne"
|
||||
points='0 0'
|
||||
style={{ filter: 'url("#clutchFilter")' }}
|
||||
/>
|
||||
<polyline
|
||||
id="stageTwo"
|
||||
points='0 0'
|
||||
style={{ filter: 'url("#clutchFilter")' }}
|
||||
/>
|
||||
<polyline
|
||||
id="stageThree"
|
||||
points='0 0'
|
||||
style={{ filter: 'url("#clutchFilter")' }}
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.animations.push(anime({
|
||||
targets: ['#clutch'],
|
||||
opacity: [
|
||||
{ value: 1, delay: TIMES.TARGET_DELAY_MS, duration: TIMES.TARGET_DURATION_MS * 0.2 },
|
||||
{ value: 0, delay: TIMES.TARGET_DURATION_MS * 0.8, duration: TIMES.TARGET_DURATION_MS * 0.2 },
|
||||
],
|
||||
easing: 'easeInOutSine',
|
||||
}));
|
||||
|
||||
this.animations.push(anime({
|
||||
targets: ['#stageOne'],
|
||||
points: '128,168 80,240 176,240 128,168',
|
||||
keyframes: [
|
||||
{
|
||||
stroke: [COLOURS.GREEN, COLOURS.RED],
|
||||
fill: [null, COLOURS.RED],
|
||||
delay: TIMES.TARGET_DELAY_MS + TIMES.TARGET_DURATION_MS * 0.2,
|
||||
duration: TIMES.TARGET_DURATION_MS * 0.6,
|
||||
easing: 'easeInOutSine',
|
||||
},
|
||||
],
|
||||
delay: TIMES.TARGET_DELAY_MS,
|
||||
duration: TIMES.TARGET_DURATION_MS,
|
||||
}));
|
||||
|
||||
this.animations.push(anime({
|
||||
targets: ['#stageTwo'],
|
||||
keyframes: [
|
||||
{
|
||||
stroke: [COLOURS.GREEN, COLOURS.RED],
|
||||
fill: [null, COLOURS.RED],
|
||||
delay: TIMES.TARGET_DELAY_MS + TIMES.TARGET_DURATION_MS * 0.5,
|
||||
duration: TIMES.TARGET_DURATION_MS * 0.6,
|
||||
easing: 'easeInOutSine',
|
||||
},
|
||||
],
|
||||
points: '176,240 212,216 128,96 44,216 80,240',
|
||||
delay: TIMES.TARGET_DELAY_MS,
|
||||
duration: TIMES.TARGET_DURATION_MS,
|
||||
}));
|
||||
|
||||
this.animations.push(anime({
|
||||
targets: ['#stageThree'],
|
||||
keyframes: [
|
||||
{
|
||||
stroke: [COLOURS.GREEN, COLOURS.RED],
|
||||
fill: [null, COLOURS.RED],
|
||||
delay: TIMES.TARGET_DELAY_MS + TIMES.TARGET_DURATION_MS * 0.8,
|
||||
duration: TIMES.TARGET_DURATION_MS * 0.4,
|
||||
easing: 'easeInOutSine',
|
||||
},
|
||||
],
|
||||
points: '212,216 248,192 128,24 8,192 44,216',
|
||||
delay: TIMES.TARGET_DELAY_MS,
|
||||
duration: TIMES.TARGET_DURATION_MS,
|
||||
}));
|
||||
|
||||
this.animations.push(anime({
|
||||
targets: ['#clutchFilter feTurbulence', '#clutchFilter feDisplacementMap'],
|
||||
baseFrequency: 2,
|
||||
scale: 10,
|
||||
numOctaves: 5,
|
||||
easing: 'easeOutSine',
|
||||
delay: TIMES.TARGET_DELAY_MS + TIMES.TARGET_DURATION_MS * 0.4,
|
||||
duration: TIMES.TARGET_DURATION_MS * 0.3 + TIMES.POST_SKILL_DURATION_MS,
|
||||
}));
|
||||
}
|
||||
|
||||
// this is necessary because
|
||||
// skipping / timing / unmounting race conditions
|
||||
// can cause the animations to cut short, this will ensure the values are reset
|
||||
// because preact will recycle all these components
|
||||
componentWillUnmount() {
|
||||
for (let i = this.animations.length - 1; i >= 0; i--) {
|
||||
this.animations[i].reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Clutch;
|
||||
|
||||
|
||||
/* <polyline
|
||||
points='128,168 80,240 176,240 128,168'
|
||||
style={{ filter: 'url("#clutchFilter")' }}
|
||||
/>
|
||||
<polyline
|
||||
points='176,240 212,216 128,96 44,216 80,240'
|
||||
style={{ filter: 'url("#clutchFilter")' }}
|
||||
/>
|
||||
<polyline
|
||||
points='212,216 248,192 128,24 8,192 44,216'
|
||||
style={{ filter: 'url("#clutchFilter")' }}
|
||||
/>
|
||||
*/
|
||||
@ -23,15 +23,12 @@ class Purify extends Component {
|
||||
super();
|
||||
this.animations = [];
|
||||
const points = [
|
||||
[128, 168],
|
||||
[80, 240],
|
||||
[176, 240],
|
||||
[212, 216],
|
||||
[128, 96],
|
||||
[44, 216],
|
||||
[80, 240],
|
||||
[248, 192],
|
||||
[128, 24],
|
||||
[8, 192],
|
||||
];
|
||||
this.charges = points.map(coord => projectile(coord[0], coord[1], 12, COLOURS.GREEN));
|
||||
|
||||
@ -41,7 +41,7 @@ class Sleep extends Component {
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="-291 -191 582 582">
|
||||
<defs>
|
||||
<filter id="triageFilter">
|
||||
<filter id="sleepFilter">
|
||||
<feGaussianBlur stdDeviation="3"/>
|
||||
<feColorMatrix mode="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 19 -9" result="cutoff"/>
|
||||
<feComposite operator="atop" in="SourceGraphic" in2="cutoff"/>
|
||||
@ -62,7 +62,7 @@ class Sleep extends Component {
|
||||
style="opacity: 0.5"
|
||||
/>
|
||||
</g>
|
||||
<g id="heal" filter="url(#triageFilter)">
|
||||
<g id="heal" filter="url(#sleepFilter)">
|
||||
{this.charges}
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user