From f2e37e1829c7f142baf7f0e18c192b44c60fc515 Mon Sep 17 00:00:00 2001
From: Jarno Westhof <jarnowesthof@gmail.com>
Date: Tue, 17 Jun 2025 20:58:03 +0200
Subject: [PATCH] Fixed hub milestone item leaking to into wrong milestones

---
 worlds/satisfactory/GameLogic.py | 2 +-
 worlds/satisfactory/Items.py     | 4 ++--
 worlds/satisfactory/Locations.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/worlds/satisfactory/GameLogic.py b/worlds/satisfactory/GameLogic.py
index 49b4590f3f..bc666a7b64 100644
--- a/worlds/satisfactory/GameLogic.py
+++ b/worlds/satisfactory/GameLogic.py
@@ -851,7 +851,7 @@ class GameLogic:
             MamNode("Explosive Resonance Application", {"Crystal Oscillator":5,"Nobelisk":100,}, depends_on=("Crystal Oscillator", )), #(Research_Quartz_3_4_C)
             MamNode("Blade Runners", {"Silica":50,"Modular Frame":10,}, depends_on=("Silica", )), #(Research_Caterium_4_3_C)
             MamNode("The Explorer", {"Crystal Oscillator":10,"Modular Frame":100,}, depends_on=("Crystal Oscillator", )), #(Research_Quartz_3_1_C)
-            MamNode("Material Resonance Screening", {"Crystal Oscillator":15,"Reinforced Iron Plate":100,}, depends_on=("Crystal Oscillator", )), #(Research_Quartz_3_1_C)
+            MamNode("Material Resonance Screening", {"Crystal Oscillator":15,"Reinforced Iron Plate":100,}, depends_on=("Crystal Oscillator", )), #(Research_Quartz_PriorityMerger_C)
             MamNode("Radio Signal Scanning", {"Crystal Oscillator":100,"Motor":100,"Object Scanner":1,}, depends_on=("Crystal Oscillator", )), #(Research_Quartz_4_1_C)
             MamNode("Inflated Pocket Dimension", {"Silica":200,}, depends_on=("Silica", )), #(Research_Caterium_3_1_C)
             MamNode("Radar Technology", {"Crystal Oscillator":50,"Heavy Modular Frame":50,"Computer":50,}, depends_on=("Crystal Oscillator", )), #(Research_Quartz_4_C) # 1.0
diff --git a/worlds/satisfactory/Items.py b/worlds/satisfactory/Items.py
index ea48e1b8ac..34f18efcda 100644
--- a/worlds/satisfactory/Items.py
+++ b/worlds/satisfactory/Items.py
@@ -74,7 +74,7 @@ class Items:
         "Bundle: Motor": ItemData(G.Parts, 1338060),
         "Bundle: Mycelia": ItemData(G.Parts, 1338061),
         "Bundle: Non-fissile Uranium": ItemData(G.Trap, 1338062, C.trap),
-        "Bundle: Nuclear Pasta": ItemData(G.Parts, 1338063),
+        "Bundle: Nuclear Pasta": ItemData(G.Parts, 1338063, count=0),
         "Bundle: Lizard Doggo Statue": ItemData(G.Parts, 1338064),
         "Bundle: Organic Data Capsule": ItemData(G.Parts, 1338065),
         "Bundle: Packaged Alumina Solution": ItemData(G.Parts, 1338066),
@@ -359,7 +359,7 @@ class Items:
         "Recipe: Assembly Director System": ItemData(G.Recipe, 1338357, C.progression),
         "Recipe: Magnetic Field Generator": ItemData(G.Recipe, 1338358, C.progression),
         "Recipe: Copper Powder": ItemData(G.Recipe, 1338359, C.progression),
-        "Recipe: Nuclear Pasta": ItemData(G.Recipe, 1338360, C.progression, count=0),
+        "Recipe: Nuclear Pasta": ItemData(G.Recipe, 1338360, C.progression),
         "Recipe: Thermal Propulsion Rocket": ItemData(G.Recipe, 1338361, C.progression),
         "Recipe: Ficsonium": ItemData(G.Recipe, 1338362), # 1.0
         "Recipe: Ficsonium Fuel Rod": ItemData(G.Recipe, 1338363), # 1.0
diff --git a/worlds/satisfactory/Locations.py b/worlds/satisfactory/Locations.py
index dff93ff1a6..ee72796b23 100644
--- a/worlds/satisfactory/Locations.py
+++ b/worlds/satisfactory/Locations.py
@@ -338,14 +338,14 @@ class Locations():
            number_of_slots_per_milestone_for_game = self.max_slots
         else:
             if self.options.final_elevator_package <= 2:
-                number_of_slots_per_milestone_for_game = 10
+                number_of_slots_per_milestone_for_game = self.max_slots
             else:
                 number_of_slots_per_milestone_for_game = self.game_logic.slots_per_milestone
 
         hub_location_id = self.hub_location_start
         for tier in range(1, max_tier + 1):
             for milestone in range(1, self.max_milestones + 1):
-                for slot in range(1, number_of_slots_per_milestone_for_game + 1):
+                for slot in range(1, self.max_slots + 1):
                     if for_data_package:
                         location_table.append(HubSlot(tier, milestone, slot, hub_location_id))
                     else: