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

Merge branch 'beta' into midturnfix

Browse Source
This commit is contained in:
Dean 2025-02-25 19:29:34 -08:00 committed by GitHub
commit 46c6aeafe1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-scene.ts
View File

@ -3448,8 +3448,6 @@ export default class BattleScene extends SceneBase {
for (const modifier of modifiers) { for (const modifier of modifiers) {
this.addEnemyModifier(modifier, true, true); this.addEnemyModifier(modifier, true, true);
} }
this.currentBattle.trainer.genAI(party);
} }
party.forEach((enemyPokemon: EnemyPokemon, i: number) => { party.forEach((enemyPokemon: EnemyPokemon, i: number) => {

3
src/phases/encounter-phase.ts
View File

@ -253,7 +253,10 @@ export class EncounterPhase extends BattlePhase {
globalScene.getEnemyField().forEach(enemy => { globalScene.getEnemyField().forEach(enemy => {
overrideHeldItems(enemy, false); overrideHeldItems(enemy, false);
}); });
}
if (battle.battleType === BattleType.TRAINER) {
globalScene.currentBattle.trainer!.genAI(globalScene.getEnemyParty());
} }
globalScene.ui.setMode(Mode.MESSAGE).then(() => { globalScene.ui.setMode(Mode.MESSAGE).then(() => {