Cleanup + Ensure unshuffled work + update starter_preset json

randovania · Apr 14, 2024 · 5c452f5 · 5c452f5
1 parent e1e9afe
commit 5c452f5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 70 deletions.
diff --git a/src/open_samus_returns_rando/misc_patches/elevators.py b/src/open_samus_returns_rando/misc_patches/elevators.py
@@ -16,76 +16,7 @@ def create_elevator_table(editor: PatcherEditor, configuration: dict):
 
 
 def update_elevators(editor: PatcherEditor, configuration: dict):
-    ELEVATORS = {
-        "s000_surface": ["LE_Platform_Elevator_FromArea01"],
-        "s010_area1": [
-            "LE_Platform_Elevator_FromArea00",
-            "LE_Platform_Elevator_FromArea02",
-        ],
-        "s020_area2": [
-            "LE_Platform_Elevator_FromArea02B",
-            "LE_Platform_Elevator_FromArea02C",
-        ],
-        "s025_area2b": ["LE_Platform_Elevator_FromArea02A"],
-        "s028_area2c": [
-            "LE_Platform_Elevator_FromArea01",
-            "LE_Platform_Elevator_FromArea02A",
-            "LE_Platform_Elevator_FromArea03",
-        ],
-        "s030_area3": [
-            "LE_Platform_Elevator_FromArea02",
-            "LE_Platform_Elevator_FromArea03B_01",
-            "LE_Platform_Elevator_FromArea03B_02",
-            "LE_Platform_Elevator_FromArea03C",
-            "LE_Platform_Elevator_FromArea04",
-        ],
-        "s033_area3b": [
-            "LE_Platform_Elevator_FromArea03A_01",
-            "LE_Platform_Elevator_FromArea03A_02",
-            "LE_Platform_Elevator_FromArea03C",
-        ],
-        "s036_area3c": [
-            "LE_Platform_Elevator_FromArea03A",
-            "LE_Platform_Elevator_FromArea03B",
-        ],
-        "s040_area4": [
-            "LE_Platform_Elevator_FromArea03",
-            "LE_Platform_Elevator_FromArea05",
-            "LE_Platform_Elevator_FromArea06",
-        ],
-        "s050_area5": ["LE_Platform_Elevator_FromArea04"],
-        "s060_area6": [
-            "LE_Platform_Elevator_FromArea04",
-            "LE_Platform_Elevator_FromArea06C_01",
-            "LE_Platform_Elevator_FromArea06C_02",
-            "LE_Platform_Elevator_FromArea07",
-        ],
-        "s065_area6b": [
-            "LE_Platform_Elevator_FromArea06C_01",
-            "LE_Platform_Elevator_FromArea06C_02",
-        ],
-        "s067_area6c": [
-            "LE_Platform_Elevator_FromArea06A_01",
-            "LE_Platform_Elevator_FromArea06A_02",
-            "LE_Platform_Elevator_FromArea06B_01",
-            "LE_Platform_Elevator_FromArea06B_02",
-        ],
-        "s070_area7": [
-            "LE_Platform_Elevator_FromArea06",
-            "LE_Platform_Elevator_FromArea09",
-        ],
-        "s090_area9": [
-            "LE_Platform_Elevator_FromArea07",
-            "LE_Platform_Elevator_FromArea10",
-        ],
-        "s100_area10": [
-            "LE_Platform_Elevator_FromArea09",
-            "LE_Platform_Elevator_FromAreaSurfaceB",
-        ],
-        "s110_surfaceb": ["LE_Platform_Elevator_FromArea10"],
-    }
-
-    for scenario_name, elevators in ELEVATORS.items():
+    for scenario_name, elevators in configuration["elevators"].items():
         scenario = editor.get_scenario(scenario_name)
         for elevator in elevators:
             platform = scenario.raw.actors[10][elevator]["components"][0]

diff --git a/tests/test_files/starter_preset_patcher.json b/tests/test_files/starter_preset_patcher.json
@@ -4022,6 +4022,20 @@
             }
         }
     ],
+    "elevators": {
+        "s010_area1": {
+            "LE_Platform_Elevator_FromArea02": {
+                "scenario": "s028_area2c",
+                "actor": "ST_FromArea01"
+            }
+        },
+        "s028_area2c": {
+            "LE_Platform_Elevator_FromArea01": {
+                "scenario": "s010_area1",
+                "actor": "ST_FromArea02"
+            }
+        }
+    },
     "energy_per_tank": 100,
     "reserves_per_tank": {
         "life_tank_size": 299,