cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Count all hits for multi hit moves

pull/1/head
Flashfyre 2023-05-03 00:00:21 -04:00
parent 5413fd5c9c
commit 230b582b66
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle-phases.ts
View File

@ -1013,7 +1013,7 @@ abstract class MoveEffectPhase extends PokemonPhase {
const hitCount = new Utils.IntegerHolder(1); const hitCount = new Utils.IntegerHolder(1);
applyMoveAttrs(MultiHitAttr, user, target, this.move.getMove(), hitCount); applyMoveAttrs(MultiHitAttr, user, target, this.move.getMove(), hitCount);
user.turnData.hitCount = 0; user.turnData.hitCount = 0;
user.turnData.hitsLeft = user.turnData.hitsTotal = hitCount.value; user.turnData.hitsLeft = user.turnData.hitCount = hitCount.value;
} }
if (!this.hitCheck()) { if (!this.hitCheck()) {
@ -1028,7 +1028,6 @@ abstract class MoveEffectPhase extends PokemonPhase {
new MoveAnim(this.move.getMove().id as Moves, user).play(this.scene, () => { new MoveAnim(this.move.getMove().id as Moves, user).play(this.scene, () => {
const result = !isProtected ? target.apply(user, this.move) : MoveResult.NO_EFFECT; const result = !isProtected ? target.apply(user, this.move) : MoveResult.NO_EFFECT;
++user.turnData.hitCount;
user.pushMoveHistory({ move: this.move.moveId, result: result, virtual: this.move.virtual }); user.pushMoveHistory({ move: this.move.moveId, result: result, virtual: this.move.virtual });
if (result !== MoveResult.NO_EFFECT && result !== MoveResult.FAILED) { if (result !== MoveResult.NO_EFFECT && result !== MoveResult.FAILED) {
applyMoveAttrs(MoveEffectAttr, user, target, this.move.getMove()); applyMoveAttrs(MoveEffectAttr, user, target, this.move.getMove());
@ -1052,7 +1051,7 @@ abstract class MoveEffectPhase extends PokemonPhase {
if (--user.turnData.hitsLeft >= 1 && this.getTargetPokemon().hp) if (--user.turnData.hitsLeft >= 1 && this.getTargetPokemon().hp)
this.scene.unshiftPhase(this.getNewHitPhase()); this.scene.unshiftPhase(this.getNewHitPhase());
else { else {
if (user.turnData.hitsTotal > 1) if (user.turnData.hitCount > 1)
this.scene.queueMessage(`Hit ${user.turnData.hitCount} time(s)!`); this.scene.queueMessage(`Hit ${user.turnData.hitCount} time(s)!`);
this.scene.applyModifiers(HitHealModifier, this.player, user); this.scene.applyModifiers(HitHealModifier, this.player, user);
} }

1
src/pokemon.ts
View File

@ -1127,7 +1127,6 @@ export class PokemonTurnData {
public flinched: boolean; public flinched: boolean;
public hitCount: integer; public hitCount: integer;
public hitsLeft: integer; public hitsLeft: integer;
public hitsTotal: integer;
public damageDealt: integer = 0; public damageDealt: integer = 0;
} }