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

The Witness: Add Desert Control Panels (#2643)

This commit is contained in:
NewSoupVi 2024-01-16 15:11:52 +01:00 committed by GitHub
parent 5df7a8f686
commit 1c2dcb7b01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
worlds/witness/WitnessItems.txt
View File

@ -41,10 +41,13 @@ Doors:
1102 - Tutorial Outpost Exit (Panel) - 0x04CA4 1102 - Tutorial Outpost Exit (Panel) - 0x04CA4
1105 - Symmetry Island Lower (Panel) - 0x000B0 1105 - Symmetry Island Lower (Panel) - 0x000B0
1107 - Symmetry Island Upper (Panel) - 0x1C349 1107 - Symmetry Island Upper (Panel) - 0x1C349
1108 - Desert Surface 3 Control (Panel) - 0x09FA0
1109 - Desert Surface 8 Control (Panel) - 0x09F86
1110 - Desert Light Room Entry (Panel) - 0x0C339 1110 - Desert Light Room Entry (Panel) - 0x0C339
1111 - Desert Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B 1111 - Desert Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B
1112 - Desert Light Control (Panel) - 0x09FAA 1112 - Desert Light Control (Panel) - 0x09FAA
1113 - Desert Flood Room Entry (Panel) - 0x0A249 1113 - Desert Flood Room Entry (Panel) - 0x0A249
1114 - Desert Elevator Room Hexagonal Control (Panel) - 0x0A015
1115 - Quarry Elevator Control (Panel) - 0x17CC4 1115 - Quarry Elevator Control (Panel) - 0x17CC4
1117 - Quarry Entry 1 (Panel) - 0x09E57 1117 - Quarry Entry 1 (Panel) - 0x09E57
1118 - Quarry Entry 2 (Panel) - 0x17C09 1118 - Quarry Entry 2 (Panel) - 0x17C09
@ -232,7 +235,7 @@ Doors:
1984 - Caves Shortcuts - 0x2D859,0x2D73F 1984 - Caves Shortcuts - 0x2D859,0x2D73F
1987 - Tunnels Doors - 0x27739,0x27263,0x09E87,0x0348A 1987 - Tunnels Doors - 0x27739,0x27263,0x09E87,0x0348A
2000 - Desert Control Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B 2000 - Desert Control Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B,0x0A015,0x09FA0,0x09F86
2005 - Quarry Stoneworks Control Panels - 0x03678,0x03676,0x03679,0x03675 2005 - Quarry Stoneworks Control Panels - 0x03678,0x03676,0x03679,0x03675
2010 - Quarry Boathouse Control Panels - 0x03852,0x03858,0x275FA 2010 - Quarry Boathouse Control Panels - 0x03852,0x03858,0x275FA
2015 - Town Control Panels - 0x2896A,0x334D8,0x09F98 2015 - Town Control Panels - 0x2896A,0x334D8,0x09F98
@ -243,7 +246,7 @@ Doors:
2100 - Symmetry Island Panels - 0x1C349,0x000B0 2100 - Symmetry Island Panels - 0x1C349,0x000B0
2101 - Tutorial Outpost Panels - 0x0A171,0x04CA4 2101 - Tutorial Outpost Panels - 0x0A171,0x04CA4
2105 - Desert Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B,0x0C339,0x0A249 2105 - Desert Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B,0x0C339,0x0A249,0x0A015,0x09FA0,0x09F86
2110 - Quarry Outside Panels - 0x17C09,0x09E57,0x17CC4 2110 - Quarry Outside Panels - 0x17C09,0x09E57,0x17CC4
2115 - Quarry Stoneworks Panels - 0x01E5A,0x01E59,0x03678,0x03676,0x03679,0x03675 2115 - Quarry Stoneworks Panels - 0x01E5A,0x01E59,0x03678,0x03676,0x03679,0x03675
2120 - Quarry Boathouse Panels - 0x03852,0x03858,0x275FA 2120 - Quarry Boathouse Panels - 0x03852,0x03858,0x275FA

12
worlds/witness/WitnessLogic.txt
View File

@ -209,12 +209,12 @@ Door - 0x0C316 (Elevator Room Entry) - 0x18076
159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True
Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317: Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317:
158111 - 0x17C31 (Final Transparent) - True - True 158111 - 0x17C31 (Elevator Room Transparent) - True - True
158113 - 0x012D7 (Final Hexagonal) - 0x17C31 & 0x0A015 - True 158113 - 0x012D7 (Elevator Room Hexagonal) - 0x17C31 & 0x0A015 - True
158114 - 0x0A015 (Final Hexagonal Control) - 0x17C31 - True 158114 - 0x0A015 (Elevator Room Hexagonal Control) - 0x17C31 - True
158115 - 0x0A15C (Final Bent 1) - True - True 158115 - 0x0A15C (Elevator Room Bent 1) - True - True
158116 - 0x09FFF (Final Bent 2) - 0x0A15C - True 158116 - 0x09FFF (Elevator Room Bent 2) - 0x0A15C - True
158117 - 0x0A15F (Final Bent 3) - 0x09FFF - True 158117 - 0x0A15F (Elevator Room Bent 3) - 0x09FFF - True
159035 - 0x037BB (Elevator EP) - 0x01317 - True 159035 - 0x037BB (Elevator EP) - 0x01317 - True
Door - 0x01317 (Elevator) - 0x03608 Door - 0x01317 (Elevator) - 0x03608

12
worlds/witness/WitnessLogicExpert.txt
View File

@ -209,12 +209,12 @@ Door - 0x0C316 (Elevator Room Entry) - 0x18076
159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True
Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317: Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317:
158111 - 0x17C31 (Final Transparent) - True - True 158111 - 0x17C31 (Elevator Room Transparent) - True - True
158113 - 0x012D7 (Final Hexagonal) - 0x17C31 & 0x0A015 - True 158113 - 0x012D7 (Elevator Room Hexagonal) - 0x17C31 & 0x0A015 - True
158114 - 0x0A015 (Final Hexagonal Control) - 0x17C31 - True 158114 - 0x0A015 (Elevator Room Hexagonal Control) - 0x17C31 - True
158115 - 0x0A15C (Final Bent 1) - True - True 158115 - 0x0A15C (Elevator Room Bent 1) - True - True
158116 - 0x09FFF (Final Bent 2) - 0x0A15C - True 158116 - 0x09FFF (Elevator Room Bent 2) - 0x0A15C - True
158117 - 0x0A15F (Final Bent 3) - 0x09FFF - True 158117 - 0x0A15F (Elevator Room Bent 3) - 0x09FFF - True
159035 - 0x037BB (Elevator EP) - 0x01317 - True 159035 - 0x037BB (Elevator EP) - 0x01317 - True
Door - 0x01317 (Elevator) - 0x03608 Door - 0x01317 (Elevator) - 0x03608

12
worlds/witness/WitnessLogicVanilla.txt
View File

@ -209,12 +209,12 @@ Door - 0x0C316 (Elevator Room Entry) - 0x18076
159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True
Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317: Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317:
158111 - 0x17C31 (Final Transparent) - True - True 158111 - 0x17C31 (Elevator Room Transparent) - True - True
158113 - 0x012D7 (Final Hexagonal) - 0x17C31 & 0x0A015 - True 158113 - 0x012D7 (Elevator Room Hexagonal) - 0x17C31 & 0x0A015 - True
158114 - 0x0A015 (Final Hexagonal Control) - 0x17C31 - True 158114 - 0x0A015 (Elevator Room Hexagonal Control) - 0x17C31 - True
158115 - 0x0A15C (Final Bent 1) - True - True 158115 - 0x0A15C (Elevator Room Bent 1) - True - True
158116 - 0x09FFF (Final Bent 2) - 0x0A15C - True 158116 - 0x09FFF (Elevator Room Bent 2) - 0x0A15C - True
158117 - 0x0A15F (Final Bent 3) - 0x09FFF - True 158117 - 0x0A15F (Elevator Room Bent 3) - 0x09FFF - True
159035 - 0x037BB (Elevator EP) - 0x01317 - True 159035 - 0x037BB (Elevator EP) - 0x01317 - True
Door - 0x01317 (Elevator) - 0x03608 Door - 0x01317 (Elevator) - 0x03608

3
worlds/witness/__init__.py
View File

@ -176,7 +176,8 @@ class WitnessWorld(World):
extra_checks = [ extra_checks = [
("First Hallway Room", "First Hallway Bend"), ("First Hallway Room", "First Hallway Bend"),
("First Hallway", "First Hallway Straight"), ("First Hallway", "First Hallway Straight"),
("Desert Outside", "Desert Surface 3"), ("Desert Outside", "Desert Surface 1"),
("Desert Outside", "Desert Surface 2"),
] ]
for i in range(num_early_locs, needed_size): for i in range(num_early_locs, needed_size):

4
worlds/witness/locations.py
View File

@ -55,8 +55,8 @@ class StaticWitnessLocations:
"Desert Light Room 3", "Desert Light Room 3",
"Desert Pond Room 5", "Desert Pond Room 5",
"Desert Flood Room 6", "Desert Flood Room 6",
"Desert Final Hexagonal", "Desert Elevator Room Hexagonal",
"Desert Final Bent 3", "Desert Elevator Room Bent 3",
"Desert Laser Panel", "Desert Laser Panel",
"Quarry Entry 1 Panel", "Quarry Entry 1 Panel",

3
worlds/witness/settings/Door_Shuffle/Complex_Additional_Panels.txt
View File

@ -1,4 +1,7 @@
Items: Items:
Desert Surface 3 Control (Panel)
Desert Surface 8 Control (Panel)
Desert Elevator Room Hexagonal Control (Panel)
Desert Flood Controls (Panel) Desert Flood Controls (Panel)
Desert Light Control (Panel) Desert Light Control (Panel)
Quarry Elevator Control (Panel) Quarry Elevator Control (Panel)