monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The Witness: Fix Logic Error for Keep Pressure Plates 2 EP in puzzle_randomization: none (#2515)

This commit is contained in:
NewSoupVi 2023-12-10 20:35:46 +01:00 committed by GitHub
parent 3a09677333
commit e2109dba50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/witness/WitnessLogicVanilla.txt
View File

@ -430,7 +430,7 @@ Door - 0x04F8F (Tower Shortcut) - 0x0361B
158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Dots & Shapers & Black/White Squares & Rotated Shapers 158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Dots & Shapers & Black/White Squares & Rotated Shapers
Laser - 0x014BB (Laser) - 0x0360E | 0x03317 Laser - 0x014BB (Laser) - 0x0360E | 0x03317
159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True 159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True
159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 - True 159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 & 0x01BEA - True
159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True 159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True
159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True 159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True
159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True 159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True

5
worlds/witness/items.py
View File

@ -115,6 +115,7 @@ class WitnessPlayerItems:
# Adjust item classifications based on game settings. # Adjust item classifications based on game settings.
eps_shuffled = self._world.options.shuffle_EPs eps_shuffled = self._world.options.shuffle_EPs
come_to_you = self._world.options.elevators_come_to_you come_to_you = self._world.options.elevators_come_to_you
difficulty = self._world.options.puzzle_randomization
for item_name, item_data in self.item_data.items(): for item_name, item_data in self.item_data.items():
if not eps_shuffled and item_name in {"Monastery Garden Entry (Door)", if not eps_shuffled and item_name in {"Monastery Garden Entry (Door)",
"Monastery Shortcuts", "Monastery Shortcuts",
@ -130,10 +131,12 @@ class WitnessPlayerItems:
"Monastery Laser Shortcut (Door)", "Monastery Laser Shortcut (Door)",
"Orchard Second Gate (Door)", "Orchard Second Gate (Door)",
"Jungle Bamboo Laser Shortcut (Door)", "Jungle Bamboo Laser Shortcut (Door)",
"Keep Pressure Plates 2 Exit (Door)",
"Caves Elevator Controls (Panel)"}: "Caves Elevator Controls (Panel)"}:
# Downgrade doors that don't gate progress. # Downgrade doors that don't gate progress.
item_data.classification = ItemClassification.useful item_data.classification = ItemClassification.useful
elif item_name == "Keep Pressure Plates 2 Exit (Door)" and not (difficulty == "none" and eps_shuffled):
# PP2EP requires the door in vanilla puzzles, otherwise it's unnecessary
item_data.classification = ItemClassification.useful
# Build the mandatory item list. # Build the mandatory item list.
self._mandatory_items: Dict[str, int] = {} self._mandatory_items: Dict[str, int] = {}