Fix logic issues with item stealing

This commit is contained in:
Flashfyre committed 2023-10-24 11:07:09 -04:00
1 parent 10733fd98d
commit 0ab7f1b018
2 files changed
+16 -12

No files matched your search

+2 -1
View File
@@ -14,6 +14,7 @@ import * as Utils from "../utils";
import { TempBattleStat } from '../data/temp-battle-stat';
import { BerryType, getBerryEffectFunc, getBerryPredicate } from '../data/berry';
import { Species } from '../data/species';
import { BattleType } from '../battle';
type ModifierType = ModifierTypes.ModifierType;
export type ModifierPredicate = (modifier: Modifier) => boolean;
@@ -339,7 +340,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
isIconVisible(scene: BattleScene): boolean {
const pokemon = this.getPokemon(scene);
return pokemon instanceof PlayerPokemon || this.getPokemon(scene).isOnField();
return pokemon instanceof PlayerPokemon || (scene.currentBattle.battleType === BattleType.WILD || this.getPokemon(scene).isOnField());
}
getIcon(scene: BattleScene, forSummary?: boolean): Phaser.GameObjects.Container {