From 959397175986d374cd4a7959ee982856e9341f40 Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:16:04 +0200
Subject: [PATCH 1/3] fix: don't use armor/shield sortie modifiers when faction
 is infestation

---
 src/services/worldStateService.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index 9667340d..9a1d1220 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 does not work for non-infested enemies
         ) {
             nodes.push(key);
         }
@@ -339,11 +340,9 @@ export const getSortie = (day: number): ISortie => {
             modifiers.push("SORTIE_MODIFIER_HAZARD_RADIATION");
         }
 
-        if (ExportRegions[node].faction == "FC_GRINEER") {
-            // Grineer
+        if (enemyFaction == "FC_GRINEER") {
             modifiers.push("SORTIE_MODIFIER_ARMOR");
-        } else if (ExportRegions[node].faction == "FC_CORPUS") {
-            // Corpus
+        } else if (enemyFaction == "FC_CORPUS") {
             modifiers.push("SORTIE_MODIFIER_SHIELDS");
         }
 
-- 
2.47.2


From a9657829f8daea6bad9ccdc19a930f7bc4e1aed0 Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:35:23 +0200
Subject: [PATCH 2/3] fix: determine armor or shield based on sortie boss
 faction

---
 src/services/worldStateService.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index 9a1d1220..5df677ee 100644
--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@@ -340,11 +340,7 @@ export const getSortie = (day: number): ISortie => {
             modifiers.push("SORTIE_MODIFIER_HAZARD_RADIATION");
         }
 
-        if (enemyFaction == "FC_GRINEER") {
-            modifiers.push("SORTIE_MODIFIER_ARMOR");
-        } else if (enemyFaction == "FC_CORPUS") {
-            modifiers.push("SORTIE_MODIFIER_SHIELDS");
-        }
+        modifiers.push(enemyFaction == "FC_CORPUS" ? "SORTIE_MODIFIER_SHIELDS" : "SORTIE_MODIFIER_ARMOR");
 
         const modifierType = rng.randomElement(modifiers)!;
 
-- 
2.47.2


From cab63ced9088040966946bcf245237436c89f691 Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:37:02 +0200
Subject: [PATCH 3/3] fix this note here

---
 src/services/worldStateService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts
index 5df677ee..df35d988 100644
--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@@ -274,7 +274,7 @@ export const getSortie = (day: number): ISortie => {
             sortieFactionToSystemIndexes[enemyFaction].includes(value.systemIndex) &&
             sortieFactionToFactions[enemyFaction].includes(value.faction!) &&
             key in sortieTilesets &&
-            (key != "SolNode228" || enemyFaction == "FC_GRINEER") // PoE does not work for non-infested enemies
+            (key != "SolNode228" || enemyFaction == "FC_GRINEER") // PoE only works for grineer enemies
         ) {
             nodes.push(key);
         }
-- 
2.47.2