The Witness: Renaming, Options, Logic Fixes (#1000)

Fixes to postgame detection for "shuffle_postgame"
Renamed many locations to be symbol-independent ("Outside Tutorial Dots Introduction" becomes "Outside Tutorial Shed Row"). This is to set up future alternate modes, like Sigma Expert, which use completely different symbols.
Renamed most door items to be shorter, more consistent, and less... stupid. ("Bunker Bunker Entry Door" -> "Bunker Entry")
Removed "shuffle_uncommon"
Many logic fixes
This commit is contained in:
NewSoupVi 2022-09-18 04:20:59 +02:00 committed by GitHub
parent 332dde154f
commit 4fcde135e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 1307 additions and 1297 deletions

View File

@ -15,9 +15,9 @@ class DisableNonRandomizedPuzzles(DefaultOnToggle):
class EarlySecretArea(Toggle): class EarlySecretArea(Toggle):
"""Opens the Mountainside shortcut to the Mountain Secret Area from the start. """Opens the Mountainside shortcut to the Caves from the start.
(Otherwise known as "UTM", "Caves" or the "Challenge Area")""" (Otherwise known as "UTM", "Caves" or the "Challenge Area")"""
display_name = "Early Secret Area" display_name = "Early Caves"
class ShuffleSymbols(DefaultOnToggle): class ShuffleSymbols(DefaultOnToggle):
@ -58,15 +58,9 @@ class ShuffleVaultBoxes(Toggle):
display_name = "Shuffle Vault Boxes" display_name = "Shuffle Vault Boxes"
class ShuffleUncommonLocations(Toggle):
"""Adds some optional puzzles that are somewhat difficult or out of the way.
Examples: Mountaintop River Shape, Tutorial Patio Floor, Theater Videos"""
display_name = "Shuffle Uncommon Locations"
class ShufflePostgame(Toggle): class ShufflePostgame(Toggle):
"""Adds locations into the pool that are guaranteed to be locked behind your goal. Use this if you don't play with """Adds locations into the pool that are guaranteed to become accessible before or at the same time as your goal.
forfeit on victory.""" Use this if you don't play with forfeit on victory."""
display_name = "Shuffle Postgame" display_name = "Shuffle Postgame"
@ -90,7 +84,7 @@ class MountainLasers(Range):
class ChallengeLasers(Range): class ChallengeLasers(Range):
"""Sets the amount of beams required to enter the secret area through the Mountain Bottom Layer Discard.""" """Sets the amount of beams required to enter the Caves through the Mountain Bottom Floor Discard."""
display_name = "Required Lasers for Challenge" display_name = "Required Lasers for Challenge"
range_start = 1 range_start = 1
range_end = 11 range_end = 11
@ -122,7 +116,6 @@ the_witness_options: Dict[str, type] = {
"disable_non_randomized_puzzles": DisableNonRandomizedPuzzles, "disable_non_randomized_puzzles": DisableNonRandomizedPuzzles,
"shuffle_discarded_panels": ShuffleDiscardedPanels, "shuffle_discarded_panels": ShuffleDiscardedPanels,
"shuffle_vault_boxes": ShuffleVaultBoxes, "shuffle_vault_boxes": ShuffleVaultBoxes,
"shuffle_uncommon": ShuffleUncommonLocations,
"shuffle_postgame": ShufflePostgame, "shuffle_postgame": ShufflePostgame,
"victory_condition": VictoryCondition, "victory_condition": VictoryCondition,
"mountain_lasers": MountainLasers, "mountain_lasers": MountainLasers,

View File

@ -28,38 +28,38 @@ Traps:
610 - Power Surge 610 - Power Surge
Doors: Doors:
1100 - Glass Factory Entry Door (Panel) - 0x01A54 1100 - Glass Factory Entry (Panel) - 0x01A54
1105 - Door to Symmetry Island Lower (Panel) - 0x000B0 1105 - Symmetry Island Lower (Panel) - 0x000B0
1107 - Door to Symmetry Island Upper (Panel) - 0x1C349 1107 - Symmetry Island Upper (Panel) - 0x1C349
1110 - Door to Desert Flood Light Room (Panel) - 0x0C339 1110 - Desert Light Room Entry (Panel) - 0x0C339
1111 - Desert Flood Room Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B 1111 - Desert Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B
1119 - Quarry Door to Mill (Panel) - 0x01E5A,0x01E59 1119 - Quarry Mill Entry (Panel) - 0x01E5A,0x01E59
1120 - Quarry Mill Ramp Controls (Panel) - 0x03678,0x03676 1120 - Quarry Mill Ramp Controls (Panel) - 0x03678,0x03676
1122 - Quarry Mill Elevator Controls (Panel) - 0x03679,0x03675 1122 - Quarry Mill Lift Controls (Panel) - 0x03679,0x03675
1125 - Quarry Boathouse Ramp Height Control (Panel) - 0x03852 1125 - Quarry Boathouse Ramp Height Control (Panel) - 0x03852
1127 - Quarry Boathouse Ramp Horizontal Control (Panel) - 0x03858 1127 - Quarry Boathouse Ramp Horizontal Control (Panel) - 0x03858
1131 - Shadows Door Timer (Panel) - 0x334DB,0x334DC 1131 - Shadows Door Timer (Panel) - 0x334DB,0x334DC
1150 - Monastery Entry Door Left (Panel) - 0x00B10 1150 - Monastery Entry Left (Panel) - 0x00B10
1151 - Monastery Entry Door Right (Panel) - 0x00C92 1151 - Monastery Entry Right (Panel) - 0x00C92
1162 - Town Door to RGB House (Panel) - 0x28998 1162 - Town Tinted Glass Door (Panel) - 0x28998
1163 - Town Door to Church (Panel) - 0x28A0D 1163 - Town Church Entry (Panel) - 0x28A0D
1166 - Town Maze Panel (Drop-Down Staircase) (Panel) - 0x28A79 1166 - Town Maze Panel (Drop-Down Staircase) (Panel) - 0x28A79
1169 - Windmill Door (Panel) - 0x17F5F 1169 - Windmill Entry (Panel) - 0x17F5F
1200 - Treehouse First & Second Doors (Panel) - 0x0288C,0x02886 1200 - Treehouse First & Second Doors (Panel) - 0x0288C,0x02886
1202 - Treehouse Third Door (Panel) - 0x0A182 1202 - Treehouse Third Door (Panel) - 0x0A182
1205 - Treehouse Laser House Door Timer (Panel) - 0x2700B,0x334DC 1205 - Treehouse Laser House Door Timer (Panel) - 0x2700B,0x334DC
1208 - Treehouse Shortcut Drop-Down Bridge (Panel) - 0x17CBC 1208 - Treehouse Drawbridge (Panel) - 0x17CBC
1175 - Jungle Popup Wall (Panel) - 0x17CAB 1175 - Jungle Popup Wall (Panel) - 0x17CAB
1180 - Bunker Entry Door (Panel) - 0x17C2E 1180 - Bunker Entry (Panel) - 0x17C2E
1183 - Inside Bunker Door to Bunker Proper (Panel) - 0x0A099 1183 - Bunker Tinted Glass Door (Panel) - 0x0A099
1186 - Bunker Elevator Control (Panel) - 0x0A079 1186 - Bunker Elevator Control (Panel) - 0x0A079
1190 - Swamp Entry Door (Panel) - 0x0056E 1190 - Swamp Entry (Panel) - 0x0056E
1192 - Swamp Sliding Bridge (Panel) - 0x00609,0x18488 1192 - Swamp Sliding Bridge (Panel) - 0x00609,0x18488
1195 - Swamp Rotating Bridge (Panel) - 0x181F5 1195 - Swamp Rotating Bridge (Panel) - 0x181F5
1197 - Swamp Maze Control (Panel) - 0x17C0A 1197 - Swamp Maze Control (Panel) - 0x17C0A
1310 - Boat - 0x17CDF,0x17CC8,0x17CA6,0x09DB8,0x17C95,0x0A054 1310 - Boat - 0x17CDF,0x17CC8,0x17CA6,0x09DB8,0x17C95,0x0A054
1400 - Caves Mountain Shortcut - 0x2D73F 1400 - Caves Mountain Shortcut (Door) - 0x2D73F
1500 - Symmetry Laser - 0x00509 1500 - Symmetry Laser - 0x00509
1501 - Desert Laser - 0x012FB,0x01317 1501 - Desert Laser - 0x012FB,0x01317
@ -73,101 +73,101 @@ Doors:
1509 - Swamp Laser - 0x00BF6 1509 - Swamp Laser - 0x00BF6
1510 - Treehouse Laser - 0x028A4 1510 - Treehouse Laser - 0x028A4
1600 - Outside Tutorial Optional Door - 0x03BA2 1600 - Outside Tutorial Outpost Path (Door) - 0x03BA2
1603 - Outside Tutorial Outpost Entry Door - 0x0A170 1603 - Outside Tutorial Outpost Entry (Door) - 0x0A170
1606 - Outside Tutorial Outpost Exit Door - 0x04CA3 1606 - Outside Tutorial Outpost Exit (Door) - 0x04CA3
1609 - Glass Factory Entry Door - 0x01A29 1609 - Glass Factory Entry (Door) - 0x01A29
1612 - Glass Factory Back Wall - 0x0D7ED 1612 - Glass Factory Back Wall (Door) - 0x0D7ED
1615 - Symmetry Island Lower Door - 0x17F3E 1615 - Symmetry Island Lower (Door) - 0x17F3E
1618 - Symmetry Island Upper Door - 0x18269 1618 - Symmetry Island Upper (Door) - 0x18269
1619 - Orchard Middle Gate - 0x03307 1619 - Orchard First Gate (Door) - 0x03307
1620 - Orchard Final Gate - 0x03313 1620 - Orchard Second Gate (Door) - 0x03313
1621 - Desert Door to Flood Light Room - 0x09FEE 1621 - Desert Light Room Entry (Door) - 0x09FEE
1624 - Desert Door to Pond Room - 0x0C2C3 1624 - Desert Pond Room Entry (Door) - 0x0C2C3
1627 - Desert Door to Water Levels Room - 0x0A24B 1627 - Desert Flood Room Entry (Door) - 0x0A24B
1630 - Desert Door to Elevator Room - 0x0C316 1630 - Desert Elevator Room Entry (Door) - 0x0C316
1633 - Quarry Main Entry 1 - 0x09D6F 1633 - Quarry Entry 1 (Door) - 0x09D6F
1636 - Quarry Main Entry 2 - 0x17C07 1636 - Quarry Entry 2 (Door) - 0x17C07
1639 - Quarry Door to Mill - 0x02010 1639 - Quarry Mill Entry (Door) - 0x02010
1642 - Quarry Mill Side Door - 0x275FF 1642 - Quarry Mill Side Exit (Door) - 0x275FF
1645 - Quarry Mill Rooftop Shortcut - 0x17CE8 1645 - Quarry Mill Roof Exit (Door) - 0x17CE8
1648 - Quarry Mill Stairs - 0x0368A 1648 - Quarry Mill Stairs (Door) - 0x0368A
1651 - Quarry Boathouse Boat Staircase - 0x2769B,0x27163 1651 - Quarry Boathouse Dock (Door) - 0x2769B,0x27163
1653 - Quarry Boathouse First Barrier - 0x17C50 1653 - Quarry Boathouse First Barrier (Door) - 0x17C50
1654 - Quarry Boathouse Shortcut - 0x3865F 1654 - Quarry Boathouse Second Barrier (Door) - 0x3865F
1656 - Shadows Timed Door - 0x19B24 1656 - Shadows Timed Door (Door) - 0x19B24
1657 - Shadows Laser Room Right Door - 0x194B2 1657 - Shadows Laser Entry Right (Door) - 0x194B2
1660 - Shadows Laser Room Left Door - 0x19665 1660 - Shadows Laser Entry Left (Door) - 0x19665
1663 - Shadows Barrier to Quarry - 0x19865,0x0A2DF 1663 - Shadows Quarry Barrier (Door) - 0x19865,0x0A2DF
1666 - Shadows Barrier to Ledge - 0x1855B,0x19ADE 1666 - Shadows Ledge Barrier (Door) - 0x1855B,0x19ADE
1669 - Keep Hedge Maze 1 Exit Door - 0x01954 1669 - Keep Hedge Maze 1 Exit (Door) - 0x01954
1672 - Keep Pressure Plates 1 Exit Door - 0x01BEC 1672 - Keep Pressure Plates 1 Exit (Door) - 0x01BEC
1675 - Keep Hedge Maze 2 Shortcut - 0x018CE 1675 - Keep Hedge Maze 2 Shortcut (Door) - 0x018CE
1678 - Keep Hedge Maze 2 Exit Door - 0x019D8 1678 - Keep Hedge Maze 2 Exit (Door) - 0x019D8
1681 - Keep Hedge Maze 3 Shortcut - 0x019B5 1681 - Keep Hedge Maze 3 Shortcut (Door) - 0x019B5
1684 - Keep Hedge Maze 3 Exit Door - 0x019E6 1684 - Keep Hedge Maze 3 Exit (Door) - 0x019E6
1687 - Keep Hedge Maze 4 Shortcut - 0x0199A 1687 - Keep Hedge Maze 4 Shortcut (Door) - 0x0199A
1690 - Keep Hedge Maze 4 Exit Door - 0x01A0E 1690 - Keep Hedge Maze 4 Exit (Door) - 0x01A0E
1693 - Keep Pressure Plates 2 Exit Door - 0x01BEA 1693 - Keep Pressure Plates 2 Exit (Door) - 0x01BEA
1696 - Keep Pressure Plates 3 Exit Door - 0x01CD5 1696 - Keep Pressure Plates 3 Exit (Door) - 0x01CD5
1699 - Keep Pressure Plates 4 Exit Door - 0x01D40 1699 - Keep Pressure Plates 4 Exit (Door) - 0x01D40
1702 - Keep Shortcut to Shadows - 0x09E3D 1702 - Keep Shadows Shortcut (Door) - 0x09E3D
1705 - Keep Tower Shortcut - 0x04F8F 1705 - Keep Tower Shortcut (Door) - 0x04F8F
1708 - Monastery Shortcut - 0x0364E 1708 - Monastery Shortcut (Door) - 0x0364E
1711 - Monastery Inner Door - 0x0C128 1711 - Monastery Entry Inner (Door) - 0x0C128
1714 - Monastery Outer Door - 0x0C153 1714 - Monastery Entry Outer (Door) - 0x0C153
1717 - Monastery Door to Garden - 0x03750 1717 - Monastery Garden Entry (Door) - 0x03750
1718 - Town Cargo Box Door - 0x0A0C9 1718 - Town Cargo Box Entry (Door) - 0x0A0C9
1720 - Town Wooden Roof Staircase - 0x034F5 1720 - Town Wooden Roof Stairs (Door) - 0x034F5
1723 - Town Tinted Door to RGB House - 0x28A61 1723 - Town Tinted Glass Door (Door) - 0x28A61
1726 - Town Door to Church - 0x03BB0 1726 - Town Church Entry (Door) - 0x03BB0
1729 - Town Maze Staircase - 0x28AA2 1729 - Town Maze Stairs (Door) - 0x28AA2
1732 - Town Windmill Door - 0x1845B 1732 - Town Windmill Entry (Door) - 0x1845B
1735 - Town RGB House Staircase - 0x2897B 1735 - Town RGB House Stairs (Door) - 0x2897B
1738 - Town Tower Blue Panels Door - 0x27798 1738 - Town Tower First Door (Door) - 0x27798
1741 - Town Tower Lattice Door - 0x27799 1741 - Town Tower Third Door (Door) - 0x27799
1744 - Town Tower Environmental Set Door - 0x2779A 1744 - Town Tower Fourth Door (Door) - 0x2779A
1747 - Town Tower Wooden Roof Set Door - 0x2779C 1747 - Town Tower Second Door (Door) - 0x2779C
1750 - Theater Entry Door - 0x17F88 1750 - Theater Entry (Door) - 0x17F88
1753 - Theater Exit Door Left - 0x0A16D 1753 - Theater Exit Left (Door) - 0x0A16D
1756 - Theater Exit Door Right - 0x3CCDF 1756 - Theater Exit Right (Door) - 0x3CCDF
1759 - Jungle Bamboo Shortcut to River - 0x3873B 1759 - Jungle Bamboo Laser Shortcut (Door) - 0x3873B
1760 - Jungle Popup Wall - 0x1475B 1760 - Jungle Popup Wall (Door) - 0x1475B
1762 - River Shortcut to Monastery Garden - 0x0CF2A 1762 - River Monastery Shortcut (Door) - 0x0CF2A
1765 - Bunker Bunker Entry Door - 0x0C2A4 1765 - Bunker Entry (Door) - 0x0C2A4
1768 - Bunker Tinted Glass Door - 0x17C79 1768 - Bunker Tinted Glass Door (Door) - 0x17C79
1771 - Bunker Door to Ultraviolet Room - 0x0C2A3 1771 - Bunker UV Room Entry (Door) - 0x0C2A3
1774 - Bunker Door to Elevator - 0x0A08D 1774 - Bunker Elevator Room Entry (Door) - 0x0A08D
1777 - Swamp Entry Door - 0x00C1C 1777 - Swamp Entry (Door) - 0x00C1C
1780 - Swamp Door to Broken Shapers - 0x184B7 1780 - Swamp Between Bridges First Door - 0x184B7
1783 - Swamp Platform Shortcut Door - 0x38AE6 1783 - Swamp Platform Shortcut Door - 0x38AE6
1786 - Swamp Cyan Water Pump - 0x04B7F 1786 - Swamp Cyan Water Pump (Door) - 0x04B7F
1789 - Swamp Door to Rotated Shapers - 0x18507 1789 - Swamp Between Bridges Second Door - 0x18507
1792 - Swamp Red Water Pump - 0x183F2 1792 - Swamp Red Water Pump (Door) - 0x183F2
1795 - Swamp Red Underwater Exit - 0x305D5 1795 - Swamp Red Underwater Exit (Door) - 0x305D5
1798 - Swamp Blue Water Pump - 0x18482 1798 - Swamp Blue Water Pump (Door) - 0x18482
1801 - Swamp Purple Water Pump - 0x0A1D6 1801 - Swamp Purple Water Pump (Door) - 0x0A1D6
1804 - Swamp Near Laser Shortcut - 0x2D880 1804 - Swamp Laser Shortcut (Door) - 0x2D880
1807 - Treehouse First Door - 0x0C309 1807 - Treehouse First Door (Door) - 0x0C309
1810 - Treehouse Second Door - 0x0C310 1810 - Treehouse Second Door (Door) - 0x0C310
1813 - Treehouse Beyond Yellow Bridge Door - 0x0A181 1813 - Treehouse Third Door (Door) - 0x0A181
1816 - Treehouse Drawbridge - 0x0C32D 1816 - Treehouse Drawbridge (Door) - 0x0C32D
1819 - Treehouse Timed Door to Laser House - 0x0C323 1819 - Treehouse Laser House Entry (Door) - 0x0C323
1822 - Inside Mountain First Layer Exit Door - 0x09E54 1822 - Mountain Floor 1 Exit (Door) - 0x09E54
1825 - Inside Mountain Second Layer Staircase Near - 0x09FFB 1825 - Mountain Floor 2 Staircase Near (Door) - 0x09FFB
1828 - Inside Mountain Second Layer Exit Door - 0x09EDD 1828 - Mountain Floor 2 Exit (Door) - 0x09EDD
1831 - Inside Mountain Second Layer Staircase Far - 0x09E07 1831 - Mountain Floor 2 Staircase Far (Door) - 0x09E07
1834 - Inside Mountain Giant Puzzle Exit Door - 0x09F89 1834 - Mountain Bottom Floor Giant Puzzle Exit (Door) - 0x09F89
1840 - Inside Mountain Door to Final Room - 0x0C141 1840 - Mountain Bottom Floor Final Room Entry (Door) - 0x0C141
1843 - Inside Mountain Bottom Layer Rock - 0x17F33 1843 - Mountain Bottom Floor Rock (Door) - 0x17F33
1846 - Inside Mountain Door to Secret Area - 0x2D77D 1846 - Caves Entry (Door) - 0x2D77D
1849 - Caves Pillar Door - 0x019A5 1849 - Caves Pillar Door (Door) - 0x019A5
1855 - Caves Swamp Shortcut - 0x2D859 1855 - Caves Swamp Shortcut (Door) - 0x2D859
1858 - Challenge Entry Door - 0x0A19A 1858 - Challenge Entry (Door) - 0x0A19A
1861 - Challenge Door to Theater Walkway - 0x0348A 1861 - Challenge Tunnels Entry (Door) - 0x0348A
1864 - Theater Walkway Door to Windmill Interior - 0x27739 1864 - Tunnels Theater Shortcut (Door) - 0x27739
1867 - Theater Walkway Door to Desert Elevator Room - 0x27263 1867 - Tunnels Desert Shortcut (Door) - 0x27263
1870 - Theater Walkway Door to Town - 0x09E87 1870 - Tunnels Town Shortcut (Door) - 0x09E87
1903 - Outside Tutorial Outpost Doors - 0x03BA2,0x0A170,0x04CA3 1903 - Outside Tutorial Outpost Doors - 0x03BA2,0x0A170,0x04CA3
1906 - Symmetry Island Doors - 0x17F3E,0x18269 1906 - Symmetry Island Doors - 0x17F3E,0x18269
@ -181,18 +181,18 @@ Doors:
1930 - Keep Hedge Maze Doors - 0x01954,0x018CE,0x019D8,0x019B5,0x019E6,0x0199A,0x01A0E 1930 - Keep Hedge Maze Doors - 0x01954,0x018CE,0x019D8,0x019B5,0x019E6,0x0199A,0x01A0E
1933 - Keep Pressure Plates Doors - 0x01BEC,0x01BEA,0x01CD5,0x01D40 1933 - Keep Pressure Plates Doors - 0x01BEC,0x01BEA,0x01CD5,0x01D40
1936 - Keep Shortcuts - 0x09E3D,0x04F8F 1936 - Keep Shortcuts - 0x09E3D,0x04F8F
1939 - Monastery Entry Door - 0x0C128,0x0C153 1939 - Monastery Entry - 0x0C128,0x0C153
1942 - Monastery Shortcuts - 0x0364E,0x03750 1942 - Monastery Shortcuts - 0x0364E,0x03750
1945 - Town Doors - 0x0A0C9,0x034F5,0x28A61,0x03BB0,0x28AA2,0x1845B,0x2897B 1945 - Town Doors - 0x0A0C9,0x034F5,0x28A61,0x03BB0,0x28AA2,0x1845B,0x2897B
1948 - Town Tower Doors - 0x27798,0x27799,0x2779A,0x2779C 1948 - Town Tower Doors - 0x27798,0x27799,0x2779A,0x2779C
1951 - Theater Exit Door - 0x0A16D,0x3CCDF 1951 - Theater Exit - 0x0A16D,0x3CCDF
1954 - Jungle & River Shortcuts - 0x3873B,0x0CF2A 1954 - Jungle & River Shortcuts - 0x3873B,0x0CF2A
1957 - Bunker Doors - 0x0C2A4,0x17C79,0x0C2A3,0x0A08D 1957 - Bunker Doors - 0x0C2A4,0x17C79,0x0C2A3,0x0A08D
1960 - Swamp Doors - 0x00C1C,0x184B7,0x38AE6,0x18507 1960 - Swamp Doors - 0x00C1C,0x184B7,0x38AE6,0x18507
1963 - Swamp Water Pumps - 0x04B7F,0x183F2,0x305D5,0x18482,0x0A1D6 1963 - Swamp Water Pumps - 0x04B7F,0x183F2,0x305D5,0x18482,0x0A1D6
1966 - Treehouse Entry Doors - 0x0C309,0x0C310,0x0A181 1966 - Treehouse Entry Doors - 0x0C309,0x0C310,0x0A181
1975 - Inside Mountain Second Layer Stairs & Doors - 0x09FFB,0x09EDD,0x09E07 1975 - Mountain Floor 2 Stairs & Doors - 0x09FFB,0x09EDD,0x09E07
1978 - Inside Mountain Bottom Layer Doors to Caves - 0x17F33,0x2D77D 1978 - Mountain Bottom Floor Doors to Caves - 0x17F33,0x2D77D
1981 - Caves Doors to Challenge - 0x019A5,0x0A19A 1981 - Caves Doors to Challenge - 0x019A5,0x0A19A
1984 - Caves Exits to Main Island - 0x2D859,0x2D73F 1984 - Caves Exits to Main Island - 0x2D859,0x2D73F
1987 - Theater Walkway Doors - 0x27739,0x27263,0x09E87 1987 - Tunnels Doors - 0x27739,0x27263,0x09E87

File diff suppressed because it is too large Load Diff

View File

@ -36,7 +36,7 @@ class WitnessWorld(World):
""" """
game = "The Witness" game = "The Witness"
topology_present = False topology_present = False
data_version = 5 data_version = 7
static_logic = StaticWitnessLogic() static_logic = StaticWitnessLogic()
static_locat = StaticWitnessLocations() static_locat = StaticWitnessLocations()

View File

@ -30,17 +30,17 @@ class StaticWitnessLocations:
"Outside Tutorial Vault Box", "Outside Tutorial Vault Box",
"Outside Tutorial Discard", "Outside Tutorial Discard",
"Outside Tutorial Dots Introduction 5", "Outside Tutorial Shed Row 5",
"Outside Tutorial Squares Introduction 9", "Outside Tutorial Tree Row 9",
"Glass Factory Discard", "Glass Factory Discard",
"Glass Factory Vertical Symmetry 5", "Glass Factory Back Wall 5",
"Glass Factory Rotational Symmetry 3", "Glass Factory Front 3",
"Glass Factory Melting 3", "Glass Factory Melting 3",
"Symmetry Island Black Dots 5", "Symmetry Island Right 5",
"Symmetry Island Colored Dots 6", "Symmetry Island Back 6",
"Symmetry Island Fading Lines 7", "Symmetry Island Left 7",
"Symmetry Island Scenery Outlines 5", "Symmetry Island Scenery Outlines 5",
"Symmetry Island Laser Panel", "Symmetry Island Laser Panel",
@ -48,26 +48,28 @@ class StaticWitnessLocations:
"Desert Vault Box", "Desert Vault Box",
"Desert Discard", "Desert Discard",
"Desert Sun Reflection 8", "Desert Surface 8",
"Desert Artificial Light Reflection 3", "Desert Light Room 3",
"Desert Pond Reflection 5", "Desert Pond Room 5",
"Desert Flood Reflection 6", "Desert Flood Room 6",
"Desert Final Bent 3",
"Desert Final Hexagonal",
"Desert Laser Panel", "Desert Laser Panel",
"Quarry Mill Eraser and Dots 6", "Quarry Mill Lower Row 6",
"Quarry Mill Eraser and Squares 8", "Quarry Mill Upper Row 8",
"Quarry Mill Small Squares & Dots & Eraser", "Quarry Mill Control Room Right",
"Quarry Boathouse Intro Shapers", "Quarry Boathouse Intro Right",
"Quarry Boathouse Intro Stars", "Quarry Boathouse Intro Left",
"Quarry Boathouse Eraser and Shapers 5", "Quarry Boathouse Front Row 5",
"Quarry Boathouse Stars & Eraser & Shapers 2", "Quarry Boathouse Back First Row 9",
"Quarry Boathouse Stars & Eraser & Shapers 5", "Quarry Boathouse Back Second Row 3",
"Quarry Discard", "Quarry Discard",
"Quarry Laser Panel", "Quarry Laser Panel",
"Shadows Lower Avoid 8", "Shadows Intro 8",
"Shadows Environmental Avoid 8", "Shadows Far 8",
"Shadows Follow 5", "Shadows Near 5",
"Shadows Laser Panel", "Shadows Laser Panel",
"Keep Hedge Maze 4", "Keep Hedge Maze 4",
@ -79,44 +81,44 @@ class StaticWitnessLocations:
"Shipwreck Vault Box", "Shipwreck Vault Box",
"Shipwreck Discard", "Shipwreck Discard",
"Monastery Rhombic Avoid 3", "Monastery Outside 3",
"Monastery Branch Follow 2", "Monastery Inside 4",
"Monastery Laser Panel", "Monastery Laser Panel",
"Town Cargo Box Discard", "Town Cargo Box Discard",
"Town Hexagonal Reflection", "Town Tall Hexagonal",
"Town Church Lattice", "Town Church Lattice",
"Town Rooftop Discard", "Town Rooftop Discard",
"Town Symmetry Squares 5 + Dots", "Town Red Rooftop 5",
"Town Full Dot Grid Shapers 5", "Town Wooden Roof Lower Row 5",
"Town Shapers & Dots & Eraser", "Town Wooden Rooftop",
"Town Laser Panel", "Town Laser Panel",
"Theater Discard", "Theater Discard",
"Jungle Discard", "Jungle Discard",
"Jungle Waves 3", "Jungle First Row 3",
"Jungle Waves 7", "Jungle Second Row 4",
"Jungle Popup Wall 6", "Jungle Popup Wall 6",
"Jungle Laser Panel", "Jungle Laser Panel",
"River Vault Box", "River Vault Box",
"Bunker Drawn Squares 5", "Bunker Intro Left 5",
"Bunker Drawn Squares 9", "Bunker Intro Back 4",
"Bunker Drawn Squares through Tinted Glass 3", "Bunker Glass Room 3",
"Bunker Drop-Down Door Squares 2", "Bunker UV Room 2",
"Bunker Laser Panel", "Bunker Laser Panel",
"Swamp Seperatable Shapers 6", "Swamp Intro Front 6",
"Swamp Combinable Shapers 8", "Swamp Intro Back 8",
"Swamp Broken Shapers 4", "Swamp Between Bridges Near Row 4",
"Swamp Cyan Underwater Negative Shapers 5", "Swamp Cyan Underwater 5",
"Swamp Platform Shapers 4", "Swamp Platform Row 4",
"Swamp Rotated Shapers 4", "Swamp Between Bridges Far Row 4",
"Swamp Red Underwater Negative Shapers 4", "Swamp Red Underwater 4",
"Swamp More Rotated Shapers 4", "Swamp Beyond Rotating Bridge 4",
"Swamp Blue Underwater Negative Shapers 5", "Swamp Blue Underwater 5",
"Swamp Laser Panel", "Swamp Laser Panel",
"Treehouse Yellow Bridge 9", "Treehouse Yellow Bridge 9",
@ -125,73 +127,77 @@ class StaticWitnessLocations:
"Treehouse Green Bridge 7", "Treehouse Green Bridge 7",
"Treehouse Green Bridge Discard", "Treehouse Green Bridge Discard",
"Treehouse Left Orange Bridge 15", "Treehouse Left Orange Bridge 15",
"Treehouse Burnt House Discard", "Treehouse Laser Discard",
"Treehouse Right Orange Bridge 12", "Treehouse Right Orange Bridge 12",
"Treehouse Laser Panel", "Treehouse Laser Panel",
"Mountaintop Discard", "Mountainside Discard",
"Mountaintop Vault Box", "Mountainside Vault Box",
}
UNCOMMON_LOCATIONS = {
"Mountaintop River Shape", "Mountaintop River Shape",
"Tutorial Patio Floor", "Tutorial Patio Floor",
"Quarry Mill Big Squares & Dots & Eraser", "Quarry Mill Control Room Left",
"Theater Tutorial Video", "Theater Tutorial Video",
"Theater Desert Video", "Theater Desert Video",
"Theater Jungle Video", "Theater Jungle Video",
"Theater Shipwreck Video", "Theater Shipwreck Video",
"Theater Mountain Video", "Theater Mountain Video",
"Town RGB Squares", "Town RGB Room Left",
"Town RGB Stars", "Town RGB Room Right",
"Swamp Underwater Back Optional", "Swamp Purple Underwater",
} }
CAVES_LOCATIONS = { CAVES_LOCATIONS = {
"Inside Mountain Caves Dot Grid Triangles 4", "Caves Blue Tunnel Right First 4",
"Inside Mountain Caves Symmetry Triangles", "Caves Blue Tunnel Left First 1",
"Inside Mountain Caves Stars & Squares and Triangles 2", "Caves Blue Tunnel Left Second 5",
"Inside Mountain Caves Shapers and Triangles 2", "Caves Blue Tunnel Right Second 5",
"Inside Mountain Caves Symmetry Shapers", "Caves Blue Tunnel Right Third 1",
"Inside Mountain Caves Broken and Negative Shapers", "Caves Blue Tunnel Left Fourth 1",
"Inside Mountain Caves Broken Shapers", "Caves Blue Tunnel Left Third 1",
"Inside Mountain Caves Rainbow Squares", "Caves First Floor Middle",
"Inside Mountain Caves Squares & Stars and Colored Eraser", "Caves First Floor Right",
"Inside Mountain Caves Rotated Broken Shapers", "Caves First Floor Left",
"Inside Mountain Caves Stars and Squares", "Caves First Floor Grounded",
"Inside Mountain Caves Lone Pillar", "Caves Lone Pillar",
"Inside Mountain Caves Wooden Beam Shapers", "Caves First Wooden Beam",
"Inside Mountain Caves Wooden Beam Squares and Shapers", "Caves Second Wooden Beam",
"Inside Mountain Caves Wooden Beam Stars and Squares", "Caves Third Wooden Beam",
"Inside Mountain Caves Wooden Beam Shapers and Stars", "Caves Fourth Wooden Beam",
"Inside Mountain Caves Upstairs Invisible Dots 8", "Caves Right Upstairs Left Row 8",
"Inside Mountain Caves Upstairs Invisible Dot Symmetry 3", "Caves Right Upstairs Right Row 3",
"Inside Mountain Caves Upstairs Dot Grid Negative Shapers", "Caves Left Upstairs Single",
"Inside Mountain Caves Upstairs Dot Grid Rotated Shapers", "Caves Left Upstairs Left Row 5",
"Theater Walkway Vault Box", "Tunnels Vault Box",
"Inside Mountain Bottom Layer Discard", "Mountain Bottom Floor Discard",
"Theater Challenge Video", "Theater Challenge Video",
} }
MOUNTAIN_UNREACHABLE_FROM_BEHIND = { MOUNTAIN_UNREACHABLE_FROM_BEHIND = {
"Mountaintop Trap Door Triple Exit", "Mountaintop Trap Door Triple Exit",
"Inside Mountain Obscured Vision 5", "Mountain Floor 1 Right Row 5",
"Inside Mountain Moving Background 7", "Mountain Floor 1 Left Row 7",
"Inside Mountain Physically Obstructed 3", "Mountain Floor 1 Back Row 3",
"Inside Mountain Angled Inside Trash 2", "Mountain Floor 1 Trash Pillar 2",
"Inside Mountain Color Cycle 5", "Mountain Floor 2 Near Row 5",
"Inside Mountain Same Solution 6", "Mountain Floor 2 Far Row 6",
} }
MOUNTAIN_REACHABLE_FROM_BEHIND = { MOUNTAIN_REACHABLE_FROM_BEHIND = {
"Inside Mountain Elevator Discard", "Mountain Floor 2 Elevator Discard",
"Inside Mountain Giant Puzzle", "Mountain Bottom Floor Giant Puzzle",
"Inside Mountain Final Room Left Pillar 4", "Mountain Final Room Left Pillar 4",
"Inside Mountain Final Room Right Pillar 4", "Mountain Final Room Right Pillar 4",
}
MOUNTAIN_EXTRAS = {
"Challenge Vault Box",
"Theater Challenge Video",
"Mountain Bottom Floor Discard"
} }
ALL_LOCATIONS_TO_ID = dict() ALL_LOCATIONS_TO_ID = dict()
@ -241,37 +247,44 @@ class WitnessPlayerLocations:
StaticWitnessLocations.GENERAL_LOCATIONS StaticWitnessLocations.GENERAL_LOCATIONS
) )
doors = get_option_value(world, player, "shuffle_doors") doors = get_option_value(world, player, "shuffle_doors") >= 2
earlyutm = is_option_enabled(world, player, "early_secret_area") earlyutm = is_option_enabled(world, player, "early_secret_area")
victory = get_option_value(world, player, "victory_condition") victory = get_option_value(world, player, "victory_condition")
lasers = get_option_value(world, player, "challenge_lasers") mount_lasers = get_option_value(world, player, "mountain_lasers")
chal_lasers = get_option_value(world, player, "challenge_lasers")
laser_shuffle = get_option_value(world, player, "shuffle_lasers") laser_shuffle = get_option_value(world, player, "shuffle_lasers")
postgame = set() postgame = set()
postgame = postgame | StaticWitnessLocations.CAVES_LOCATIONS postgame = postgame | StaticWitnessLocations.CAVES_LOCATIONS
postgame = postgame | StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND postgame = postgame | StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND
postgame = postgame | StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND postgame = postgame | StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND
postgame = postgame | StaticWitnessLocations.MOUNTAIN_EXTRAS
self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | postgame self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | postgame
if earlyutm or doors >= 2 or (victory == 1 and (lasers <= 11 or laser_shuffle)): mountain_enterable_from_top = victory == 0 or victory == 1 or (victory == 3 and chal_lasers > mount_lasers)
if earlyutm or doors: # in non-doors, there is no way to get symbol-locked by the final pillars (currently)
postgame -= StaticWitnessLocations.CAVES_LOCATIONS postgame -= StaticWitnessLocations.CAVES_LOCATIONS
if doors >= 2: if (doors or earlyutm) and (victory == 0 or (victory == 2 and mount_lasers > chal_lasers)):
postgame -= {"Challenge Vault Box", "Theater Challenge Video"}
if doors or mountain_enterable_from_top:
postgame -= StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND postgame -= StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND
if victory != 2: if mountain_enterable_from_top:
postgame -= StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND postgame -= StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND
if (victory == 0 and doors) or victory == 1 or (victory == 2 and mount_lasers > chal_lasers and doors):
postgame -= {"Mountain Bottom Floor Discard"}
if is_option_enabled(world, player, "shuffle_discarded_panels"): if is_option_enabled(world, player, "shuffle_discarded_panels"):
self.PANEL_TYPES_TO_SHUFFLE.add("Discard") self.PANEL_TYPES_TO_SHUFFLE.add("Discard")
if is_option_enabled(world, player, "shuffle_vault_boxes"): if is_option_enabled(world, player, "shuffle_vault_boxes"):
self.PANEL_TYPES_TO_SHUFFLE.add("Vault") self.PANEL_TYPES_TO_SHUFFLE.add("Vault")
if is_option_enabled(world, player, "shuffle_uncommon"):
self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | StaticWitnessLocations.UNCOMMON_LOCATIONS
self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | player_logic.ADDED_CHECKS self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | player_logic.ADDED_CHECKS
if not is_option_enabled(world, player, "shuffle_postgame"): if not is_option_enabled(world, player, "shuffle_postgame"):

