From 24939ad2e08d71b4eaafbf247e113e38df1b2f5b Mon Sep 17 00:00:00 2001
From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Date: Fri, 2 May 2025 21:52:51 -0400
Subject: [PATCH] [Balance][Mystery][Beta] Salesman doesn't offer event mons
 without HA or shiny (#5746)

Don't offer event mons without HA or shiny
---
 .../the-pokemon-salesman-encounter.ts         | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
index bab0c44db7d..25798de3b4a 100644
--- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
@@ -88,7 +88,7 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
 
     const r = randSeedInt(SHINY_MAGIKARP_WEIGHT);
 
-    const validEventEncounters = timedEventManager
+    let validEventEncounters = timedEventManager
       .getEventEncounters()
       .filter(
         s =>
@@ -116,18 +116,44 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
       // If you roll 1%, give shiny Magikarp with random variant
       species = getPokemonSpecies(Species.MAGIKARP);
       pokemon = new PlayerPokemon(species, 5, 2, undefined, undefined, true);
-    } else if (
+    }
+    else if (
       (validEventEncounters.length > 0 && (r <= EVENT_THRESHOLD ||
       (isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE)))
     ) {
-      // If you roll 20%, give event encounter with 3 extra shiny rolls and its HA, if it has one
-      const enc = randSeedItem(validEventEncounters);
-      species = getPokemonSpecies(enc.species);
-      pokemon = new PlayerPokemon(species, 5, species.abilityHidden === Abilities.NONE ? undefined : 2, enc.formIndex);
-      pokemon.trySetShinySeed();
-      pokemon.trySetShinySeed();
-      pokemon.trySetShinySeed();
-    } else {
+      tries = 0;
+      do {
+        // If you roll 20%, give event encounter with 3 extra shiny rolls and its HA, if it has one
+        const enc = randSeedItem(validEventEncounters);
+        species = getPokemonSpecies(enc.species);
+        pokemon = new PlayerPokemon(species, 5, species.abilityHidden === Abilities.NONE ? undefined : 2, enc.formIndex);
+        pokemon.trySetShinySeed();
+        pokemon.trySetShinySeed();
+        pokemon.trySetShinySeed();
+        if (pokemon.shiny || pokemon.abilityIndex === 2) {
+          break;
+        }
+        tries++;
+      } while (tries < 6);
+      if (!pokemon.shiny && pokemon.abilityIndex !== 2) {
+        // If, after 6 tries, you STILL somehow don't have an HA or shiny mon, pick from only the event mons that have an HA.
+        if (validEventEncounters.some(s => !!getPokemonSpecies(s.species).abilityHidden)) {
+          validEventEncounters.filter(s => !!getPokemonSpecies(s.species).abilityHidden);
+          const enc = randSeedItem(validEventEncounters);
+          species = getPokemonSpecies(enc.species);
+          pokemon = new PlayerPokemon(species, 5, 2, enc.formIndex);
+          pokemon.trySetShinySeed();
+          pokemon.trySetShinySeed();
+          pokemon.trySetShinySeed();
+        }
+        else {
+          // If there's, and this would never happen, no eligible event encounters with a hidden ability, just do Magikarp
+          species = getPokemonSpecies(Species.MAGIKARP);
+          pokemon = new PlayerPokemon(species, 5, 2, undefined, undefined, true);
+        }
+      }
+    }
+    else {
       pokemon = new PlayerPokemon(species, 5, 2, species.formIndex);
     }
     pokemon.generateAndPopulateMoveset();