From c47c60fdcc22c21b122c5b96aa188650dd44364d Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Thu, 18 Sep 2025 01:12:25 -0700 Subject: [PATCH] fix: determine armor or shield based on sortie boss faction (#2787) Closes #2785 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2787 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com> --- src/services/worldStateService.ts | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts index 9667340d..df35d988 100644 --- a/src/services/worldStateService.ts +++ b/src/services/worldStateService.ts @@ -266,14 +266,15 @@ export const getSortie = (day: number): ISortie => { const rng = new SRng(seed); const boss = rng.randomElement(sortieBosses)!; + const enemyFaction = sortieBossToFaction[boss]; const nodes: string[] = []; for (const [key, value] of Object.entries(ExportRegions)) { if ( - sortieFactionToSystemIndexes[sortieBossToFaction[boss]].includes(value.systemIndex) && - sortieFactionToFactions[sortieBossToFaction[boss]].includes(value.faction!) && + sortieFactionToSystemIndexes[enemyFaction].includes(value.systemIndex) && + sortieFactionToFactions[enemyFaction].includes(value.faction!) && key in sortieTilesets && - (key != "SolNode228" || sortieBossToFaction[boss] == "FC_GRINEER") // PoE does not work for non-infested enemies + (key != "SolNode228" || enemyFaction == "FC_GRINEER") // PoE only works for grineer enemies ) { nodes.push(key); } @@ -339,13 +340,7 @@ export const getSortie = (day: number): ISortie => { modifiers.push("SORTIE_MODIFIER_HAZARD_RADIATION"); } - if (ExportRegions[node].faction == "FC_GRINEER") { - // Grineer - modifiers.push("SORTIE_MODIFIER_ARMOR"); - } else if (ExportRegions[node].faction == "FC_CORPUS") { - // Corpus - modifiers.push("SORTIE_MODIFIER_SHIELDS"); - } + modifiers.push(enemyFaction == "FC_CORPUS" ? "SORTIE_MODIFIER_SHIELDS" : "SORTIE_MODIFIER_ARMOR"); const modifierType = rng.randomElement(modifiers)!;