Skip to content

Commit a77ed2a

Browse files
authored
Support blank target in -item message (#2302)
* Support blank target in -item message * TS fix * TS fix again
1 parent d43e960 commit a77ed2a

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

play.pokemonshowdown.com/src/battle.ts

+14
Original file line numberDiff line numberDiff line change
@@ -2231,6 +2231,20 @@ export class Battle {
22312231
let item = Dex.items.get(args[2]);
22322232
let effect = Dex.getEffect(kwArgs.from);
22332233
let ofpoke = this.getPokemon(kwArgs.of);
2234+
if (!poke) {
2235+
if (effect.id === 'frisk') {
2236+
const possibleTargets = ofpoke!.side.foe.active.filter(p => p !== null);
2237+
if (possibleTargets.length === 1) {
2238+
poke = possibleTargets[0]!;
2239+
} else {
2240+
this.activateAbility(ofpoke!, "Frisk");
2241+
this.log(args, kwArgs);
2242+
break;
2243+
}
2244+
} else {
2245+
throw new Error('No Pokemon in -item message');
2246+
}
2247+
}
22342248
poke.item = item.name;
22352249
poke.itemEffect = '';
22362250
poke.removeVolatile('airballoon' as ID);

0 commit comments

Comments
 (0)