Fix sunchamber generation

Electro1512 · Oct 27, 2024 · 88309aa · 88309aa
1 parent b1c38aa
commit 88309aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/data/BlastShieldRegions.py b/data/BlastShieldRegions.py
@@ -41,7 +41,7 @@ def __get_chozo_region():
                 doors={
                     RoomName.Main_Plaza: RoomName.Ruined_Shrine_Access,
                 },
-                invalid_start_rooms=[RoomName.Arboretum, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain, RoomName.Tower_Chamber]
+                invalid_start_rooms=[RoomName.Arboretum, RoomName.Sunchamber_Lobby, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain, RoomName.Tower_Chamber]
             ),
             BlastShieldRegion(
                 name=RoomName.Tower_of_Light,
@@ -56,7 +56,7 @@ def __get_chozo_region():
                 doors={
                     RoomName.Main_Plaza: RoomName.Nursery_Access,
                 },
-                invalid_start_rooms=[RoomName.Arboretum, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain, RoomName.Tower_Chamber]
+                invalid_start_rooms=[RoomName.Arboretum, RoomName.Sunchamber_Lobby, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain, RoomName.Tower_Chamber]
             ),
             BlastShieldRegion(
                 name=RoomName.Hive_Totem,
@@ -91,23 +91,23 @@ def __get_chozo_region():
                     RoomName.Ruined_Fountain: RoomName.Arboretum_Access,
                     RoomName.Arboretum_Access: RoomName.Arboretum,
                 },
-                invalid_start_rooms=[RoomName.Arboretum, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
+                invalid_start_rooms=[RoomName.Arboretum, RoomName.Sunchamber_Lobby, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
             ),
             BlastShieldRegion(
                 name=RoomName.Arboretum,
                 doors={
                     RoomName.Arboretum: RoomName.Sunchamber_Lobby,
                     RoomName.Arboretum: RoomName.Gathering_Hall_Access,
                 },
-                invalid_start_rooms=[RoomName.Arboretum, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
+                invalid_start_rooms=[RoomName.Arboretum, RoomName.Sunchamber_Lobby, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
             ),
             BlastShieldRegion(
                 name=RoomName.Watery_Hall,
                 doors={
                     RoomName.Gathering_Hall: RoomName.Watery_Hall_Access,
                     RoomName.Watery_Hall: RoomName.Dynamo_Access
                 },
-                invalid_start_rooms=[RoomName.Arboretum, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
+                invalid_start_rooms=[RoomName.Arboretum, RoomName.Sunchamber_Lobby, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
             ),
             BlastShieldRegion(
                 name=RoomName.Energy_Core,
@@ -116,7 +116,7 @@ def __get_chozo_region():
                     RoomName.Gathering_Hall: RoomName.East_Atrium,
                     RoomName.Energy_Core_Access: RoomName.Energy_Core,
                 },
-                invalid_start_rooms=[RoomName.Arboretum, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
+                invalid_start_rooms=[RoomName.Arboretum, RoomName.Sunchamber_Lobby, RoomName.Save_Station_1, RoomName.Save_Station_2, RoomName.Burn_Dome, RoomName.Ruined_Fountain]
             ),
             BlastShieldRegion(
                 name=RoomName.Burn_Dome,

diff --git a/data/StartRoomData.py b/data/StartRoomData.py
@@ -179,7 +179,6 @@ class StartRoomData:
         area=MetroidPrimeArea.Chozo_Ruins,
         loadouts=[
             StartRoomLoadout([SuitUpgrade.Morph_Ball, SuitUpgrade.Missile_Launcher, SuitUpgrade.Morph_Ball_Bomb]),
-            StartRoomLoadout([SuitUpgrade.Morph_Ball, SuitUpgrade.Missile_Launcher, SuitUpgrade.Main_Power_Bomb])
         ],
         difficulty=StartRoomDifficulty.Buckle_Up
     ),