From 8845d437849deb7b63c0a10038b593e23e61e39d Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Sat, 30 Mar 2024 18:55:37 -0500 Subject: [PATCH] Partially implement Flower Gift The Attack and Special Defense boost works, but only for the ability holder currently. It does not change Cherrim's form yet. Also adds the necessary battler tag entries because I forgot them in the previous commit. --- src/data/ability.ts | 4 +++- src/data/enums/battler-tag-type.ts | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 8a068b49c..41887f3eb 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -2243,7 +2243,9 @@ export function initAbilities() { .attr(MovePowerBoostAbAttr, (user, target, move) => move.getAttrs(RecoilAttr).length && move.id !== Moves.STRUGGLE, 1.2), new Ability(Abilities.MULTITYPE, "Multitype (N)", "Changes the Pokémon's type to match the Plate or Z-Crystal it holds.", 4) .attr(ProtectAbilityAbAttr), - new Ability(Abilities.FLOWER_GIFT, "Flower Gift (N)", "Boosts the Attack and Sp. Def stats of itself and allies in harsh sunlight.", 4) + new Ability(Abilities.FLOWER_GIFT, "Flower Gift (P)", "Boosts the Attack and Sp. Def stats of itself and allies in harsh sunlight.", 4) + .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), BattleStatMultiplierAbAttr, BattleStat.ATK, 1.5) + .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), BattleStatMultiplierAbAttr, BattleStat.SPDEF, 1.5) .ignorable(), new Ability(Abilities.BAD_DREAMS, "Bad Dreams (N)", "Reduces the HP of sleeping opposing Pokémon.", 4), new Ability(Abilities.PICKPOCKET, "Pickpocket", "Steals an item from an attacker that made direct contact.", 5) diff --git a/src/data/enums/battler-tag-type.ts b/src/data/enums/battler-tag-type.ts index 30bb824ff..4021100a2 100644 --- a/src/data/enums/battler-tag-type.ts +++ b/src/data/enums/battler-tag-type.ts @@ -24,6 +24,8 @@ export enum BattlerTagType { THUNDER_CAGE = "THUNDER_CAGE", PROTECTED = "PROTECTED", KINGS_SHIELD = "KINGS_SHIELD", + OBSTRUCT = "OBSTRUCT", + SILK_TRAP = "SILK_TRAP", BANEFUL_BUNKER = "BANEFUL_BUNKER", BURNING_BULWARK = "BURNING_BULWARK", ENDURING = "ENDURING",