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

disable wiggle onclick during animation

Browse Source
This commit is contained in:
ntr 2019-12-20 17:16:48 +10:00
parent 5c3a318882
commit 44089724ae
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,8 @@ const { ConstructAnimation } = require('./animations');
const addState = connect( const addState = connect(
function receiveState(state) { function receiveState(state) {
const { animSource, animTarget, resolution, account } = state; const { animating, animSource, animTarget, resolution, account } = state;
return { animSource, animTarget, resolution, account }; return { animating, animSource, animTarget, resolution, account };
} }
); );
@ -43,6 +43,7 @@ class ConstructAvatar extends Component {
} }
onClick() { onClick() {
if (this.props.animating) return false;
return this.animations.push(wiggle(this.props.construct.id, this.idle)); return this.animations.push(wiggle(this.props.construct.id, this.idle));
} }

3
core/src/skill.rs
View File

@ -637,6 +637,9 @@ impl Skill {
Skill::Heal | Skill::Heal |
Skill::HealPlus | Skill::HealPlus |
Skill::HealPlusPlus | Skill::HealPlusPlus |
Skill::Hybrid |
Skill::HybridPlus |
Skill::HybridPlusPlus |
Skill::Absorb | Skill::Absorb |
Skill::AbsorbPlus | Skill::AbsorbPlus |
Skill::AbsorbPlusPlus | Skill::AbsorbPlusPlus |