mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-20 14:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'grudgeImplementation' into grudge-patch-1

Browse Source
This commit is contained in:
Mumble 2024-11-05 17:12:58 -08:00 committed by GitHub
commit 94e2a51690
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/field/pokemon.ts
View File

@ -2914,6 +2914,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
// set splice index here, so future scene queues happen before FaintedPhase // set splice index here, so future scene queues happen before FaintedPhase
this.scene.setPhaseQueueSplice(); this.scene.setPhaseQueueSplice();
this.scene.unshiftPhase(new FaintPhase(this.scene, this.getBattlerIndex(), isOneHitKo, destinyTag, grudgeTag, source)); this.scene.unshiftPhase(new FaintPhase(this.scene, this.getBattlerIndex(), isOneHitKo, destinyTag, grudgeTag, source));
this.destroySubstitute(); this.destroySubstitute();
this.lapseTag(BattlerTagType.COMMANDED); this.lapseTag(BattlerTagType.COMMANDED);
this.resetSummonData(); this.resetSummonData();

2
src/phases/faint-phase.ts
View File

@ -39,7 +39,7 @@ export class FaintPhase extends PokemonPhase {
private grudgeTag?: GrudgeTag | null; private grudgeTag?: GrudgeTag | null;
/** /**
* The source Pokemon that dealt fatal damage and should get KO'd by Destiny Bond, if applicable * The source Pokemon that dealt fatal damage
*/ */
private source?: Pokemon; private source?: Pokemon;