mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-26 09:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

aRHGHSHDKSHD

Browse Source
This commit is contained in:
frutescens 2024-09-25 14:26:55 -07:00
parent 301852714e
commit 3a83833b5a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/battler-tags.ts
View File

@ -2536,7 +2536,7 @@ export class TauntTag extends MoveRestrictionBattlerTag {
* The tag is only removed when the source-user is removed from the field. * The tag is only removed when the source-user is removed from the field.
*/ */
export class ImprisonTag extends MoveRestrictionBattlerTag { export class ImprisonTag extends MoveRestrictionBattlerTag {
private source: Pokemon; private source: Pokemon | null;
constructor(sourceId: number) { constructor(sourceId: number) {
super(BattlerTagType.IMPRISON, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE], 1, Moves.IMPRISON, sourceId); super(BattlerTagType.IMPRISON, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE], 1, Moves.IMPRISON, sourceId);
@ -2544,7 +2544,7 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
override onAdd(pokemon: Pokemon) { override onAdd(pokemon: Pokemon) {
if (this.sourceId) { if (this.sourceId) {
this.source = pokemon.scene.getPokemonById(this.sourceId)!; this.source = pokemon.scene.getPokemonById(this.sourceId);
} }
} }
@ -2555,7 +2555,7 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
* @returns `true` if the source is still active * @returns `true` if the source is still active
*/ */
override lapse(_pokemon: Pokemon, _lapseType: BattlerTagLapseType): boolean { override lapse(_pokemon: Pokemon, _lapseType: BattlerTagLapseType): boolean {
return this.source.isActive(true); return this.source?.isActive(true) ?? false;
} }
/** /**
@ -2564,8 +2564,11 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
* @returns `false` if either condition is not met * @returns `false` if either condition is not met
*/ */
override isMoveRestricted(move: Moves): boolean { override isMoveRestricted(move: Moves): boolean {
const sourceMoveset = this.source.getMoveset().map(m => m!.moveId); if (this.source) {
return sourceMoveset.includes(move) && this.source.isActive(true); const sourceMoveset = this.source.getMoveset().map(m => m!.moveId);
return sourceMoveset?.includes(move) && this.source.isActive(true);
}
return false;
} }
override selectionDeniedText(_pokemon: Pokemon, move: Moves): string { override selectionDeniedText(_pokemon: Pokemon, move: Moves): string {