From 32f5421b329110244e14c321147f203e5f7edf50 Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Thu, 7 Aug 2025 23:11:03 -0500 Subject: [PATCH 1/3] [Misc] Replace `Abilities.ABILITY_NAME` with `AbilityId.ABILITY_NAME` in comments This commit mirrors the comment changes made in 375587213e344ab3531391b2c96ceb75bac08e5d. --- src/data/abilities/ability.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index 336d45fed66..f5fd9b19f72 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -5491,7 +5491,7 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr { * Attribute used for abilities that damage opponents causing the user to faint * equal to the amount of damage the last attack inflicted. * - * Used for {@linkcode Abilities.INNARDS_OUT}. + * Used for {@linkcode AbilityId.INNARDS_OUT | Innards Out}. * @sealed */ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr { @@ -7307,7 +7307,7 @@ export function initAbilities() { .attr(HealFromBerryUseAbAttr, 1 / 3), new Ability(AbilityId.PROTEAN, 6) .attr(PokemonTypeChangeAbAttr) - // .condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.PROTEAN)) //Gen 9 Implementation + // .condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.PROTEAN)) //Gen 9 Implementation // TODO: needs testing on interaction with weather blockage .edgeCase(), new Ability(AbilityId.FUR_COAT, 6) @@ -7566,7 +7566,7 @@ export function initAbilities() { .attr(PostSummonStatStageChangeAbAttr, [ Stat.DEF ], 1, true), new Ability(AbilityId.LIBERO, 8) .attr(PokemonTypeChangeAbAttr) - //.condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.LIBERO)), //Gen 9 Implementation + //.condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.LIBERO)), //Gen 9 Implementation // TODO: needs testing on interaction with weather blockage .edgeCase(), new Ability(AbilityId.BALL_FETCH, 8) From 2dfe7232aa3e01989421d139c23e8462b80c37e0 Mon Sep 17 00:00:00 2001 From: damocleas Date: Fri, 8 Aug 2025 00:27:59 -0400 Subject: [PATCH 2/3] Add 1/16 chance for Trainers in Laboratory --- src/field/arena.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/field/arena.ts b/src/field/arena.ts index ed2f1df9b12..06ba6fdd334 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -536,6 +536,7 @@ export class Arena { case BiomeId.ABYSS: case BiomeId.SPACE: case BiomeId.TEMPLE: + case BiomeId.LABORATORY: return 16; default: return 0; From 8a66cfe40b51fdca48441b4f003fd9f40c04f017 Mon Sep 17 00:00:00 2001 From: Blitzy <118096277+Blitz425@users.noreply.github.com> Date: Fri, 8 Aug 2025 14:28:33 -0500 Subject: [PATCH 3/3] =?UTF-8?q?[Bug]=20Fix=20Pok=C3=A9=20Fan=20in=20Traine?= =?UTF-8?q?r=20Config=20(#6238)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix Poke Fan in Trainer Config --- src/data/trainers/trainer-config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts index 7ae157ded96..0f047157174 100644 --- a/src/data/trainers/trainer-config.ts +++ b/src/data/trainers/trainer-config.ts @@ -1593,9 +1593,9 @@ export const trainerConfigs: TrainerConfigs = { .setSpeciesFilter(s => tmSpecies[MoveId.FLY].indexOf(s.speciesId) > -1), [TrainerType.POKEFAN]: new TrainerConfig(++t) .setMoneyMultiplier(1.4) - .setName("PokéFan") - .setHasGenders("PokéFan Female") - .setHasDouble("PokéFan Family") + .setName("Pokéfan") + .setHasGenders("Pokéfan Female") + .setHasDouble("Pokéfan Family") .setEncounterBgm(TrainerType.POKEFAN) .setPartyTemplates( trainerPartyTemplates.SIX_WEAKER,