From 840d032aa72dc45d63674c7046288c2401109b89 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 29 Oct 2023 16:15:18 -0400 Subject: [PATCH] Don't apply Golden Pokeball towards enemy buffs --- src/battle-phases.ts | 3 ++- src/battle-scene.ts | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/battle-phases.ts b/src/battle-phases.ts index d24ec2009..8bbd8e7c5 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -2811,7 +2811,8 @@ export class SelectModifierPhase extends BattlePhase { const party = this.scene.getParty(); regenerateModifierPoolThresholds(party, this.getPoolType()); const modifierCount = new Utils.IntegerHolder(3); - this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount); + if (this.isPlayer()) + this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount); const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value); const modifierSelectCallback = (cursor: integer) => { diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 04e6cb7a6..f33dbebea 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1248,13 +1248,6 @@ export default class BattleScene extends Phaser.Scene { }); } - generateEnemyBuffModifier(): void{ - const enemyBuffModifierTypes = [ modifierTypes.ENEMY_DAMAGE_BOOSTER, modifierTypes.ENEMY_DAMAGE_REDUCTION ]; - this.executeWithSeedOffset(() => { - (getModifierType(Phaser.Math.RND.pick(enemyBuffModifierTypes)).newModifier() as PersistentModifier).add(this.enemyModifiers, false); - }, Math.floor(this.currentBattle.waveIndex / 50)); - } - clearEnemyHeldItemModifiers(): void { const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier); for (let m of modifiersToRemove)