random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-05-11 10:53:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Bug][Hotfix] Suppress Illusion if NG is already active (#5797)

Browse Source 
* Suppress preSummon attrs off field

* Add test case
This commit is contained in:
Dean 2025-05-07 21:04:24 -07:00 committed by GitHub
parent 530b2b8a00
commit 5a58abfddf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/field/pokemon.ts
View File

@ -186,6 +186,7 @@ import {
applyAllyStatMultiplierAbAttrs, applyAllyStatMultiplierAbAttrs,
AllyStatMultiplierAbAttr, AllyStatMultiplierAbAttr,
MoveAbilityBypassAbAttr, MoveAbilityBypassAbAttr,
PreSummonAbAttr,
} from "#app/data/abilities/ability"; } from "#app/data/abilities/ability";
import { allAbilities } from "#app/data/data-lists"; import { allAbilities } from "#app/data/data-lists";
import type PokemonData from "#app/system/pokemon-data"; import type PokemonData from "#app/system/pokemon-data";
@ -2414,8 +2415,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const suppressAbilitiesTag = arena.getTag( const suppressAbilitiesTag = arena.getTag(
ArenaTagType.NEUTRALIZING_GAS, ArenaTagType.NEUTRALIZING_GAS,
) as SuppressAbilitiesTag; ) as SuppressAbilitiesTag;
const suppressOffField = ability.hasAttr(PreSummonAbAttr);
if ( if (
this.isOnField() && (this.isOnField() || suppressOffField) &&
suppressAbilitiesTag && suppressAbilitiesTag &&
!suppressAbilitiesTag.isBeingRemoved() !suppressAbilitiesTag.isBeingRemoved()
) { ) {

16
test/abilities/illusion.test.ts
View File

@ -65,7 +65,7 @@ describe("Abilities - Illusion", () => {
expect(!!zorua.summonData.illusion).equals(false); expect(!!zorua.summonData.illusion).equals(false);
}); });
it("break with neutralizing gas", async () => { it("breaks with neutralizing gas", async () => {
game.override.enemyAbility(Abilities.NEUTRALIZING_GAS); game.override.enemyAbility(Abilities.NEUTRALIZING_GAS);
await game.classicMode.startBattle([Species.KOFFING]); await game.classicMode.startBattle([Species.KOFFING]);
@ -74,6 +74,20 @@ describe("Abilities - Illusion", () => {
expect(!!zorua.summonData.illusion).equals(false); expect(!!zorua.summonData.illusion).equals(false);
}); });
it("does not activate if neutralizing gas is active", async () => {
game.override
.enemyAbility(Abilities.NEUTRALIZING_GAS)
.ability(Abilities.ILLUSION)
.moveset(Moves.SPLASH)
.enemyMoveset(Moves.SPLASH);
await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.MAGIKARP]);
game.doSwitchPokemon(1);
await game.toNextTurn();
expect(game.scene.getPlayerPokemon()!.summonData.illusion).toBeFalsy();
});
it("causes enemy AI to consider the illusion's type instead of the actual type when considering move effectiveness", async () => { it("causes enemy AI to consider the illusion's type instead of the actual type when considering move effectiveness", async () => {
game.override.enemyMoveset([Moves.FLAMETHROWER, Moves.PSYCHIC, Moves.TACKLE]); game.override.enemyMoveset([Moves.FLAMETHROWER, Moves.PSYCHIC, Moves.TACKLE]);
await game.classicMode.startBattle([Species.ZOROARK, Species.FEEBAS]); await game.classicMode.startBattle([Species.ZOROARK, Species.FEEBAS]);