mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-18 22:32:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix call to getAttackDamage that was reset after merge

Browse Source
This commit is contained in:
Sirz Benjie 2025-03-28 21:50:05 -05:00
parent 9ddee0e73e
commit 31382eb72f
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/field/pokemon.ts
View File

@ -4133,7 +4133,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
ignoreAbility, ignoreAbility,
ignoreSourceAbility, ignoreSourceAbility,
ignoreAllyAbility, ignoreAllyAbility,
ignoreSourceAbility, ignoreSourceAllyAbility,
isCritical, isCritical,
simulated, simulated,
); );
@ -4459,7 +4459,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
cancelled, cancelled,
result, result,
damage: dmg, damage: dmg,
} = this.getAttackDamage(source, move, false, false, isCritical, false); } = this.getAttackDamage(source, move, false, false, false, false, isCritical, false);
const typeBoost = source.findTag( const typeBoost = source.findTag(
t => t =>
@ -7147,7 +7147,6 @@ export class EnemyPokemon extends Pokemon {
!p.getAlly()?.battleData.abilityRevealed, !p.getAlly()?.battleData.abilityRevealed,
false, false,
isCritical, isCritical,
true
).damage >= p.hp ).damage >= p.hp
); );
}) })