View File

@ -60,7 +60,10 @@ class WitnessPlayerLogic:
for dependentItem in door_items: for dependentItem in door_items:
all_options.add(items_option.union(dependentItem)) all_options.add(items_option.union(dependentItem))
return frozenset(all_options) if panel_hex != "0x28A0D":
return frozenset(all_options)
else: # 0x28A0D depends on another entity for *non-power* reasons -> This dependency needs to be preserved
these_items = all_options
these_panels = self.DEPENDENT_REQUIREMENTS_BY_HEX[panel_hex]["panels"] these_panels = self.DEPENDENT_REQUIREMENTS_BY_HEX[panel_hex]["panels"]
@ -321,7 +324,7 @@ class WitnessPlayerLogic:
self.VICTORY_LOCATION = "0x0356B" self.VICTORY_LOCATION = "0x0356B"
self.EVENT_ITEM_NAMES = { self.EVENT_ITEM_NAMES = {
"0x01A0F": "Keep Laser Panel (Hedge Mazes) Activates", "0x01A0F": "Keep Laser Panel (Hedge Mazes) Activates",
"0x09D9B": "Monastery Overhead Doors Open", "0x09D9B": "Monastery Shutters Open",
"0x193A6": "Monastery Laser Panel Activates", "0x193A6": "Monastery Laser Panel Activates",
"0x00037": "Monastery Branch Panels Activate", "0x00037": "Monastery Branch Panels Activate",
"0x0A079": "Access to Bunker Laser", "0x0A079": "Access to Bunker Laser",
@ -332,24 +335,24 @@ class WitnessPlayerLogic:
"0x01D3F": "Keep Laser Panel (Pressure Plates) Activates", "0x01D3F": "Keep Laser Panel (Pressure Plates) Activates",
"0x09F7F": "Mountain Access", "0x09F7F": "Mountain Access",
"0x0367C": "Quarry Laser Mill Requirement Met", "0x0367C": "Quarry Laser Mill Requirement Met",
"0x009A1": "Swamp Rotated Shapers 1 Activates", "0x009A1": "Swamp Between Bridges Far 1 Activates",
"0x00006": "Swamp Cyan Water Drains", "0x00006": "Swamp Cyan Water Drains",
"0x00990": "Swamp Broken Shapers 1 Activates", "0x00990": "Swamp Between Bridges Near Row 1 Activates",
"0x0A8DC": "Lower Avoid 6 Activates", "0x0A8DC": "Intro 6 Activates",
"0x0000A": "Swamp More Rotated Shapers 1 Access", "0x0000A": "Swamp Beyond Rotating Bridge 1 Access",
"0x09E86": "Inside Mountain Second Layer Blue Bridge Access", "0x09E86": "Mountain Floor 2 Blue Bridge Access",
"0x09ED8": "Inside Mountain Second Layer Yellow Bridge Access", "0x09ED8": "Mountain Floor 2 Yellow Bridge Access",
"0x0A3D0": "Quarry Laser Boathouse Requirement Met", "0x0A3D0": "Quarry Laser Boathouse Requirement Met",
"0x00596": "Swamp Red Water Drains", "0x00596": "Swamp Red Water Drains",
"0x00E3A": "Swamp Purple Water Drains", "0x00E3A": "Swamp Purple Water Drains",
"0x0343A": "Door to Symmetry Island Powers On", "0x0343A": "Door to Symmetry Island Powers On",
"0xFFF00": "Inside Mountain Bottom Layer Discard Turns On", "0xFFF00": "Mountain Bottom Floor Discard Turns On",
"0x17CA6": "All Boat Panels Turn On", "0x17CA6": "All Boat Panels Turn On",
"0x17CDF": "All Boat Panels Turn On", "0x17CDF": "All Boat Panels Turn On",
"0x09DB8": "All Boat Panels Turn On", "0x09DB8": "All Boat Panels Turn On",
"0x17C95": "All Boat Panels Turn On", "0x17C95": "All Boat Panels Turn On",
"0x03BB0": "Town Church Lattice Vision From Outside", "0x03BB0": "Town Church Lattice Vision From Outside",
"0x28AC1": "Town Shapers & Dots & Eraser Turns On", "0x28AC1": "Town Wooden Rooftop Turns On",
"0x28A69": "Town Tower 1st Door Opens", "0x28A69": "Town Tower 1st Door Opens",
"0x28ACC": "Town Tower 2nd Door Opens", "0x28ACC": "Town Tower 2nd Door Opens",
"0x28AD9": "Town Tower 3rd Door Opens", "0x28AD9": "Town Tower 3rd Door Opens",
@ -357,9 +360,9 @@ class WitnessPlayerLogic:
"0x03675": "Quarry Mill Ramp Activation From Above", "0x03675": "Quarry Mill Ramp Activation From Above",
"0x03679": "Quarry Mill Lift Lowering While Standing On It", "0x03679": "Quarry Mill Lift Lowering While Standing On It",
"0x2FAF6": "Tutorial Gate Secret Solution Knowledge", "0x2FAF6": "Tutorial Gate Secret Solution Knowledge",
"0x079DF": "Town Hexagonal Reflection Turns On", "0x079DF": "Town Tall Hexagonal Turns On",
"0x17DA2": "Right Orange Bridge Fully Extended", "0x17DA2": "Right Orange Bridge Fully Extended",
"0x19B24": "Shadows Lower Avoid Patterns Visible", "0x19B24": "Shadows Intro Patterns Visible",
"0x2700B": "Open Door to Treehouse Laser House", "0x2700B": "Open Door to Treehouse Laser House",
"0x00055": "Orchard Apple Trees 4 Turns On", "0x00055": "Orchard Apple Trees 4 Turns On",
"0x17DDB": "Left Orange Bridge Fully Extended", "0x17DDB": "Left Orange Bridge Fully Extended",
@ -369,6 +372,8 @@ class WitnessPlayerLogic:
"0x03481": "Tutorial Video Pattern Knowledge", "0x03481": "Tutorial Video Pattern Knowledge",
"0x03702": "Jungle Video Pattern Knowledge", "0x03702": "Jungle Video Pattern Knowledge",
"0x0356B": "Challenge Video Pattern Knowledge", "0x0356B": "Challenge Video Pattern Knowledge",
"0x0A15F": "Desert Laser Panel Shutters Open (1)",
"0x012D7": "Desert Laser Panel Shutters Open (2)",
} }
self.ALWAYS_EVENT_NAMES_BY_HEX = { self.ALWAYS_EVENT_NAMES_BY_HEX = {

View File

@ -73,7 +73,7 @@ class WitnessRegions:
all_locations = all_locations | set(locations_for_this_region) all_locations = all_locations | set(locations_for_this_region)
world.regions += [ world.regions += [
create_region(world, player, region_name, self.locat,locations_for_this_region) create_region(world, player, region_name, self.locat, locations_for_this_region)
] ]
for region_name, region in StaticWitnessLogic.ALL_REGIONS_BY_NAME.items(): for region_name, region in StaticWitnessLogic.ALL_REGIONS_BY_NAME.items():

View File

@ -25,84 +25,84 @@ Disabled Locations:
0x00055 (Orchard Apple Tree 3) 0x00055 (Orchard Apple Tree 3)
0x032F7 (Orchard Apple Tree 4) 0x032F7 (Orchard Apple Tree 4)
0x032FF (Orchard Apple Tree 5) 0x032FF (Orchard Apple Tree 5)
0x198B5 (Shadows Lower Avoid 1) 0x198B5 (Shadows Intro 1)
0x198BD (Shadows Lower Avoid 2) 0x198BD (Shadows Intro 2)
0x198BF (Shadows Lower Avoid 3) 0x198BF (Shadows Intro 3)
0x19771 (Shadows Lower Avoid 4) 0x19771 (Shadows Intro 4)
0x0A8DC (Shadows Lower Avoid 5) 0x0A8DC (Shadows Intro 5)
0x0AC74 (Shadows Lower Avoid 6) 0x0AC74 (Shadows Intro 6)
0x0AC7A (Shadows Lower Avoid 7) 0x0AC7A (Shadows Intro 7)
0x0A8E0 (Shadows Lower Avoid 8) 0x0A8E0 (Shadows Intro 8)
0x386FA (Shadows Environmental Avoid 1) 0x386FA (Shadows Far 1)
0x1C33F (Shadows Environmental Avoid 2) 0x1C33F (Shadows Far 2)
0x196E2 (Shadows Environmental Avoid 3) 0x196E2 (Shadows Far 3)
0x1972A (Shadows Environmental Avoid 4) 0x1972A (Shadows Far 4)
0x19809 (Shadows Environmental Avoid 5) 0x19809 (Shadows Far 5)
0x19806 (Shadows Environmental Avoid 6) 0x19806 (Shadows Far 6)
0x196F8 (Shadows Environmental Avoid 7) 0x196F8 (Shadows Far 7)
0x1972F (Shadows Environmental Avoid 8) 0x1972F (Shadows Far 8)
0x19797 (Shadows Follow 1) 0x19797 (Shadows Near 1)
0x1979A (Shadows Follow 2) 0x1979A (Shadows Near 2)
0x197E0 (Shadows Follow 3) 0x197E0 (Shadows Near 3)
0x197E8 (Shadows Follow 4) 0x197E8 (Shadows Near 4)
0x197E5 (Shadows Follow 5) 0x197E5 (Shadows Near 5)
0x19650 (Shadows Laser) 0x19650 (Shadows Laser)
0x00139 (Keep Hedge Maze 1) 0x00139 (Keep Hedge Maze 1)
0x019DC (Keep Hedge Maze 2) 0x019DC (Keep Hedge Maze 2)
0x019E7 (Keep Hedge Maze 3) 0x019E7 (Keep Hedge Maze 3)
0x01A0F (Keep Hedge Maze 4) 0x01A0F (Keep Hedge Maze 4)
0x0360E (Laser Hedges) 0x0360E (Laser Hedges)
0x00B10 (Monastery Door Open Left) 0x00B10 (Monastery Entry Left)
0x00C92 (Monastery Door Open Right) 0x00C92 (Monastery Entry Right)
0x00290 (Monastery Rhombic Avoid 1) 0x00290 (Monastery Outside 1)
0x00038 (Monastery Rhombic Avoid 2) 0x00038 (Monastery Outside 2)
0x00037 (Monastery Rhombic Avoid 3) 0x00037 (Monastery Outside 3)
0x193A7 (Monastery Branch Avoid 1) 0x193A7 (Monastery Inside 1)
0x193AA (Monastery Branch Avoid 2) 0x193AA (Monastery Inside 2)
0x193AB (Monastery Branch Follow 1) 0x193AB (Monastery Inside 3)
0x193A6 (Monastery Branch Follow 2) 0x193A6 (Monastery Inside 4)
0x17CA4 (Monastery Laser) 0x17CA4 (Monastery Laser)
0x18590 (Tree Outlines) - True - Symmetry & Environment 0x18590 (Transparent) - True - Symmetry & Environment
0x28AE3 (Vines Shadows Follow) - 0x18590 - Shadows Follow & Environment 0x28AE3 (Vines) - 0x18590 - Shadows Follow & Environment
0x28938 (Four-way Apple Tree) - 0x28AE3 - Environment 0x28938 (Apple Tree) - 0x28AE3 - Environment
0x079DF (Triple Environmental Puzzle) - 0x28938 - Shadows Avoid & Environment & Reflection 0x079DF (Triple Exit) - 0x28938 - Shadows Avoid & Environment & Reflection
0x28B39 (Hexagonal Reflection) - 0x079DF & 0x2896A - Reflection 0x28B39 (Tall Hexagonal) - 0x079DF & 0x2896A - Reflection
0x03553 (Theater Tutorial Video) 0x03553 (Theater Tutorial Video)
0x03552 (Theater Desert Video) 0x03552 (Theater Desert Video)
0x0354E (Theater Jungle Video) 0x0354E (Theater Jungle Video)
0x03549 (Theater Challenge Video) 0x03549 (Theater Challenge Video)
0x0354F (Theater Shipwreck Video) 0x0354F (Theater Shipwreck Video)
0x03545 (Theater Mountain Video) 0x03545 (Theater Mountain Video)
0x002C4 (Waves 1) 0x002C4 (First Row 1)
0x00767 (Waves 2) 0x00767 (First Row 2)
0x002C6 (Waves 3) 0x002C6 (First Row 3)
0x0070E (Waves 4) 0x0070E (Second Row 1)
0x0070F (Waves 5) 0x0070F (Second Row 2)
0x0087D (Waves 6) 0x0087D (Second Row 3)
0x002C7 (Waves 7) 0x002C7 (Second Row 4)
0x15ADD (River Rhombic Avoid Vault) 0x15ADD (River Outside Vault)
0x03702 (River Vault Box) 0x03702 (River Vault Box)
0x17CAA (Rhombic Avoid to Monastery Garden) 0x17CAA (Monastery Shortcut Panel)
0x17C2E (Door to Bunker) 0x17C2E (Door to Bunker)
0x09F7D (Bunker Drawn Squares 1) 0x09F7D (Bunker Intro Left 1)
0x09FDC (Bunker Drawn Squares 2) 0x09FDC (Bunker Intro Left 2)
0x09FF7 (Bunker Drawn Squares 3) 0x09FF7 (Bunker Intro Left 3)
0x09F82 (Bunker Drawn Squares 4) 0x09F82 (Bunker Intro Left 4)
0x09FF8 (Bunker Drawn Squares 5) 0x09FF8 (Bunker Intro Left 5)
0x09D9F (Bunker Drawn Squares 6) 0x09D9F (Bunker Intro Back 1)
0x09DA1 (Bunker Drawn Squares 7) 0x09DA1 (Bunker Intro Back 2)
0x09DA2 (Bunker Drawn Squares 8) 0x09DA2 (Bunker Intro Back 3)
0x09DAF (Bunker Drawn Squares 9) 0x09DAF (Bunker Intro Back 4)
0x0A010 (Bunker Drawn Squares through Tinted Glass 1) 0x0A010 (Bunker Glass Room 1)
0x0A01B (Bunker Drawn Squares through Tinted Glass 2) 0x0A01B (Bunker Glass Room 2)
0x0A01F (Bunker Drawn Squares through Tinted Glass 3) 0x0A01F (Bunker Glass Room 3)
0x0A099 (Door to Bunker Proper) 0x0A099 (Tinted Glass Door)
0x34BC5 (Bunker Drop-Down Door Open) 0x34BC5 (Bunker Drop-Down Door Open)
0x34BC6 (Bunker Drop-Down Door Close) 0x34BC6 (Bunker Drop-Down Door Close)
0x17E63 (Bunker Drop-Down Door Squares 1) 0x17E63 (Bunker UV Room 1)
0x17E67 (Bunker Drop-Down Door Squares 2) 0x17E67 (Bunker UV Room 2)
0x09DE0 (Bunker Laser) 0x09DE0 (Bunker Laser)
0x0A079 (Bunker Elevator Control) 0x0A079 (Bunker Elevator Control)
0x0042D (Mountaintop River Shape) 0x0042D (Mountaintop River Shape)
0x17CAA (River Door to Garden Panel) 0x17CAA (River Garden Entry Panel)

View File

@ -1,31 +1,31 @@
Items: Items:
Glass Factory Entry Door (Panel) Glass Factory Entry (Panel)
Door to Symmetry Island Lower (Panel) Symmetry Island Lower (Panel)
Door to Symmetry Island Upper (Panel) Symmetry Island Upper (Panel)
Door to Desert Flood Light Room (Panel) Desert Light Room Entry (Panel)
Desert Flood Room Flood Controls (Panel) Desert Flood Controls (Panel)
Quarry Door to Mill (Panel) Quarry Mill Entry (Panel)
Quarry Mill Ramp Controls (Panel) Quarry Mill Ramp Controls (Panel)
Quarry Mill Elevator Controls (Panel) Quarry Mill Lift Controls (Panel)
Quarry Boathouse Ramp Height Control (Panel) Quarry Boathouse Ramp Height Control (Panel)
Quarry Boathouse Ramp Horizontal Control (Panel) Quarry Boathouse Ramp Horizontal Control (Panel)
Shadows Door Timer (Panel) Shadows Door Timer (Panel)
Monastery Entry Door Left (Panel) Monastery Entry Left (Panel)
Monastery Entry Door Right (Panel) Monastery Entry Right (Panel)
Town Door to RGB House (Panel) Town Tinted Glass Door (Panel)
Town Door to Church (Panel) Town Church Entry (Panel)
Town Maze Panel (Drop-Down Staircase) (Panel) Town Maze Panel (Drop-Down Staircase) (Panel)
Windmill Door (Panel) Windmill Entry (Panel)
Treehouse First & Second Doors (Panel) Treehouse First & Second Doors (Panel)
Treehouse Third Door (Panel) Treehouse Third Door (Panel)
Treehouse Laser House Door Timer (Panel) Treehouse Laser House Door Timer (Panel)
Treehouse Shortcut Drop-Down Bridge (Panel) Treehouse Drawbridge (Panel)
Jungle Popup Wall (Panel) Jungle Popup Wall (Panel)
Bunker Entry Door (Panel) Bunker Entry (Panel)
Inside Bunker Door to Bunker Proper (Panel) Bunker Tinted Glass Door (Panel)
Bunker Elevator Control (Panel) Bunker Elevator Control (Panel)
Swamp Entry Door (Panel) Swamp Entry (Panel)
Swamp Sliding Bridge (Panel) Swamp Sliding Bridge (Panel)
Swamp Rotating Bridge (Panel) Swamp Rotating Bridge (Panel)
Swamp Maze Control (Panel) Swamp Maze Control (Panel)
Boat Boat

View File

@ -1,128 +1,128 @@
Items: Items:
Outside Tutorial Optional Door Outside Tutorial Outpost Path (Door)
Outside Tutorial Outpost Entry Door Outside Tutorial Outpost Entry (Door)
Outside Tutorial Outpost Exit Door Outside Tutorial Outpost Exit (Door)
Glass Factory Entry Door Glass Factory Entry (Door)
Glass Factory Back Wall Glass Factory Back Wall (Door)
Symmetry Island Lower Door Symmetry Island Lower (Door)
Symmetry Island Upper Door Symmetry Island Upper (Door)
Orchard Middle Gate Orchard First Gate (Door)
Orchard Final Gate Orchard Second Gate (Door)
Desert Door to Flood Light Room Desert Light Room Entry (Door)
Desert Door to Pond Room Desert Pond Room Entry (Door)
Desert Door to Water Levels Room Desert Flood Room Entry (Door)
Desert Door to Elevator Room Desert Elevator Room Entry (Door)
Quarry Main Entry 1 Quarry Entry 1 (Door)
Quarry Main Entry 2 Quarry Entry 2 (Door)
Quarry Door to Mill Quarry Mill Entry (Door)
Quarry Mill Side Door Quarry Mill Side Exit (Door)
Quarry Mill Rooftop Shortcut Quarry Mill Roof Exit (Door)
Quarry Mill Stairs Quarry Mill Stairs (Door)
Quarry Boathouse Boat Staircase Quarry Boathouse Dock (Door)
Quarry Boathouse First Barrier Quarry Boathouse First Barrier (Door)
Quarry Boathouse Shortcut Quarry Boathouse Second Barrier (Door)
Shadows Timed Door Shadows Timed Door (Door)
Shadows Laser Room Right Door Shadows Laser Entry Right (Door)
Shadows Laser Room Left Door Shadows Laser Entry Left (Door)
Shadows Barrier to Quarry Shadows Quarry Barrier (Door)
Shadows Barrier to Ledge Shadows Ledge Barrier (Door)
Keep Hedge Maze 1 Exit Door Keep Hedge Maze 1 Exit (Door)
Keep Pressure Plates 1 Exit Door Keep Pressure Plates 1 Exit (Door)
Keep Hedge Maze 2 Shortcut Keep Hedge Maze 2 Shortcut (Door)
Keep Hedge Maze 2 Exit Door Keep Hedge Maze 2 Exit (Door)
Keep Hedge Maze 3 Shortcut Keep Hedge Maze 3 Shortcut (Door)
Keep Hedge Maze 3 Exit Door Keep Hedge Maze 3 Exit (Door)
Keep Hedge Maze 4 Shortcut Keep Hedge Maze 4 Shortcut (Door)
Keep Hedge Maze 4 Exit Door Keep Hedge Maze 4 Exit (Door)
Keep Pressure Plates 2 Exit Door Keep Pressure Plates 2 Exit (Door)
Keep Pressure Plates 3 Exit Door Keep Pressure Plates 3 Exit (Door)
Keep Pressure Plates 4 Exit Door Keep Pressure Plates 4 Exit (Door)
Keep Shortcut to Shadows Keep Shadows Shortcut (Door)
Keep Tower Shortcut Keep Tower Shortcut (Door)
Monastery Shortcut Monastery Shortcut (Door)
Monastery Inner Door Monastery Entry Inner (Door)
Monastery Outer Door Monastery Entry Outer (Door)
Monastery Door to Garden Monastery Garden Entry (Door)
Town Cargo Box Door Town Cargo Box Entry (Door)
Town Wooden Roof Staircase Town Wooden Roof Stairs (Door)
Town Tinted Door to RGB House Town Tinted Glass Door (Door)
Town Door to Church Town Church Entry (Door)
Town Maze Staircase Town Maze Stairs (Door)
Town Windmill Door Town Windmill Entry (Door)
Town RGB House Staircase Town RGB House Stairs (Door)
Town Tower Blue Panels Door Town Tower First Door (Door)
Town Tower Lattice Door Town Tower Third Door (Door)
Town Tower Environmental Set Door Town Tower Fourth Door (Door)
Town Tower Wooden Roof Set Door Town Tower Second Door (Door)
Theater Entry Door Theater Entry (Door)
Theater Exit Door Left Theater Exit Left (Door)
Theater Exit Door Right Theater Exit Right (Door)
Jungle Bamboo Shortcut to River Jungle Bamboo Laser Shortcut (Door)
Jungle Popup Wall Jungle Popup Wall (Door)
River Shortcut to Monastery Garden River Monastery Shortcut (Door)
Bunker Bunker Entry Door Bunker Entry (Door)
Bunker Tinted Glass Door Bunker Tinted Glass Door (Door)
Bunker Door to Ultraviolet Room Bunker UV Room Entry (Door)
Bunker Door to Elevator Bunker Elevator Room Entry (Door)
Swamp Entry Door Swamp Entry (Door)
Swamp Door to Broken Shapers Swamp Between Bridges First Door
Swamp Platform Shortcut Door Swamp Platform Shortcut Door
Swamp Cyan Water Pump Swamp Cyan Water Pump (Door)
Swamp Door to Rotated Shapers Swamp Between Bridges Second Door
Swamp Red Water Pump Swamp Red Water Pump (Door)
Swamp Red Underwater Exit Swamp Red Underwater Exit (Door)
Swamp Blue Water Pump Swamp Blue Water Pump (Door)
Swamp Purple Water Pump Swamp Purple Water Pump (Door)
Swamp Near Laser Shortcut Swamp Laser Shortcut (Door)
Treehouse First Door Treehouse First Door (Door)
Treehouse Second Door Treehouse Second Door (Door)
Treehouse Beyond Yellow Bridge Door Treehouse Third Door (Door)
Treehouse Drawbridge Treehouse Drawbridge (Door)
Treehouse Timed Door to Laser House Treehouse Laser House Entry (Door)
Inside Mountain First Layer Exit Door Mountain Floor 1 Exit (Door)
Inside Mountain Second Layer Staircase Near Mountain Floor 2 Staircase Near (Door)
Inside Mountain Second Layer Exit Door Mountain Floor 2 Exit (Door)
Inside Mountain Second Layer Staircase Far Mountain Floor 2 Staircase Far (Door)
Inside Mountain Giant Puzzle Exit Door Mountain Bottom Floor Giant Puzzle Exit (Door)
Inside Mountain Door to Final Room Mountain Bottom Floor Final Room Entry (Door)
Inside Mountain Bottom Layer Rock Mountain Bottom Floor Rock (Door)
Inside Mountain Door to Secret Area Caves Entry (Door)
Caves Pillar Door Caves Pillar Door (Door)
Caves Mountain Shortcut Caves Mountain Shortcut (Door)
Caves Swamp Shortcut Caves Swamp Shortcut (Door)
Challenge Entry Door Challenge Entry (Door)
Challenge Door to Theater Walkway Challenge Tunnels Entry (Door)
Theater Walkway Door to Windmill Interior Tunnels Theater Shortcut (Door)
Theater Walkway Door to Desert Elevator Room Tunnels Desert Shortcut (Door)
Theater Walkway Door to Town Tunnels Town Shortcut (Door)
Added Locations: Added Locations:
Outside Tutorial Door to Outpost Panel Outside Tutorial Outpost Entry Panel
Outside Tutorial Exit Door from Outpost Panel Outside Tutorial Outpost Exit Panel
Glass Factory Entry Door Panel Glass Factory Entry Panel
Glass Factory Vertical Symmetry 5 Glass Factory Back Wall 5
Symmetry Island Door to Symmetry Island Lower Panel Symmetry Island Lower Panel
Symmetry Island Door to Symmetry Island Upper Panel Symmetry Island Upper Panel
Orchard Apple Tree 3 Orchard Apple Tree 3
Orchard Apple Tree 5 Orchard Apple Tree 5
Desert Door to Desert Flood Light Room Panel Desert Light Room Entry Panel
Desert Artificial Light Reflection 3 Desert Light Room 3
Desert Door to Water Levels Room Panel Desert Flood Room Entry Panel
Desert Flood Reflection 6 Desert Flood Room 6
Quarry Door to Quarry 1 Panel Quarry Entry 1 Panel
Quarry Door to Quarry 2 Panel Quarry Entry 2 Panel
Quarry Door to Mill Right Quarry Mill Entry Right Panel
Quarry Door to Mill Left Quarry Mill Entry Left Panel
Quarry Mill Ground Floor Shortcut Door Panel Quarry Mill Side Exit Panel
Quarry Mill Door to Outside Quarry Stairs Panel Quarry Mill Roof Exit Panel
Quarry Mill Stair Control Quarry Mill Stair Control
Quarry Boathouse Shortcut Door Panel Quarry Boathouse Second Barrier Panel
Shadows Door Timer Inside Shadows Door Timer Inside
Shadows Door Timer Outside Shadows Door Timer Outside
Shadows Environmental Avoid 8 Shadows Far 8
Shadows Follow 5 Shadows Near 5
Shadows Lower Avoid 3 Shadows Intro 3
Shadows Lower Avoid 5 Shadows Intro 5
Keep Hedge Maze 1 Keep Hedge Maze 1
Keep Pressure Plates 1 Keep Pressure Plates 1
Keep Hedge Maze 2 Keep Hedge Maze 2
@ -131,71 +131,70 @@ Keep Hedge Maze 4
Keep Pressure Plates 2 Keep Pressure Plates 2
Keep Pressure Plates 3 Keep Pressure Plates 3
Keep Pressure Plates 4 Keep Pressure Plates 4
Keep Shortcut to Shadows Panel Keep Shadows Shortcut Panel
Keep Tower Shortcut to Keep Panel Keep Tower Shortcut Panel
Monastery Shortcut Door Panel Monastery Shortcut Panel
Monastery Door Open Left Monastery Entry Left
Monastery Door Open Right Monastery Entry Right
Monastery Rhombic Avoid 3 Monastery Outside 3
Town Cargo Box Panel Town Cargo Box Entry Panel
Town Full Dot Grid Shapers 5 Town Wooden Roof Lower Row 5
Town Tinted Door Panel Town Tinted Glass Door Panel
Town Door to Church Stars Panel Town Church Entry Panel
Town Maze Stair Control Town Maze Stair Control
Town Windmill Door Panel Town Windmill Entry Panel
Town Sound Room Left
Town Sound Room Right Town Sound Room Right
Town Symmetry Squares 5 + Dots Town Red Rooftop 5
Town Church Lattice Town Church Lattice
Town Hexagonal Reflection Town Tall Hexagonal
Town Shapers & Dots & Eraser Town Wooden Rooftop
Windmill Door to Front of Theater Panel Windmill Theater Entry Panel
Theater Door to Cargo Box Left Panel Theater Exit Left Panel
Theater Door to Cargo Box Right Panel Theater Exit Right Panel
Jungle Shortcut to River Panel Jungle Laser Shortcut Panel
Jungle Popup Wall Control Jungle Popup Wall Control
River Rhombic Avoid to Monastery Garden River Monastery Shortcut Panel
Bunker Bunker Entry Panel Bunker Entry Panel
Bunker Door to Bunker Proper Panel Bunker Tinted Glass Door Panel
Bunker Drawn Squares through Tinted Glass 3 Bunker Glass Room 3
Bunker Drop-Down Door Squares 2 Bunker UV Room 2
Swamp Entry Panel Swamp Entry Panel
Swamp Platform Shapers 4 Swamp Platform Row 4
Swamp Platform Shortcut Right Panel Swamp Platform Shortcut Right Panel
Swamp Blue Underwater Negative Shapers 5 Swamp Blue Underwater 5
Swamp Broken Shapers 4 Swamp Between Bridges Near Row 4
Swamp Cyan Underwater Negative Shapers 5 Swamp Cyan Underwater 5
Swamp Red Underwater Negative Shapers 4 Swamp Red Underwater 4
Swamp More Rotated Shapers 4 Swamp Beyond Rotating Bridge 4
Swamp More Rotated Shapers 4 Swamp Beyond Rotating Bridge 4
Swamp Near Laser Shortcut Right Panel Swamp Laser Shortcut Right Panel
Treehouse First Door Panel Treehouse First Door Panel
Treehouse Second Door Panel Treehouse Second Door Panel
Treehouse Beyond Yellow Bridge Door Panel Treehouse Third Door Panel
Treehouse Bridge Control Treehouse Bridge Control
Treehouse Left Orange Bridge 15 Treehouse Left Orange Bridge 15
Treehouse Right Orange Bridge 12 Treehouse Right Orange Bridge 12
Treehouse Laser House Door Timer Outside Control Treehouse Laser House Door Timer Outside Control
Treehouse Laser House Door Timer Inside Control Treehouse Laser House Door Timer Inside
Inside Mountain Moving Background 7 Mountain Floor 1 Left Row 7
Inside Mountain Obscured Vision 5 Mountain Floor 1 Right Row 5
Inside Mountain Physically Obstructed 3 Mountain Floor 1 Back Row 3
Inside Mountain Angled Inside Trash 2 Mountain Floor 1 Trash Pillar 2
Inside Mountain Color Cycle 5 Mountain Floor 2 Near Row 5
Inside Mountain Light Bridge Controller 2 Mountain Floor 2 Light Bridge Controller Near
Inside Mountain Light Bridge Controller 3 Mountain Floor 2 Light Bridge Controller Far
Inside Mountain Same Solution 6 Mountain Floor 2 Far Row 6
Inside Mountain Giant Puzzle Mountain Bottom Floor Giant Puzzle
Inside Mountain Door to Final Room Left Mountain Bottom Floor Final Room Entry Left
Inside Mountain Door to Final Room Right Mountain Bottom Floor Final Room Entry Right
Inside Mountain Bottom Layer Discard Mountain Bottom Floor Discard
Inside Mountain Rock Control Mountain Bottom Floor Rock Control
Inside Mountain Secret Area Entry Panel Mountain Bottom Floor Caves Entry Panel
Inside Mountain Caves Lone Pillar Caves Lone Pillar
Inside Mountain Caves Shortcut to Mountain Panel Caves Mountain Shortcut Panel
Inside Mountain Caves Shortcut to Swamp Panel Caves Swamp Shortcut Panel
Inside Mountain Caves Challenge Entry Panel Caves Challenge Entry Panel
Challenge Door to Theater Walkway Panel Challenge Tunnels Entry Panel
Theater Walkway Theater Shortcut Panel Tunnels Theater Shortcut Panel
Theater Walkway Desert Shortcut Panel Tunnels Desert Shortcut Panel
Theater Walkway Town Shortcut Panel Tunnels Town Shortcut Panel

View File

@ -1,104 +1,104 @@
Items: Items:
Outside Tutorial Optional Door Outside Tutorial Outpost Path (Door)
Outside Tutorial Outpost Entry Door Outside Tutorial Outpost Entry (Door)
Outside Tutorial Outpost Exit Door Outside Tutorial Outpost Exit (Door)
Glass Factory Entry Door Glass Factory Entry (Door)
Glass Factory Back Wall Glass Factory Back Wall (Door)
Symmetry Island Lower Door Symmetry Island Lower (Door)
Symmetry Island Upper Door Symmetry Island Upper (Door)
Orchard Middle Gate Orchard First Gate (Door)
Orchard Final Gate Orchard Second Gate (Door)
Desert Door to Flood Light Room Desert Light Room Entry (Door)
Desert Door to Pond Room Desert Pond Room Entry (Door)
Desert Door to Water Levels Room Desert Flood Room Entry (Door)
Desert Door to Elevator Room Desert Elevator Room Entry (Door)
Quarry Main Entry 1 Quarry Entry 1 (Door)
Quarry Main Entry 2 Quarry Entry 2 (Door)
Quarry Door to Mill Quarry Mill Entry (Door)
Quarry Mill Side Door Quarry Mill Side Exit (Door)
Quarry Mill Rooftop Shortcut Quarry Mill Roof Exit (Door)
Quarry Mill Stairs Quarry Mill Stairs (Door)
Quarry Boathouse Boat Staircase Quarry Boathouse Dock (Door)
Quarry Boathouse First Barrier Quarry Boathouse First Barrier (Door)
Quarry Boathouse Shortcut Quarry Boathouse Second Barrier (Door)
Shadows Timed Door Shadows Timed Door (Door)
Shadows Laser Room Right Door Shadows Laser Entry Right (Door)
Shadows Laser Room Left Door Shadows Laser Entry Left (Door)
Shadows Barrier to Quarry Shadows Quarry Barrier (Door)
Shadows Barrier to Ledge Shadows Ledge Barrier (Door)
Keep Hedge Maze 1 Exit Door Keep Hedge Maze 1 Exit (Door)
Keep Pressure Plates 1 Exit Door Keep Pressure Plates 1 Exit (Door)
Keep Hedge Maze 2 Shortcut Keep Hedge Maze 2 Shortcut (Door)
Keep Hedge Maze 2 Exit Door Keep Hedge Maze 2 Exit (Door)
Keep Hedge Maze 3 Shortcut Keep Hedge Maze 3 Shortcut (Door)
Keep Hedge Maze 3 Exit Door Keep Hedge Maze 3 Exit (Door)
Keep Hedge Maze 4 Shortcut Keep Hedge Maze 4 Shortcut (Door)
Keep Hedge Maze 4 Exit Door Keep Hedge Maze 4 Exit (Door)
Keep Pressure Plates 2 Exit Door Keep Pressure Plates 2 Exit (Door)
Keep Pressure Plates 3 Exit Door Keep Pressure Plates 3 Exit (Door)
Keep Pressure Plates 4 Exit Door Keep Pressure Plates 4 Exit (Door)
Keep Shortcut to Shadows Keep Shadows Shortcut (Door)
Keep Tower Shortcut Keep Tower Shortcut (Door)
Monastery Shortcut Monastery Shortcut (Door)
Monastery Inner Door Monastery Entry Inner (Door)
Monastery Outer Door Monastery Entry Outer (Door)
Monastery Door to Garden Monastery Garden Entry (Door)
Town Cargo Box Door Town Cargo Box Entry (Door)
Town Wooden Roof Staircase Town Wooden Roof Stairs (Door)
Town Tinted Door to RGB House Town Tinted Glass Door (Door)
Town Door to Church Town Church Entry (Door)
Town Maze Staircase Town Maze Stairs (Door)
Town Windmill Door Town Windmill Entry (Door)
Town RGB House Staircase Town RGB House Stairs (Door)
Town Tower Blue Panels Door Town Tower First Door (Door)
Town Tower Lattice Door Town Tower Third Door (Door)
Town Tower Environmental Set Door Town Tower Fourth Door (Door)
Town Tower Wooden Roof Set Door Town Tower Second Door (Door)
Theater Entry Door Theater Entry (Door)
Theater Exit Door Left Theater Exit Left (Door)
Theater Exit Door Right Theater Exit Right (Door)
Jungle Bamboo Shortcut to River Jungle Bamboo Laser Shortcut (Door)
Jungle Popup Wall Jungle Popup Wall (Door)
River Shortcut to Monastery Garden River Monastery Shortcut (Door)
Bunker Bunker Entry Door Bunker Entry (Door)
Bunker Tinted Glass Door Bunker Tinted Glass Door (Door)
Bunker Door to Ultraviolet Room Bunker UV Room Entry (Door)
Bunker Door to Elevator Bunker Elevator Room Entry (Door)
Swamp Entry Door Swamp Entry (Door)
Swamp Door to Broken Shapers Swamp Between Bridges First Door
Swamp Platform Shortcut Door Swamp Platform Shortcut Door
Swamp Cyan Water Pump Swamp Cyan Water Pump (Door)
Swamp Door to Rotated Shapers Swamp Between Bridges Second Door
Swamp Red Water Pump Swamp Red Water Pump (Door)
Swamp Red Underwater Exit Swamp Red Underwater Exit (Door)
Swamp Blue Water Pump Swamp Blue Water Pump (Door)
Swamp Purple Water Pump Swamp Purple Water Pump (Door)
Swamp Near Laser Shortcut Swamp Laser Shortcut (Door)
Treehouse First Door Treehouse First Door (Door)
Treehouse Second Door Treehouse Second Door (Door)
Treehouse Beyond Yellow Bridge Door Treehouse Third Door (Door)
Treehouse Drawbridge Treehouse Drawbridge (Door)
Treehouse Timed Door to Laser House Treehouse Laser House Entry (Door)
Inside Mountain First Layer Exit Door Mountain Floor 1 Exit (Door)
Inside Mountain Second Layer Staircase Near Mountain Floor 2 Staircase Near (Door)
Inside Mountain Second Layer Exit Door Mountain Floor 2 Exit (Door)
Inside Mountain Second Layer Staircase Far Mountain Floor 2 Staircase Far (Door)
Inside Mountain Giant Puzzle Exit Door Mountain Bottom Floor Giant Puzzle Exit (Door)
Inside Mountain Door to Final Room Mountain Bottom Floor Final Room Entry (Door)
Inside Mountain Bottom Layer Rock Mountain Bottom Floor Rock (Door)
Inside Mountain Door to Secret Area Caves Entry (Door)
Caves Pillar Door Caves Pillar Door (Door)
Caves Mountain Shortcut Caves Mountain Shortcut (Door)
Caves Swamp Shortcut Caves Swamp Shortcut (Door)
Challenge Entry Door Challenge Entry (Door)
Challenge Door to Theater Walkway Challenge Tunnels Entry (Door)
Theater Walkway Door to Windmill Interior Tunnels Theater Shortcut (Door)
Theater Walkway Door to Desert Elevator Room Tunnels Desert Shortcut (Door)
Theater Walkway Door to Town Tunnels Town Shortcut (Door)
Desert Flood Room Flood Controls (Panel) Desert Flood Controls (Panel)
Quarry Mill Ramp Controls (Panel) Quarry Mill Ramp Controls (Panel)
Quarry Mill Elevator Controls (Panel) Quarry Mill Lift Controls (Panel)
Quarry Boathouse Ramp Height Control (Panel) Quarry Boathouse Ramp Height Control (Panel)
Quarry Boathouse Ramp Horizontal Control (Panel) Quarry Boathouse Ramp Horizontal Control (Panel)
Bunker Elevator Control (Panel) Bunker Elevator Control (Panel)
@ -108,32 +108,32 @@ Swamp Maze Control (Panel)
Boat Boat
Added Locations: Added Locations:
Outside Tutorial Door to Outpost Panel Outside Tutorial Outpost Entry Panel
Outside Tutorial Exit Door from Outpost Panel Outside Tutorial Outpost Exit Panel
Glass Factory Entry Door Panel Glass Factory Entry Panel
Glass Factory Vertical Symmetry 5 Glass Factory Back Wall 5
Symmetry Island Door to Symmetry Island Lower Panel Symmetry Island Lower Panel
Symmetry Island Door to Symmetry Island Upper Panel Symmetry Island Upper Panel
Orchard Apple Tree 3 Orchard Apple Tree 3
Orchard Apple Tree 5 Orchard Apple Tree 5
Desert Door to Desert Flood Light Room Panel Desert Light Room Entry Panel
Desert Artificial Light Reflection 3 Desert Light Room 3
Desert Door to Water Levels Room Panel Desert Flood Room Entry Panel
Desert Flood Reflection 6 Desert Flood Room 6
Quarry Door to Quarry 1 Panel Quarry Entry 1 Panel
Quarry Door to Quarry 2 Panel Quarry Entry 2 Panel
Quarry Door to Mill Right Quarry Mill Entry Right Panel
Quarry Door to Mill Left Quarry Mill Entry Left Panel
Quarry Mill Ground Floor Shortcut Door Panel Quarry Mill Side Exit Panel
Quarry Mill Door to Outside Quarry Stairs Panel Quarry Mill Roof Exit Panel
Quarry Mill Stair Control Quarry Mill Stair Control
Quarry Boathouse Shortcut Door Panel Quarry Boathouse Second Barrier Panel
Shadows Door Timer Inside Shadows Door Timer Inside
Shadows Door Timer Outside Shadows Door Timer Outside
Shadows Environmental Avoid 8 Shadows Far 8
Shadows Follow 5 Shadows Near 5
Shadows Lower Avoid 3 Shadows Intro 3
Shadows Lower Avoid 5 Shadows Intro 5
Keep Hedge Maze 1 Keep Hedge Maze 1
Keep Pressure Plates 1 Keep Pressure Plates 1
Keep Hedge Maze 2 Keep Hedge Maze 2
@ -142,71 +142,70 @@ Keep Hedge Maze 4
Keep Pressure Plates 2 Keep Pressure Plates 2
Keep Pressure Plates 3 Keep Pressure Plates 3
Keep Pressure Plates 4 Keep Pressure Plates 4
Keep Shortcut to Shadows Panel Keep Shadows Shortcut Panel
Keep Tower Shortcut to Keep Panel Keep Tower Shortcut Panel
Monastery Shortcut Door Panel Monastery Shortcut Panel
Monastery Door Open Left Monastery Entry Left
Monastery Door Open Right Monastery Entry Right
Monastery Rhombic Avoid 3 Monastery Outside 3
Town Cargo Box Panel Town Cargo Box Entry Panel
Town Full Dot Grid Shapers 5 Town Wooden Roof Lower Row 5
Town Tinted Door Panel Town Tinted Glass Door Panel
Town Door to Church Stars Panel Town Church Entry Panel
Town Maze Stair Control Town Maze Stair Control
Town Windmill Door Panel Town Windmill Entry Panel
Town Sound Room Left
Town Sound Room Right Town Sound Room Right
Town Symmetry Squares 5 + Dots Town Red Rooftop 5
Town Church Lattice Town Church Lattice
Town Hexagonal Reflection Town Tall Hexagonal
Town Shapers & Dots & Eraser Town Wooden Rooftop
Windmill Door to Front of Theater Panel Windmill Theater Entry Panel
Theater Door to Cargo Box Left Panel Theater Exit Left Panel
Theater Door to Cargo Box Right Panel Theater Exit Right Panel
Jungle Shortcut to River Panel Jungle Laser Shortcut Panel
Jungle Popup Wall Control Jungle Popup Wall Control
River Rhombic Avoid to Monastery Garden River Monastery Shortcut Panel
Bunker Bunker Entry Panel Bunker Entry Panel
Bunker Door to Bunker Proper Panel Bunker Tinted Glass Door Panel
Bunker Drawn Squares through Tinted Glass 3 Bunker Glass Room 3
Bunker Drop-Down Door Squares 2 Bunker UV Room 2
Swamp Entry Panel Swamp Entry Panel
Swamp Platform Shapers 4 Swamp Platform Row 4
Swamp Platform Shortcut Right Panel Swamp Platform Shortcut Right Panel
Swamp Blue Underwater Negative Shapers 5 Swamp Blue Underwater 5
Swamp Broken Shapers 4 Swamp Between Bridges Near Row 4
Swamp Cyan Underwater Negative Shapers 5 Swamp Cyan Underwater 5
Swamp Red Underwater Negative Shapers 4 Swamp Red Underwater 4
Swamp More Rotated Shapers 4 Swamp Beyond Rotating Bridge 4
Swamp More Rotated Shapers 4 Swamp Beyond Rotating Bridge 4
Swamp Near Laser Shortcut Right Panel Swamp Laser Shortcut Right Panel
Treehouse First Door Panel Treehouse First Door Panel
Treehouse Second Door Panel Treehouse Second Door Panel
Treehouse Beyond Yellow Bridge Door Panel Treehouse Third Door Panel
Treehouse Bridge Control Treehouse Bridge Control
Treehouse Left Orange Bridge 15 Treehouse Left Orange Bridge 15
Treehouse Right Orange Bridge 12 Treehouse Right Orange Bridge 12
Treehouse Laser House Door Timer Outside Control Treehouse Laser House Door Timer Outside Control
Treehouse Laser House Door Timer Inside Control Treehouse Laser House Door Timer Inside
Inside Mountain Moving Background 7 Mountain Floor 1 Left Row 7
Inside Mountain Obscured Vision 5 Mountain Floor 1 Right Row 5
Inside Mountain Physically Obstructed 3 Mountain Floor 1 Back Row 3
Inside Mountain Angled Inside Trash 2 Mountain Floor 1 Trash Pillar 2
Inside Mountain Color Cycle 5 Mountain Floor 2 Near Row 5
Inside Mountain Light Bridge Controller 2 Mountain Floor 2 Light Bridge Controller Near
Inside Mountain Light Bridge Controller 3 Mountain Floor 2 Light Bridge Controller Far
Inside Mountain Same Solution 6 Mountain Floor 2 Far Row 6
Inside Mountain Giant Puzzle Mountain Bottom Floor Giant Puzzle
Inside Mountain Door to Final Room Left Mountain Bottom Floor Final Room Entry Left
Inside Mountain Door to Final Room Right Mountain Bottom Floor Final Room Entry Right
Inside Mountain Bottom Layer Discard Mountain Bottom Floor Discard
Inside Mountain Rock Control Mountain Bottom Floor Rock Control
Inside Mountain Secret Area Entry Panel Mountain Bottom Floor Caves Entry Panel
Inside Mountain Caves Lone Pillar Caves Lone Pillar
Inside Mountain Caves Shortcut to Mountain Panel Caves Mountain Shortcut Panel
Inside Mountain Caves Shortcut to Swamp Panel Caves Swamp Shortcut Panel
Inside Mountain Caves Challenge Entry Panel Caves Challenge Entry Panel
Challenge Door to Theater Walkway Panel Challenge Tunnels Entry Panel
Theater Walkway Theater Shortcut Panel Tunnels Theater Shortcut Panel
Theater Walkway Desert Shortcut Panel Tunnels Desert Shortcut Panel
Theater Walkway Town Shortcut Panel Tunnels Town Shortcut Panel

View File

@ -1,73 +1,73 @@
Items: Items:
Glass Factory Back Wall Glass Factory Back Wall (Door)
Quarry Boathouse Boat Staircase Quarry Boathouse Dock (Door)
Outside Tutorial Outpost Doors Outside Tutorial Outpost Doors
Glass Factory Entry Door Glass Factory Entry (Door)
Symmetry Island Doors Symmetry Island Doors
Orchard Gates Orchard Gates
Desert Doors Desert Doors
Quarry Main Entry Quarry Main Entry
Quarry Door to Mill Quarry Mill Entry (Door)
Quarry Mill Shortcuts Quarry Mill Shortcuts
Quarry Boathouse Barriers Quarry Boathouse Barriers
Shadows Timed Door Shadows Timed Door (Door)
Shadows Laser Room Door Shadows Laser Room Door
Shadows Barriers Shadows Barriers
Keep Hedge Maze Doors Keep Hedge Maze Doors
Keep Pressure Plates Doors Keep Pressure Plates Doors
Keep Shortcuts Keep Shortcuts
Monastery Entry Door Monastery Entry
Monastery Shortcuts Monastery Shortcuts
Town Doors Town Doors
Town Tower Doors Town Tower Doors
Theater Entry Door Theater Entry (Door)
Theater Exit Door Theater Exit
Jungle & River Shortcuts Jungle & River Shortcuts
Jungle Popup Wall Jungle Popup Wall (Door)
Bunker Doors Bunker Doors
Swamp Doors Swamp Doors
Swamp Near Laser Shortcut Swamp Laser Shortcut (Door)
Swamp Water Pumps Swamp Water Pumps
Treehouse Entry Doors Treehouse Entry Doors
Treehouse Drawbridge Treehouse Drawbridge (Door)
Treehouse Timed Door to Laser House Treehouse Laser House Entry (Door)
Inside Mountain First Layer Exit Door Mountain Floor 1 Exit (Door)
Inside Mountain Second Layer Stairs & Doors Mountain Floor 2 Stairs & Doors
Inside Mountain Giant Puzzle Exit Door Mountain Bottom Floor Giant Puzzle Exit (Door)
Inside Mountain Door to Final Room Mountain Bottom Floor Final Room Entry (Door)
Inside Mountain Bottom Layer Doors to Caves Mountain Bottom Floor Doors to Caves
Caves Doors to Challenge Caves Doors to Challenge
Caves Exits to Main Island Caves Exits to Main Island
Challenge Door to Theater Walkway Challenge Tunnels Entry (Door)
Theater Walkway Doors Tunnels Doors
Added Locations: Added Locations:
Outside Tutorial Door to Outpost Panel Outside Tutorial Outpost Entry Panel
Outside Tutorial Exit Door from Outpost Panel Outside Tutorial Outpost Exit Panel
Glass Factory Entry Door Panel Glass Factory Entry Panel
Glass Factory Vertical Symmetry 5 Glass Factory Back Wall 5
Symmetry Island Door to Symmetry Island Lower Panel Symmetry Island Lower Panel
Symmetry Island Door to Symmetry Island Upper Panel Symmetry Island Upper Panel
Orchard Apple Tree 3 Orchard Apple Tree 3
Orchard Apple Tree 5 Orchard Apple Tree 5
Desert Door to Desert Flood Light Room Panel Desert Light Room Entry Panel
Desert Artificial Light Reflection 3 Desert Light Room 3
Desert Door to Water Levels Room Panel Desert Flood Room Entry Panel
Desert Flood Reflection 6 Desert Flood Room 6
Quarry Door to Quarry 1 Panel Quarry Entry 1 Panel
Quarry Door to Quarry 2 Panel Quarry Entry 2 Panel
Quarry Door to Mill Right Quarry Mill Entry Right Panel
Quarry Door to Mill Left Quarry Mill Entry Left Panel
Quarry Mill Ground Floor Shortcut Door Panel Quarry Mill Side Exit Panel
Quarry Mill Door to Outside Quarry Stairs Panel Quarry Mill Roof Exit Panel
Quarry Mill Stair Control Quarry Mill Stair Control
Quarry Boathouse Shortcut Door Panel Quarry Boathouse Second Barrier Panel
Shadows Door Timer Inside Shadows Door Timer Inside
Shadows Door Timer Outside Shadows Door Timer Outside
Shadows Environmental Avoid 8 Shadows Far 8
Shadows Follow 5 Shadows Near 5
Shadows Lower Avoid 3 Shadows Intro 3
Shadows Lower Avoid 5 Shadows Intro 5
Keep Hedge Maze 1 Keep Hedge Maze 1
Keep Pressure Plates 1 Keep Pressure Plates 1
Keep Hedge Maze 2 Keep Hedge Maze 2
@ -76,71 +76,70 @@ Keep Hedge Maze 4
Keep Pressure Plates 2 Keep Pressure Plates 2
Keep Pressure Plates 3 Keep Pressure Plates 3
Keep Pressure Plates 4 Keep Pressure Plates 4
Keep Shortcut to Shadows Panel Keep Shadows Shortcut Panel
Keep Tower Shortcut to Keep Panel Keep Tower Shortcut Panel
Monastery Shortcut Door Panel Monastery Shortcut Panel
Monastery Door Open Left Monastery Entry Left
Monastery Door Open Right Monastery Entry Right
Monastery Rhombic Avoid 3 Monastery Outside 3
Town Cargo Box Panel Town Cargo Box Entry Panel
Town Full Dot Grid Shapers 5 Town Wooden Roof Lower Row 5
Town Tinted Door Panel Town Tinted Glass Door Panel
Town Door to Church Stars Panel Town Church Entry Panel
Town Maze Stair Control Town Maze Stair Control
Town Windmill Door Panel Town Windmill Entry Panel
Town Sound Room Left
Town Sound Room Right Town Sound Room Right
Town Symmetry Squares 5 + Dots Town Red Rooftop 5
Town Church Lattice Town Church Lattice
Town Hexagonal Reflection Town Tall Hexagonal
Town Shapers & Dots & Eraser Town Wooden Rooftop
Windmill Door to Front of Theater Panel Windmill Theater Entry Panel
Theater Door to Cargo Box Left Panel Theater Exit Left Panel
Theater Door to Cargo Box Right Panel Theater Exit Right Panel
Jungle Shortcut to River Panel Jungle Laser Shortcut Panel
Jungle Popup Wall Control Jungle Popup Wall Control
River Rhombic Avoid to Monastery Garden River Monastery Shortcut Panel
Bunker Bunker Entry Panel Bunker Entry Panel
Bunker Door to Bunker Proper Panel Bunker Tinted Glass Door Panel
Bunker Drawn Squares through Tinted Glass 3 Bunker Glass Room 3
Bunker Drop-Down Door Squares 2 Bunker UV Room 2
Swamp Entry Panel Swamp Entry Panel
Swamp Platform Shapers 4 Swamp Platform Row 4
Swamp Platform Shortcut Right Panel Swamp Platform Shortcut Right Panel
Swamp Blue Underwater Negative Shapers 5 Swamp Blue Underwater 5
Swamp Broken Shapers 4 Swamp Between Bridges Near Row 4
Swamp Cyan Underwater Negative Shapers 5 Swamp Cyan Underwater 5
Swamp Red Underwater Negative Shapers 4 Swamp Red Underwater 4
Swamp More Rotated Shapers 4 Swamp Beyond Rotating Bridge 4
Swamp More Rotated Shapers 4 Swamp Beyond Rotating Bridge 4
Swamp Near Laser Shortcut Right Panel Swamp Laser Shortcut Right Panel
Treehouse First Door Panel Treehouse First Door Panel
Treehouse Second Door Panel Treehouse Second Door Panel
Treehouse Beyond Yellow Bridge Door Panel Treehouse Third Door Panel
Treehouse Bridge Control Treehouse Bridge Control
Treehouse Left Orange Bridge 15 Treehouse Left Orange Bridge 15
Treehouse Right Orange Bridge 12 Treehouse Right Orange Bridge 12
Treehouse Laser House Door Timer Outside Control Treehouse Laser House Door Timer Outside Control
Treehouse Laser House Door Timer Inside Control Treehouse Laser House Door Timer Inside
Inside Mountain Moving Background 7 Mountain Floor 1 Left Row 7
Inside Mountain Obscured Vision 5 Mountain Floor 1 Right Row 5
Inside Mountain Physically Obstructed 3 Mountain Floor 1 Back Row 3
Inside Mountain Angled Inside Trash 2 Mountain Floor 1 Trash Pillar 2
Inside Mountain Color Cycle 5 Mountain Floor 2 Near Row 5
Inside Mountain Light Bridge Controller 2 Mountain Floor 2 Light Bridge Controller Near
Inside Mountain Light Bridge Controller 3 Mountain Floor 2 Light Bridge Controller Far
Inside Mountain Same Solution 6 Mountain Floor 2 Far Row 6
Inside Mountain Giant Puzzle Mountain Bottom Floor Giant Puzzle
Inside Mountain Door to Final Room Left Mountain Bottom Floor Final Room Entry Left
Inside Mountain Door to Final Room Right Mountain Bottom Floor Final Room Entry Right
Inside Mountain Bottom Layer Discard Mountain Bottom Floor Discard
Inside Mountain Rock Control Mountain Bottom Floor Rock Control
Inside Mountain Secret Area Entry Panel Mountain Bottom Floor Caves Entry Panel
Inside Mountain Caves Lone Pillar Caves Lone Pillar
Inside Mountain Caves Shortcut to Mountain Panel Caves Mountain Shortcut Panel
Inside Mountain Caves Shortcut to Swamp Panel Caves Swamp Shortcut Panel
Inside Mountain Caves Challenge Entry Panel Caves Challenge Entry Panel
Challenge Door to Theater Walkway Panel Challenge Tunnels Entry Panel
Theater Walkway Theater Shortcut Panel Tunnels Theater Shortcut Panel
Theater Walkway Desert Shortcut Panel Tunnels Desert Shortcut Panel
Theater Walkway Town Shortcut Panel Tunnels Town Shortcut Panel

View File

@ -5,5 +5,5 @@ Starting Inventory:
Caves Exits to Main Island Caves Exits to Main Island
Remove Items: Remove Items:
Caves Mountain Shortcut Caves Mountain Shortcut (Door)
Caves Swamp Shortcut Caves Swamp Shortcut (Door)