diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts index 8cd9ff8a115..a5635bf464e 100644 --- a/src/data/daily-run.ts +++ b/src/data/daily-run.ts @@ -233,10 +233,12 @@ function setDailyRunEventStarterMovesets(seed: string, starters: StarterTuple): */ // TODO: Rework this setup into JSON or similar - this is quite hard to maintain function getDailyEventSeedStarters(seed: string): StarterTuple | null { - const speciesConfigurations = - /starters(?s\d{4})(?:(?f\d{2})(?v\d{2})?|(?v\d{2})(?f\d{2})?)?(?s\d{4})(?:(?f\d{2})(?v\d{2})?|(?v\d{2})(?f\d{2})?)?(?s\d{4})(?:(?f\d{2})(?v\d{2})?|(?v\d{2})(?f\d{2})?)?/.exec( - seed, - )?.groups; + const speciesRegex = i => + `(?s\\d{4})(?:(?f\\d{2})(?v\\d{2})?|(?v\\d{2})(?f\\d{2})?)?`; + + const matcher = new RegExp(`starters${speciesRegex(1)}${speciesRegex(2)}${speciesRegex(3)}`); + + const speciesConfigurations = matcher.exec(seed)?.groups; if (!speciesConfigurations) { const legacyStarters = getDailyEventSeedStartersLegay(seed);