From 7050e1526735062fae47a72b14c042745eb1d6ab Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sat, 23 Aug 2025 04:09:30 +0200
Subject: [PATCH] [Challenge][Bug] Partial Fix Available starters in fresh
 start monotype (#6344)

Full fresh start filter also accepts evolutions

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 src/constants.ts      | 6 ++++++
 src/data/challenge.ts | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/constants.ts b/src/constants.ts
index 17cf08aa7e2..589a091153c 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -53,6 +53,12 @@ export const defaultStarterSpecies: SpeciesId[] = [
   SpeciesId.QUAXLY,
 ];
 
+export const defaultStarterSpeciesAndEvolutions: SpeciesId[] = defaultStarterSpecies.flatMap(id => [
+  id,
+  (id + 1) as SpeciesId,
+  (id + 2) as SpeciesId,
+]);
+
 export const saveKey = "x0i2O7WRiANTqPmZ"; // Temporary; secure encryption is not yet necessary
 
 /**
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 92fa8d4f4a0..3c282e7640e 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -1,6 +1,6 @@
 import type { FixedBattleConfig } from "#app/battle";
 import { getRandomTrainerFunc } from "#app/battle";
-import { defaultStarterSpecies } from "#app/constants";
+import { defaultStarterSpeciesAndEvolutions } from "#app/constants";
 import { speciesStarterCosts } from "#balance/starters";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { AbilityAttr } from "#enums/ability-attr";
@@ -797,7 +797,7 @@ export class FreshStartChallenge extends Challenge {
   }
 
   applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder): boolean {
-    if (this.value === 1 && !defaultStarterSpecies.includes(pokemon.speciesId)) {
+    if (this.value === 1 && !defaultStarterSpeciesAndEvolutions.includes(pokemon.speciesId)) {
       valid.value = false;
       return true;
     }