Shivers: Add collect behavior option. (ArchipelagoMW#3854)

* Add collect behavior option. * Add comma Co-authored-by: Scipio Wright <[email protected]> --------- Co-authored-by: Scipio Wright <[email protected]>
NewSoupVi · Aug 31, 2024 · 8ed466b · 8ed466b
1 parent 920cffd
commit 8ed466b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py
@@ -92,6 +92,21 @@ class FullPots(Choice):
     option_mixed = 2
 
 
+class PuzzleCollectBehavior(Choice):
+    """
+    Defines what happens to puzzles on collect.
+    - Solve None: No puzzles will be solved when collected.
+    - Prevent Out Of Logic Access: All puzzles, except Red Door and Skull Door, will be solved when collected.
+    This prevents out of logic access to Gods Room and Slide.
+    - Solve All: All puzzles will be solved when collected. (original behavior)
+    """
+    display_name = "Puzzle Collect Behavior"
+    option_solve_none = 0
+    option_prevent_out_of_logic_access = 1
+    option_solve_all = 2
+    default = 1
+
+
 @dataclass
 class ShiversOptions(PerGameCommonOptions):
     ixupi_captures_needed: IxupiCapturesNeeded
@@ -104,3 +119,4 @@ class ShiversOptions(PerGameCommonOptions):
     early_lightning: EarlyLightning
     location_pot_pieces: LocationPotPieces
     full_pots: FullPots
+    puzzle_collect_behavior: PuzzleCollectBehavior
diff --git a/worlds/shivers/__init__.py b/worlds/shivers/__init__.py
@@ -219,7 +219,8 @@ def fill_slot_data(self) -> dict:
             "ElevatorsStaySolved": self.options.elevators_stay_solved.value,
             "EarlyBeth": self.options.early_beth.value,
             "EarlyLightning": self.options.early_lightning.value,
-            "FrontDoorUsable": self.options.front_door_usable.value
+            "FrontDoorUsable": self.options.front_door_usable.value,
+            "PuzzleCollectBehavior": self.options.puzzle_collect_behavior.value,
         }