Enemy item override will now apply to all enemies

This commit is contained in:
NightKev 2024-10-09 04:52:25 -07:00
parent d8c914c768
commit 7f5fdcca6c
2 changed files with 3 additions and 3 deletions

View File

@ -2689,8 +2689,8 @@ export default class BattleScene extends SceneBase {
/** /**
* Removes all modifiers from enemy of PokemonHeldItemModifier type * Removes all modifiers from enemy of PokemonHeldItemModifier type
*/ */
clearEnemyHeldItemModifiers(): void { clearEnemyHeldItemModifiers(pokemon?: Pokemon): void {
const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier); const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier && (!pokemon || m.getPokemon(this) === pokemon));
for (const m of modifiersToRemove) { for (const m of modifiersToRemove) {
this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1); this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1);
} }

View File

@ -3634,7 +3634,7 @@ export function overrideHeldItems(scene: BattleScene, pokemon: Pokemon, isPlayer
} }
if (!isPlayer) { if (!isPlayer) {
scene.clearEnemyHeldItemModifiers(); scene.clearEnemyHeldItemModifiers(pokemon);
} }
heldItemsOverride.forEach(item => { heldItemsOverride.forEach(item => {