diff --git a/worlds/witness/WitnessItems.txt b/worlds/witness/WitnessItems.txt index e85e7c50d..8e5d9383b 100644 --- a/worlds/witness/WitnessItems.txt +++ b/worlds/witness/WitnessItems.txt @@ -35,9 +35,9 @@ Doors: 1107 - Symmetry Island Upper (Panel) - 0x1C349 1110 - Desert Light Room Entry (Panel) - 0x0C339 1111 - Desert Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B -1119 - Quarry Mill Entry (Panel) - 0x01E5A,0x01E59 -1120 - Quarry Mill Ramp Controls (Panel) - 0x03678,0x03676 -1122 - Quarry Mill Lift Controls (Panel) - 0x03679,0x03675 +1119 - Quarry Stoneworks Entry (Panel) - 0x01E5A,0x01E59 +1120 - Quarry Stoneworks Ramp Controls (Panel) - 0x03678,0x03676 +1122 - Quarry Stoneworks Lift Controls (Panel) - 0x03679,0x03675 1125 - Quarry Boathouse Ramp Height Control (Panel) - 0x03852 1127 - Quarry Boathouse Ramp Horizontal Control (Panel) - 0x03858 1131 - Shadows Door Timer (Panel) - 0x334DB,0x334DC @@ -90,14 +90,14 @@ Doors: 1630 - Desert Elevator Room Entry (Door) - 0x0C316 1633 - Quarry Entry 1 (Door) - 0x09D6F 1636 - Quarry Entry 2 (Door) - 0x17C07 -1639 - Quarry Mill Entry (Door) - 0x02010 -1642 - Quarry Mill Side Exit (Door) - 0x275FF -1645 - Quarry Mill Roof Exit (Door) - 0x17CE8 -1648 - Quarry Mill Stairs (Door) - 0x0368A +1639 - Quarry Stoneworks Entry (Door) - 0x02010 +1642 - Quarry Stoneworks Side Exit (Door) - 0x275FF +1645 - Quarry Stoneworks Roof Exit (Door) - 0x17CE8 +1648 - Quarry Stoneworks Stairs (Door) - 0x0368A 1651 - Quarry Boathouse Dock (Door) - 0x2769B,0x27163 1653 - Quarry Boathouse First Barrier (Door) - 0x17C50 1654 - Quarry Boathouse Second Barrier (Door) - 0x3865F -1656 - Shadows Timed Door (Door) - 0x19B24 +1656 - Shadows Timed Door - 0x19B24 1657 - Shadows Laser Entry Right (Door) - 0x194B2 1660 - Shadows Laser Entry Left (Door) - 0x19665 1663 - Shadows Quarry Barrier (Door) - 0x19865,0x0A2DF @@ -121,15 +121,15 @@ Doors: 1717 - Monastery Garden Entry (Door) - 0x03750 1718 - Town Cargo Box Entry (Door) - 0x0A0C9 1720 - Town Wooden Roof Stairs (Door) - 0x034F5 -1723 - Town Tinted Glass Door (Door) - 0x28A61 +1723 - Town Tinted Glass Door - 0x28A61 1726 - Town Church Entry (Door) - 0x03BB0 1729 - Town Maze Stairs (Door) - 0x28AA2 1732 - Town Windmill Entry (Door) - 0x1845B 1735 - Town RGB House Stairs (Door) - 0x2897B -1738 - Town Tower First Door (Door) - 0x27798 -1741 - Town Tower Third Door (Door) - 0x27799 -1744 - Town Tower Fourth Door (Door) - 0x2779A -1747 - Town Tower Second Door (Door) - 0x2779C +1738 - Town Tower Second (Door) - 0x27798 +1741 - Town Tower First (Door) - 0x27799 +1744 - Town Tower Fourth (Door) - 0x2779A +1747 - Town Tower Third (Door) - 0x2779C 1750 - Theater Entry (Door) - 0x17F88 1753 - Theater Exit Left (Door) - 0x0A16D 1756 - Theater Exit Right (Door) - 0x3CCDF @@ -137,7 +137,7 @@ Doors: 1760 - Jungle Popup Wall (Door) - 0x1475B 1762 - River Monastery Shortcut (Door) - 0x0CF2A 1765 - Bunker Entry (Door) - 0x0C2A4 -1768 - Bunker Tinted Glass Door (Door) - 0x17C79 +1768 - Bunker Tinted Glass Door - 0x17C79 1771 - Bunker UV Room Entry (Door) - 0x0C2A3 1774 - Bunker Elevator Room Entry (Door) - 0x0A08D 1777 - Swamp Entry (Door) - 0x00C1C @@ -150,9 +150,9 @@ Doors: 1798 - Swamp Blue Water Pump (Door) - 0x18482 1801 - Swamp Purple Water Pump (Door) - 0x0A1D6 1804 - Swamp Laser Shortcut (Door) - 0x2D880 -1807 - Treehouse First Door (Door) - 0x0C309 -1810 - Treehouse Second Door (Door) - 0x0C310 -1813 - Treehouse Third Door (Door) - 0x0A181 +1807 - Treehouse First (Door) - 0x0C309 +1810 - Treehouse Second (Door) - 0x0C310 +1813 - Treehouse Third (Door) - 0x0A181 1816 - Treehouse Drawbridge (Door) - 0x0C32D 1819 - Treehouse Laser House Entry (Door) - 0x0C323 1822 - Mountain Floor 1 Exit (Door) - 0x09E54 @@ -163,7 +163,7 @@ Doors: 1840 - Mountain Bottom Floor Final Room Entry (Door) - 0x0C141 1843 - Mountain Bottom Floor Rock (Door) - 0x17F33 1846 - Caves Entry (Door) - 0x2D77D -1849 - Caves Pillar Door (Door) - 0x019A5 +1849 - Caves Pillar Door - 0x019A5 1855 - Caves Swamp Shortcut (Door) - 0x2D859 1858 - Challenge Entry (Door) - 0x0A19A 1861 - Challenge Tunnels Entry (Door) - 0x0348A @@ -176,7 +176,7 @@ Doors: 1909 - Orchard Gates - 0x03313,0x03307 1912 - Desert Doors - 0x09FEE,0x0C2C3,0x0A24B,0x0C316 1915 - Quarry Main Entry - 0x09D6F,0x17C07 -1918 - Quarry Mill Shortcuts - 0x17CE8,0x0368A,0x275FF +1918 - Quarry Stoneworks Shortcuts - 0x17CE8,0x0368A,0x275FF 1921 - Quarry Boathouse Barriers - 0x17C50,0x3865F 1924 - Shadows Laser Room Door - 0x194B2,0x19665 1927 - Shadows Barriers - 0x19865,0x0A2DF,0x1855B,0x19ADE diff --git a/worlds/witness/WitnessLogic.txt b/worlds/witness/WitnessLogic.txt index 85bf7d40c..308cba385 100644 --- a/worlds/witness/WitnessLogic.txt +++ b/worlds/witness/WitnessLogic.txt @@ -230,19 +230,19 @@ Quarry Between Entrys (Quarry) - Quarry - 0x17C07: 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers Door - 0x17C07 (Entry 2) - 0x17C09 -Quarry (Quarry) - Quarry Mill Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4: -158121 - 0x01E5A (Mill Entry Left Panel) - True - Black/White Squares -158122 - 0x01E59 (Mill Entry Right Panel) - True - Dots -Door - 0x02010 (Mill Entry) - 0x01E59 & 0x01E5A +Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4: +158121 - 0x01E5A (Stoneworks Entry Left Panel) - True - Black/White Squares +158122 - 0x01E59 (Stoneworks Entry Right Panel) - True - Dots +Door - 0x02010 (Stoneworks Entry) - 0x01E59 & 0x01E5A -Quarry Mill Ground Floor (Quarry Mill) - Quarry - 0x275FF - Quarry Mill Middle Floor - 0x03678 - Outside Quarry - 0x17CE8: +Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8: 158123 - 0x275ED (Side Exit Panel) - True - True Door - 0x275FF (Side Exit) - 0x275ED 158124 - 0x03678 (Lower Ramp Control) - True - Dots & Eraser 158145 - 0x17CAC (Roof Exit Panel) - True - True Door - 0x17CE8 (Roof Exit) - 0x17CAC -Quarry Mill Middle Floor (Quarry Mill) - Quarry Mill Ground Floor - 0x03675 - Quarry Mill Upper Floor - 0x03679: +Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Ground Floor - 0x03675 - Quarry Stoneworks Upper Floor - 0x03679: 158125 - 0x00E0C (Lower Row 1) - True - Dots & Eraser 158126 - 0x01489 (Lower Row 2) - 0x00E0C - Dots & Eraser 158127 - 0x0148A (Lower Row 3) - 0x01489 - Dots & Eraser @@ -251,7 +251,7 @@ Quarry Mill Middle Floor (Quarry Mill) - Quarry Mill Ground Floor - 0x03675 - Qu 158130 - 0x014E8 (Lower Row 6) - 0x014E7 - Dots & Eraser 158131 - 0x03679 (Lower Lift Control) - 0x014E8 - Dots & Eraser -Quarry Mill Upper Floor (Quarry Mill) - Quarry Mill Middle Floor - 0x03676 & 0x03679 - Quarry Mill Ground Floor - 0x0368A: +Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03676 & 0x03679 - Quarry Stoneworks Ground Floor - 0x0368A: 158132 - 0x03676 (Upper Ramp Control) - True - Dots & Eraser 158133 - 0x03675 (Upper Lift Control) - True - Dots & Eraser 158134 - 0x00557 (Upper Row 1) - True - Colored Squares & Eraser @@ -330,7 +330,7 @@ Door - 0x194B2 (Laser Entry Right) - 0x1972F 158185 - 0x197E8 (Near 4) - 0x197E0 - True 158186 - 0x197E5 (Near 5) - 0x197E8 - True Door - 0x19665 (Laser Entry Left) - 0x197E5 -159400 - 0x28A7B (Quarry Mill Rooftop Vent EP) - True - True +159400 - 0x28A7B (Quarry Stoneworks Rooftop Vent EP) - True - True Shadows Ledge (Shadows) - Shadows - 0x1855B - Quarry - 0x19865 & 0x0A2DF: 158187 - 0x334DC (Door Timer Inside) - True - True @@ -480,10 +480,10 @@ Door - 0x1845B (Windmill Entry) - 0x17F5F 159010 - 0x037B6 (Windmill First Blade EP) - 0x17D02 - True 159011 - 0x037B2 (Windmill Second Blade EP) - 0x17D02 - True 159012 - 0x000F7 (Windmill Third Blade EP) - 0x17D02 - True -159540 - 0x03335 (Tower Underside First EP) - True - True -159541 - 0x03412 (Tower Underside Second EP) - True - True -159542 - 0x038A6 (Tower Underside Third EP) - True - True -159543 - 0x038AA (Tower Underside Fourth EP) - True - True +159540 - 0x03335 (Tower Underside Third EP) - True - True +159541 - 0x03412 (Tower Underside Fourth EP) - True - True +159542 - 0x038A6 (Tower Underside First EP) - True - True +159543 - 0x038AA (Tower Underside Second EP) - True - True 159545 - 0x03E40 (RGB House Green EP) - 0x334D8 - True 159546 - 0x28B8E (Maze Bridge Underside EP) - 0x2896A - True 159552 - 0x03BCF (Black Line Redirect EP) - True - True @@ -523,9 +523,9 @@ RGB Room (Town): 158246 - 0x03C08 (RGB Room Right) - 0x334D8 - Stars Town Tower (Town Tower) - Town - True - Town Tower Top - 0x27798 & 0x27799 & 0x2779A & 0x2779C: -Door - 0x27798 (First Door) - 0x28ACC -Door - 0x2779C (Second Door) - 0x28AD9 -Door - 0x27799 (Third Door) - 0x28A69 +Door - 0x27798 (Second Door) - 0x28ACC +Door - 0x2779C (Third Door) - 0x28AD9 +Door - 0x27799 (First Door) - 0x28A69 Door - 0x2779A (Fourth Door) - 0x28B39 Town Tower Top (Town): diff --git a/worlds/witness/WitnessLogicExpert.txt b/worlds/witness/WitnessLogicExpert.txt index aecf5f04c..f100a3095 100644 --- a/worlds/witness/WitnessLogicExpert.txt +++ b/worlds/witness/WitnessLogicExpert.txt @@ -230,19 +230,19 @@ Quarry Between Entrys (Quarry) - Quarry - 0x17C07: 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers & Triangles Door - 0x17C07 (Entry 2) - 0x17C09 -Quarry (Quarry) - Quarry Mill Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4: -158121 - 0x01E5A (Mill Entry Left Panel) - True - Squares & Black/White Squares & Stars & Stars + Same Colored Symbol -158122 - 0x01E59 (Mill Entry Right Panel) - True - Triangles -Door - 0x02010 (Mill Entry) - 0x01E59 & 0x01E5A +Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4: +158121 - 0x01E5A (Stoneworks Entry Left Panel) - True - Squares & Black/White Squares & Stars & Stars + Same Colored Symbol +158122 - 0x01E59 (Stoneworks Entry Right Panel) - True - Triangles +Door - 0x02010 (Stoneworks Entry) - 0x01E59 & 0x01E5A -Quarry Mill Ground Floor (Quarry Mill) - Quarry - 0x275FF - Quarry Mill Middle Floor - 0x03678 - Outside Quarry - 0x17CE8: +Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8: 158123 - 0x275ED (Side Exit Panel) - True - True Door - 0x275FF (Side Exit) - 0x275ED 158124 - 0x03678 (Lower Ramp Control) - True - Dots & Eraser 158145 - 0x17CAC (Roof Exit Panel) - True - True Door - 0x17CE8 (Roof Exit) - 0x17CAC -Quarry Mill Middle Floor (Quarry Mill) - Quarry Mill Ground Floor - 0x03675 - Quarry Mill Upper Floor - 0x03679: +Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Ground Floor - 0x03675 - Quarry Stoneworks Upper Floor - 0x03679: 158125 - 0x00E0C (Lower Row 1) - True - Dots & Eraser 158126 - 0x01489 (Lower Row 2) - 0x00E0C - Triangles & Eraser 158127 - 0x0148A (Lower Row 3) - 0x01489 - Triangles & Eraser @@ -251,7 +251,7 @@ Quarry Mill Middle Floor (Quarry Mill) - Quarry Mill Ground Floor - 0x03675 - Qu 158130 - 0x014E8 (Lower Row 6) - 0x014E7 - Triangles & Eraser 158131 - 0x03679 (Lower Lift Control) - 0x014E8 - Dots & Eraser -Quarry Mill Upper Floor (Quarry Mill) - Quarry Mill Middle Floor - 0x03676 & 0x03679 - Quarry Mill Ground Floor - 0x0368A: +Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03676 & 0x03679 - Quarry Stoneworks Ground Floor - 0x0368A: 158132 - 0x03676 (Upper Ramp Control) - True - Dots & Eraser 158133 - 0x03675 (Upper Lift Control) - True - Dots & Eraser 158134 - 0x00557 (Upper Row 1) - True - Squares & Colored Squares & Eraser & Stars & Stars + Same Colored Symbol @@ -330,7 +330,7 @@ Door - 0x194B2 (Laser Entry Right) - 0x1972F 158185 - 0x197E8 (Near 4) - 0x197E0 - True 158186 - 0x197E5 (Near 5) - 0x197E8 - True Door - 0x19665 (Laser Entry Left) - 0x197E5 -159400 - 0x28A7B (Quarry Mill Rooftop Vent EP) - True - True +159400 - 0x28A7B (Quarry Stoneworks Rooftop Vent EP) - True - True Shadows Ledge (Shadows) - Shadows - 0x1855B - Quarry - 0x19865 & 0x0A2DF: 158187 - 0x334DC (Door Timer Inside) - True - True @@ -480,10 +480,10 @@ Door - 0x1845B (Windmill Entry) - 0x17F5F 159010 - 0x037B6 (Windmill First Blade EP) - 0x17D02 - True 159011 - 0x037B2 (Windmill Second Blade EP) - 0x17D02 - True 159012 - 0x000F7 (Windmill Third Blade EP) - 0x17D02 - True -159540 - 0x03335 (Tower Underside First EP) - True - True -159541 - 0x03412 (Tower Underside Second EP) - True - True -159542 - 0x038A6 (Tower Underside Third EP) - True - True -159543 - 0x038AA (Tower Underside Fourth EP) - True - True +159540 - 0x03335 (Tower Underside Third EP) - True - True +159541 - 0x03412 (Tower Underside Fourth EP) - True - True +159542 - 0x038A6 (Tower Underside First EP) - True - True +159543 - 0x038AA (Tower Underside Second EP) - True - True 159545 - 0x03E40 (RGB House Green EP) - 0x334D8 & 0x03C0C & 0x03C08 - True 159546 - 0x28B8E (Maze Bridge Underside EP) - 0x2896A - True 159552 - 0x03BCF (Black Line Redirect EP) - True - True @@ -523,9 +523,9 @@ RGB Room (Town): 158246 - 0x03C08 (RGB Room Right) - 0x334D8 & 0x03C0C - Symmetry & Dots & Colored Dots & Triangles Town Tower (Town Tower) - Town - True - Town Tower Top - 0x27798 & 0x27799 & 0x2779A & 0x2779C: -Door - 0x27798 (First Door) - 0x28ACC -Door - 0x2779C (Second Door) - 0x28AD9 -Door - 0x27799 (Third Door) - 0x28A69 +Door - 0x27798 (Second Door) - 0x28ACC +Door - 0x2779C (Third Door) - 0x28AD9 +Door - 0x27799 (First Door) - 0x28A69 Door - 0x2779A (Fourth Door) - 0x28B39 Town Tower Top (Town): diff --git a/worlds/witness/WitnessLogicVanilla.txt b/worlds/witness/WitnessLogicVanilla.txt index 7b9fa884d..294950c30 100644 --- a/worlds/witness/WitnessLogicVanilla.txt +++ b/worlds/witness/WitnessLogicVanilla.txt @@ -230,19 +230,19 @@ Quarry Between Entrys (Quarry) - Quarry - 0x17C07: 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers Door - 0x17C07 (Entry 2) - 0x17C09 -Quarry (Quarry) - Quarry Mill Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4: -158121 - 0x01E5A (Mill Entry Left Panel) - True - Black/White Squares -158122 - 0x01E59 (Mill Entry Right Panel) - True - Dots -Door - 0x02010 (Mill Entry) - 0x01E59 & 0x01E5A +Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4: +158121 - 0x01E5A (Stoneworks Entry Left Panel) - True - Black/White Squares +158122 - 0x01E59 (Stoneworks Entry Right Panel) - True - Dots +Door - 0x02010 (Stoneworks Entry) - 0x01E59 & 0x01E5A -Quarry Mill Ground Floor (Quarry Mill) - Quarry - 0x275FF - Quarry Mill Middle Floor - 0x03678 - Outside Quarry - 0x17CE8: +Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8: 158123 - 0x275ED (Side Exit Panel) - True - True Door - 0x275FF (Side Exit) - 0x275ED 158124 - 0x03678 (Lower Ramp Control) - True - Dots & Eraser 158145 - 0x17CAC (Roof Exit Panel) - True - True Door - 0x17CE8 (Roof Exit) - 0x17CAC -Quarry Mill Middle Floor (Quarry Mill) - Quarry Mill Ground Floor - 0x03675 - Quarry Mill Upper Floor - 0x03679: +Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Ground Floor - 0x03675 - Quarry Stoneworks Upper Floor - 0x03679: 158125 - 0x00E0C (Lower Row 1) - True - Dots & Eraser 158126 - 0x01489 (Lower Row 2) - 0x00E0C - Dots & Eraser 158127 - 0x0148A (Lower Row 3) - 0x01489 - Dots & Eraser @@ -251,7 +251,7 @@ Quarry Mill Middle Floor (Quarry Mill) - Quarry Mill Ground Floor - 0x03675 - Qu 158130 - 0x014E8 (Lower Row 6) - 0x014E7 - Dots & Eraser 158131 - 0x03679 (Lower Lift Control) - 0x014E8 - Dots & Eraser -Quarry Mill Upper Floor (Quarry Mill) - Quarry Mill Middle Floor - 0x03676 & 0x03679 - Quarry Mill Ground Floor - 0x0368A: +Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03676 & 0x03679 - Quarry Stoneworks Ground Floor - 0x0368A: 158132 - 0x03676 (Upper Ramp Control) - True - Dots & Eraser 158133 - 0x03675 (Upper Lift Control) - True - Dots & Eraser 158134 - 0x00557 (Upper Row 1) - True - Colored Squares & Eraser @@ -330,7 +330,7 @@ Door - 0x194B2 (Laser Entry Right) - 0x1972F 158185 - 0x197E8 (Near 4) - 0x197E0 - True 158186 - 0x197E5 (Near 5) - 0x197E8 - True Door - 0x19665 (Laser Entry Left) - 0x197E5 -159400 - 0x28A7B (Quarry Mill Rooftop Vent EP) - True - True +159400 - 0x28A7B (Quarry Stoneworks Rooftop Vent EP) - True - True Shadows Ledge (Shadows) - Shadows - 0x1855B - Quarry - 0x19865 & 0x0A2DF: 158187 - 0x334DC (Door Timer Inside) - True - True @@ -480,10 +480,10 @@ Door - 0x1845B (Windmill Entry) - 0x17F5F 159010 - 0x037B6 (Windmill First Blade EP) - 0x17D02 - True 159011 - 0x037B2 (Windmill Second Blade EP) - 0x17D02 - True 159012 - 0x000F7 (Windmill Third Blade EP) - 0x17D02 - True -159540 - 0x03335 (Tower Underside First EP) - True - True -159541 - 0x03412 (Tower Underside Second EP) - True - True -159542 - 0x038A6 (Tower Underside Third EP) - True - True -159543 - 0x038AA (Tower Underside Fourth EP) - True - True +159540 - 0x03335 (Tower Underside Third EP) - True - True +159541 - 0x03412 (Tower Underside Fourth EP) - True - True +159542 - 0x038A6 (Tower Underside First EP) - True - True +159543 - 0x038AA (Tower Underside Second EP) - True - True 159545 - 0x03E40 (RGB House Green EP) - 0x334D8 - True 159546 - 0x28B8E (Maze Bridge Underside EP) - 0x2896A - True 159552 - 0x03BCF (Black Line Redirect EP) - True - True @@ -523,9 +523,9 @@ RGB Room (Town): 158246 - 0x03C08 (RGB Room Right) - 0x334D8 - Stars Town Tower (Town Tower) - Town - True - Town Tower Top - 0x27798 & 0x27799 & 0x2779A & 0x2779C: -Door - 0x27798 (First Door) - 0x28ACC -Door - 0x2779C (Second Door) - 0x28AD9 -Door - 0x27799 (Third Door) - 0x28A69 +Door - 0x27798 (Second Door) - 0x28ACC +Door - 0x2779C (Third Door) - 0x28AD9 +Door - 0x27799 (First Door) - 0x28A69 Door - 0x2779A (Fourth Door) - 0x28B39 Town Tower Top (Town): diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index 5a288e0c8..a5765bf71 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -38,7 +38,7 @@ class WitnessWorld(World): """ game = "The Witness" topology_present = False - data_version = 11 + data_version = 12 static_logic = StaticWitnessLogic() static_locat = StaticWitnessLocations() diff --git a/worlds/witness/locations.py b/worlds/witness/locations.py index 14291f4ee..37f61646d 100644 --- a/worlds/witness/locations.py +++ b/worlds/witness/locations.py @@ -48,9 +48,9 @@ class StaticWitnessLocations: "Desert Flood Room 6", "Desert Laser Panel", - "Quarry Mill Lower Row 6", - "Quarry Mill Upper Row 8", - "Quarry Mill Control Room Right", + "Quarry Stoneworks Lower Row 6", + "Quarry Stoneworks Upper Row 8", + "Quarry Stoneworks Control Room Right", "Quarry Boathouse Intro Right", "Quarry Boathouse Intro Left", "Quarry Boathouse Front Row 5", @@ -128,7 +128,7 @@ class StaticWitnessLocations: "Mountaintop River Shape", "Tutorial Patio Floor", - "Quarry Mill Control Room Left", + "Quarry Stoneworks Control Room Left", "Theater Tutorial Video", "Theater Desert Video", "Theater Jungle Video", @@ -170,11 +170,11 @@ class StaticWitnessLocations: "Quarry Rock Line EP", "Quarry Rock Line Reflection EP", "Quarry Railroad EP", - "Quarry Mill Ramp EP", - "Quarry Mill Lift EP", + "Quarry Stoneworks Ramp EP", + "Quarry Stoneworks Lift EP", "Quarry Boathouse Moving Ramp EP", "Quarry Boathouse Hook EP", - "Shadows Quarry Mill Rooftop Vent EP", + "Shadows Quarry Stoneworks Rooftop Vent EP", "Treehouse Beach Rock Shadow EP", "Treehouse Beach Sand Shadow EP", "Treehouse Beach Both Orange Bridges EP", @@ -207,10 +207,10 @@ class StaticWitnessLocations: "Town Windmill First Blade EP", "Town Windmill Second Blade EP", "Town Windmill Third Blade EP", - "Town Tower Underside First EP", - "Town Tower Underside Second EP", "Town Tower Underside Third EP", "Town Tower Underside Fourth EP", + "Town Tower Underside First EP", + "Town Tower Underside Second EP", "Town RGB House Red EP", "Town RGB House Green EP", "Town Maze Bridge Underside EP", diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py index 948029ec4..34b53b62f 100644 --- a/worlds/witness/player_logic.py +++ b/worlds/witness/player_logic.py @@ -445,7 +445,7 @@ def __init__(self, world: MultiWorld, player: int, disabled_locations: Set[str], "0x01D3F": "Keep Laser Panel (Pressure Plates) Activates", "0x01BE9": "Keep Laser Panel (Pressure Plates) Activates - Expert", "0x09F7F": "Mountain Access", - "0x0367C": "Quarry Laser Mill Requirement Met", + "0x0367C": "Quarry Laser Stoneworks Requirement Met", "0x009A1": "Swamp Between Bridges Far 1 Activates", "0x00006": "Swamp Cyan Water Drains", "0x00990": "Swamp Between Bridges Near Row 1 Activates", @@ -469,8 +469,8 @@ def __init__(self, world: MultiWorld, player: int, disabled_locations: Set[str], "0x28ACC": "Town Tower 2nd Door Opens", "0x28AD9": "Town Tower 3rd Door Opens", "0x28B39": "Town Tower 4th Door Opens", - "0x03675": "Quarry Mill Ramp Activation From Above", - "0x03679": "Quarry Mill Lift Lowering While Standing On It", + "0x03675": "Quarry Stoneworks Ramp Activation From Above", + "0x03679": "Quarry Stoneworks Lift Lowering While Standing On It", "0x2FAF6": "Tutorial Gate Secret Solution Knowledge", "0x079DF": "Town Tall Hexagonal Turns On", "0x17DA2": "Right Orange Bridge Fully Extended", @@ -499,7 +499,7 @@ def __init__(self, world: MultiWorld, player: int, disabled_locations: Set[str], "0x033EA": "Pressure Plates 1 EP available", "0x03553": "Tutorial Video EPs availble", "0x17C79": "Bunker Door EP available", - "0x275FF": "Mill Light EPs available", + "0x275FF": "Stoneworks Light EPs available", "0x17E2B": "Remaining Purple Sand EPs available", "0x03852": "Ramp EPs requirement", "0x334D8": "RGB panels & EPs solvable", diff --git a/worlds/witness/settings/Door_Panel_Shuffle.txt b/worlds/witness/settings/Door_Panel_Shuffle.txt index 745c0b4a4..80195cfb9 100644 --- a/worlds/witness/settings/Door_Panel_Shuffle.txt +++ b/worlds/witness/settings/Door_Panel_Shuffle.txt @@ -4,9 +4,9 @@ Symmetry Island Lower (Panel) Symmetry Island Upper (Panel) Desert Light Room Entry (Panel) Desert Flood Controls (Panel) -Quarry Mill Entry (Panel) -Quarry Mill Ramp Controls (Panel) -Quarry Mill Lift Controls (Panel) +Quarry Stoneworks Entry (Panel) +Quarry Stoneworks Ramp Controls (Panel) +Quarry Stoneworks Lift Controls (Panel) Quarry Boathouse Ramp Height Control (Panel) Quarry Boathouse Ramp Horizontal Control (Panel) Shadows Door Timer (Panel) diff --git a/worlds/witness/settings/Doors_Complex.txt b/worlds/witness/settings/Doors_Complex.txt index 9d883cad2..d8da6783b 100644 --- a/worlds/witness/settings/Doors_Complex.txt +++ b/worlds/witness/settings/Doors_Complex.txt @@ -14,14 +14,14 @@ Desert Flood Room Entry (Door) Desert Elevator Room Entry (Door) Quarry Entry 1 (Door) Quarry Entry 2 (Door) -Quarry Mill Entry (Door) -Quarry Mill Side Exit (Door) -Quarry Mill Roof Exit (Door) -Quarry Mill Stairs (Door) +Quarry Stoneworks Entry (Door) +Quarry Stoneworks Side Exit (Door) +Quarry Stoneworks Roof Exit (Door) +Quarry Stoneworks Stairs (Door) Quarry Boathouse Dock (Door) Quarry Boathouse First Barrier (Door) Quarry Boathouse Second Barrier (Door) -Shadows Timed Door (Door) +Shadows Timed Door Shadows Laser Entry Right (Door) Shadows Laser Entry Left (Door) Shadows Quarry Barrier (Door) @@ -45,15 +45,15 @@ Monastery Entry Outer (Door) Monastery Garden Entry (Door) Town Cargo Box Entry (Door) Town Wooden Roof Stairs (Door) -Town Tinted Glass Door (Door) +Town Tinted Glass Door Town Church Entry (Door) Town Maze Stairs (Door) Town Windmill Entry (Door) Town RGB House Stairs (Door) -Town Tower First Door (Door) -Town Tower Third Door (Door) -Town Tower Fourth Door (Door) -Town Tower Second Door (Door) +Town Tower Second (Door) +Town Tower First (Door) +Town Tower Fourth (Door) +Town Tower Third (Door) Theater Entry (Door) Theater Exit Left (Door) Theater Exit Right (Door) @@ -61,7 +61,7 @@ Jungle Bamboo Laser Shortcut (Door) Jungle Popup Wall (Door) River Monastery Shortcut (Door) Bunker Entry (Door) -Bunker Tinted Glass Door (Door) +Bunker Tinted Glass Door Bunker UV Room Entry (Door) Bunker Elevator Room Entry (Door) Swamp Entry (Door) @@ -74,9 +74,9 @@ Swamp Red Underwater Exit (Door) Swamp Blue Water Pump (Door) Swamp Purple Water Pump (Door) Swamp Laser Shortcut (Door) -Treehouse First Door (Door) -Treehouse Second Door (Door) -Treehouse Third Door (Door) +Treehouse First (Door) +Treehouse Second (Door) +Treehouse Third (Door) Treehouse Drawbridge (Door) Treehouse Laser House Entry (Door) Mountain Floor 1 Exit (Door) @@ -87,7 +87,7 @@ Mountain Bottom Floor Giant Puzzle Exit (Door) Mountain Bottom Floor Final Room Entry (Door) Mountain Bottom Floor Rock (Door) Caves Entry (Door) -Caves Pillar Door (Door) +Caves Pillar Door Caves Mountain Shortcut (Door) Caves Swamp Shortcut (Door) Challenge Entry (Door) @@ -111,11 +111,11 @@ Desert Flood Room Entry Panel Desert Flood Room 6 Quarry Entry 1 Panel Quarry Entry 2 Panel -Quarry Mill Entry Right Panel -Quarry Mill Entry Left Panel -Quarry Mill Side Exit Panel -Quarry Mill Roof Exit Panel -Quarry Mill Stair Control +Quarry Stoneworks Entry Right Panel +Quarry Stoneworks Entry Left Panel +Quarry Stoneworks Side Exit Panel +Quarry Stoneworks Roof Exit Panel +Quarry Stoneworks Stair Control Quarry Boathouse Second Barrier Panel Shadows Door Timer Inside Shadows Door Timer Outside diff --git a/worlds/witness/settings/Doors_Max.txt b/worlds/witness/settings/Doors_Max.txt index 739000426..e722b61ca 100644 --- a/worlds/witness/settings/Doors_Max.txt +++ b/worlds/witness/settings/Doors_Max.txt @@ -14,14 +14,14 @@ Desert Flood Room Entry (Door) Desert Elevator Room Entry (Door) Quarry Entry 1 (Door) Quarry Entry 2 (Door) -Quarry Mill Entry (Door) -Quarry Mill Side Exit (Door) -Quarry Mill Roof Exit (Door) -Quarry Mill Stairs (Door) +Quarry Stoneworks Entry (Door) +Quarry Stoneworks Side Exit (Door) +Quarry Stoneworks Roof Exit (Door) +Quarry Stoneworks Stairs (Door) Quarry Boathouse Dock (Door) Quarry Boathouse First Barrier (Door) Quarry Boathouse Second Barrier (Door) -Shadows Timed Door (Door) +Shadows Timed Door Shadows Laser Entry Right (Door) Shadows Laser Entry Left (Door) Shadows Quarry Barrier (Door) @@ -45,15 +45,15 @@ Monastery Entry Outer (Door) Monastery Garden Entry (Door) Town Cargo Box Entry (Door) Town Wooden Roof Stairs (Door) -Town Tinted Glass Door (Door) +Town Tinted Glass Door Town Church Entry (Door) Town Maze Stairs (Door) Town Windmill Entry (Door) Town RGB House Stairs (Door) -Town Tower First Door (Door) -Town Tower Third Door (Door) -Town Tower Fourth Door (Door) -Town Tower Second Door (Door) +Town Tower Second (Door) +Town Tower First (Door) +Town Tower Fourth (Door) +Town Tower Third (Door) Theater Entry (Door) Theater Exit Left (Door) Theater Exit Right (Door) @@ -61,7 +61,7 @@ Jungle Bamboo Laser Shortcut (Door) Jungle Popup Wall (Door) River Monastery Shortcut (Door) Bunker Entry (Door) -Bunker Tinted Glass Door (Door) +Bunker Tinted Glass Door Bunker UV Room Entry (Door) Bunker Elevator Room Entry (Door) Swamp Entry (Door) @@ -74,9 +74,9 @@ Swamp Red Underwater Exit (Door) Swamp Blue Water Pump (Door) Swamp Purple Water Pump (Door) Swamp Laser Shortcut (Door) -Treehouse First Door (Door) -Treehouse Second Door (Door) -Treehouse Third Door (Door) +Treehouse First (Door) +Treehouse Second (Door) +Treehouse Third (Door) Treehouse Drawbridge (Door) Treehouse Laser House Entry (Door) Mountain Floor 1 Exit (Door) @@ -87,7 +87,7 @@ Mountain Bottom Floor Giant Puzzle Exit (Door) Mountain Bottom Floor Final Room Entry (Door) Mountain Bottom Floor Rock (Door) Caves Entry (Door) -Caves Pillar Door (Door) +Caves Pillar Door Caves Mountain Shortcut (Door) Caves Swamp Shortcut (Door) Challenge Entry (Door) @@ -97,8 +97,8 @@ Tunnels Desert Shortcut (Door) Tunnels Town Shortcut (Door) Desert Flood Controls (Panel) -Quarry Mill Ramp Controls (Panel) -Quarry Mill Lift Controls (Panel) +Quarry Stoneworks Ramp Controls (Panel) +Quarry Stoneworks Lift Controls (Panel) Quarry Boathouse Ramp Height Control (Panel) Quarry Boathouse Ramp Horizontal Control (Panel) Bunker Elevator Control (Panel) @@ -122,11 +122,11 @@ Desert Flood Room Entry Panel Desert Flood Room 6 Quarry Entry 1 Panel Quarry Entry 2 Panel -Quarry Mill Entry Right Panel -Quarry Mill Entry Left Panel -Quarry Mill Side Exit Panel -Quarry Mill Roof Exit Panel -Quarry Mill Stair Control +Quarry Stoneworks Entry Right Panel +Quarry Stoneworks Entry Left Panel +Quarry Stoneworks Side Exit Panel +Quarry Stoneworks Roof Exit Panel +Quarry Stoneworks Stair Control Quarry Boathouse Second Barrier Panel Shadows Door Timer Inside Shadows Door Timer Outside diff --git a/worlds/witness/settings/Doors_Simple.txt b/worlds/witness/settings/Doors_Simple.txt index 8cda2ee64..309874b13 100644 --- a/worlds/witness/settings/Doors_Simple.txt +++ b/worlds/witness/settings/Doors_Simple.txt @@ -7,10 +7,10 @@ Symmetry Island Doors Orchard Gates Desert Doors Quarry Main Entry -Quarry Mill Entry (Door) -Quarry Mill Shortcuts +Quarry Stoneworks Entry (Door) +Quarry Stoneworks Shortcuts Quarry Boathouse Barriers -Shadows Timed Door (Door) +Shadows Timed Door Shadows Laser Room Door Shadows Barriers Keep Hedge Maze Doors @@ -56,11 +56,11 @@ Desert Flood Room Entry Panel Desert Flood Room 6 Quarry Entry 1 Panel Quarry Entry 2 Panel -Quarry Mill Entry Right Panel -Quarry Mill Entry Left Panel -Quarry Mill Side Exit Panel -Quarry Mill Roof Exit Panel -Quarry Mill Stair Control +Quarry Stoneworks Entry Right Panel +Quarry Stoneworks Entry Left Panel +Quarry Stoneworks Side Exit Panel +Quarry Stoneworks Roof Exit Panel +Quarry Stoneworks Stair Control Quarry Boathouse Second Barrier Panel Shadows Door Timer Inside Shadows Door Timer Outside