From 19d244ee949ef071847dce2806b2a1ac9e367798 Mon Sep 17 00:00:00 2001
From: JackGilham <46994951+JackGilham@users.noreply.github.com>
Date: Tue, 14 May 2024 00:38:27 +0100
Subject: [PATCH] Update modifier-type.ts (#636)

Issue#613.

Have added additional EvolutionItemModifierType condition that prevents none base form pokes from taking Evo Items.
---
 src/modifier/modifier-type.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 2457a705bce..6b336523014 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -554,10 +554,10 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge
     super(Utils.toReadableString(EvolutionItem[evolutionItem]), `Causes certain Pokémon to evolve`, (_type, args) => new Modifiers.EvolutionItemModifier(this, (args[0] as PlayerPokemon).id),
     (pokemon: PlayerPokemon) => {
       if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === this.evolutionItem
-        && (!e.condition || e.condition.predicate(pokemon))).length)
+          && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.formIndex == 0))
         return null;
       else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === this.evolutionItem
-        && (!e.condition || e.condition.predicate(pokemon))).length)
+        && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.fusionFormIndex == 0))
         return null;
 
       return PartyUiHandler.NoEffectMessage;