Skip to content

Make abolished turn toward target during fiery claw animation#1744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DreadKnight merged 2 commits into from
Aug 19, 2020
Merged

Make abolished turn toward target during fiery claw animation #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe6bcd8
Make abolished turn toward target during fiery claw animation
leopoldwe Aug 17, 2020
1f807ad
Make abolished turn around for longer.
leopoldwe Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/abilities/Abolished.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ export default (G) => {
},
activate(path, args) {
let ability = this;
ability.end();

let target = arrayUtils.last(path).creature;
let projectileInstance = G.animations.projectile(
Expand All @@ -134,9 +133,15 @@ export default (G) => {
);
target.takeDamage(damage);

ability.end();
this.destroy();
}, sprite); // End tween.onComplete
},
getAnimationData: function () {
return {
duration: 425,
};
},
},
// Wild Fire
{
Expand Down
12 changes: 10 additions & 2 deletions src/ability.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,16 @@ export class Ability {
this.creature.facePlayerDefault();

// Force creatures to face towards their target
if (args[0] instanceof Creature) {
this.creature.faceHex(args[0]);
if (args[0]) {
if (args[0] instanceof Creature) {
this.creature.faceHex(args[0]);
} else if (args[0] instanceof Array) {
for (var argument of args[0]) {
if (argument instanceof Creature || argument.creature) {
this.creature.faceHex(argument);
}
}
}
}
// Play animations and sounds only for active abilities
if (this.getTrigger() === 'onQuery') {
Expand Down