From 67d333fb31e370c5f35882c20c4979a865ffcfd0 Mon Sep 17 00:00:00 2001 From: FragginWagon Date: Wed, 28 Jan 2026 19:02:51 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=8D=20Refactor=20regional=20form=20che?= =?UTF-8?q?ck=20logic=20for=20better=20readability=20and=20clarity=20in=20?= =?UTF-8?q?gamemaster=20utility=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/utilities/gamemaster-utils.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/websites/pokedex.online/src/utilities/gamemaster-utils.js b/code/websites/pokedex.online/src/utilities/gamemaster-utils.js index 68e58c5..6065057 100644 --- a/code/websites/pokedex.online/src/utilities/gamemaster-utils.js +++ b/code/websites/pokedex.online/src/utilities/gamemaster-utils.js @@ -48,13 +48,13 @@ export function breakUpGamemaster(gamemaster) { acc.pokemonAllForms.push(item); // Add to pokemon (filtered - first occurrence OR regional forms) - if ( - !acc.pokemonSeen.has(pokemonId) || - (acc.pokemonSeen.has(pokemonId) && - regionCheck.includes( - pokemonSettings?.form?.split('_')[1]?.toLowerCase() - )) - ) { + // Check if this is a regional form by looking at the form string + const form = pokemonSettings?.form; + const isRegionalForm = form ? regionCheck.includes( + form.split('_')[1]?.toLowerCase() + ) : false; + + if (!acc.pokemonSeen.has(pokemonId) || (acc.pokemonSeen.has(pokemonId) && isRegionalForm)) { acc.pokemonSeen.add(pokemonId); acc.pokemon.push(item); }