From 0c4064552596a8b13ddf578fd193a54917e88c6b Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Thu, 22 May 2025 00:38:02 -0500 Subject: [PATCH] Change how rare boolean is set, add todo --- src/data/balance/pokemon-evolutions.ts | 1 + src/modifier/modifier-type.ts | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts index 135c27aacf3..cf1e4061987 100644 --- a/src/data/balance/pokemon-evolutions.ts +++ b/src/data/balance/pokemon-evolutions.ts @@ -1793,6 +1793,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.DUSKNOIR, 1, EvolutionItem.REAPER_CLOTH, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.CLAMPERL]: [ + // TODO: Change the SpeciesEvolutionConditions here to use a bespoke HeldItemEvolutionCondition after the modifier rework new SpeciesEvolution(Species.HUNTAIL, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(p => p.getHeldItems().some(m => m instanceof SpeciesStatBoosterModifier && (m.type as SpeciesStatBoosterModifierType).key === "DEEP_SEA_TOOTH")), SpeciesWildEvolutionDelay.VERY_LONG), new SpeciesEvolution(Species.GOREBYSS, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(p => p.getHeldItems().some(m => m instanceof SpeciesStatBoosterModifier && (m.type as SpeciesStatBoosterModifierType).key === "DEEP_SEA_SCALE")), SpeciesWildEvolutionDelay.VERY_LONG) ], diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index c1c7d576fdd..c5b0337be8e 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1505,9 +1505,8 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator { if (!hasItem) { if (checkedSpecies.includes(speciesId) || (!!fusionSpeciesId && checkedSpecies.includes(fusionSpeciesId))) { - if (values[i].rare === true) { - rare === true; - } + // Sets the item's rarity in order to determine if the item is rare (ultra tier) or not (great tier) + values[i].rare = rare; // Add weight if party member has a matching species or, if applicable, a matching fusion species weights[i]++; } else if (checkedSpecies.includes(Species.PIKACHU) && hasFling) {