mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-20 14:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added Lingering Arena Trap Fix for Mystery Encounters

Browse Source
This commit is contained in:
geeil-han 2024-10-29 10:02:31 +01:00
parent 8d279f8eb0
commit 6cf047aa1f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/field/pokemon.ts
View File

@ -353,14 +353,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* Checks if the Pokemon is allowed to be in battle and if it is on the field * Checks if the Pokemon is allowed to be in battle and if it is on the field
* @param onField overrides if this Pokemon is on the field or not * @param onField overrides if this Pokemon is on the field or not
* @returns returns false if there is no scene otherwise it returns true * @returns returns false if there is no scene otherwise it returns true
*
* Does not work with Mystery Encounters
*/ */
isActive(onField?: boolean): boolean { isActive(onField?: boolean): boolean {
if (!this.scene) { if (!this.scene) {
return false; return false;
} }
if (this.switchOutStatus && !this.isPlayer && (!this.scene.currentBattle?.isBattleMysteryEncounter() || !this.scene.currentBattle?.mysteryEncounter)) { if (this.switchOutStatus && !this.isPlayer) {
return false; return false;
} }
return this.isAllowedInBattle() && !!this.scene && (!onField || this.isOnField()); return this.isAllowedInBattle() && !!this.scene && (!onField || this.isOnField());
@ -1530,10 +1528,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
/** /**
* Contains opposing Pokemon (Enemy/Player Pokemon) depending on perspective * Contains opposing Pokemon (Enemy/Player Pokemon) depending on perspective
* Afterwards, it filters out Pokemon that have been switched out of the field so trapped abilities/moves do not trigger * Afterwards, it filters out Pokemon that have been switched out of the field so trapped abilities/moves do not trigger
* This does not apply for Mystery Encounters
*/ */
const opposingFieldUnfiltered = this.isPlayer() ? this.scene.getEnemyField() : this.scene.getPlayerField(); const opposingFieldUnfiltered = this.isPlayer() ? this.scene.getEnemyField() : this.scene.getPlayerField();
const opposingField = (!!this.scene.currentBattle?.isBattleMysteryEncounter() || !!this.scene.currentBattle?.mysteryEncounter) ? opposingFieldUnfiltered.filter(enemyPkm => enemyPkm.switchOutStatus === false) : opposingFieldUnfiltered; const opposingField = opposingFieldUnfiltered.filter(enemyPkm => enemyPkm.switchOutStatus === false);
opposingField.forEach(opponent => opposingField.forEach(opponent =>
applyCheckTrappedAbAttrs(CheckTrappedAbAttr, opponent, trappedByAbility, this, trappedAbMessages, simulated) applyCheckTrappedAbAttrs(CheckTrappedAbAttr, opponent, trappedByAbility, this, trappedAbMessages, simulated)