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

moved playerFaints reset to resetArenaEffects

Browse Source
This commit is contained in:
geeil-han 2025-02-10 05:34:05 +01:00
parent 9ef29b7d90
commit 1d73eebddf
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle-scene.ts
View File

@ -1344,7 +1344,6 @@ export default class BattleScene extends SceneBase {
if (newBattleType === BattleType.MYSTERY_ENCOUNTER) { if (newBattleType === BattleType.MYSTERY_ENCOUNTER) {
// Will generate the actual Mystery Encounter during NextEncounterPhase, to ensure it uses proper biome // Will generate the actual Mystery Encounter during NextEncounterPhase, to ensure it uses proper biome
this.currentBattle.mysteryEncounterType = mysteryEncounterType; this.currentBattle.mysteryEncounterType = mysteryEncounterType;
this.arena.resetPlayerFaintCount();
} }
//this.pushPhase(new TrainerMessageTestPhase(this, TrainerType.RIVAL, TrainerType.RIVAL_2, TrainerType.RIVAL_3, TrainerType.RIVAL_4, TrainerType.RIVAL_5, TrainerType.RIVAL_6)); //this.pushPhase(new TrainerMessageTestPhase(this, TrainerType.RIVAL, TrainerType.RIVAL_2, TrainerType.RIVAL_3, TrainerType.RIVAL_4, TrainerType.RIVAL_5, TrainerType.RIVAL_6));
@ -1362,9 +1361,6 @@ export default class BattleScene extends SceneBase {
this.arena.updatePoolsForTimeOfDay(); this.arena.updatePoolsForTimeOfDay();
} }
if (resetArenaState) { if (resetArenaState) {
this.resetEnemyFaintCount();
this.arena.resetPlayerFaintCount();
this.arena.resetArenaEffects(); this.arena.resetArenaEffects();
playerField.forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED)); playerField.forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED));

1
src/field/arena.ts
View File

@ -694,6 +694,7 @@ export class Arena {
this.trySetWeather(WeatherType.NONE, false); this.trySetWeather(WeatherType.NONE, false);
} }
this.trySetTerrain(TerrainType.NONE, false, true); this.trySetTerrain(TerrainType.NONE, false, true);
this.resetPlayerFaintCount();
this.removeAllTags(); this.removeAllTags();
} }