From e1b64e062370d2141a7d92cb3f5628d60c53e491 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Tue, 4 Jul 2023 16:35:40 -0400 Subject: [PATCH] Fix Salac berry raising the wrong stat --- src/data/berry.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/berry.ts b/src/data/berry.ts index 4cb9fcdf9..d75a6d5f4 100644 --- a/src/data/berry.ts +++ b/src/data/berry.ts @@ -12,9 +12,9 @@ export enum BerryType { ENIGMA, LIECHI, GANLON, - SALAC, PETAYA, APICOT, + SALAC, LANSAT, STARF } @@ -33,9 +33,9 @@ export function getBerryEffectDescription(berryType: BerryType) { return 'Restores 25% HP if hit by a super effective move'; case BerryType.LIECHI: case BerryType.GANLON: - case BerryType.SALAC: case BerryType.PETAYA: case BerryType.APICOT: + case BerryType.SALAC: const stat = (berryType - BerryType.LIECHI) as BattleStat; return `Raises ${getBattleStatName(stat)} if HP is below 25%`; case BerryType.LANSAT: @@ -57,9 +57,9 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate { return (pokemon: Pokemon) => !!pokemon.turnData.attacksReceived.filter(a => a.result === HitResult.SUPER_EFFECTIVE).length; case BerryType.LIECHI: case BerryType.GANLON: - case BerryType.SALAC: case BerryType.PETAYA: case BerryType.APICOT: + case BerryType.SALAC: return (pokemon: Pokemon) => { const battleStat = (berryType - BerryType.LIECHI) as BattleStat; return pokemon.getHpRatio() < 0.25 && pokemon.summonData.battleStats[battleStat] < 6; @@ -92,9 +92,9 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { }; case BerryType.LIECHI: case BerryType.GANLON: - case BerryType.SALAC: case BerryType.PETAYA: case BerryType.APICOT: + case BerryType.SALAC: return (pokemon: Pokemon) => { const battleStat = (berryType - BerryType.LIECHI) as BattleStat; pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ battleStat ], 1));