Skip to content

Commit

Permalink
qol(sword-slitter): Fixed some merge issues with the previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
JoelFernandes09 committed Aug 19, 2023
1 parent ca1d81d commit a6f2712
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions src/abilities/Bounty-Hunter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ export default (G: Game) => {
const targetOriginalHealth = target.health;

const ability = this;
ability.end();
G.Phaser.camera.shake(0.01, 150, true, G.Phaser.camera.SHAKE_HORIZONTAL, true);

const damage = new Damage(
ability.creature, // Attacker
Expand All @@ -157,18 +155,26 @@ export default (G: Game) => {
G,
);
target.takeDamage(damage);
G.Phaser.camera.shake(0.01, 150, true, G.Phaser.camera.SHAKE_HORIZONTAL, true);
/** damage dealt is original health - current health
* if current health is lower than damage dealt,
* and the ability is upgraded,
* and the target is alive
* make a second attack
*/
if ((targetOriginalHealth - target.health >= target.health) && !target.dead && this.isUpgraded()) {
// Added a delay for the second attack
if (
targetOriginalHealth - target.health >= target.health &&
!target.dead &&
this.isUpgraded()
) {
// Added a delay for the second attack with a custom log message
setTimeout(() => {
G.Phaser.camera.shake(0.01, 150, true, G.Phaser.camera.SHAKE_HORIZONTAL, true);
target.takeDamage(damage);
ability.end(true);
G.log('%CreatureName' + ability.creature.id + '% used ' + ability.title + ' twice');
}, 1000);
}
} else ability.end();
},
},

Expand Down

0 comments on commit a6f2712

Please sign in to comment.