From 24a44a55e17e52e42cb4cb8959f26bbc123fcca5 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 28 Mar 2025 14:32:10 -0700 Subject: [PATCH] Make flower gift unreplaceable --- src/data/ability.ts | 1 + test/abilities/flower_gift.test.ts | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 3af141f06ee..429aae7b0dd 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -6441,6 +6441,7 @@ export function initAbilities() { .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), StatMultiplierAbAttr, Stat.ATK, 1.5) .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), StatMultiplierAbAttr, Stat.SPDEF, 1.5) .uncopiable() + .unreplaceable() .attr(NoFusionAbilityAbAttr) .attr(PostSummonFormChangeByWeatherAbAttr, Abilities.FLOWER_GIFT) .attr(PostWeatherChangeFormChangeAbAttr, Abilities.FLOWER_GIFT, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG, WeatherType.HAIL, WeatherType.HEAVY_RAIN, WeatherType.SNOW, WeatherType.RAIN ]) diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts index fff509a1f00..c265742ef4a 100644 --- a/test/abilities/flower_gift.test.ts +++ b/test/abilities/flower_gift.test.ts @@ -90,25 +90,6 @@ describe("Abilities - Flower Gift", () => { await testRevertFormAgainstAbility(game, Abilities.CLOUD_NINE); }); - it("reverts to Overcast Form when the Pokémon loses Flower Gift, changes form under Harsh Sunlight/Sunny when it regains it", async () => { - game.override.enemyMoveset([Moves.SKILL_SWAP]).weather(WeatherType.HARSH_SUN); - - await game.classicMode.startBattle([Species.CHERRIM]); - - const cherrim = game.scene.getPlayerPokemon()!; - - game.move.select(Moves.SKILL_SWAP); - - await game.phaseInterceptor.to("TurnStartPhase"); - expect(cherrim.formIndex).toBe(SUNSHINE_FORM); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(cherrim.formIndex).toBe(OVERCAST_FORM); - - await game.phaseInterceptor.to("MoveEndPhase"); - expect(cherrim.formIndex).toBe(SUNSHINE_FORM); - }); - it("reverts to Overcast Form when the Flower Gift is suppressed, changes form under Harsh Sunlight/Sunny when it regains it", async () => { game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.HARSH_SUN);