From 5e8eb1c98a44508836f1c90b2a743414096afe09 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Wed, 28 Feb 2024 04:44:22 +0100 Subject: [PATCH] The Witness: New hint type ("area hints") (#2494) This new type of "area hint" will instead give you general information about one of the named geographical areas in your world. Example: ``` There are 4 progression items in the "Quarry" region. Of them, 2 are for other players. Also, one of them is a laser for this world. ``` This also renames some of the locations in the game to better fit into an "area", such as the "River Obelisk" being renamed to the "Mountainside Obelisk". --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Scipio Wright --- worlds/witness/WitnessItems.txt | 12 +- worlds/witness/WitnessLogic.txt | 346 +++++++------ worlds/witness/WitnessLogicExpert.txt | 346 +++++++------ worlds/witness/WitnessLogicVanilla.txt | 346 +++++++------ worlds/witness/__init__.py | 35 +- worlds/witness/hints.py | 457 ++++++++++++++---- worlds/witness/locations.py | 68 +-- worlds/witness/options.py | 15 +- worlds/witness/presets.py | 3 + worlds/witness/regions.py | 5 +- .../Door_Shuffle/Complex_Door_Panels.txt | 4 +- .../settings/Door_Shuffle/Complex_Doors.txt | 16 +- .../settings/Door_Shuffle/Simple_Doors.txt | 10 +- .../settings/Door_Shuffle/Simple_Panels.txt | 2 +- .../witness/settings/EP_Shuffle/EP_Sides.txt | 12 +- worlds/witness/settings/Exclusions/Vaults.txt | 6 +- .../settings/Postgame/Mountain_Lower.txt | 6 +- worlds/witness/static_logic.py | 25 +- worlds/witness/utils.py | 15 + 19 files changed, 1135 insertions(+), 594 deletions(-) diff --git a/worlds/witness/WitnessItems.txt b/worlds/witness/WitnessItems.txt index e17464a0923a..6f63eccc9521 100644 --- a/worlds/witness/WitnessItems.txt +++ b/worlds/witness/WitnessItems.txt @@ -39,8 +39,8 @@ Jokes: Doors: 1100 - Glass Factory Entry (Panel) - 0x01A54 -1101 - Tutorial Outpost Entry (Panel) - 0x0A171 -1102 - Tutorial Outpost Exit (Panel) - 0x04CA4 +1101 - Outside Tutorial Outpost Entry (Panel) - 0x0A171 +1102 - Outside Tutorial Outpost Exit (Panel) - 0x04CA4 1105 - Symmetry Island Lower (Panel) - 0x000B0 1107 - Symmetry Island Upper (Panel) - 0x1C349 1108 - Desert Surface 3 Control (Panel) - 0x09FA0 @@ -168,9 +168,9 @@ Doors: 1750 - Theater Entry (Door) - 0x17F88 1753 - Theater Exit Left (Door) - 0x0A16D 1756 - Theater Exit Right (Door) - 0x3CCDF -1759 - Jungle Bamboo Laser Shortcut (Door) - 0x3873B +1759 - Jungle Laser Shortcut (Door) - 0x3873B 1760 - Jungle Popup Wall (Door) - 0x1475B -1762 - River Monastery Garden Shortcut (Door) - 0x0CF2A +1762 - Jungle Monastery Garden Shortcut (Door) - 0x0CF2A 1765 - Bunker Entry (Door) - 0x0C2A4 1768 - Bunker Tinted Glass Door - 0x17C79 1771 - Bunker UV Room Entry (Door) - 0x0C2A3 @@ -195,7 +195,7 @@ Doors: 1828 - Mountain Floor 2 Exit (Door) - 0x09EDD 1831 - Mountain Floor 2 Staircase Far (Door) - 0x09E07 1834 - Mountain Bottom Floor Giant Puzzle Exit (Door) - 0x09F89 -1840 - Mountain Bottom Floor Final Room Entry (Door) - 0x0C141 +1840 - Mountain Bottom Floor Pillars Room Entry (Door) - 0x0C141 1843 - Mountain Bottom Floor Rock (Door) - 0x17F33 1846 - Caves Entry (Door) - 0x2D77D 1849 - Caves Pillar Door - 0x019A5 @@ -247,7 +247,7 @@ Doors: 2035 - Mountain & Caves Control Panels - 0x09ED8,0x09E86,0x09E39,0x09EEB,0x335AB,0x335AC,0x3369D 2100 - Symmetry Island Panels - 0x1C349,0x000B0 -2101 - Tutorial Outpost Panels - 0x0A171,0x04CA4 +2101 - Outside Tutorial Outpost Panels - 0x0A171,0x04CA4 2105 - Desert Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B,0x0C339,0x0A249,0x0A015,0x09FA0,0x09F86 2110 - Quarry Outside Panels - 0x17C09,0x09E57,0x17CC4 2115 - Quarry Stoneworks Panels - 0x01E5A,0x01E59,0x03678,0x03676,0x03679,0x03675 diff --git a/worlds/witness/WitnessLogic.txt b/worlds/witness/WitnessLogic.txt index ec0922bec697..e3bacfb4b0e4 100644 --- a/worlds/witness/WitnessLogic.txt +++ b/worlds/witness/WitnessLogic.txt @@ -1,12 +1,14 @@ +==Tutorial (Inside)== + Menu (Menu) - Entry - True: Entry (Entry): -First Hallway (First Hallway) - Entry - True - First Hallway Room - 0x00064: +Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064: 158000 - 0x00064 (Straight) - True - True 159510 - 0x01848 (EP) - 0x00064 - True -First Hallway Room (First Hallway) - Tutorial - 0x00182: +Tutorial First Hallway Room (Tutorial First Hallway) - Tutorial - 0x00182: 158001 - 0x00182 (Bend) - True - True Tutorial (Tutorial) - Outside Tutorial - 0x03629: @@ -23,6 +25,8 @@ Tutorial (Tutorial) - Outside Tutorial - 0x03629: 159513 - 0x33600 (Patio Flowers EP) - 0x0C373 - True 159517 - 0x3352F (Gate EP) - 0x03505 - True +==Tutorial (Outside)== + Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2 - Outside Tutorial Vault - 0x033D0: 158650 - 0x033D4 (Vault Panel) - True - Dots & Black/White Squares Door - 0x033D0 (Vault Door) - 0x033D4 @@ -58,9 +62,23 @@ Outside Tutorial Outpost (Outside Tutorial) - Outside Tutorial - 0x04CA3: Door - 0x04CA3 (Outpost Exit) - 0x04CA4 158600 - 0x17CFB (Discard) - True - Triangles +Orchard (Orchard) - Main Island - True - Orchard Beyond First Gate - 0x03307: +158071 - 0x00143 (Apple Tree 1) - True - True +158072 - 0x0003B (Apple Tree 2) - 0x00143 - True +158073 - 0x00055 (Apple Tree 3) - 0x0003B - True +Door - 0x03307 (First Gate) - 0x00055 + +Orchard Beyond First Gate (Orchard) - Orchard End - 0x03313: +158074 - 0x032F7 (Apple Tree 4) - 0x00055 - True +158075 - 0x032FF (Apple Tree 5) - 0x032F7 - True +Door - 0x03313 (Second Gate) - 0x032FF + +Orchard End (Orchard): + Main Island (Main Island) - Outside Tutorial - True: 159801 - 0xFFD00 (Reached Independently) - True - True -159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True + +==Glass Factory== Outside Glass Factory (Glass Factory) - Main Island - True - Inside Glass Factory - 0x01A29: 158027 - 0x01A54 (Entry Panel) - True - Symmetry @@ -85,6 +103,8 @@ Door - 0x0D7ED (Back Wall) - 0x0005C Inside Glass Factory Behind Back Wall (Glass Factory) - The Ocean - 0x17CC8: 158039 - 0x17CC8 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat +==Symmetry Island== + Outside Symmetry Island (Symmetry Island) - Main Island - True - Symmetry Island Lower - 0x17F3E: 158040 - 0x000B0 (Lower Panel) - 0x0343A - Dots Door - 0x17F3E (Lower) - 0x000B0 @@ -128,20 +148,17 @@ Symmetry Island Upper (Symmetry Island): Laser - 0x00509 (Laser) - 0x0360D 159001 - 0x03367 (Glass Factory Black Line EP) - True - True -Orchard (Orchard) - Main Island - True - Orchard Beyond First Gate - 0x03307: -158071 - 0x00143 (Apple Tree 1) - True - True -158072 - 0x0003B (Apple Tree 2) - 0x00143 - True -158073 - 0x00055 (Apple Tree 3) - 0x0003B - True -Door - 0x03307 (First Gate) - 0x00055 - -Orchard Beyond First Gate (Orchard) - Orchard End - 0x03313: -158074 - 0x032F7 (Apple Tree 4) - 0x00055 - True -158075 - 0x032FF (Apple Tree 5) - 0x032F7 - True -Door - 0x03313 (Second Gate) - 0x032FF +==Desert== -Orchard End (Orchard): +Desert Obelisk (Desert) - Entry - True: +159700 - 0xFFE00 (Obelisk Side 1) - 0x0332B & 0x03367 & 0x28B8A - True +159701 - 0xFFE01 (Obelisk Side 2) - 0x037B6 & 0x037B2 & 0x000F7 - True +159702 - 0xFFE02 (Obelisk Side 3) - 0x3351D - True +159703 - 0xFFE03 (Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True +159704 - 0xFFE04 (Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True +159709 - 0x00359 (Obelisk) - True - True -Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE - Desert Vault - 0x03444: +Desert Outside (Desert) - Main Island - True - Desert Light Room - 0x09FEE - Desert Vault - 0x03444: 158652 - 0x0CC7B (Vault Panel) - True - Dots & Shapers & Rotated Shapers & Negative Shapers & Full Dots Door - 0x03444 (Vault Door) - 0x0CC7B 158602 - 0x17CE7 (Discard) - True - Triangles @@ -172,14 +189,14 @@ Laser - 0x012FB (Laser) - 0x03608 Desert Vault (Desert): 158653 - 0x0339E (Vault Box) - True - True -Desert Floodlight Room (Desert) - Desert Pond Room - 0x0C2C3: +Desert Light Room (Desert) - Desert Pond Room - 0x0C2C3: 158087 - 0x09FAA (Light Control) - True - True 158088 - 0x00422 (Light Room 1) - 0x09FAA - True 158089 - 0x006E3 (Light Room 2) - 0x09FAA - True 158090 - 0x0A02D (Light Room 3) - 0x09FAA & 0x00422 & 0x006E3 - True Door - 0x0C2C3 (Pond Room Entry) - 0x0A02D -Desert Pond Room (Desert) - Desert Water Levels Room - 0x0A24B: +Desert Pond Room (Desert) - Desert Flood Room - 0x0A24B: 158091 - 0x00C72 (Pond Room 1) - True - True 158092 - 0x0129D (Pond Room 2) - 0x00C72 - True 158093 - 0x008BB (Pond Room 3) - 0x0129D - True @@ -190,7 +207,7 @@ Door - 0x0A24B (Flood Room Entry) - 0x0A249 159043 - 0x0A14C (Pond Room Near Reflection EP) - True - True 159044 - 0x0A14D (Pond Room Far Reflection EP) - True - True -Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316: +Desert Flood Room (Desert) - Desert Elevator Room - 0x0C316: 158097 - 0x1C2DF (Reduce Water Level Far Left) - True - True 158098 - 0x1831E (Reduce Water Level Far Right) - True - True 158099 - 0x1C260 (Reduce Water Level Near Left) - True - True @@ -208,7 +225,7 @@ Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316: Door - 0x0C316 (Elevator Room Entry) - 0x18076 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True -Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317: +Desert Elevator Room (Desert) - Desert Behind Elevator - 0x01317: 158111 - 0x17C31 (Elevator Room Transparent) - True - True 158113 - 0x012D7 (Elevator Room Hexagonal) - 0x17C31 & 0x0A015 - True 158114 - 0x0A015 (Elevator Room Hexagonal Control) - 0x17C31 - True @@ -218,9 +235,19 @@ Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x0131 159035 - 0x037BB (Elevator EP) - 0x01317 - True Door - 0x01317 (Elevator) - 0x03608 -Desert Lowest Level Inbetween Shortcuts (Desert): +Desert Behind Elevator (Desert): -Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01: +==Quarry== + +Quarry Obelisk (Quarry) - Entry - True: +159740 - 0xFFE40 (Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True +159741 - 0xFFE41 (Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True +159742 - 0xFFE42 (Obelisk Side 3) - 0x289CF & 0x289D1 - True +159743 - 0xFFE43 (Obelisk Side 4) - 0x33692 - True +159744 - 0xFFE44 (Obelisk Side 5) - 0x03E77 & 0x03E7C - True +159749 - 0x22073 (Obelisk) - True - True + +Outside Quarry (Quarry) - Main Island - True - Quarry Between Entry Doors - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01: 158118 - 0x09E57 (Entry 1 Panel) - True - Black/White Squares 158603 - 0x17CF0 (Discard) - True - Triangles 158702 - 0x03612 (Laser Panel) - 0x0A3D0 & 0x0367C - Eraser & Shapers @@ -236,7 +263,7 @@ Quarry Elevator (Quarry) - Outside Quarry - 0x17CC4 - Quarry - 0x17CC4: 158120 - 0x17CC4 (Elevator Control) - 0x0367C - Dots & Eraser 159403 - 0x17CB9 (Railroad EP) - 0x17CC4 - True -Quarry Between Entrys (Quarry) - Quarry - 0x17C07: +Quarry Between Entry Doors (Quarry) - Quarry - 0x17C07: 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers Door - 0x17C07 (Entry 2) - 0x17C09 @@ -322,6 +349,8 @@ Door - 0x3865F (Second Barrier) - 0x38663 158169 - 0x0A3D0 (Back Second Row 3) - 0x0A3CC - Stars & Eraser & Shapers 159401 - 0x005F6 (Hook EP) - 0x275FA & 0x03852 & 0x3865F - True +==Shadows== + Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 | 0x19665: 158170 - 0x334DB (Door Timer Outside) - True - True Door - 0x19B24 (Timed Door) - 0x334DB | 0x334DC @@ -361,19 +390,18 @@ Shadows Laser Room (Shadows): 158703 - 0x19650 (Laser Panel) - 0x194B2 & 0x19665 - True Laser - 0x181B3 (Laser) - 0x19650 -Treehouse Beach (Treehouse Beach) - Main Island - True: -159200 - 0x0053D (Rock Shadow EP) - True - True -159201 - 0x0053E (Sand Shadow EP) - True - True -159212 - 0x220BD (Both Orange Bridges EP) - 0x17DA2 & 0x17DDB - True +==Keep== -Keep (Keep) - Main Island - True - Keep 2nd Maze - 0x01954 - Keep 2nd Pressure Plate - 0x01BEC: +Outside Keep (Keep) - Main Island - True: +159430 - 0x03E77 (Red Flowers EP) - True - True +159431 - 0x03E7C (Purple Flowers EP) - True - True + +Keep (Keep) - Outside Keep - True - Keep 2nd Maze - 0x01954 - Keep 2nd Pressure Plate - 0x01BEC: 158193 - 0x00139 (Hedge Maze 1) - True - True 158197 - 0x0A3A8 (Reset Pressure Plates 1) - True - True 158198 - 0x033EA (Pressure Plates 1) - 0x0A3A8 - Dots Door - 0x01954 (Hedge Maze 1 Exit) - 0x00139 Door - 0x01BEC (Pressure Plates 1 Exit) - 0x033EA -159430 - 0x03E77 (Red Flowers EP) - True - True -159431 - 0x03E7C (Purple Flowers EP) - True - True Keep 2nd Maze (Keep) - Keep - 0x018CE - Keep 3rd Maze - 0x019D8: Door - 0x018CE (Hedge Maze 2 Shortcut) - 0x00139 @@ -408,6 +436,22 @@ Door - 0x01D40 (Pressure Plates 4 Exit) - 0x01D3F 158205 - 0x09E49 (Shadows Shortcut Panel) - True - True Door - 0x09E3D (Shadows Shortcut) - 0x09E49 +Keep Tower (Keep) - Keep - 0x04F8F: +158206 - 0x0361B (Tower Shortcut Panel) - True - True +Door - 0x04F8F (Tower Shortcut) - 0x0361B +158704 - 0x0360E (Laser Panel Hedges) - 0x01A0F & 0x019E7 & 0x019DC & 0x00139 - True +158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Shapers & Black/White Squares & Colored Squares & Stars & Stars + Same Colored Symbol & Dots +Laser - 0x014BB (Laser) - 0x0360E | 0x03317 +159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True +159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 - True +159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True +159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True +159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True +159250 - 0x28AE9 (Path EP) - True - True +159251 - 0x3348F (Hedges EP) - True - True + +==Shipwreck== + Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True - Shipwreck Vault - 0x17BB4: 158654 - 0x00AFB (Vault Panel) - True - Symmetry & Sound Dots & Colored Dots Door - 0x17BB4 (Vault Door) - 0x00AFB @@ -423,19 +467,16 @@ Door - 0x17BB4 (Vault Door) - 0x00AFB Shipwreck Vault (Shipwreck): 158655 - 0x03535 (Vault Box) - True - True -Keep Tower (Keep) - Keep - 0x04F8F: -158206 - 0x0361B (Tower Shortcut Panel) - True - True -Door - 0x04F8F (Tower Shortcut) - 0x0361B -158704 - 0x0360E (Laser Panel Hedges) - 0x01A0F & 0x019E7 & 0x019DC & 0x00139 - True -158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Shapers & Black/White Squares & Colored Squares & Stars & Stars + Same Colored Symbol & Dots -Laser - 0x014BB (Laser) - 0x0360E | 0x03317 -159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True -159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 - True -159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True -159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True -159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True -159250 - 0x28AE9 (Path EP) - True - True -159251 - 0x3348F (Hedges EP) - True - True +==Monastery== + +Monastery Obelisk (Monastery) - Entry - True: +159710 - 0xFFE10 (Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True +159711 - 0xFFE11 (Obelisk Side 2) - 0x03AC5 - True +159712 - 0xFFE12 (Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True +159713 - 0xFFE13 (Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True +159714 - 0xFFE14 (Obelisk Side 5) - 0x03E01 - True +159715 - 0xFFE15 (Obelisk Side 6) - 0x289F4 & 0x289F5 - True +159719 - 0x00263 (Obelisk) - True - True Outside Monastery (Monastery) - Main Island - True - Inside Monastery - 0x0C128 & 0x0C153 - Monastery Garden - 0x03750: 158207 - 0x03713 (Laser Shortcut Panel) - True - True @@ -457,6 +498,9 @@ Laser - 0x17C65 (Laser) - 0x17CA4 159137 - 0x03DAC (Facade Left Stairs EP) - True - True 159138 - 0x03DAD (Facade Right Stairs EP) - True - True 159140 - 0x03E01 (Grass Stairs EP) - True - True +159120 - 0x03BE2 (Garden Left EP) - 0x03750 - True +159121 - 0x03BE3 (Garden Right EP) - True - True +159122 - 0x0A409 (Wall EP) - True - True Inside Monastery (Monastery): 158213 - 0x09D9B (Shutters Control) - True - Dots @@ -470,7 +514,18 @@ Inside Monastery (Monastery): Monastery Garden (Monastery): -Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9: +==Town== + +Town Obelisk (Town) - Entry - True: +159750 - 0xFFE50 (Obelisk Side 1) - 0x035C7 - True +159751 - 0xFFE51 (Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True +159752 - 0xFFE52 (Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True +159753 - 0xFFE53 (Obelisk Side 4) - 0x28B30 & 0x035C9 - True +159754 - 0xFFE54 (Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True +159755 - 0xFFE55 (Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True +159759 - 0x0A16C (Obelisk) - True - True + +Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - Town RGB House - 0x28A61 - Town Inside Cargo Box - 0x0A0C9 - Outside Windmill - True: 158218 - 0x0A054 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat 158219 - 0x0A0C8 (Cargo Box Entry Panel) - True - Black/White Squares & Shapers Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8 @@ -491,11 +546,6 @@ Door - 0x28A61 (RGB House Entry) - 0x28998 Door - 0x03BB0 (Church Entry) - 0x28A0D 158228 - 0x28A79 (Maze Panel) - True - True Door - 0x28AA2 (Maze Stairs) - 0x28A79 -158241 - 0x17F5F (Windmill Entry Panel) - True - Dots -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 Third EP) - True - True 159541 - 0x03412 (Tower Underside Fourth EP) - True - True 159542 - 0x038A6 (Tower Underside First EP) - True - True @@ -528,20 +578,26 @@ Town Church (Town): 158227 - 0x28A69 (Church Lattice) - 0x03BB0 - True 159553 - 0x03BD1 (Black Line Church EP) - True - True -RGB House (Town) - RGB Room - 0x2897B: +Town RGB House (Town RGB House) - Town RGB House Upstairs - 0x2897B: 158242 - 0x034E4 (Sound Room Left) - True - True 158243 - 0x034E3 (Sound Room Right) - True - Sound Dots -Door - 0x2897B (RGB House Stairs) - 0x034E4 & 0x034E3 +Door - 0x2897B (Stairs) - 0x034E4 & 0x034E3 -RGB Room (Town): +Town RGB House Upstairs (Town RGB House Upstairs): 158244 - 0x334D8 (RGB Control) - True - Rotated Shapers & Colored Squares -158245 - 0x03C0C (RGB Room Left) - 0x334D8 - Colored Squares & Black/White Squares -158246 - 0x03C08 (RGB Room Right) - 0x334D8 - Stars +158245 - 0x03C0C (Left) - 0x334D8 - Colored Squares & Black/White Squares +158246 - 0x03C08 (Right) - 0x334D8 - Stars + +Town Tower Bottom (Town Tower) - Town - True - Town Tower After First Door - 0x27799: +Door - 0x27799 (First Door) - 0x28A69 -Town Tower (Town Tower) - Town - True - Town Tower Top - 0x27798 & 0x27799 & 0x2779A & 0x2779C: +Town Tower After First Door (Town Tower) - Town Tower After Second Door - 0x27798: Door - 0x27798 (Second Door) - 0x28ACC + +Town Tower After Second Door (Town Tower) - Town Tower After Third Door - 0x2779C: Door - 0x2779C (Third Door) - 0x28AD9 -Door - 0x27799 (First Door) - 0x28A69 + +Town Tower After Third Door (Town Tower) - Town Tower Top - 0x2779A: Door - 0x2779A (Fourth Door) - 0x28B39 Town Tower Top (Town): @@ -550,6 +606,15 @@ Laser - 0x032F9 (Laser) - 0x032F5 159422 - 0x33692 (Brown Bridge EP) - True - True 159551 - 0x03BCE (Black Line Tower EP) - True - True +==Windmill & Theater== + +Outside Windmill (Windmill) - Windmill Interior - 0x1845B: +159010 - 0x037B6 (First Blade EP) - 0x17D02 - True +159011 - 0x037B2 (Second Blade EP) - 0x17D02 - True +159012 - 0x000F7 (Third Blade EP) - 0x17D02 - True +158241 - 0x17F5F (Entry Panel) - True - Dots +Door - 0x1845B (Entry) - 0x17F5F + Windmill Interior (Windmill) - Theater - 0x17F88: 158247 - 0x17D02 (Turn Control) - True - Dots 158248 - 0x17F89 (Theater Entry Panel) - True - Black/White Squares @@ -573,6 +638,8 @@ Door - 0x3CCDF (Exit Right) - 0x33AB2 159556 - 0x33A2A (Door EP) - 0x03553 - True 159558 - 0x33B06 (Church EP) - 0x0354E - True +==Jungle== + Jungle (Jungle) - Main Island - True - The Ocean - 0x17CDF: 158251 - 0x17CDF (Shore Boat Spawn) - True - Boat 158609 - 0x17F9B (Discard) - True - Triangles @@ -604,19 +671,18 @@ Door - 0x3873B (Laser Shortcut) - 0x337FA 159350 - 0x035CB (Bamboo CCW EP) - True - True 159351 - 0x035CF (Bamboo CW EP) - True - True -Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A - River Vault - 0x15287: +Outside Jungle River (Jungle) - Main Island - True - Monastery Garden - 0x0CF2A - Jungle Vault - 0x15287: 158267 - 0x17CAA (Monastery Garden Shortcut Panel) - True - True Door - 0x0CF2A (Monastery Garden Shortcut) - 0x17CAA 158663 - 0x15ADD (Vault Panel) - True - Black/White Squares & Dots Door - 0x15287 (Vault Door) - 0x15ADD 159110 - 0x03AC5 (Green Leaf Moss EP) - True - True -159120 - 0x03BE2 (Monastery Garden Left EP) - 0x03750 - True -159121 - 0x03BE3 (Monastery Garden Right EP) - True - True -159122 - 0x0A409 (Monastery Wall EP) - True - True -River Vault (River): +Jungle Vault (Jungle): 158664 - 0x03702 (Vault Box) - True - True +==Bunker== + Outside Bunker (Bunker) - Main Island - True - Bunker - 0x0C2A4: 158268 - 0x17C2E (Entry Panel) - True - Black/White Squares Door - 0x0C2A4 (Entry) - 0x17C2E @@ -650,9 +716,11 @@ Door - 0x0A08D (Elevator Room Entry) - 0x17E67 Bunker Elevator Section (Bunker) - Bunker Elevator - TrueOneWay: 159311 - 0x035F5 (Tinted Door EP) - 0x17C79 - True -Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079: +Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Cyan Room - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079: 158286 - 0x0A079 (Elevator Control) - True - Colored Squares & Black/White Squares +Bunker Cyan Room (Bunker) - Bunker Elevator - TrueOneWay: + Bunker Green Room (Bunker) - Bunker Elevator - TrueOneWay: 159310 - 0x000D3 (Green Room Flowers EP) - True - True @@ -660,6 +728,8 @@ Bunker Laser Platform (Bunker) - Bunker Elevator - TrueOneWay: 158710 - 0x09DE0 (Laser Panel) - True - True Laser - 0x0C2B2 (Laser) - 0x09DE0 +==Swamp== + Outside Swamp (Swamp) - Swamp Entry Area - 0x00C1C - Main Island - True: 158287 - 0x0056E (Entry Panel) - True - Shapers Door - 0x00C1C (Entry) - 0x0056E @@ -774,13 +844,29 @@ Laser - 0x00BF6 (Laser) - 0x03615 158342 - 0x17C02 (Laser Shortcut Right Panel) - 0x17C05 - Shapers & Negative Shapers & Rotated Shapers Door - 0x2D880 (Laser Shortcut) - 0x17C02 -Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309 - The Ocean - 0x17C95: +==Treehouse== + +Treehouse Obelisk (Treehouse) - Entry - True: +159720 - 0xFFE20 (Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True +159721 - 0xFFE21 (Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True +159722 - 0xFFE22 (Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True +159723 - 0xFFE23 (Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True +159724 - 0xFFE24 (Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True +159725 - 0xFFE25 (Obelisk Side 6) - 0x28AE9 & 0x3348F - True +159729 - 0x00097 (Obelisk) - True - True + +Treehouse Beach (Treehouse Beach) - Main Island - True: +159200 - 0x0053D (Rock Shadow EP) - True - True +159201 - 0x0053E (Sand Shadow EP) - True - True +159212 - 0x220BD (Both Orange Bridges EP) - 0x17DA2 & 0x17DDB - True + +Treehouse Entry Area (Treehouse) - Treehouse Between Entry Doors - 0x0C309 - The Ocean - 0x17C95: 158343 - 0x17C95 (Boat Spawn) - True - Boat 158344 - 0x0288C (First Door Panel) - True - Stars Door - 0x0C309 (First Door) - 0x0288C 159210 - 0x33721 (Buoy EP) - 0x17C95 - True -Treehouse Between Doors (Treehouse) - Treehouse Yellow Bridge - 0x0C310: +Treehouse Between Entry Doors (Treehouse) - Treehouse Yellow Bridge - 0x0C310: 158345 - 0x02886 (Second Door Panel) - True - Stars Door - 0x0C310 (Second Door) - 0x02886 @@ -809,7 +895,7 @@ Treehouse First Purple Bridge (Treehouse) - Treehouse Second Purple Bridge - 0x1 158360 - 0x17D2D (First Purple Bridge 4) - 0x17CE4 - Stars & Dots 158361 - 0x17D6C (First Purple Bridge 5) - 0x17D2D - Stars & Dots -Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2: +Treehouse Right Orange Bridge (Treehouse) - Treehouse Drawbridge Platform - 0x17DA2: 158391 - 0x17D88 (Right Orange Bridge 1) - True - Stars 158392 - 0x17DB4 (Right Orange Bridge 2) - 0x17D88 - Stars 158393 - 0x17D8C (Right Orange Bridge 3) - 0x17DB4 - Stars @@ -823,7 +909,7 @@ Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2: 158401 - 0x17DB1 (Right Orange Bridge 11) - 0x17DB7 - Stars 158402 - 0x17DA2 (Right Orange Bridge 12) - 0x17DB1 - Stars -Treehouse Bridge Platform (Treehouse) - Main Island - 0x0C32D: +Treehouse Drawbridge Platform (Treehouse) - Main Island - 0x0C32D: 158404 - 0x037FF (Drawbridge Panel) - True - Stars Door - 0x0C32D (Drawbridge) - 0x037FF @@ -882,7 +968,19 @@ Treehouse Laser Room (Treehouse): 158403 - 0x17CBC (Laser House Door Timer Inside) - True - True Laser - 0x028A4 (Laser) - 0x03613 +==Mountain (Outside)== + +Mountainside Obelisk (Mountainside) - Entry - True: +159730 - 0xFFE30 (Obelisk Side 1) - 0x001A3 & 0x335AE - True +159731 - 0xFFE31 (Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True +159732 - 0xFFE32 (Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True +159733 - 0xFFE33 (Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True +159734 - 0xFFE34 (Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True +159735 - 0xFFE35 (Obelisk Side 6) - 0x035CB & 0x035CF - True +159739 - 0x00367 (Obelisk) - True - True + Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085: +159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True 158612 - 0x17C42 (Discard) - True - Triangles 158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Dots & Black/White Squares & Dots Door - 0x00085 (Vault Door) - 0x002A6 @@ -893,7 +991,7 @@ Door - 0x00085 (Vault Door) - 0x002A6 Mountainside Vault (Mountainside): 158666 - 0x03542 (Vault Box) - True - True -Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34: +Mountaintop (Mountaintop) - Mountain Floor 1 - 0x17C34: 158405 - 0x0042D (River Shape) - True - True 158406 - 0x09F7F (Box Short) - 7 Lasers + Redirect - True 158407 - 0x17C34 (Mountain Entry Panel) - 0x09F7F - Stars & Black/White Squares & Stars + Same Colored Symbol @@ -903,10 +1001,12 @@ Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34: 159324 - 0x336C8 (Arch White Right EP) - True - True 159326 - 0x3369A (Arch White Left EP) - True - True -Mountain Top Layer (Mountain Floor 1) - Mountain Top Layer Bridge - 0x09E39: +==Mountain (Inside)== + +Mountain Floor 1 (Mountain Floor 1) - Mountain Floor 1 Bridge - 0x09E39: 158408 - 0x09E39 (Light Bridge Controller) - True - Black/White Squares & Colored Squares & Eraser -Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - TrueOneWay: +Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay: 158409 - 0x09E7A (Right Row 1) - True - Black/White Squares & Dots 158410 - 0x09E71 (Right Row 2) - 0x09E7A - Black/White Squares & Dots 158411 - 0x09E72 (Right Row 3) - 0x09E71 - Black/White Squares & Shapers & Dots @@ -925,10 +1025,10 @@ Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - True 158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers 158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shapers -Mountain Top Layer At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54: +Mountain Floor 1 At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54: Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B -Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Blue Bridge - 0x09E86 - Mountain Pink Bridge EP - TrueOneWay: +Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Beyond Bridge - 0x09E86 - Mountain Floor 2 At Door - 0x09ED8 & 0x09E86 - Mountain Pink Bridge EP - TrueOneWay: 158426 - 0x09FD3 (Near Row 1) - True - Stars & Colored Squares & Stars + Same Colored Symbol 158427 - 0x09FD4 (Near Row 2) - 0x09FD3 - Stars & Colored Squares & Stars + Same Colored Symbol 158428 - 0x09FD6 (Near Row 3) - 0x09FD4 - Stars & Colored Squares & Stars + Same Colored Symbol @@ -936,8 +1036,6 @@ Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 158430 - 0x09FD8 (Near Row 5) - 0x09FD7 - Colored Squares & Symmetry & Colored Dots Door - 0x09FFB (Staircase Near) - 0x09FD8 -Mountain Floor 2 Blue Bridge (Mountain Floor 2) - Mountain Floor 2 Beyond Bridge - TrueOneWay - Mountain Floor 2 At Door - 0x09ED8: - Mountain Floor 2 At Door (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EDD: Door - 0x09EDD (Elevator Room Entry) - 0x09ED8 & 0x09E86 @@ -959,10 +1057,10 @@ Mountain Floor 2 Light Bridge Room Far (Mountain Floor 2): Mountain Floor 2 Elevator Room (Mountain Floor 2) - Mountain Floor 2 Elevator - TrueOneWay: 158613 - 0x17F93 (Elevator Discard) - True - Triangles -Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Third Layer - 0x09EEB: +Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Floor 3 - 0x09EEB: 158439 - 0x09EEB (Elevator Control Panel) - True - Dots -Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay: +Mountain Floor 3 (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay: 158440 - 0x09FC1 (Giant Puzzle Bottom Left) - True - Shapers & Eraser 158441 - 0x09F8E (Giant Puzzle Bottom Right) - True - Shapers & Eraser 158442 - 0x09F01 (Giant Puzzle Top Right) - True - Rotated Shapers @@ -972,13 +1070,32 @@ Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueO 159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True Door - 0x09F89 (Exit) - 0x09FDA -Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Final Room - 0x0C141: +Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Mountain Bottom Floor Pillars Room - 0x0C141: 158614 - 0x17FA2 (Discard) - 0xFFF00 - Triangles -158445 - 0x01983 (Final Room Entry Left) - True - Shapers & Stars -158446 - 0x01987 (Final Room Entry Right) - True - Colored Squares & Dots -Door - 0x0C141 (Final Room Entry) - 0x01983 & 0x01987 +158445 - 0x01983 (Pillars Room Entry Left) - True - Shapers & Stars +158446 - 0x01987 (Pillars Room Entry Right) - True - Colored Squares & Dots +Door - 0x0C141 (Pillars Room Entry) - 0x01983 & 0x01987 Door - 0x17F33 (Rock Open) - 0x17FA2 | 0x334E1 +Mountain Bottom Floor Pillars Room (Mountain Bottom Floor) - Elevator - 0x339BB & 0x33961: +158522 - 0x0383A (Right Pillar 1) - True - Stars +158523 - 0x09E56 (Right Pillar 2) - 0x0383A - Stars & Dots +158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Dots & Full Dots +158525 - 0x33961 (Right Pillar 4) - 0x09E5A - Dots & Symmetry +158526 - 0x0383D (Left Pillar 1) - True - Dots +158527 - 0x0383F (Left Pillar 2) - 0x0383D - Black/White Squares +158528 - 0x03859 (Left Pillar 3) - 0x0383F - Shapers +158529 - 0x339BB (Left Pillar 4) - 0x03859 - Black/White Squares & Stars & Symmetry + +Elevator (Mountain Bottom Floor): +158530 - 0x3D9A6 (Elevator Door Closer Left) - True - True +158531 - 0x3D9A7 (Elevator Door Close Right) - True - True +158532 - 0x3C113 (Elevator Entry Left) - 0x3D9A6 | 0x3D9A7 - True +158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True +158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True +158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True +158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True + Mountain Pink Bridge EP (Mountain Floor 2): 159312 - 0x09D63 (Pink Bridge EP) - 0x09E39 - True @@ -987,7 +1104,9 @@ Mountain Path to Caves (Mountain Bottom Floor) - Caves - 0x2D77D: Door - 0x2D77D (Caves Entry) - 0x00FF8 158448 - 0x334E1 (Rock Control) - True - True -Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Path to Challenge - 0x019A5: +==Caves== + +Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Caves Path to Challenge - 0x019A5: 158451 - 0x335AB (Elevator Inside Control) - True - Dots & Black/White Squares 158452 - 0x335AC (Elevator Upper Outside Control) - 0x335AB - Black/White Squares 158453 - 0x3369D (Elevator Lower Outside Control) - 0x335AB - Black/White Squares & Dots @@ -1042,10 +1161,12 @@ Door - 0x2D73F (Mountain Shortcut Door) - 0x021D7 Door - 0x2D859 (Swamp Shortcut Door) - 0x17CF2 159341 - 0x3397C (Skylight EP) - True - True -Path to Challenge (Caves) - Challenge - 0x0A19A: +Caves Path to Challenge (Caves) - Challenge - 0x0A19A: 158477 - 0x0A16E (Challenge Entry Panel) - True - Stars & Shapers & Stars + Same Colored Symbol Door - 0x0A19A (Challenge Entry) - 0x0A16E +==Challenge== + Challenge (Challenge) - Tunnels - 0x0348A - Challenge Vault - 0x04D75: 158499 - 0x0A332 (Start Timer) - 11 Lasers - True 158500 - 0x0088E (Small Basic) - 0x0A332 - True @@ -1074,7 +1195,9 @@ Door - 0x0348A (Tunnels Entry) - 0x039B4 Challenge Vault (Challenge): 158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True -Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Lowest Level Inbetween Shortcuts - 0x27263 - Town - 0x09E87: +==Tunnels== + +Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Behind Elevator - 0x27263 - Town - 0x09E87: 158668 - 0x2FAF6 (Vault Box) - True - True 158519 - 0x27732 (Theater Shortcut Panel) - True - True Door - 0x27739 (Theater Shortcut) - 0x27732 @@ -1084,24 +1207,7 @@ Door - 0x27263 (Desert Shortcut) - 0x2773D Door - 0x09E87 (Town Shortcut) - 0x09E85 159557 - 0x33A20 (Theater Flowers EP) - 0x03553 & Theater to Tunnels - True -Final Room (Mountain Final Room) - Elevator - 0x339BB & 0x33961: -158522 - 0x0383A (Right Pillar 1) - True - Stars -158523 - 0x09E56 (Right Pillar 2) - 0x0383A - Stars & Dots -158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Dots & Full Dots -158525 - 0x33961 (Right Pillar 4) - 0x09E5A - Dots & Symmetry -158526 - 0x0383D (Left Pillar 1) - True - Dots -158527 - 0x0383F (Left Pillar 2) - 0x0383D - Black/White Squares -158528 - 0x03859 (Left Pillar 3) - 0x0383F - Shapers -158529 - 0x339BB (Left Pillar 4) - 0x03859 - Black/White Squares & Stars & Symmetry - -Elevator (Mountain Final Room): -158530 - 0x3D9A6 (Elevator Door Closer Left) - True - True -158531 - 0x3D9A7 (Elevator Door Close Right) - True - True -158532 - 0x3C113 (Elevator Entry Left) - 0x3D9A6 | 0x3D9A7 - True -158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True -158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True -158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True -158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True +==Boat== The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay: 159042 - 0x22106 (Desert EP) - True - True @@ -1114,45 +1220,3 @@ The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Tre 159521 - 0x33879 (Tutorial Reflection EP) - True - True 159522 - 0x03C19 (Tutorial Moss EP) - True - True 159531 - 0x035C9 (Cargo Box EP) - 0x0A0C9 - True - -Obelisks (EPs) - Entry - True: -159700 - 0xFFE00 (Desert Obelisk Side 1) - 0x0332B & 0x03367 & 0x28B8A - True -159701 - 0xFFE01 (Desert Obelisk Side 2) - 0x037B6 & 0x037B2 & 0x000F7 - True -159702 - 0xFFE02 (Desert Obelisk Side 3) - 0x3351D - True -159703 - 0xFFE03 (Desert Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True -159704 - 0xFFE04 (Desert Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True -159709 - 0x00359 (Desert Obelisk) - True - True -159710 - 0xFFE10 (Monastery Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True -159711 - 0xFFE11 (Monastery Obelisk Side 2) - 0x03AC5 - True -159712 - 0xFFE12 (Monastery Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True -159713 - 0xFFE13 (Monastery Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True -159714 - 0xFFE14 (Monastery Obelisk Side 5) - 0x03E01 - True -159715 - 0xFFE15 (Monastery Obelisk Side 6) - 0x289F4 & 0x289F5 - True -159719 - 0x00263 (Monastery Obelisk) - True - True -159720 - 0xFFE20 (Treehouse Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True -159721 - 0xFFE21 (Treehouse Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True -159722 - 0xFFE22 (Treehouse Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True -159723 - 0xFFE23 (Treehouse Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True -159724 - 0xFFE24 (Treehouse Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True -159725 - 0xFFE25 (Treehouse Obelisk Side 6) - 0x28AE9 & 0x3348F - True -159729 - 0x00097 (Treehouse Obelisk) - True - True -159730 - 0xFFE30 (River Obelisk Side 1) - 0x001A3 & 0x335AE - True -159731 - 0xFFE31 (River Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True -159732 - 0xFFE32 (River Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True -159733 - 0xFFE33 (River Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True -159734 - 0xFFE34 (River Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True -159735 - 0xFFE35 (River Obelisk Side 6) - 0x035CB & 0x035CF - True -159739 - 0x00367 (River Obelisk) - True - True -159740 - 0xFFE40 (Quarry Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True -159741 - 0xFFE41 (Quarry Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True -159742 - 0xFFE42 (Quarry Obelisk Side 3) - 0x289CF & 0x289D1 - True -159743 - 0xFFE43 (Quarry Obelisk Side 4) - 0x33692 - True -159744 - 0xFFE44 (Quarry Obelisk Side 5) - 0x03E77 & 0x03E7C - True -159749 - 0x22073 (Quarry Obelisk) - True - True -159750 - 0xFFE50 (Town Obelisk Side 1) - 0x035C7 - True -159751 - 0xFFE51 (Town Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True -159752 - 0xFFE52 (Town Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True -159753 - 0xFFE53 (Town Obelisk Side 4) - 0x28B30 & 0x035C9 - True -159754 - 0xFFE54 (Town Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True -159755 - 0xFFE55 (Town Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True -159759 - 0x0A16C (Town Obelisk) - True - True diff --git a/worlds/witness/WitnessLogicExpert.txt b/worlds/witness/WitnessLogicExpert.txt index 056ae145c47e..b01d5551ec55 100644 --- a/worlds/witness/WitnessLogicExpert.txt +++ b/worlds/witness/WitnessLogicExpert.txt @@ -1,12 +1,14 @@ +==Tutorial (Inside)== + Menu (Menu) - Entry - True: Entry (Entry): -First Hallway (First Hallway) - Entry - True - First Hallway Room - 0x00064: +Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064: 158000 - 0x00064 (Straight) - True - True 159510 - 0x01848 (EP) - 0x00064 - True -First Hallway Room (First Hallway) - Tutorial - 0x00182: +Tutorial First Hallway Room (Tutorial First Hallway) - Tutorial - 0x00182: 158001 - 0x00182 (Bend) - True - True Tutorial (Tutorial) - Outside Tutorial - True: @@ -23,6 +25,8 @@ Tutorial (Tutorial) - Outside Tutorial - True: 159513 - 0x33600 (Patio Flowers EP) - 0x0C373 - True 159517 - 0x3352F (Gate EP) - 0x03505 - True +==Tutorial (Outside)== + Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2 - Outside Tutorial Vault - 0x033D0: 158650 - 0x033D4 (Vault Panel) - True - Dots & Full Dots & Squares & Black/White Squares Door - 0x033D0 (Vault Door) - 0x033D4 @@ -58,9 +62,23 @@ Outside Tutorial Outpost (Outside Tutorial) - Outside Tutorial - 0x04CA3: Door - 0x04CA3 (Outpost Exit) - 0x04CA4 158600 - 0x17CFB (Discard) - True - Arrows +Orchard (Orchard) - Main Island - True - Orchard Beyond First Gate - 0x03307: +158071 - 0x00143 (Apple Tree 1) - True - True +158072 - 0x0003B (Apple Tree 2) - 0x00143 - True +158073 - 0x00055 (Apple Tree 3) - 0x0003B - True +Door - 0x03307 (First Gate) - 0x00055 + +Orchard Beyond First Gate (Orchard) - Orchard End - 0x03313: +158074 - 0x032F7 (Apple Tree 4) - 0x00055 - True +158075 - 0x032FF (Apple Tree 5) - 0x032F7 - True +Door - 0x03313 (Second Gate) - 0x032FF + +Orchard End (Orchard): + Main Island (Main Island) - Outside Tutorial - True: 159801 - 0xFFD00 (Reached Independently) - True - True -159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True + +==Glass Factory== Outside Glass Factory (Glass Factory) - Main Island - True - Inside Glass Factory - 0x01A29: 158027 - 0x01A54 (Entry Panel) - True - Symmetry @@ -85,6 +103,8 @@ Door - 0x0D7ED (Back Wall) - 0x0005C Inside Glass Factory Behind Back Wall (Glass Factory) - The Ocean - 0x17CC8: 158039 - 0x17CC8 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat +==Symmetry Island== + Outside Symmetry Island (Symmetry Island) - Main Island - True - Symmetry Island Lower - 0x17F3E: 158040 - 0x000B0 (Lower Panel) - 0x0343A - Triangles Door - 0x17F3E (Lower) - 0x000B0 @@ -128,20 +148,17 @@ Symmetry Island Upper (Symmetry Island): Laser - 0x00509 (Laser) - 0x0360D 159001 - 0x03367 (Glass Factory Black Line EP) - True - True -Orchard (Orchard) - Main Island - True - Orchard Beyond First Gate - 0x03307: -158071 - 0x00143 (Apple Tree 1) - True - True -158072 - 0x0003B (Apple Tree 2) - 0x00143 - True -158073 - 0x00055 (Apple Tree 3) - 0x0003B - True -Door - 0x03307 (First Gate) - 0x00055 - -Orchard Beyond First Gate (Orchard) - Orchard End - 0x03313: -158074 - 0x032F7 (Apple Tree 4) - 0x00055 - True -158075 - 0x032FF (Apple Tree 5) - 0x032F7 - True -Door - 0x03313 (Second Gate) - 0x032FF +==Desert== -Orchard End (Orchard): +Desert Obelisk (Desert) - Entry - True: +159700 - 0xFFE00 (Obelisk Side 1) - 0x0332B & 0x03367 & 0x28B8A - True +159701 - 0xFFE01 (Obelisk Side 2) - 0x037B6 & 0x037B2 & 0x000F7 - True +159702 - 0xFFE02 (Obelisk Side 3) - 0x3351D - True +159703 - 0xFFE03 (Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True +159704 - 0xFFE04 (Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True +159709 - 0x00359 (Obelisk) - True - True -Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE - Desert Vault - 0x03444: +Desert Outside (Desert) - Main Island - True - Desert Light Room - 0x09FEE - Desert Vault - 0x03444: 158652 - 0x0CC7B (Vault Panel) - True - Dots & Full Dots & Stars & Stars + Same Colored Symbol & Eraser & Triangles & Shapers & Negative Shapers & Colored Squares Door - 0x03444 (Vault Door) - 0x0CC7B 158602 - 0x17CE7 (Discard) - True - Arrows @@ -172,14 +189,14 @@ Laser - 0x012FB (Laser) - 0x03608 Desert Vault (Desert): 158653 - 0x0339E (Vault Box) - True - True -Desert Floodlight Room (Desert) - Desert Pond Room - 0x0C2C3: +Desert Light Room (Desert) - Desert Pond Room - 0x0C2C3: 158087 - 0x09FAA (Light Control) - True - True 158088 - 0x00422 (Light Room 1) - 0x09FAA - True 158089 - 0x006E3 (Light Room 2) - 0x09FAA - True 158090 - 0x0A02D (Light Room 3) - 0x09FAA & 0x00422 & 0x006E3 - True Door - 0x0C2C3 (Pond Room Entry) - 0x0A02D -Desert Pond Room (Desert) - Desert Water Levels Room - 0x0A24B: +Desert Pond Room (Desert) - Desert Flood Room - 0x0A24B: 158091 - 0x00C72 (Pond Room 1) - True - True 158092 - 0x0129D (Pond Room 2) - 0x00C72 - True 158093 - 0x008BB (Pond Room 3) - 0x0129D - True @@ -190,7 +207,7 @@ Door - 0x0A24B (Flood Room Entry) - 0x0A249 159043 - 0x0A14C (Pond Room Near Reflection EP) - True - True 159044 - 0x0A14D (Pond Room Far Reflection EP) - True - True -Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316: +Desert Flood Room (Desert) - Desert Elevator Room - 0x0C316: 158097 - 0x1C2DF (Reduce Water Level Far Left) - True - True 158098 - 0x1831E (Reduce Water Level Far Right) - True - True 158099 - 0x1C260 (Reduce Water Level Near Left) - True - True @@ -208,7 +225,7 @@ Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316: Door - 0x0C316 (Elevator Room Entry) - 0x18076 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True -Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317: +Desert Elevator Room (Desert) - Desert Behind Elevator - 0x01317: 158111 - 0x17C31 (Elevator Room Transparent) - True - True 158113 - 0x012D7 (Elevator Room Hexagonal) - 0x17C31 & 0x0A015 - True 158114 - 0x0A015 (Elevator Room Hexagonal Control) - 0x17C31 - True @@ -218,9 +235,19 @@ Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x0131 159035 - 0x037BB (Elevator EP) - 0x01317 - True Door - 0x01317 (Elevator) - 0x03608 -Desert Lowest Level Inbetween Shortcuts (Desert): +Desert Behind Elevator (Desert): -Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01: +==Quarry== + +Quarry Obelisk (Quarry) - Entry - True: +159740 - 0xFFE40 (Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True +159741 - 0xFFE41 (Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True +159742 - 0xFFE42 (Obelisk Side 3) - 0x289CF & 0x289D1 - True +159743 - 0xFFE43 (Obelisk Side 4) - 0x33692 - True +159744 - 0xFFE44 (Obelisk Side 5) - 0x03E77 & 0x03E7C - True +159749 - 0x22073 (Obelisk) - True - True + +Outside Quarry (Quarry) - Main Island - True - Quarry Between Entry Doors - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01: 158118 - 0x09E57 (Entry 1 Panel) - True - Squares & Black/White Squares & Triangles 158603 - 0x17CF0 (Discard) - True - Arrows 158702 - 0x03612 (Laser Panel) - 0x0A3D0 & 0x0367C - Eraser & Triangles & Stars & Stars + Same Colored Symbol @@ -236,7 +263,7 @@ Quarry Elevator (Quarry) - Outside Quarry - 0x17CC4 - Quarry - 0x17CC4: 158120 - 0x17CC4 (Elevator Control) - 0x0367C - Dots & Eraser 159403 - 0x17CB9 (Railroad EP) - 0x17CC4 - True -Quarry Between Entrys (Quarry) - Quarry - 0x17C07: +Quarry Between Entry Doors (Quarry) - Quarry - 0x17C07: 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers & Triangles Door - 0x17C07 (Entry 2) - 0x17C09 @@ -322,6 +349,8 @@ Door - 0x3865F (Second Barrier) - 0x38663 158169 - 0x0A3D0 (Back Second Row 3) - 0x0A3CC - Stars & Eraser & Shapers & Negative Shapers & Stars + Same Colored Symbol 159401 - 0x005F6 (Hook EP) - 0x275FA & 0x03852 & 0x3865F - True +==Shadows== + Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 | 0x19665: 158170 - 0x334DB (Door Timer Outside) - True - True Door - 0x19B24 (Timed Door) - 0x334DB | 0x334DC @@ -361,19 +390,18 @@ Shadows Laser Room (Shadows): 158703 - 0x19650 (Laser Panel) - 0x194B2 & 0x19665 - True Laser - 0x181B3 (Laser) - 0x19650 -Treehouse Beach (Treehouse Beach) - Main Island - True: -159200 - 0x0053D (Rock Shadow EP) - True - True -159201 - 0x0053E (Sand Shadow EP) - True - True -159212 - 0x220BD (Both Orange Bridges EP) - 0x17DA2 & 0x17DDB - True +==Keep== -Keep (Keep) - Main Island - True - Keep 2nd Maze - 0x01954 - Keep 2nd Pressure Plate - 0x01BEC: +Outside Keep (Keep) - Main Island - True: +159430 - 0x03E77 (Red Flowers EP) - True - True +159431 - 0x03E7C (Purple Flowers EP) - True - True + +Keep (Keep) - Outside Keep - True - Keep 2nd Maze - 0x01954 - Keep 2nd Pressure Plate - 0x01BEC: 158193 - 0x00139 (Hedge Maze 1) - True - True 158197 - 0x0A3A8 (Reset Pressure Plates 1) - True - True 158198 - 0x033EA (Pressure Plates 1) - 0x0A3A8 - Colored Squares & Triangles & Stars & Stars + Same Colored Symbol Door - 0x01954 (Hedge Maze 1 Exit) - 0x00139 Door - 0x01BEC (Pressure Plates 1 Exit) - 0x033EA -159430 - 0x03E77 (Red Flowers EP) - True - True -159431 - 0x03E7C (Purple Flowers EP) - True - True Keep 2nd Maze (Keep) - Keep - 0x018CE - Keep 3rd Maze - 0x019D8: Door - 0x018CE (Hedge Maze 2 Shortcut) - 0x00139 @@ -408,6 +436,22 @@ Door - 0x01D40 (Pressure Plates 4 Exit) - 0x01D3F 158205 - 0x09E49 (Shadows Shortcut Panel) - True - True Door - 0x09E3D (Shadows Shortcut) - 0x09E49 +Keep Tower (Keep) - Keep - 0x04F8F: +158206 - 0x0361B (Tower Shortcut Panel) - True - True +Door - 0x04F8F (Tower Shortcut) - 0x0361B +158704 - 0x0360E (Laser Panel Hedges) - 0x01A0F & 0x019E7 & 0x019DC & 0x00139 - True +158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Shapers & Rotated Shapers & Triangles & Stars & Stars + Same Colored Symbol & Colored Squares & Black/White Squares +Laser - 0x014BB (Laser) - 0x0360E | 0x03317 +159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True +159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 - True +159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True +159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True +159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True +159250 - 0x28AE9 (Path EP) - True - True +159251 - 0x3348F (Hedges EP) - True - True + +==Shipwreck== + Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True - Shipwreck Vault - 0x17BB4: 158654 - 0x00AFB (Vault Panel) - True - Symmetry & Sound Dots & Colored Dots Door - 0x17BB4 (Vault Door) - 0x00AFB @@ -423,19 +467,16 @@ Door - 0x17BB4 (Vault Door) - 0x00AFB Shipwreck Vault (Shipwreck): 158655 - 0x03535 (Vault Box) - True - True -Keep Tower (Keep) - Keep - 0x04F8F: -158206 - 0x0361B (Tower Shortcut Panel) - True - True -Door - 0x04F8F (Tower Shortcut) - 0x0361B -158704 - 0x0360E (Laser Panel Hedges) - 0x01A0F & 0x019E7 & 0x019DC & 0x00139 - True -158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Shapers & Rotated Shapers & Triangles & Stars & Stars + Same Colored Symbol & Colored Squares & Black/White Squares -Laser - 0x014BB (Laser) - 0x0360E | 0x03317 -159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True -159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 - True -159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True -159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True -159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True -159250 - 0x28AE9 (Path EP) - True - True -159251 - 0x3348F (Hedges EP) - True - True +==Monastery== + +Monastery Obelisk (Monastery) - Entry - True: +159710 - 0xFFE10 (Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True +159711 - 0xFFE11 (Obelisk Side 2) - 0x03AC5 - True +159712 - 0xFFE12 (Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True +159713 - 0xFFE13 (Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True +159714 - 0xFFE14 (Obelisk Side 5) - 0x03E01 - True +159715 - 0xFFE15 (Obelisk Side 6) - 0x289F4 & 0x289F5 - True +159719 - 0x00263 (Obelisk) - True - True Outside Monastery (Monastery) - Main Island - True - Inside Monastery - 0x0C128 & 0x0C153 - Monastery Garden - 0x03750: 158207 - 0x03713 (Laser Shortcut Panel) - True - True @@ -457,6 +498,9 @@ Laser - 0x17C65 (Laser) - 0x17CA4 159137 - 0x03DAC (Facade Left Stairs EP) - True - True 159138 - 0x03DAD (Facade Right Stairs EP) - True - True 159140 - 0x03E01 (Grass Stairs EP) - True - True +159120 - 0x03BE2 (Garden Left EP) - 0x03750 - True +159121 - 0x03BE3 (Garden Right EP) - True - True +159122 - 0x0A409 (Wall EP) - True - True Inside Monastery (Monastery): 158213 - 0x09D9B (Shutters Control) - True - Dots @@ -470,7 +514,18 @@ Inside Monastery (Monastery): Monastery Garden (Monastery): -Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9: +==Town== + +Town Obelisk (Town) - Entry - True: +159750 - 0xFFE50 (Obelisk Side 1) - 0x035C7 - True +159751 - 0xFFE51 (Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True +159752 - 0xFFE52 (Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True +159753 - 0xFFE53 (Obelisk Side 4) - 0x28B30 & 0x035C9 - True +159754 - 0xFFE54 (Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True +159755 - 0xFFE55 (Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True +159759 - 0x0A16C (Obelisk) - True - True + +Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - Town RGB House - 0x28A61 - Town Inside Cargo Box - 0x0A0C9 - Outside Windmill - True: 158218 - 0x0A054 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat 158219 - 0x0A0C8 (Cargo Box Entry Panel) - True - Squares & Black/White Squares & Shapers & Triangles Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8 @@ -491,11 +546,6 @@ Door - 0x28A61 (RGB House Entry) - 0x28A0D Door - 0x03BB0 (Church Entry) - 0x03C08 158228 - 0x28A79 (Maze Panel) - True - True Door - 0x28AA2 (Maze Stairs) - 0x28A79 -158241 - 0x17F5F (Windmill Entry Panel) - True - Dots -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 Third EP) - True - True 159541 - 0x03412 (Tower Underside Fourth EP) - True - True 159542 - 0x038A6 (Tower Underside First EP) - True - True @@ -528,20 +578,26 @@ Town Church (Town): 158227 - 0x28A69 (Church Lattice) - 0x03BB0 - True 159553 - 0x03BD1 (Black Line Church EP) - True - True -RGB House (Town) - RGB Room - 0x2897B: +Town RGB House (Town RGB House) - Town RGB House Upstairs - 0x2897B: 158242 - 0x034E4 (Sound Room Left) - True - True 158243 - 0x034E3 (Sound Room Right) - True - Sound Dots -Door - 0x2897B (RGB House Stairs) - 0x034E4 & 0x034E3 +Door - 0x2897B (Stairs) - 0x034E4 & 0x034E3 -RGB Room (Town): +Town RGB House Upstairs (Town RGB House Upstairs): 158244 - 0x334D8 (RGB Control) - True - Rotated Shapers & Squares & Colored Squares & Triangles -158245 - 0x03C0C (RGB Room Left) - 0x334D8 - Squares & Colored Squares & Black/White Squares & Eraser -158246 - 0x03C08 (RGB Room Right) - 0x334D8 & 0x03C0C - Symmetry & Dots & Colored Dots & Triangles +158245 - 0x03C0C (Left) - 0x334D8 - Squares & Colored Squares & Black/White Squares & Eraser +158246 - 0x03C08 (Right) - 0x334D8 & 0x03C0C - Symmetry & Dots & Colored Dots & Triangles + +Town Tower Bottom (Town Tower) - Town - True - Town Tower After First Door - 0x27799: +Door - 0x27799 (First Door) - 0x28A69 -Town Tower (Town Tower) - Town - True - Town Tower Top - 0x27798 & 0x27799 & 0x2779A & 0x2779C: +Town Tower After First Door (Town Tower) - Town Tower After Second Door - 0x27798: Door - 0x27798 (Second Door) - 0x28ACC + +Town Tower After Second Door (Town Tower) - Town Tower After Third Door - 0x2779C: Door - 0x2779C (Third Door) - 0x28AD9 -Door - 0x27799 (First Door) - 0x28A69 + +Town Tower After Third Door (Town Tower) - Town Tower Top - 0x2779A: Door - 0x2779A (Fourth Door) - 0x28B39 Town Tower Top (Town): @@ -550,6 +606,15 @@ Laser - 0x032F9 (Laser) - 0x032F5 159422 - 0x33692 (Brown Bridge EP) - True - True 159551 - 0x03BCE (Black Line Tower EP) - True - True +==Windmill & Theater== + +Outside Windmill (Windmill) - Windmill Interior - 0x1845B: +159010 - 0x037B6 (First Blade EP) - 0x17D02 - True +159011 - 0x037B2 (Second Blade EP) - 0x17D02 - True +159012 - 0x000F7 (Third Blade EP) - 0x17D02 - True +158241 - 0x17F5F (Entry Panel) - True - Dots +Door - 0x1845B (Entry) - 0x17F5F + Windmill Interior (Windmill) - Theater - 0x17F88: 158247 - 0x17D02 (Turn Control) - True - Dots 158248 - 0x17F89 (Theater Entry Panel) - True - Squares & Black/White Squares & Eraser & Triangles @@ -573,6 +638,8 @@ Door - 0x3CCDF (Exit Right) - 0x33AB2 159556 - 0x33A2A (Door EP) - 0x03553 - True 159558 - 0x33B06 (Church EP) - 0x0354E - True +==Jungle== + Jungle (Jungle) - Main Island - True - The Ocean - 0x17CDF: 158251 - 0x17CDF (Shore Boat Spawn) - True - Boat 158609 - 0x17F9B (Discard) - True - Arrows @@ -604,19 +671,18 @@ Door - 0x3873B (Laser Shortcut) - 0x337FA 159350 - 0x035CB (Bamboo CCW EP) - True - True 159351 - 0x035CF (Bamboo CW EP) - True - True -Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A - River Vault - 0x15287: +Outside Jungle River (Jungle) - Main Island - True - Monastery Garden - 0x0CF2A - Jungle Vault - 0x15287: 158267 - 0x17CAA (Monastery Garden Shortcut Panel) - True - True Door - 0x0CF2A (Monastery Garden Shortcut) - 0x17CAA 158663 - 0x15ADD (Vault Panel) - True - Black/White Squares & Dots Door - 0x15287 (Vault Door) - 0x15ADD 159110 - 0x03AC5 (Green Leaf Moss EP) - True - True -159120 - 0x03BE2 (Monastery Garden Left EP) - 0x03750 - True -159121 - 0x03BE3 (Monastery Garden Right EP) - True - True -159122 - 0x0A409 (Monastery Wall EP) - True - True -River Vault (River): +Jungle Vault (Jungle): 158664 - 0x03702 (Vault Box) - True - True +==Bunker== + Outside Bunker (Bunker) - Main Island - True - Bunker - 0x0C2A4: 158268 - 0x17C2E (Entry Panel) - True - Squares & Black/White Squares Door - 0x0C2A4 (Entry) - 0x17C2E @@ -650,9 +716,11 @@ Door - 0x0A08D (Elevator Room Entry) - 0x17E67 Bunker Elevator Section (Bunker) - Bunker Elevator - TrueOneWay: 159311 - 0x035F5 (Tinted Door EP) - 0x17C79 - True -Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079: +Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Cyan Room - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079: 158286 - 0x0A079 (Elevator Control) - True - Colored Squares & Black/White Squares +Bunker Cyan Room (Bunker) - Bunker Elevator - TrueOneWay: + Bunker Green Room (Bunker) - Bunker Elevator - TrueOneWay: 159310 - 0x000D3 (Green Room Flowers EP) - True - True @@ -660,6 +728,8 @@ Bunker Laser Platform (Bunker) - Bunker Elevator - TrueOneWay: 158710 - 0x09DE0 (Laser Panel) - True - True Laser - 0x0C2B2 (Laser) - 0x09DE0 +==Swamp== + Outside Swamp (Swamp) - Swamp Entry Area - 0x00C1C - Main Island - True: 158287 - 0x0056E (Entry Panel) - True - Rotated Shapers & Black/White Squares & Triangles Door - 0x00C1C (Entry) - 0x0056E @@ -774,13 +844,29 @@ Laser - 0x00BF6 (Laser) - 0x03615 158342 - 0x17C02 (Laser Shortcut Right Panel) - 0x17C05 - Shapers & Negative Shapers & Stars & Stars + Same Colored Symbol Door - 0x2D880 (Laser Shortcut) - 0x17C02 -Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309 - The Ocean - 0x17C95: +==Treehouse== + +Treehouse Obelisk (Treehouse) - Entry - True: +159720 - 0xFFE20 (Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True +159721 - 0xFFE21 (Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True +159722 - 0xFFE22 (Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True +159723 - 0xFFE23 (Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True +159724 - 0xFFE24 (Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True +159725 - 0xFFE25 (Obelisk Side 6) - 0x28AE9 & 0x3348F - True +159729 - 0x00097 (Obelisk) - True - True + +Treehouse Beach (Treehouse Beach) - Main Island - True: +159200 - 0x0053D (Rock Shadow EP) - True - True +159201 - 0x0053E (Sand Shadow EP) - True - True +159212 - 0x220BD (Both Orange Bridges EP) - 0x17DA2 & 0x17DDB - True + +Treehouse Entry Area (Treehouse) - Treehouse Between Entry Doors - 0x0C309 - The Ocean - 0x17C95: 158343 - 0x17C95 (Boat Spawn) - True - Boat 158344 - 0x0288C (First Door Panel) - True - Stars & Stars + Same Colored Symbol & Triangles Door - 0x0C309 (First Door) - 0x0288C 159210 - 0x33721 (Buoy EP) - 0x17C95 - True -Treehouse Between Doors (Treehouse) - Treehouse Yellow Bridge - 0x0C310: +Treehouse Between Entry Doors (Treehouse) - Treehouse Yellow Bridge - 0x0C310: 158345 - 0x02886 (Second Door Panel) - True - Stars & Stars + Same Colored Symbol & Triangles Door - 0x0C310 (Second Door) - 0x02886 @@ -809,7 +895,7 @@ Treehouse First Purple Bridge (Treehouse) - Treehouse Second Purple Bridge - 0x1 158360 - 0x17D2D (First Purple Bridge 4) - 0x17CE4 - Stars & Dots & Full Dots 158361 - 0x17D6C (First Purple Bridge 5) - 0x17D2D - Stars & Dots & Full Dots -Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2: +Treehouse Right Orange Bridge (Treehouse) - Treehouse Drawbridge Platform - 0x17DA2: 158391 - 0x17D88 (Right Orange Bridge 1) - True - Stars & Stars + Same Colored Symbol & Triangles 158392 - 0x17DB4 (Right Orange Bridge 2) - 0x17D88 - Stars & Stars + Same Colored Symbol & Triangles 158393 - 0x17D8C (Right Orange Bridge 3) - 0x17DB4 - Stars & Stars + Same Colored Symbol & Triangles @@ -823,7 +909,7 @@ Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2: 158401 - 0x17DB1 (Right Orange Bridge 11) - 0x17DB7 - Stars & Stars + Same Colored Symbol & Triangles 158402 - 0x17DA2 (Right Orange Bridge 12) - 0x17DB1 - Stars & Stars + Same Colored Symbol & Triangles -Treehouse Bridge Platform (Treehouse) - Main Island - 0x0C32D: +Treehouse Drawbridge Platform (Treehouse) - Main Island - 0x0C32D: 158404 - 0x037FF (Drawbridge Panel) - True - Stars Door - 0x0C32D (Drawbridge) - 0x037FF @@ -882,7 +968,19 @@ Treehouse Laser Room (Treehouse): 158403 - 0x17CBC (Laser House Door Timer Inside) - True - True Laser - 0x028A4 (Laser) - 0x03613 +==Mountain (Outside)== + +Mountainside Obelisk (Mountainside) - Entry - True: +159730 - 0xFFE30 (Obelisk Side 1) - 0x001A3 & 0x335AE - True +159731 - 0xFFE31 (Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True +159732 - 0xFFE32 (Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True +159733 - 0xFFE33 (Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True +159734 - 0xFFE34 (Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True +159735 - 0xFFE35 (Obelisk Side 6) - 0x035CB & 0x035CF - True +159739 - 0x00367 (Obelisk) - True - True + Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085: +159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True 158612 - 0x17C42 (Discard) - True - Arrows 158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Squares & Triangles & Stars & Stars + Same Colored Symbol Door - 0x00085 (Vault Door) - 0x002A6 @@ -893,7 +991,7 @@ Door - 0x00085 (Vault Door) - 0x002A6 Mountainside Vault (Mountainside): 158666 - 0x03542 (Vault Box) - True - True -Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34: +Mountaintop (Mountaintop) - Mountain Floor 1 - 0x17C34: 158405 - 0x0042D (River Shape) - True - True 158406 - 0x09F7F (Box Short) - 7 Lasers + Redirect - True 158407 - 0x17C34 (Mountain Entry Panel) - 0x09F7F - Stars & Black/White Squares & Stars + Same Colored Symbol & Triangles @@ -903,10 +1001,12 @@ Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34: 159324 - 0x336C8 (Arch White Right EP) - True - True 159326 - 0x3369A (Arch White Left EP) - True - True -Mountain Top Layer (Mountain Floor 1) - Mountain Top Layer Bridge - 0x09E39: +==Mountain (Inside)== + +Mountain Floor 1 (Mountain Floor 1) - Mountain Floor 1 Bridge - 0x09E39: 158408 - 0x09E39 (Light Bridge Controller) - True - Eraser & Triangles -Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - TrueOneWay: +Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay: 158409 - 0x09E7A (Right Row 1) - True - Black/White Squares & Dots & Stars & Stars + Same Colored Symbol 158410 - 0x09E71 (Right Row 2) - 0x09E7A - Black/White Squares & Triangles 158411 - 0x09E72 (Right Row 3) - 0x09E71 - Black/White Squares & Shapers & Stars & Stars + Same Colored Symbol @@ -925,10 +1025,10 @@ Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - True 158424 - 0x09EAD (Trash Pillar 1) - True - Rotated Shapers & Stars 158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Rotated Shapers & Triangles -Mountain Top Layer At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54: +Mountain Floor 1 At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54: Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B -Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Blue Bridge - 0x09E86 - Mountain Pink Bridge EP - TrueOneWay: +Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Beyond Bridge - 0x09E86 - Mountain Floor 2 At Door - 0x09ED8 & 0x09E86 - Mountain Pink Bridge EP - TrueOneWay: 158426 - 0x09FD3 (Near Row 1) - True - Stars & Colored Squares & Stars + Same Colored Symbol 158427 - 0x09FD4 (Near Row 2) - 0x09FD3 - Stars & Triangles & Stars + Same Colored Symbol 158428 - 0x09FD6 (Near Row 3) - 0x09FD4 - Stars & Shapers & Negative Shapers & Stars + Same Colored Symbol @@ -936,8 +1036,6 @@ Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 158430 - 0x09FD8 (Near Row 5) - 0x09FD7 - Stars & Stars + Same Colored Symbol & Rotated Shapers & Eraser Door - 0x09FFB (Staircase Near) - 0x09FD8 -Mountain Floor 2 Blue Bridge (Mountain Floor 2) - Mountain Floor 2 Beyond Bridge - TrueOneWay - Mountain Floor 2 At Door - 0x09ED8: - Mountain Floor 2 At Door (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EDD: Door - 0x09EDD (Elevator Room Entry) - 0x09ED8 & 0x09E86 @@ -959,10 +1057,10 @@ Mountain Floor 2 Light Bridge Room Far (Mountain Floor 2): Mountain Floor 2 Elevator Room (Mountain Floor 2) - Mountain Floor 2 Elevator - TrueOneWay: 158613 - 0x17F93 (Elevator Discard) - True - Arrows -Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Third Layer - 0x09EEB: +Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Floor 3 - 0x09EEB: 158439 - 0x09EEB (Elevator Control Panel) - True - Dots -Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay: +Mountain Floor 3 (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay: 158440 - 0x09FC1 (Giant Puzzle Bottom Left) - True - Shapers & Eraser & Negative Shapers 158441 - 0x09F8E (Giant Puzzle Bottom Right) - True - Shapers & Eraser & Negative Shapers 158442 - 0x09F01 (Giant Puzzle Top Right) - True - Shapers & Eraser & Negative Shapers @@ -972,13 +1070,32 @@ Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueO 159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True Door - 0x09F89 (Exit) - 0x09FDA -Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Final Room - 0x0C141: +Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Mountain Bottom Floor Pillars Room - 0x0C141: 158614 - 0x17FA2 (Discard) - 0xFFF00 - Arrows -158445 - 0x01983 (Final Room Entry Left) - True - Shapers & Stars -158446 - 0x01987 (Final Room Entry Right) - True - Squares & Colored Squares & Dots -Door - 0x0C141 (Final Room Entry) - 0x01983 & 0x01987 +158445 - 0x01983 (Pillars Room Entry Left) - True - Shapers & Stars +158446 - 0x01987 (Pillars Room Entry Right) - True - Squares & Colored Squares & Dots +Door - 0x0C141 (Pillars Room Entry) - 0x01983 & 0x01987 Door - 0x17F33 (Rock Open) - 0x17FA2 | 0x334E1 +Mountain Bottom Floor Pillars Room (Mountain Bottom Floor) - Elevator - 0x339BB & 0x33961: +158522 - 0x0383A (Right Pillar 1) - True - Stars & Eraser & Triangles & Stars + Same Colored Symbol +158523 - 0x09E56 (Right Pillar 2) - 0x0383A - Dots & Full Dots & Triangles & Symmetry +158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Dots & Shapers & Stars & Negative Shapers & Stars + Same Colored Symbol & Symmetry +158525 - 0x33961 (Right Pillar 4) - 0x09E5A - Eraser & Symmetry & Stars & Stars + Same Colored Symbol & Negative Shapers & Shapers +158526 - 0x0383D (Left Pillar 1) - True - Stars & Black/White Squares & Stars + Same Colored Symbol +158527 - 0x0383F (Left Pillar 2) - 0x0383D - Triangles & Symmetry +158528 - 0x03859 (Left Pillar 3) - 0x0383F - Symmetry & Shapers & Black/White Squares +158529 - 0x339BB (Left Pillar 4) - 0x03859 - Symmetry & Black/White Squares & Stars & Stars + Same Colored Symbol & Triangles & Colored Dots + +Elevator (Mountain Bottom Floor): +158530 - 0x3D9A6 (Elevator Door Closer Left) - True - True +158531 - 0x3D9A7 (Elevator Door Close Right) - True - True +158532 - 0x3C113 (Elevator Entry Left) - 0x3D9A6 | 0x3D9A7 - True +158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True +158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True +158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True +158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True + Mountain Pink Bridge EP (Mountain Floor 2): 159312 - 0x09D63 (Pink Bridge EP) - 0x09E39 - True @@ -987,7 +1104,9 @@ Mountain Path to Caves (Mountain Bottom Floor) - Caves - 0x2D77D: Door - 0x2D77D (Caves Entry) - 0x00FF8 158448 - 0x334E1 (Rock Control) - True - True -Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Path to Challenge - 0x019A5: +==Caves== + +Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Caves Path to Challenge - 0x019A5: 158451 - 0x335AB (Elevator Inside Control) - True - Dots & Squares & Black/White Squares 158452 - 0x335AC (Elevator Upper Outside Control) - 0x335AB - Squares & Black/White Squares 158453 - 0x3369D (Elevator Lower Outside Control) - 0x335AB - Squares & Black/White Squares & Dots @@ -1042,10 +1161,12 @@ Door - 0x2D73F (Mountain Shortcut Door) - 0x021D7 Door - 0x2D859 (Swamp Shortcut Door) - 0x17CF2 159341 - 0x3397C (Skylight EP) - True - True -Path to Challenge (Caves) - Challenge - 0x0A19A: +Caves Path to Challenge (Caves) - Challenge - 0x0A19A: 158477 - 0x0A16E (Challenge Entry Panel) - True - Stars & Arrows & Stars + Same Colored Symbol Door - 0x0A19A (Challenge Entry) - 0x0A16E +==Challenge== + Challenge (Challenge) - Tunnels - 0x0348A - Challenge Vault - 0x04D75: 158499 - 0x0A332 (Start Timer) - 11 Lasers - True 158500 - 0x0088E (Small Basic) - 0x0A332 - True @@ -1074,7 +1195,9 @@ Door - 0x0348A (Tunnels Entry) - 0x039B4 Challenge Vault (Challenge): 158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True -Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Lowest Level Inbetween Shortcuts - 0x27263 - Town - 0x09E87: +==Tunnels== + +Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Behind Elevator - 0x27263 - Town - 0x09E87: 158668 - 0x2FAF6 (Vault Box) - True - True 158519 - 0x27732 (Theater Shortcut Panel) - True - True Door - 0x27739 (Theater Shortcut) - 0x27732 @@ -1084,24 +1207,7 @@ Door - 0x27263 (Desert Shortcut) - 0x2773D Door - 0x09E87 (Town Shortcut) - 0x09E85 159557 - 0x33A20 (Theater Flowers EP) - 0x03553 & Theater to Tunnels - True -Final Room (Mountain Final Room) - Elevator - 0x339BB & 0x33961: -158522 - 0x0383A (Right Pillar 1) - True - Stars & Eraser & Triangles & Stars + Same Colored Symbol -158523 - 0x09E56 (Right Pillar 2) - 0x0383A - Dots & Full Dots & Triangles & Symmetry -158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Dots & Shapers & Stars & Negative Shapers & Stars + Same Colored Symbol & Symmetry -158525 - 0x33961 (Right Pillar 4) - 0x09E5A - Eraser & Symmetry & Stars & Stars + Same Colored Symbol & Negative Shapers & Shapers -158526 - 0x0383D (Left Pillar 1) - True - Stars & Black/White Squares & Stars + Same Colored Symbol -158527 - 0x0383F (Left Pillar 2) - 0x0383D - Triangles & Symmetry -158528 - 0x03859 (Left Pillar 3) - 0x0383F - Symmetry & Shapers & Black/White Squares -158529 - 0x339BB (Left Pillar 4) - 0x03859 - Symmetry & Black/White Squares & Stars & Stars + Same Colored Symbol & Triangles & Colored Dots - -Elevator (Mountain Final Room): -158530 - 0x3D9A6 (Elevator Door Closer Left) - True - True -158531 - 0x3D9A7 (Elevator Door Close Right) - True - True -158532 - 0x3C113 (Elevator Entry Left) - 0x3D9A6 | 0x3D9A7 - True -158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True -158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True -158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True -158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True +==Boat== The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay: 159042 - 0x22106 (Desert EP) - True - True @@ -1114,45 +1220,3 @@ The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Tre 159521 - 0x33879 (Tutorial Reflection EP) - True - True 159522 - 0x03C19 (Tutorial Moss EP) - True - True 159531 - 0x035C9 (Cargo Box EP) - 0x0A0C9 - True - -Obelisks (EPs) - Entry - True: -159700 - 0xFFE00 (Desert Obelisk Side 1) - 0x0332B & 0x03367 & 0x28B8A - True -159701 - 0xFFE01 (Desert Obelisk Side 2) - 0x037B6 & 0x037B2 & 0x000F7 - True -159702 - 0xFFE02 (Desert Obelisk Side 3) - 0x3351D - True -159703 - 0xFFE03 (Desert Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True -159704 - 0xFFE04 (Desert Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True -159709 - 0x00359 (Desert Obelisk) - True - True -159710 - 0xFFE10 (Monastery Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True -159711 - 0xFFE11 (Monastery Obelisk Side 2) - 0x03AC5 - True -159712 - 0xFFE12 (Monastery Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True -159713 - 0xFFE13 (Monastery Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True -159714 - 0xFFE14 (Monastery Obelisk Side 5) - 0x03E01 - True -159715 - 0xFFE15 (Monastery Obelisk Side 6) - 0x289F4 & 0x289F5 - True -159719 - 0x00263 (Monastery Obelisk) - True - True -159720 - 0xFFE20 (Treehouse Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True -159721 - 0xFFE21 (Treehouse Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True -159722 - 0xFFE22 (Treehouse Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True -159723 - 0xFFE23 (Treehouse Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True -159724 - 0xFFE24 (Treehouse Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True -159725 - 0xFFE25 (Treehouse Obelisk Side 6) - 0x28AE9 & 0x3348F - True -159729 - 0x00097 (Treehouse Obelisk) - True - True -159730 - 0xFFE30 (River Obelisk Side 1) - 0x001A3 & 0x335AE - True -159731 - 0xFFE31 (River Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True -159732 - 0xFFE32 (River Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True -159733 - 0xFFE33 (River Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True -159734 - 0xFFE34 (River Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True -159735 - 0xFFE35 (River Obelisk Side 6) - 0x035CB & 0x035CF - True -159739 - 0x00367 (River Obelisk) - True - True -159740 - 0xFFE40 (Quarry Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True -159741 - 0xFFE41 (Quarry Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True -159742 - 0xFFE42 (Quarry Obelisk Side 3) - 0x289CF & 0x289D1 - True -159743 - 0xFFE43 (Quarry Obelisk Side 4) - 0x33692 - True -159744 - 0xFFE44 (Quarry Obelisk Side 5) - 0x03E77 & 0x03E7C - True -159749 - 0x22073 (Quarry Obelisk) - True - True -159750 - 0xFFE50 (Town Obelisk Side 1) - 0x035C7 - True -159751 - 0xFFE51 (Town Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True -159752 - 0xFFE52 (Town Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True -159753 - 0xFFE53 (Town Obelisk Side 4) - 0x28B30 & 0x035C9 - True -159754 - 0xFFE54 (Town Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True -159755 - 0xFFE55 (Town Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True -159759 - 0x0A16C (Town Obelisk) - True - True diff --git a/worlds/witness/WitnessLogicVanilla.txt b/worlds/witness/WitnessLogicVanilla.txt index 71af12f76dbb..62c38d412427 100644 --- a/worlds/witness/WitnessLogicVanilla.txt +++ b/worlds/witness/WitnessLogicVanilla.txt @@ -1,12 +1,14 @@ +==Tutorial (Inside)== + Menu (Menu) - Entry - True: Entry (Entry): -First Hallway (First Hallway) - Entry - True - First Hallway Room - 0x00064: +Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064: 158000 - 0x00064 (Straight) - True - True 159510 - 0x01848 (EP) - 0x00064 - True -First Hallway Room (First Hallway) - Tutorial - 0x00182: +Tutorial First Hallway Room (Tutorial First Hallway) - Tutorial - 0x00182: 158001 - 0x00182 (Bend) - True - True Tutorial (Tutorial) - Outside Tutorial - 0x03629: @@ -23,6 +25,8 @@ Tutorial (Tutorial) - Outside Tutorial - 0x03629: 159513 - 0x33600 (Patio Flowers EP) - 0x0C373 - True 159517 - 0x3352F (Gate EP) - 0x03505 - True +==Tutorial (Outside)== + Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2 - Outside Tutorial Vault - 0x033D0: 158650 - 0x033D4 (Vault Panel) - True - Dots & Black/White Squares Door - 0x033D0 (Vault Door) - 0x033D4 @@ -58,9 +62,23 @@ Outside Tutorial Outpost (Outside Tutorial) - Outside Tutorial - 0x04CA3: Door - 0x04CA3 (Outpost Exit) - 0x04CA4 158600 - 0x17CFB (Discard) - True - Triangles +Orchard (Orchard) - Main Island - True - Orchard Beyond First Gate - 0x03307: +158071 - 0x00143 (Apple Tree 1) - True - True +158072 - 0x0003B (Apple Tree 2) - 0x00143 - True +158073 - 0x00055 (Apple Tree 3) - 0x0003B - True +Door - 0x03307 (First Gate) - 0x00055 + +Orchard Beyond First Gate (Orchard) - Orchard End - 0x03313: +158074 - 0x032F7 (Apple Tree 4) - 0x00055 - True +158075 - 0x032FF (Apple Tree 5) - 0x032F7 - True +Door - 0x03313 (Second Gate) - 0x032FF + +Orchard End (Orchard): + Main Island (Main Island) - Outside Tutorial - True: 159801 - 0xFFD00 (Reached Independently) - True - True -159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True + +==Glass Factory== Outside Glass Factory (Glass Factory) - Main Island - True - Inside Glass Factory - 0x01A29: 158027 - 0x01A54 (Entry Panel) - True - Symmetry @@ -85,6 +103,8 @@ Door - 0x0D7ED (Back Wall) - 0x0005C Inside Glass Factory Behind Back Wall (Glass Factory) - The Ocean - 0x17CC8: 158039 - 0x17CC8 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat +==Symmetry Island== + Outside Symmetry Island (Symmetry Island) - Main Island - True - Symmetry Island Lower - 0x17F3E: 158040 - 0x000B0 (Lower Panel) - 0x0343A - Dots Door - 0x17F3E (Lower) - 0x000B0 @@ -128,20 +148,17 @@ Symmetry Island Upper (Symmetry Island): Laser - 0x00509 (Laser) - 0x0360D 159001 - 0x03367 (Glass Factory Black Line EP) - True - True -Orchard (Orchard) - Main Island - True - Orchard Beyond First Gate - 0x03307: -158071 - 0x00143 (Apple Tree 1) - True - True -158072 - 0x0003B (Apple Tree 2) - 0x00143 - True -158073 - 0x00055 (Apple Tree 3) - 0x0003B - True -Door - 0x03307 (First Gate) - 0x00055 - -Orchard Beyond First Gate (Orchard) - Orchard End - 0x03313: -158074 - 0x032F7 (Apple Tree 4) - 0x00055 - True -158075 - 0x032FF (Apple Tree 5) - 0x032F7 - True -Door - 0x03313 (Second Gate) - 0x032FF +==Desert== -Orchard End (Orchard): +Desert Obelisk (Desert) - Entry - True: +159700 - 0xFFE00 (Obelisk Side 1) - 0x0332B & 0x03367 & 0x28B8A - True +159701 - 0xFFE01 (Obelisk Side 2) - 0x037B6 & 0x037B2 & 0x000F7 - True +159702 - 0xFFE02 (Obelisk Side 3) - 0x3351D - True +159703 - 0xFFE03 (Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True +159704 - 0xFFE04 (Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True +159709 - 0x00359 (Obelisk) - True - True -Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE - Desert Vault - 0x03444: +Desert Outside (Desert) - Main Island - True - Desert Light Room - 0x09FEE - Desert Vault - 0x03444: 158652 - 0x0CC7B (Vault Panel) - True - Dots & Shapers & Rotated Shapers & Negative Shapers & Full Dots Door - 0x03444 (Vault Door) - 0x0CC7B 158602 - 0x17CE7 (Discard) - True - Triangles @@ -172,14 +189,14 @@ Laser - 0x012FB (Laser) - 0x03608 Desert Vault (Desert): 158653 - 0x0339E (Vault Box) - True - True -Desert Floodlight Room (Desert) - Desert Pond Room - 0x0C2C3: +Desert Light Room (Desert) - Desert Pond Room - 0x0C2C3: 158087 - 0x09FAA (Light Control) - True - True 158088 - 0x00422 (Light Room 1) - 0x09FAA - True 158089 - 0x006E3 (Light Room 2) - 0x09FAA - True 158090 - 0x0A02D (Light Room 3) - 0x09FAA & 0x00422 & 0x006E3 - True Door - 0x0C2C3 (Pond Room Entry) - 0x0A02D -Desert Pond Room (Desert) - Desert Water Levels Room - 0x0A24B: +Desert Pond Room (Desert) - Desert Flood Room - 0x0A24B: 158091 - 0x00C72 (Pond Room 1) - True - True 158092 - 0x0129D (Pond Room 2) - 0x00C72 - True 158093 - 0x008BB (Pond Room 3) - 0x0129D - True @@ -190,7 +207,7 @@ Door - 0x0A24B (Flood Room Entry) - 0x0A249 159043 - 0x0A14C (Pond Room Near Reflection EP) - True - True 159044 - 0x0A14D (Pond Room Far Reflection EP) - True - True -Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316: +Desert Flood Room (Desert) - Desert Elevator Room - 0x0C316: 158097 - 0x1C2DF (Reduce Water Level Far Left) - True - True 158098 - 0x1831E (Reduce Water Level Far Right) - True - True 158099 - 0x1C260 (Reduce Water Level Near Left) - True - True @@ -208,7 +225,7 @@ Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316: Door - 0x0C316 (Elevator Room Entry) - 0x18076 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True -Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317: +Desert Elevator Room (Desert) - Desert Behind Elevator - 0x01317: 158111 - 0x17C31 (Elevator Room Transparent) - True - True 158113 - 0x012D7 (Elevator Room Hexagonal) - 0x17C31 & 0x0A015 - True 158114 - 0x0A015 (Elevator Room Hexagonal Control) - 0x17C31 - True @@ -218,9 +235,19 @@ Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x0131 159035 - 0x037BB (Elevator EP) - 0x01317 - True Door - 0x01317 (Elevator) - 0x03608 -Desert Lowest Level Inbetween Shortcuts (Desert): +Desert Behind Elevator (Desert): -Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01: +==Quarry== + +Quarry Obelisk (Quarry) - Entry - True: +159740 - 0xFFE40 (Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True +159741 - 0xFFE41 (Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True +159742 - 0xFFE42 (Obelisk Side 3) - 0x289CF & 0x289D1 - True +159743 - 0xFFE43 (Obelisk Side 4) - 0x33692 - True +159744 - 0xFFE44 (Obelisk Side 5) - 0x03E77 & 0x03E7C - True +159749 - 0x22073 (Obelisk) - True - True + +Outside Quarry (Quarry) - Main Island - True - Quarry Between Entry Doors - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01: 158118 - 0x09E57 (Entry 1 Panel) - True - Black/White Squares 158603 - 0x17CF0 (Discard) - True - Triangles 158702 - 0x03612 (Laser Panel) - 0x0A3D0 & 0x0367C - Eraser & Shapers @@ -236,7 +263,7 @@ Quarry Elevator (Quarry) - Outside Quarry - 0x17CC4 - Quarry - 0x17CC4: 158120 - 0x17CC4 (Elevator Control) - 0x0367C - Dots & Eraser 159403 - 0x17CB9 (Railroad EP) - 0x17CC4 - True -Quarry Between Entrys (Quarry) - Quarry - 0x17C07: +Quarry Between Entry Doors (Quarry) - Quarry - 0x17C07: 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers Door - 0x17C07 (Entry 2) - 0x17C09 @@ -322,6 +349,8 @@ Door - 0x3865F (Second Barrier) - 0x38663 158169 - 0x0A3D0 (Back Second Row 3) - 0x0A3CC - Stars & Eraser & Shapers 159401 - 0x005F6 (Hook EP) - 0x275FA & 0x03852 & 0x3865F - True +==Shadows== + Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 | 0x19665: 158170 - 0x334DB (Door Timer Outside) - True - True Door - 0x19B24 (Timed Door) - 0x334DB | 0x334DC @@ -361,19 +390,18 @@ Shadows Laser Room (Shadows): 158703 - 0x19650 (Laser Panel) - 0x194B2 & 0x19665 - True Laser - 0x181B3 (Laser) - 0x19650 -Treehouse Beach (Treehouse Beach) - Main Island - True: -159200 - 0x0053D (Rock Shadow EP) - True - True -159201 - 0x0053E (Sand Shadow EP) - True - True -159212 - 0x220BD (Both Orange Bridges EP) - 0x17DA2 & 0x17DDB - True +==Keep== -Keep (Keep) - Main Island - True - Keep 2nd Maze - 0x01954 - Keep 2nd Pressure Plate - 0x01BEC: +Outside Keep (Keep) - Main Island - True: +159430 - 0x03E77 (Red Flowers EP) - True - True +159431 - 0x03E7C (Purple Flowers EP) - True - True + +Keep (Keep) - Outside Keep - True - Keep 2nd Maze - 0x01954 - Keep 2nd Pressure Plate - 0x01BEC: 158193 - 0x00139 (Hedge Maze 1) - True - True 158197 - 0x0A3A8 (Reset Pressure Plates 1) - True - True 158198 - 0x033EA (Pressure Plates 1) - 0x0A3A8 - Dots Door - 0x01954 (Hedge Maze 1 Exit) - 0x00139 Door - 0x01BEC (Pressure Plates 1 Exit) - 0x033EA -159430 - 0x03E77 (Red Flowers EP) - True - True -159431 - 0x03E7C (Purple Flowers EP) - True - True Keep 2nd Maze (Keep) - Keep - 0x018CE - Keep 3rd Maze - 0x019D8: Door - 0x018CE (Hedge Maze 2 Shortcut) - 0x00139 @@ -408,6 +436,22 @@ Door - 0x01D40 (Pressure Plates 4 Exit) - 0x01D3F 158205 - 0x09E49 (Shadows Shortcut Panel) - True - True Door - 0x09E3D (Shadows Shortcut) - 0x09E49 +Keep Tower (Keep) - Keep - 0x04F8F: +158206 - 0x0361B (Tower Shortcut Panel) - True - True +Door - 0x04F8F (Tower Shortcut) - 0x0361B +158704 - 0x0360E (Laser Panel Hedges) - 0x01A0F & 0x019E7 & 0x019DC & 0x00139 - True +158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Dots & Shapers & Black/White Squares & Rotated Shapers +Laser - 0x014BB (Laser) - 0x0360E | 0x03317 +159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True +159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 & 0x01BEA - True +159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True +159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True +159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True +159250 - 0x28AE9 (Path EP) - True - True +159251 - 0x3348F (Hedges EP) - True - True + +==Shipwreck== + Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True - Shipwreck Vault - 0x17BB4: 158654 - 0x00AFB (Vault Panel) - True - Symmetry & Sound Dots & Colored Dots Door - 0x17BB4 (Vault Door) - 0x00AFB @@ -423,19 +467,16 @@ Door - 0x17BB4 (Vault Door) - 0x00AFB Shipwreck Vault (Shipwreck): 158655 - 0x03535 (Vault Box) - True - True -Keep Tower (Keep) - Keep - 0x04F8F: -158206 - 0x0361B (Tower Shortcut Panel) - True - True -Door - 0x04F8F (Tower Shortcut) - 0x0361B -158704 - 0x0360E (Laser Panel Hedges) - 0x01A0F & 0x019E7 & 0x019DC & 0x00139 - True -158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Dots & Shapers & Black/White Squares & Rotated Shapers -Laser - 0x014BB (Laser) - 0x0360E | 0x03317 -159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True -159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 & 0x01BEA - True -159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True -159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True -159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True -159250 - 0x28AE9 (Path EP) - True - True -159251 - 0x3348F (Hedges EP) - True - True +==Monastery== + +Monastery Obelisk (Monastery) - Entry - True: +159710 - 0xFFE10 (Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True +159711 - 0xFFE11 (Obelisk Side 2) - 0x03AC5 - True +159712 - 0xFFE12 (Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True +159713 - 0xFFE13 (Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True +159714 - 0xFFE14 (Obelisk Side 5) - 0x03E01 - True +159715 - 0xFFE15 (Obelisk Side 6) - 0x289F4 & 0x289F5 - True +159719 - 0x00263 (Obelisk) - True - True Outside Monastery (Monastery) - Main Island - True - Inside Monastery - 0x0C128 & 0x0C153 - Monastery Garden - 0x03750: 158207 - 0x03713 (Laser Shortcut Panel) - True - True @@ -457,6 +498,9 @@ Laser - 0x17C65 (Laser) - 0x17CA4 159137 - 0x03DAC (Facade Left Stairs EP) - True - True 159138 - 0x03DAD (Facade Right Stairs EP) - True - True 159140 - 0x03E01 (Grass Stairs EP) - True - True +159120 - 0x03BE2 (Garden Left EP) - 0x03750 - True +159121 - 0x03BE3 (Garden Right EP) - True - True +159122 - 0x0A409 (Wall EP) - True - True Inside Monastery (Monastery): 158213 - 0x09D9B (Shutters Control) - True - Dots @@ -470,7 +514,18 @@ Inside Monastery (Monastery): Monastery Garden (Monastery): -Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9: +==Town== + +Town Obelisk (Town) - Entry - True: +159750 - 0xFFE50 (Obelisk Side 1) - 0x035C7 - True +159751 - 0xFFE51 (Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True +159752 - 0xFFE52 (Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True +159753 - 0xFFE53 (Obelisk Side 4) - 0x28B30 & 0x035C9 - True +159754 - 0xFFE54 (Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True +159755 - 0xFFE55 (Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True +159759 - 0x0A16C (Obelisk) - True - True + +Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - Town RGB House - 0x28A61 - Town Inside Cargo Box - 0x0A0C9 - Outside Windmill - True: 158218 - 0x0A054 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat 158219 - 0x0A0C8 (Cargo Box Entry Panel) - True - Black/White Squares & Shapers Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8 @@ -491,11 +546,6 @@ Door - 0x28A61 (RGB House Entry) - 0x28998 Door - 0x03BB0 (Church Entry) - 0x28A0D 158228 - 0x28A79 (Maze Panel) - True - True Door - 0x28AA2 (Maze Stairs) - 0x28A79 -158241 - 0x17F5F (Windmill Entry Panel) - True - Dots -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 Third EP) - True - True 159541 - 0x03412 (Tower Underside Fourth EP) - True - True 159542 - 0x038A6 (Tower Underside First EP) - True - True @@ -528,20 +578,26 @@ Town Church (Town): 158227 - 0x28A69 (Church Lattice) - 0x03BB0 - True 159553 - 0x03BD1 (Black Line Church EP) - True - True -RGB House (Town) - RGB Room - 0x2897B: +Town RGB House (Town RGB House) - Town RGB House Upstairs - 0x2897B: 158242 - 0x034E4 (Sound Room Left) - True - True 158243 - 0x034E3 (Sound Room Right) - True - Sound Dots -Door - 0x2897B (RGB House Stairs) - 0x034E4 & 0x034E3 +Door - 0x2897B (Stairs) - 0x034E4 & 0x034E3 -RGB Room (Town): +Town RGB House Upstairs (Town RGB House Upstairs): 158244 - 0x334D8 (RGB Control) - True - Rotated Shapers & Colored Squares -158245 - 0x03C0C (RGB Room Left) - 0x334D8 - Colored Squares & Black/White Squares -158246 - 0x03C08 (RGB Room Right) - 0x334D8 - Stars +158245 - 0x03C0C (Left) - 0x334D8 - Colored Squares & Black/White Squares +158246 - 0x03C08 (Right) - 0x334D8 - Stars + +Town Tower Bottom (Town Tower) - Town - True - Town Tower After First Door - 0x27799: +Door - 0x27799 (First Door) - 0x28A69 -Town Tower (Town Tower) - Town - True - Town Tower Top - 0x27798 & 0x27799 & 0x2779A & 0x2779C: +Town Tower After First Door (Town Tower) - Town Tower After Second Door - 0x27798: Door - 0x27798 (Second Door) - 0x28ACC + +Town Tower After Second Door (Town Tower) - Town Tower After Third Door - 0x2779C: Door - 0x2779C (Third Door) - 0x28AD9 -Door - 0x27799 (First Door) - 0x28A69 + +Town Tower After Third Door (Town Tower) - Town Tower Top - 0x2779A: Door - 0x2779A (Fourth Door) - 0x28B39 Town Tower Top (Town): @@ -550,6 +606,15 @@ Laser - 0x032F9 (Laser) - 0x032F5 159422 - 0x33692 (Brown Bridge EP) - True - True 159551 - 0x03BCE (Black Line Tower EP) - True - True +==Windmill & Theater== + +Outside Windmill (Windmill) - Windmill Interior - 0x1845B: +159010 - 0x037B6 (First Blade EP) - 0x17D02 - True +159011 - 0x037B2 (Second Blade EP) - 0x17D02 - True +159012 - 0x000F7 (Third Blade EP) - 0x17D02 - True +158241 - 0x17F5F (Entry Panel) - True - Dots +Door - 0x1845B (Entry) - 0x17F5F + Windmill Interior (Windmill) - Theater - 0x17F88: 158247 - 0x17D02 (Turn Control) - True - Dots 158248 - 0x17F89 (Theater Entry Panel) - True - Black/White Squares @@ -573,6 +638,8 @@ Door - 0x3CCDF (Exit Right) - 0x33AB2 159556 - 0x33A2A (Door EP) - 0x03553 - True 159558 - 0x33B06 (Church EP) - 0x0354E - True +==Jungle== + Jungle (Jungle) - Main Island - True - The Ocean - 0x17CDF: 158251 - 0x17CDF (Shore Boat Spawn) - True - Boat 158609 - 0x17F9B (Discard) - True - Triangles @@ -604,19 +671,18 @@ Door - 0x3873B (Laser Shortcut) - 0x337FA 159350 - 0x035CB (Bamboo CCW EP) - True - True 159351 - 0x035CF (Bamboo CW EP) - True - True -Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A - River Vault - 0x15287: +Outside Jungle River (Jungle) - Main Island - True - Monastery Garden - 0x0CF2A - Jungle Vault - 0x15287: 158267 - 0x17CAA (Monastery Garden Shortcut Panel) - True - True Door - 0x0CF2A (Monastery Garden Shortcut) - 0x17CAA 158663 - 0x15ADD (Vault Panel) - True - Black/White Squares & Dots Door - 0x15287 (Vault Door) - 0x15ADD 159110 - 0x03AC5 (Green Leaf Moss EP) - True - True -159120 - 0x03BE2 (Monastery Garden Left EP) - 0x03750 - True -159121 - 0x03BE3 (Monastery Garden Right EP) - True - True -159122 - 0x0A409 (Monastery Wall EP) - True - True -River Vault (River): +Jungle Vault (Jungle): 158664 - 0x03702 (Vault Box) - True - True +==Bunker== + Outside Bunker (Bunker) - Main Island - True - Bunker - 0x0C2A4: 158268 - 0x17C2E (Entry Panel) - True - Black/White Squares Door - 0x0C2A4 (Entry) - 0x17C2E @@ -650,9 +716,11 @@ Door - 0x0A08D (Elevator Room Entry) - 0x17E67 Bunker Elevator Section (Bunker) - Bunker Elevator - TrueOneWay: 159311 - 0x035F5 (Tinted Door EP) - 0x17C79 - True -Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079: +Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Cyan Room - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079: 158286 - 0x0A079 (Elevator Control) - True - Colored Squares & Black/White Squares +Bunker Cyan Room (Bunker) - Bunker Elevator - TrueOneWay: + Bunker Green Room (Bunker) - Bunker Elevator - TrueOneWay: 159310 - 0x000D3 (Green Room Flowers EP) - True - True @@ -660,6 +728,8 @@ Bunker Laser Platform (Bunker) - Bunker Elevator - TrueOneWay: 158710 - 0x09DE0 (Laser Panel) - True - True Laser - 0x0C2B2 (Laser) - 0x09DE0 +==Swamp== + Outside Swamp (Swamp) - Swamp Entry Area - 0x00C1C - Main Island - True: 158287 - 0x0056E (Entry Panel) - True - Shapers Door - 0x00C1C (Entry) - 0x0056E @@ -774,13 +844,29 @@ Laser - 0x00BF6 (Laser) - 0x03615 158342 - 0x17C02 (Laser Shortcut Right Panel) - 0x17C05 - Shapers & Negative Shapers & Rotated Shapers Door - 0x2D880 (Laser Shortcut) - 0x17C02 -Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309 - The Ocean - 0x17C95: +==Treehouse== + +Treehouse Obelisk (Treehouse) - Entry - True: +159720 - 0xFFE20 (Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True +159721 - 0xFFE21 (Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True +159722 - 0xFFE22 (Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True +159723 - 0xFFE23 (Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True +159724 - 0xFFE24 (Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True +159725 - 0xFFE25 (Obelisk Side 6) - 0x28AE9 & 0x3348F - True +159729 - 0x00097 (Obelisk) - True - True + +Treehouse Beach (Treehouse Beach) - Main Island - True: +159200 - 0x0053D (Rock Shadow EP) - True - True +159201 - 0x0053E (Sand Shadow EP) - True - True +159212 - 0x220BD (Both Orange Bridges EP) - 0x17DA2 & 0x17DDB - True + +Treehouse Entry Area (Treehouse) - Treehouse Between Entry Doors - 0x0C309 - The Ocean - 0x17C95: 158343 - 0x17C95 (Boat Spawn) - True - Boat 158344 - 0x0288C (First Door Panel) - True - Stars Door - 0x0C309 (First Door) - 0x0288C 159210 - 0x33721 (Buoy EP) - 0x17C95 - True -Treehouse Between Doors (Treehouse) - Treehouse Yellow Bridge - 0x0C310: +Treehouse Between Entry Doors (Treehouse) - Treehouse Yellow Bridge - 0x0C310: 158345 - 0x02886 (Second Door Panel) - True - Stars Door - 0x0C310 (Second Door) - 0x02886 @@ -809,7 +895,7 @@ Treehouse First Purple Bridge (Treehouse) - Treehouse Second Purple Bridge - 0x1 158360 - 0x17D2D (First Purple Bridge 4) - 0x17CE4 - Stars & Dots 158361 - 0x17D6C (First Purple Bridge 5) - 0x17D2D - Stars & Dots -Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2: +Treehouse Right Orange Bridge (Treehouse) - Treehouse Drawbridge Platform - 0x17DA2: 158391 - 0x17D88 (Right Orange Bridge 1) - True - Stars 158392 - 0x17DB4 (Right Orange Bridge 2) - 0x17D88 - Stars 158393 - 0x17D8C (Right Orange Bridge 3) - 0x17DB4 - Stars @@ -823,7 +909,7 @@ Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2: 158401 - 0x17DB1 (Right Orange Bridge 11) - 0x17DB7 - Stars 158402 - 0x17DA2 (Right Orange Bridge 12) - 0x17DB1 - Stars -Treehouse Bridge Platform (Treehouse) - Main Island - 0x0C32D: +Treehouse Drawbridge Platform (Treehouse) - Main Island - 0x0C32D: 158404 - 0x037FF (Drawbridge Panel) - True - Stars Door - 0x0C32D (Drawbridge) - 0x037FF @@ -882,7 +968,19 @@ Treehouse Laser Room (Treehouse): 158403 - 0x17CBC (Laser House Door Timer Inside) - True - True Laser - 0x028A4 (Laser) - 0x03613 +==Mountain (Outside)== + +Mountainside Obelisk (Mountainside) - Entry - True: +159730 - 0xFFE30 (Obelisk Side 1) - 0x001A3 & 0x335AE - True +159731 - 0xFFE31 (Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True +159732 - 0xFFE32 (Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True +159733 - 0xFFE33 (Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True +159734 - 0xFFE34 (Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True +159735 - 0xFFE35 (Obelisk Side 6) - 0x035CB & 0x035CF - True +159739 - 0x00367 (Obelisk) - True - True + Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085: +159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True 158612 - 0x17C42 (Discard) - True - Triangles 158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Dots & Black/White Squares Door - 0x00085 (Vault Door) - 0x002A6 @@ -893,7 +991,7 @@ Door - 0x00085 (Vault Door) - 0x002A6 Mountainside Vault (Mountainside): 158666 - 0x03542 (Vault Box) - True - True -Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34: +Mountaintop (Mountaintop) - Mountain Floor 1 - 0x17C34: 158405 - 0x0042D (River Shape) - True - True 158406 - 0x09F7F (Box Short) - 7 Lasers + Redirect - True 158407 - 0x17C34 (Mountain Entry Panel) - 0x09F7F - Black/White Squares @@ -903,10 +1001,12 @@ Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34: 159324 - 0x336C8 (Arch White Right EP) - True - True 159326 - 0x3369A (Arch White Left EP) - True - True -Mountain Top Layer (Mountain Floor 1) - Mountain Top Layer Bridge - 0x09E39: +==Mountain (Inside)== + +Mountain Floor 1 (Mountain Floor 1) - Mountain Floor 1 Bridge - 0x09E39: 158408 - 0x09E39 (Light Bridge Controller) - True - Black/White Squares & Rotated Shapers -Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - TrueOneWay: +Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay: 158409 - 0x09E7A (Right Row 1) - True - Black/White Squares & Dots 158410 - 0x09E71 (Right Row 2) - 0x09E7A - Black/White Squares & Dots 158411 - 0x09E72 (Right Row 3) - 0x09E71 - Black/White Squares & Shapers @@ -925,10 +1025,10 @@ Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - True 158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers 158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shapers -Mountain Top Layer At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54: +Mountain Floor 1 At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54: Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B -Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Blue Bridge - 0x09E86 - Mountain Pink Bridge EP - TrueOneWay: +Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Beyond Bridge - 0x09E86 - Mountain Floor 2 At Door - 0x09ED8 & 0x09E86 - Mountain Pink Bridge EP - TrueOneWay: 158426 - 0x09FD3 (Near Row 1) - True - Colored Squares 158427 - 0x09FD4 (Near Row 2) - 0x09FD3 - Colored Squares & Dots 158428 - 0x09FD6 (Near Row 3) - 0x09FD4 - Stars & Colored Squares & Stars + Same Colored Symbol @@ -936,8 +1036,6 @@ Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 158430 - 0x09FD8 (Near Row 5) - 0x09FD7 - Colored Squares Door - 0x09FFB (Staircase Near) - 0x09FD8 -Mountain Floor 2 Blue Bridge (Mountain Floor 2) - Mountain Floor 2 Beyond Bridge - TrueOneWay - Mountain Floor 2 At Door - 0x09ED8: - Mountain Floor 2 At Door (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EDD: Door - 0x09EDD (Elevator Room Entry) - 0x09ED8 & 0x09E86 @@ -959,10 +1057,10 @@ Mountain Floor 2 Light Bridge Room Far (Mountain Floor 2): Mountain Floor 2 Elevator Room (Mountain Floor 2) - Mountain Floor 2 Elevator - TrueOneWay: 158613 - 0x17F93 (Elevator Discard) - True - Triangles -Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Third Layer - 0x09EEB: +Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Floor 3 - 0x09EEB: 158439 - 0x09EEB (Elevator Control Panel) - True - Dots -Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay: +Mountain Floor 3 (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay: 158440 - 0x09FC1 (Giant Puzzle Bottom Left) - True - Shapers & Eraser 158441 - 0x09F8E (Giant Puzzle Bottom Right) - True - Rotated Shapers & Eraser 158442 - 0x09F01 (Giant Puzzle Top Right) - True - Shapers & Eraser @@ -972,13 +1070,32 @@ Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueO 159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True Door - 0x09F89 (Exit) - 0x09FDA -Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Final Room - 0x0C141: +Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Mountain Bottom Floor Pillars Room - 0x0C141: 158614 - 0x17FA2 (Discard) - 0xFFF00 - Triangles -158445 - 0x01983 (Final Room Entry Left) - True - Shapers & Stars -158446 - 0x01987 (Final Room Entry Right) - True - Colored Squares & Dots -Door - 0x0C141 (Final Room Entry) - 0x01983 & 0x01987 +158445 - 0x01983 (Pillars Room Entry Left) - True - Shapers & Stars +158446 - 0x01987 (Pillars Room Entry Right) - True - Colored Squares & Dots +Door - 0x0C141 (Pillars Room Entry) - 0x01983 & 0x01987 Door - 0x17F33 (Rock Open) - 0x17FA2 | 0x334E1 +Mountain Bottom Floor Pillars Room (Mountain Bottom Floor) - Elevator - 0x339BB & 0x33961: +158522 - 0x0383A (Right Pillar 1) - True - Stars +158523 - 0x09E56 (Right Pillar 2) - 0x0383A - Stars & Dots +158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Dots & Full Dots +158525 - 0x33961 (Right Pillar 4) - 0x09E5A - Dots & Symmetry +158526 - 0x0383D (Left Pillar 1) - True - Dots & Full Dots +158527 - 0x0383F (Left Pillar 2) - 0x0383D - Black/White Squares +158528 - 0x03859 (Left Pillar 3) - 0x0383F - Shapers +158529 - 0x339BB (Left Pillar 4) - 0x03859 - Black/White Squares & Stars & Symmetry + +Elevator (Mountain Bottom Floor): +158530 - 0x3D9A6 (Elevator Door Closer Left) - True - True +158531 - 0x3D9A7 (Elevator Door Close Right) - True - True +158532 - 0x3C113 (Elevator Entry Left) - 0x3D9A6 | 0x3D9A7 - True +158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True +158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True +158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True +158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True + Mountain Pink Bridge EP (Mountain Floor 2): 159312 - 0x09D63 (Pink Bridge EP) - 0x09E39 - True @@ -987,7 +1104,9 @@ Mountain Path to Caves (Mountain Bottom Floor) - Caves - 0x2D77D: Door - 0x2D77D (Caves Entry) - 0x00FF8 158448 - 0x334E1 (Rock Control) - True - True -Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Path to Challenge - 0x019A5: +==Caves== + +Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Caves Path to Challenge - 0x019A5: 158451 - 0x335AB (Elevator Inside Control) - True - Dots & Black/White Squares 158452 - 0x335AC (Elevator Upper Outside Control) - 0x335AB - Black/White Squares 158453 - 0x3369D (Elevator Lower Outside Control) - 0x335AB - Black/White Squares & Dots @@ -1042,10 +1161,12 @@ Door - 0x2D73F (Mountain Shortcut Door) - 0x021D7 Door - 0x2D859 (Swamp Shortcut Door) - 0x17CF2 159341 - 0x3397C (Skylight EP) - True - True -Path to Challenge (Caves) - Challenge - 0x0A19A: +Caves Path to Challenge (Caves) - Challenge - 0x0A19A: 158477 - 0x0A16E (Challenge Entry Panel) - True - Stars & Shapers & Stars + Same Colored Symbol Door - 0x0A19A (Challenge Entry) - 0x0A16E +==Challenge== + Challenge (Challenge) - Tunnels - 0x0348A - Challenge Vault - 0x04D75: 158499 - 0x0A332 (Start Timer) - 11 Lasers - True 158500 - 0x0088E (Small Basic) - 0x0A332 - True @@ -1074,7 +1195,9 @@ Door - 0x0348A (Tunnels Entry) - 0x039B4 Challenge Vault (Challenge): 158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True -Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Lowest Level Inbetween Shortcuts - 0x27263 - Town - 0x09E87: +==Tunnels== + +Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Behind Elevator - 0x27263 - Town - 0x09E87: 158668 - 0x2FAF6 (Vault Box) - True - True 158519 - 0x27732 (Theater Shortcut Panel) - True - True Door - 0x27739 (Theater Shortcut) - 0x27732 @@ -1084,24 +1207,7 @@ Door - 0x27263 (Desert Shortcut) - 0x2773D Door - 0x09E87 (Town Shortcut) - 0x09E85 159557 - 0x33A20 (Theater Flowers EP) - 0x03553 & Theater to Tunnels - True -Final Room (Mountain Final Room) - Elevator - 0x339BB & 0x33961: -158522 - 0x0383A (Right Pillar 1) - True - Stars -158523 - 0x09E56 (Right Pillar 2) - 0x0383A - Stars & Dots -158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Dots & Full Dots -158525 - 0x33961 (Right Pillar 4) - 0x09E5A - Dots & Symmetry -158526 - 0x0383D (Left Pillar 1) - True - Dots & Full Dots -158527 - 0x0383F (Left Pillar 2) - 0x0383D - Black/White Squares -158528 - 0x03859 (Left Pillar 3) - 0x0383F - Shapers -158529 - 0x339BB (Left Pillar 4) - 0x03859 - Black/White Squares & Stars & Symmetry - -Elevator (Mountain Final Room): -158530 - 0x3D9A6 (Elevator Door Closer Left) - True - True -158531 - 0x3D9A7 (Elevator Door Close Right) - True - True -158532 - 0x3C113 (Elevator Entry Left) - 0x3D9A6 | 0x3D9A7 - True -158533 - 0x3C114 (Elevator Entry Right) - 0x3D9A6 | 0x3D9A7 - True -158534 - 0x3D9AA (Back Wall Left) - 0x3D9A6 | 0x3D9A7 - True -158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True -158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True +==Boat== The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay: 159042 - 0x22106 (Desert EP) - True - True @@ -1114,45 +1220,3 @@ The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Tre 159521 - 0x33879 (Tutorial Reflection EP) - True - True 159522 - 0x03C19 (Tutorial Moss EP) - True - True 159531 - 0x035C9 (Cargo Box EP) - 0x0A0C9 - True - -Obelisks (EPs) - Entry - True: -159700 - 0xFFE00 (Desert Obelisk Side 1) - 0x0332B & 0x03367 & 0x28B8A - True -159701 - 0xFFE01 (Desert Obelisk Side 2) - 0x037B6 & 0x037B2 & 0x000F7 - True -159702 - 0xFFE02 (Desert Obelisk Side 3) - 0x3351D - True -159703 - 0xFFE03 (Desert Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True -159704 - 0xFFE04 (Desert Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True -159709 - 0x00359 (Desert Obelisk) - True - True -159710 - 0xFFE10 (Monastery Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True -159711 - 0xFFE11 (Monastery Obelisk Side 2) - 0x03AC5 - True -159712 - 0xFFE12 (Monastery Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True -159713 - 0xFFE13 (Monastery Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True -159714 - 0xFFE14 (Monastery Obelisk Side 5) - 0x03E01 - True -159715 - 0xFFE15 (Monastery Obelisk Side 6) - 0x289F4 & 0x289F5 - True -159719 - 0x00263 (Monastery Obelisk) - True - True -159720 - 0xFFE20 (Treehouse Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True -159721 - 0xFFE21 (Treehouse Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True -159722 - 0xFFE22 (Treehouse Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True -159723 - 0xFFE23 (Treehouse Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True -159724 - 0xFFE24 (Treehouse Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True -159725 - 0xFFE25 (Treehouse Obelisk Side 6) - 0x28AE9 & 0x3348F - True -159729 - 0x00097 (Treehouse Obelisk) - True - True -159730 - 0xFFE30 (River Obelisk Side 1) - 0x001A3 & 0x335AE - True -159731 - 0xFFE31 (River Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True -159732 - 0xFFE32 (River Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True -159733 - 0xFFE33 (River Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True -159734 - 0xFFE34 (River Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True -159735 - 0xFFE35 (River Obelisk Side 6) - 0x035CB & 0x035CF - True -159739 - 0x00367 (River Obelisk) - True - True -159740 - 0xFFE40 (Quarry Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True -159741 - 0xFFE41 (Quarry Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True -159742 - 0xFFE42 (Quarry Obelisk Side 3) - 0x289CF & 0x289D1 - True -159743 - 0xFFE43 (Quarry Obelisk Side 4) - 0x33692 - True -159744 - 0xFFE44 (Quarry Obelisk Side 5) - 0x03E77 & 0x03E7C - True -159749 - 0x22073 (Quarry Obelisk) - True - True -159750 - 0xFFE50 (Town Obelisk Side 1) - 0x035C7 - True -159751 - 0xFFE51 (Town Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True -159752 - 0xFFE52 (Town Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True -159753 - 0xFFE53 (Town Obelisk Side 4) - 0x28B30 & 0x035C9 - True -159754 - 0xFFE54 (Town Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True -159755 - 0xFFE55 (Town Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True -159759 - 0x0A16C (Town Obelisk) - True - True diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index d99aab5cffbd..c38898b33d4e 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -2,16 +2,17 @@ Archipelago init file for The Witness """ import dataclasses -from typing import Dict, Optional +from typing import Dict, Optional from BaseClasses import Region, Location, MultiWorld, Item, Entrance, Tutorial, CollectionState from Options import PerGameCommonOptions, Toggle from .presets import witness_option_presets -from .hints import get_always_hint_locations, get_always_hint_items, get_priority_hint_locations, \ - get_priority_hint_items, make_hints, generate_joke_hints from worlds.AutoWorld import World, WebWorld from .player_logic import WitnessPlayerLogic from .static_logic import StaticWitnessLogic +from .hints import get_always_hint_locations, get_always_hint_items, get_priority_hint_locations, \ + get_priority_hint_items, make_always_and_priority_hints, generate_joke_hints, make_area_hints, get_hintable_areas, \ + make_extra_location_hints, create_all_hints from .locations import WitnessPlayerLocations, StaticWitnessLocations from .items import WitnessItem, StaticWitnessItems, WitnessPlayerItems, ItemData from .regions import WitnessRegions @@ -57,6 +58,7 @@ class WitnessWorld(World): } location_name_to_id = StaticWitnessLocations.ALL_LOCATIONS_TO_ID item_name_groups = StaticWitnessItems.item_groups + location_name_groups = StaticWitnessLocations.AREA_LOCATION_GROUPS required_client_version = (0, 4, 4) @@ -191,8 +193,8 @@ def create_regions(self): # Then, add checks in order until the required amount of sphere 1 checks is met. extra_checks = [ - ("First Hallway Room", "First Hallway Bend"), - ("First Hallway", "First Hallway Straight"), + ("Tutorial First Hallway Room", "Tutorial First Hallway Bend"), + ("Tutorial First Hallway", "Tutorial First Hallway Straight"), ("Desert Outside", "Desert Surface 1"), ("Desert Outside", "Desert Surface 2"), ] @@ -277,26 +279,35 @@ def fill_slot_data(self) -> dict: hint_amount = self.options.hint_amount.value credits_hint = ( - "This Randomizer is brought to you by", - "NewSoupVi, Jarno, blastron,", - "jbzdarkid, sigma144, IHNN, oddGarrett, Exempt-Medic.", -1 + "This Randomizer is brought to you by\n" + "NewSoupVi, Jarno, blastron,\n", + "jbzdarkid, sigma144, IHNN, oddGarrett, Exempt-Medic.", -1, -1 ) audio_logs = get_audio_logs().copy() if hint_amount: - generated_hints = make_hints(self, hint_amount, self.own_itempool) + area_hints = round(self.options.area_hint_percentage / 100 * hint_amount) + + generated_hints = create_all_hints(self, hint_amount, area_hints) self.random.shuffle(audio_logs) duplicates = min(3, len(audio_logs) // hint_amount) - for _ in range(0, hint_amount): - hint = generated_hints.pop(0) + for hint in generated_hints: + location = hint.location + area_amount = hint.area_amount + + # None if junk hint, address if location hint, area string if area hint + arg_1 = location.address if location else (hint.area if hint.area else None) + + # self.player if junk hint, player if location hint, progression amount if area hint + arg_2 = area_amount if area_amount is not None else (location.player if location else self.player) for _ in range(0, duplicates): audio_log = audio_logs.pop() - self.log_ids_to_hints[int(audio_log, 16)] = hint + self.log_ids_to_hints[int(audio_log, 16)] = (hint.wording, arg_1, arg_2) if audio_logs: audio_log = audio_logs.pop() diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py index 0354660b5ee0..545aef221677 100644 --- a/worlds/witness/hints.py +++ b/worlds/witness/hints.py @@ -1,6 +1,9 @@ -from typing import Tuple, List, TYPE_CHECKING - -from BaseClasses import Item +import logging +from dataclasses import dataclass +from typing import Tuple, List, TYPE_CHECKING, Set, Dict, Optional +from BaseClasses import Item, ItemClassification, Location, LocationProgressType, CollectionState +from . import StaticWitnessLogic +from .utils import weighted_sample if TYPE_CHECKING: from . import WitnessWorld @@ -164,6 +167,27 @@ ] +@dataclass +class WitnessLocationHint: + location: Location + hint_came_from_location: bool + + # If a hint gets added to a set twice, but once as an item hint and once as a location hint, those are the same + def __hash__(self): + return hash(self.location) + + def __eq__(self, other): + return self.location == other.location + + +@dataclass +class WitnessWordedHint: + wording: str + location: Optional[Location] = None + area: Optional[str] = None + area_amount: Optional[int] = None + + def get_always_hint_items(world: "WitnessWorld") -> List[str]: always = [ "Boat", @@ -182,7 +206,7 @@ def get_always_hint_items(world: "WitnessWorld") -> List[str]: always.append("Triangles") if wincon == "elevator": - always += ["Mountain Bottom Floor Final Room Entry (Door)", "Mountain Bottom Floor Doors"] + always += ["Mountain Bottom Floor Pillars Room Entry (Door)", "Mountain Bottom Floor Doors"] if wincon == "challenge": always += ["Challenge Entry (Panel)", "Caves Panels"] @@ -200,12 +224,14 @@ def get_always_hint_locations(world: "WitnessWorld") -> List[str]: ] # Add Obelisk Sides that contain EPs that are meant to be hinted, if they are necessary to complete the Obelisk Side - if world.options.EP_difficulty == "eclipse": + if "0x339B6" not in world.player_logic.COMPLETELY_DISABLED_ENTITIES: always.append("Town Obelisk Side 6") # Eclipse EP - if world.options.EP_difficulty != "normal": + if "0x3388F" not in world.player_logic.COMPLETELY_DISABLED_ENTITIES: always.append("Treehouse Obelisk Side 4") # Couch EP - always.append("River Obelisk Side 1") # Cloud Cycle EP. Needs to be changed to "Mountainside Obelisk" soon + + if "0x335AE" not in world.player_logic.COMPLETELY_DISABLED_ENTITIES: + always.append("Mountainside Obelisk Side 1") # Cloud Cycle EP. return always @@ -263,10 +289,12 @@ def get_priority_hint_items(world: "WitnessWorld") -> List[str]: def get_priority_hint_locations(world: "WitnessWorld") -> List[str]: priority = [ + "Tutorial Patio Floor", + "Tutorial Patio Flowers EP", "Swamp Purple Underwater", "Shipwreck Vault Box", - "Town RGB Room Left", - "Town RGB Room Right", + "Town RGB House Upstairs Left", + "Town RGB House Upstairs Right", "Treehouse Green Bridge 7", "Treehouse Green Bridge Discard", "Shipwreck Discard", @@ -279,14 +307,38 @@ def get_priority_hint_locations(world: "WitnessWorld") -> List[str]: ] # Add Obelisk Sides that contain EPs that are meant to be hinted, if they are necessary to complete the Obelisk Side - if world.options.EP_difficulty != "normal": + if "0x33A20" not in world.player_logic.COMPLETELY_DISABLED_ENTITIES: priority.append("Town Obelisk Side 6") # Theater Flowers EP + + if "0x28B29" not in world.player_logic.COMPLETELY_DISABLED_ENTITIES: priority.append("Treehouse Obelisk Side 4") # Shipwreck Green EP + if "0x33600" not in world.player_logic.COMPLETELY_DISABLED_ENTITIES: + priority.append("Town Obelisk Side 2") # Tutorial Patio Flowers EP. + return priority -def make_hint_from_item(world: "WitnessWorld", item_name: str, own_itempool: List[Item]): +def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint): + location_name = hint.location.name + if hint.location.player != world.player: + location_name += " (" + world.multiworld.get_player_name(hint.location.player) + ")" + + item = hint.location.item + item_name = item.name + if item.player != world.player: + item_name += " (" + world.multiworld.get_player_name(item.player) + ")" + + if hint.hint_came_from_location: + hint_text = f"{location_name} contains {item_name}." + else: + hint_text = f"{item_name} can be found at {location_name}." + + return WitnessWordedHint(hint_text, hint.location) + + +def hint_from_item(world: "WitnessWorld", item_name: str, own_itempool: List[Item]) -> Optional[WitnessLocationHint]: + locations = [item.location for item in own_itempool if item.name == item_name and item.location] if not locations: @@ -298,28 +350,39 @@ def make_hint_from_item(world: "WitnessWorld", item_name: str, own_itempool: Lis if location_obj.player != world.player: location_name += " (" + world.multiworld.get_player_name(location_obj.player) + ")" - return location_name, item_name, location_obj.address if (location_obj.player == world.player) else -1 + return WitnessLocationHint(location_obj, False) -def make_hint_from_location(world: "WitnessWorld", location: str): +def hint_from_location(world: "WitnessWorld", location: str) -> Optional[WitnessLocationHint]: location_obj = world.multiworld.get_location(location, world.player) item_obj = world.multiworld.get_location(location, world.player).item item_name = item_obj.name if item_obj.player != world.player: item_name += " (" + world.multiworld.get_player_name(item_obj.player) + ")" - return location, item_name, location_obj.address if (location_obj.player == world.player) else -1 + return WitnessLocationHint(location_obj, True) -def make_hints(world: "WitnessWorld", hint_amount: int, own_itempool: List[Item]): - hints = list() +def get_items_and_locations_in_random_order(world: "WitnessWorld", own_itempool: List[Item]): + prog_items_in_this_world = sorted( + item.name for item in own_itempool + if item.advancement and item.code and item.location + ) + locations_in_this_world = sorted( + location.name for location in world.multiworld.get_locations(world.player) + if location.address and location.progress_type != LocationProgressType.EXCLUDED + ) - prog_items_in_this_world = { - item.name for item in own_itempool if item.advancement and item.code and item.location - } - loc_in_this_world = { - location.name for location in world.multiworld.get_locations(world.player) if location.address - } + world.random.shuffle(prog_items_in_this_world) + world.random.shuffle(locations_in_this_world) + + return prog_items_in_this_world, locations_in_this_world + + +def make_always_and_priority_hints(world: "WitnessWorld", own_itempool: List[Item], + already_hinted_locations: Set[Location] + ) -> Tuple[List[WitnessLocationHint], List[WitnessLocationHint]]: + prog_items_in_this_world, loc_in_this_world = get_items_and_locations_in_random_order(world, own_itempool) always_locations = [ location for location in get_always_hint_locations(world) @@ -338,105 +401,323 @@ def make_hints(world: "WitnessWorld", hint_amount: int, own_itempool: List[Item] if item in prog_items_in_this_world ] - always_hint_pairs = dict() + # Get always and priority location/item hints + always_location_hints = {hint_from_location(world, location) for location in always_locations} + always_item_hints = {hint_from_item(world, item, own_itempool) for item in always_items} + priority_location_hints = {hint_from_location(world, location) for location in priority_locations} + priority_item_hints = {hint_from_item(world, item, own_itempool) for item in priority_items} - for item in always_items: - hint_pair = make_hint_from_item(world, item, own_itempool) + # Combine the sets. This will get rid of duplicates + always_hints_set = always_item_hints | always_location_hints + priority_hints_set = priority_item_hints | priority_location_hints - if not hint_pair or hint_pair[2] == 158007: # Tutorial Gate Open - continue + # Make sure priority hints doesn't contain any hints that are already always hints. + priority_hints_set -= always_hints_set - always_hint_pairs[hint_pair[0]] = (hint_pair[1], True, hint_pair[2]) + always_generator = [hint for hint in always_hints_set if hint and hint.location not in already_hinted_locations] + priority_generator = [hint for hint in priority_hints_set if hint and hint.location not in already_hinted_locations] - for location in always_locations: - hint_pair = make_hint_from_location(world, location) - always_hint_pairs[hint_pair[0]] = (hint_pair[1], False, hint_pair[2]) + # Convert both hint types to list and then shuffle. Also, get rid of None and Tutorial Gate Open. + always_hints = sorted(always_generator, key=lambda h: h.location) + priority_hints = sorted(priority_generator, key=lambda h: h.location) + world.random.shuffle(always_hints) + world.random.shuffle(priority_hints) - priority_hint_pairs = dict() + return always_hints, priority_hints - for item in priority_items: - hint_pair = make_hint_from_item(world, item, own_itempool) - if not hint_pair or hint_pair[2] == 158007: # Tutorial Gate Open - continue +def make_extra_location_hints(world: "WitnessWorld", hint_amount: int, own_itempool: List[Item], + already_hinted_locations: Set[Location], hints_to_use_first: List[WitnessLocationHint], + unhinted_locations_for_hinted_areas: Dict[str, Set[Location]]) -> List[WitnessWordedHint]: + prog_items_in_this_world, locations_in_this_world = get_items_and_locations_in_random_order(world, own_itempool) - priority_hint_pairs[hint_pair[0]] = (hint_pair[1], True, hint_pair[2]) + next_random_hint_is_location = world.random.randrange(0, 2) - for location in priority_locations: - hint_pair = make_hint_from_location(world, location) - priority_hint_pairs[hint_pair[0]] = (hint_pair[1], False, hint_pair[2]) + hints = [] - already_hinted_locations = set() + # This is a way to reverse a Dict[a,List[b]] to a Dict[b,a] + area_reverse_lookup = {v: k for k, l in unhinted_locations_for_hinted_areas.items() for v in l} - for loc, item in always_hint_pairs.items(): - if loc in already_hinted_locations: + while len(hints) < hint_amount: + if not prog_items_in_this_world and not locations_in_this_world and not hints_to_use_first: + player_name = world.multiworld.get_player_name(world.player) + logging.warning(f"Ran out of items/locations to hint for player {player_name}.") + break + + if hints_to_use_first: + location_hint = hints_to_use_first.pop() + elif next_random_hint_is_location and locations_in_this_world: + location_hint = hint_from_location(world, locations_in_this_world.pop()) + elif not next_random_hint_is_location and prog_items_in_this_world: + location_hint = hint_from_item(world, prog_items_in_this_world.pop(), own_itempool) + # The list that the hint was supposed to be taken from was empty. + # Try the other list, which has to still have something, as otherwise, all lists would be empty, + # which would have triggered the guard condition above. + else: + next_random_hint_is_location = not next_random_hint_is_location continue - if item[1]: - hints.append((f"{item[0]} can be found at {loc}.", item[2])) - else: - hints.append((f"{loc} contains {item[0]}.", item[2])) + if not location_hint or location_hint.location in already_hinted_locations: + continue - already_hinted_locations.add(loc) + # Don't hint locations in areas that are almost fully hinted out already + if location_hint.location in area_reverse_lookup: + area = area_reverse_lookup[location_hint.location] + if len(unhinted_locations_for_hinted_areas[area]) == 1: + continue + del area_reverse_lookup[location_hint.location] + unhinted_locations_for_hinted_areas[area] -= {location_hint.location} - world.random.shuffle(hints) # shuffle always hint order in case of low hint amount + hints.append(word_direct_hint(world, location_hint)) + already_hinted_locations.add(location_hint.location) - remaining_hints = hint_amount - len(hints) - priority_hint_amount = int(max(0.0, min(len(priority_hint_pairs) / 2, remaining_hints / 2))) + next_random_hint_is_location = not next_random_hint_is_location - prog_items_in_this_world = sorted(prog_items_in_this_world) - locations_in_this_world = sorted(loc_in_this_world) + return hints - world.random.shuffle(prog_items_in_this_world) - world.random.shuffle(locations_in_this_world) - priority_hint_list = list(priority_hint_pairs.items()) - world.random.shuffle(priority_hint_list) - for _ in range(0, priority_hint_amount): - next_priority_hint = priority_hint_list.pop() - loc = next_priority_hint[0] - item = next_priority_hint[1] +def generate_joke_hints(world: "WitnessWorld", amount: int) -> List[Tuple[str, int, int]]: + return [(x, -1, -1) for x in world.random.sample(joke_hints, amount)] - if loc in already_hinted_locations: - continue - if item[1]: - hints.append((f"{item[0]} can be found at {loc}.", item[2])) - else: - hints.append((f"{loc} contains {item[0]}.", item[2])) +def choose_areas(world: "WitnessWorld", amount: int, locations_per_area: Dict[str, List[Location]], + already_hinted_locations: Set[Location]) -> Tuple[List[str], Dict[str, Set[Location]]]: + """ + Choose areas to hint. + This takes into account that some areas may already have had items hinted in them through location hints. + When this happens, they are made less likely to receive an area hint. + """ - already_hinted_locations.add(loc) + unhinted_locations_per_area = dict() + unhinted_location_percentage_per_area = dict() - next_random_hint_is_item = world.random.randrange(0, 2) + for area_name, locations in locations_per_area.items(): + not_yet_hinted_locations = sum(location not in already_hinted_locations for location in locations) + unhinted_locations_per_area[area_name] = {loc for loc in locations if loc not in already_hinted_locations} + unhinted_location_percentage_per_area[area_name] = not_yet_hinted_locations / len(locations) - while len(hints) < hint_amount: - if next_random_hint_is_item: - if not prog_items_in_this_world: - next_random_hint_is_item = not next_random_hint_is_item - continue + items_per_area = {area_name: [location.item for location in locations] + for area_name, locations in locations_per_area.items()} - hint = make_hint_from_item(world, prog_items_in_this_world.pop(), own_itempool) + areas = sorted(area for area in items_per_area if unhinted_location_percentage_per_area[area]) + weights = [unhinted_location_percentage_per_area[area] for area in areas] - if not hint or hint[0] in already_hinted_locations: - continue + amount = min(amount, len(weights)) + + hinted_areas = weighted_sample(world.random, areas, weights, amount) + + return hinted_areas, unhinted_locations_per_area + + +def get_hintable_areas(world: "WitnessWorld") -> Tuple[Dict[str, List[Location]], Dict[str, List[Item]]]: + potential_areas = list(StaticWitnessLogic.ALL_AREAS_BY_NAME.keys()) + + locations_per_area = dict() + items_per_area = dict() + + for area in potential_areas: + regions = [ + world.regio.created_regions[region] + for region in StaticWitnessLogic.ALL_AREAS_BY_NAME[area]["regions"] + if region in world.regio.created_regions + ] + locations = [location for region in regions for location in region.get_locations() if location.address] - hints.append((f"{hint[1]} can be found at {hint[0]}.", hint[2])) + if locations: + locations_per_area[area] = locations + items_per_area[area] = [location.item for location in locations] - already_hinted_locations.add(hint[0]) + return locations_per_area, items_per_area + + +def word_area_hint(world: "WitnessWorld", hinted_area: str, corresponding_items: List[Item]) -> Tuple[str, int]: + """ + Word the hint for an area using natural sounding language. + This takes into account how much progression there is, how much of it is local/non-local, and whether there are + any local lasers to be found in this area. + """ + + local_progression = sum(item.player == world.player and item.advancement for item in corresponding_items) + non_local_progression = sum(item.player != world.player and item.advancement for item in corresponding_items) + + laser_names = {"Symmetry Laser", "Desert Laser", "Quarry Laser", "Shadows Laser", "Town Laser", "Monastery Laser", + "Jungle Laser", "Bunker Laser", "Swamp Laser", "Treehouse Laser", "Keep Laser", } + + local_lasers = sum( + item.player == world.player and item.name in laser_names + for item in corresponding_items + ) + + total_progression = non_local_progression + local_progression + + player_count = world.multiworld.players + + area_progression_word = "Both" if total_progression == 2 else "All" + + if not total_progression: + hint_string = f"In the {hinted_area} area, you will find no progression items." + + elif total_progression == 1: + hint_string = f"In the {hinted_area} area, you will find 1 progression item." + + if player_count > 1: + if local_lasers: + hint_string += "\nThis item is a laser for this world." + elif non_local_progression: + other_player_str = "the other player" if player_count == 2 else "another player" + hint_string += f"\nThis item is for {other_player_str}." + else: + hint_string += "\nThis item is for this world." else: - hint = make_hint_from_location(world, locations_in_this_world.pop()) + if local_lasers: + hint_string += "\nThis item is a laser." + + else: + hint_string = f"In the {hinted_area} area, you will find {total_progression} progression items." + + if local_lasers == total_progression: + sentence_end = (" for this world." if player_count > 1 else ".") + hint_string += f"\nAll of them are lasers" + sentence_end + + elif player_count > 1: + if local_progression and non_local_progression: + if non_local_progression == 1: + other_player_str = "the other player" if player_count == 2 else "another player" + hint_string += f"\nOne of them is for {other_player_str}." + else: + other_player_str = "the other player" if player_count == 2 else "other players" + hint_string += f"\n{non_local_progression} of them are for {other_player_str}." + elif non_local_progression: + other_players_str = "the other player" if player_count == 2 else "other players" + hint_string += f"\n{area_progression_word} of them are for {other_players_str}." + elif local_progression: + hint_string += f"\n{area_progression_word} of them are for this world." + + if local_lasers == 1: + if not non_local_progression: + hint_string += "\nAlso, one of them is a laser." + else: + hint_string += "\nAlso, one of them is a laser for this world." + elif local_lasers: + if not non_local_progression: + hint_string += f"\nAlso, {local_lasers} of them are lasers." + else: + hint_string += f"\nAlso, {local_lasers} of them are lasers for this world." - if hint[0] in already_hinted_locations: - continue + else: + if local_lasers == 1: + hint_string += "\nOne of them is a laser." + elif local_lasers: + hint_string += f"\n{local_lasers} of them are lasers." - hints.append((f"{hint[0]} contains {hint[1]}.", hint[2])) + return hint_string, total_progression - already_hinted_locations.add(hint[0]) - next_random_hint_is_item = not next_random_hint_is_item +def make_area_hints(world: "WitnessWorld", amount: int, already_hinted_locations: Set[Location] + ) -> Tuple[List[WitnessWordedHint], Dict[str, Set[Location]]]: + locs_per_area, items_per_area = get_hintable_areas(world) - return hints + hinted_areas, unhinted_locations_per_area = choose_areas(world, amount, locs_per_area, already_hinted_locations) + + hints = [] + + for hinted_area in hinted_areas: + hint_string, prog_amount = word_area_hint(world, hinted_area, items_per_area[hinted_area]) + + hints.append(WitnessWordedHint(hint_string, None, f"hinted_area:{hinted_area}", prog_amount)) + + if len(hinted_areas) < amount: + player_name = world.multiworld.get_player_name(world.player) + logging.warning(f"Was not able to make {amount} area hints for player {player_name}. " + f"Made {len(hinted_areas)} instead, and filled the rest with random location hints.") + + return hints, unhinted_locations_per_area + + +def create_all_hints(world: "WitnessWorld", hint_amount: int, area_hints: int) -> List[WitnessWordedHint]: + generated_hints: List[WitnessWordedHint] = [] + + state = CollectionState(world.multiworld) + + # Keep track of already hinted locations. Consider early Tutorial as "already hinted" + + already_hinted_locations = { + loc for loc in world.multiworld.get_reachable_locations(state, world.player) + if loc.address and StaticWitnessLogic.ENTITIES_BY_NAME[loc.name]["area"]["name"] == "Tutorial (Inside)" + } + + intended_location_hints = hint_amount - area_hints + + # First, make always and priority hints. + + always_hints, priority_hints = make_always_and_priority_hints( + world, world.own_itempool, already_hinted_locations + ) + + generated_always_hints = len(always_hints) + possible_priority_hints = len(priority_hints) + + # Make as many always hints as possible + always_hints_to_use = min(intended_location_hints, generated_always_hints) + + # Make up to half of the rest of the location hints priority hints, using up to half of the possibly priority hints + remaining_location_hints = intended_location_hints - always_hints_to_use + priority_hints_to_use = int(max(0.0, min(possible_priority_hints / 2, remaining_location_hints / 2))) + + for _ in range(always_hints_to_use): + location_hint = always_hints.pop() + generated_hints.append(word_direct_hint(world, location_hint)) + already_hinted_locations.add(location_hint.location) + + for _ in range(priority_hints_to_use): + location_hint = priority_hints.pop() + generated_hints.append(word_direct_hint(world, location_hint)) + already_hinted_locations.add(location_hint.location) + + location_hints_created_in_round_1 = len(generated_hints) + + unhinted_locations_per_area: Dict[str, Set[Location]] = dict() + + # Then, make area hints. + if area_hints: + generated_area_hints, unhinted_locations_per_area = make_area_hints(world, area_hints, already_hinted_locations) + generated_hints += generated_area_hints + + # If we don't have enough hints yet, recalculate always and priority hints, then fill with random hints + if len(generated_hints) < hint_amount: + remaining_needed_location_hints = hint_amount - len(generated_hints) + + # Save old values for used always and priority hints for later calculations + amt_of_used_always_hints = always_hints_to_use + amt_of_used_priority_hints = priority_hints_to_use + + # Recalculate how many always hints and priority hints are supposed to be used + intended_location_hints = remaining_needed_location_hints + location_hints_created_in_round_1 + + always_hints_to_use = min(intended_location_hints, generated_always_hints) + priority_hints_to_use = int(max(0.0, min(possible_priority_hints / 2, remaining_location_hints / 2))) + + # If we now need more always hints and priority hints than we thought previously, make some more. + more_always_hints = always_hints_to_use - amt_of_used_always_hints + more_priority_hints = priority_hints_to_use - amt_of_used_priority_hints + + extra_always_and_priority_hints: List[WitnessLocationHint] = [] + + for _ in range(more_always_hints): + extra_always_and_priority_hints.append(always_hints.pop()) + + for _ in range(more_priority_hints): + extra_always_and_priority_hints.append(priority_hints.pop()) + + generated_hints += make_extra_location_hints( + world, hint_amount - len(generated_hints), world.own_itempool, already_hinted_locations, + extra_always_and_priority_hints, unhinted_locations_per_area + ) + # If we still don't have enough for whatever reason, throw a warning, proceed with the lower amount + if len(generated_hints) != hint_amount: + player_name = world.multiworld.get_player_name(world.player) + logging.warning(f"Couldn't generate {hint_amount} hints for player {player_name}. " + f"Generated {len(generated_hints)} instead.") -def generate_joke_hints(world: "WitnessWorld", amount: int) -> List[Tuple[str, int]]: - return [(x, -1) for x in world.random.sample(joke_hints, amount)] + return generated_hints diff --git a/worlds/witness/locations.py b/worlds/witness/locations.py index 781cc4e25d94..d38cf9025806 100644 --- a/worlds/witness/locations.py +++ b/worlds/witness/locations.py @@ -110,13 +110,13 @@ class StaticWitnessLocations: "Town Red Rooftop 5", "Town Wooden Roof Lower Row 5", "Town Wooden Rooftop", - "Town Windmill Entry Panel", + "Windmill Entry Panel", "Town RGB House Entry Panel", "Town Laser Panel", - "Town RGB Room Left", - "Town RGB Room Right", - "Town Sound Room Right", + "Town RGB House Upstairs Left", + "Town RGB House Upstairs Right", + "Town RGB House Sound Room Right", "Windmill Theater Entry Panel", "Theater Exit Left Panel", @@ -134,8 +134,8 @@ class StaticWitnessLocations: "Jungle Popup Wall 6", "Jungle Laser Panel", - "River Vault Box", - "River Monastery Garden Shortcut Panel", + "Jungle Vault Box", + "Jungle Monastery Garden Shortcut Panel", "Bunker Entry Panel", "Bunker Intro Left 5", @@ -177,7 +177,7 @@ class StaticWitnessLocations: "Mountainside Vault Box", "Mountaintop River Shape", - "First Hallway EP", + "Tutorial First Hallway EP", "Tutorial Cloud EP", "Tutorial Patio Flowers EP", "Tutorial Gate EP", @@ -185,7 +185,7 @@ class StaticWitnessLocations: "Outside Tutorial Town Sewer EP", "Outside Tutorial Path EP", "Outside Tutorial Tractor EP", - "Main Island Thundercloud EP", + "Mountainside Thundercloud EP", "Glass Factory Vase EP", "Symmetry Island Glass Factory Black Line Reflection EP", "Symmetry Island Glass Factory Black Line EP", @@ -242,9 +242,9 @@ class StaticWitnessLocations: "Monastery Left Shutter EP", "Monastery Middle Shutter EP", "Monastery Right Shutter EP", - "Town Windmill First Blade EP", - "Town Windmill Second Blade EP", - "Town Windmill Third Blade EP", + "Windmill First Blade EP", + "Windmill Second Blade EP", + "Windmill Third Blade EP", "Town Tower Underside Third EP", "Town Tower Underside Fourth EP", "Town Tower Underside First EP", @@ -268,10 +268,10 @@ class StaticWitnessLocations: "Jungle Tree Halo EP", "Jungle Bamboo CCW EP", "Jungle Bamboo CW EP", - "River Green Leaf Moss EP", - "River Monastery Garden Left EP", - "River Monastery Garden Right EP", - "River Monastery Wall EP", + "Jungle Green Leaf Moss EP", + "Monastery Garden Left EP", + "Monastery Garden Right EP", + "Monastery Wall EP", "Bunker Tinted Door EP", "Bunker Green Room Flowers EP", "Swamp Purple Sand Middle EP", @@ -330,12 +330,12 @@ class StaticWitnessLocations: "Treehouse Obelisk Side 4", "Treehouse Obelisk Side 5", "Treehouse Obelisk Side 6", - "River Obelisk Side 1", - "River Obelisk Side 2", - "River Obelisk Side 3", - "River Obelisk Side 4", - "River Obelisk Side 5", - "River Obelisk Side 6", + "Mountainside Obelisk Side 1", + "Mountainside Obelisk Side 2", + "Mountainside Obelisk Side 3", + "Mountainside Obelisk Side 4", + "Mountainside Obelisk Side 5", + "Mountainside Obelisk Side 6", "Quarry Obelisk Side 1", "Quarry Obelisk Side 2", "Quarry Obelisk Side 3", @@ -407,13 +407,13 @@ class StaticWitnessLocations: "Mountain Floor 2 Elevator Discard", "Mountain Bottom Floor Giant Puzzle", - "Mountain Bottom Floor Final Room Entry Left", - "Mountain Bottom Floor Final Room Entry Right", + "Mountain Bottom Floor Pillars Room Entry Left", + "Mountain Bottom Floor Pillars Room Entry Right", "Mountain Bottom Floor Caves Entry Panel", - "Mountain Final Room Left Pillar 4", - "Mountain Final Room Right Pillar 4", + "Mountain Bottom Floor Left Pillar 4", + "Mountain Bottom Floor Right Pillar 4", "Challenge Vault Box", "Theater Challenge Video", @@ -438,12 +438,12 @@ class StaticWitnessLocations: "Treehouse Obelisk Side 4", "Treehouse Obelisk Side 5", "Treehouse Obelisk Side 6", - "River Obelisk Side 1", - "River Obelisk Side 2", - "River Obelisk Side 3", - "River Obelisk Side 4", - "River Obelisk Side 5", - "River Obelisk Side 6", + "Mountainside Obelisk Side 1", + "Mountainside Obelisk Side 2", + "Mountainside Obelisk Side 3", + "Mountainside Obelisk Side 4", + "Mountainside Obelisk Side 5", + "Mountainside Obelisk Side 6", "Quarry Obelisk Side 1", "Quarry Obelisk Side 2", "Quarry Obelisk Side 3", @@ -459,6 +459,8 @@ class StaticWitnessLocations: ALL_LOCATIONS_TO_ID = dict() + AREA_LOCATION_GROUPS = dict() + @staticmethod def get_id(chex: str): """ @@ -491,6 +493,10 @@ def __init__(self): for key, item in all_loc_to_id.items(): self.ALL_LOCATIONS_TO_ID[key] = item + for loc in all_loc_to_id: + area = StaticWitnessLogic.ENTITIES_BY_NAME[loc]["area"]["name"] + self.AREA_LOCATION_GROUPS.setdefault(area, []).append(loc) + class WitnessPlayerLocations: """ diff --git a/worlds/witness/options.py b/worlds/witness/options.py index ac1f2bc82830..68a4ac7fc231 100644 --- a/worlds/witness/options.py +++ b/worlds/witness/options.py @@ -187,7 +187,19 @@ class HintAmount(Range): display_name = "Hints on Audio Logs" range_start = 0 range_end = 49 - default = 10 + default = 12 + + +class AreaHintPercentage(Range): + """There are two types of hints for The Witness. + "Location hints" hint one location in your world / containing an item for your world. + "Area hints" will tell you some general info about the items you can find in one of the + main geographic areas on the island. + Use this option to specify how many of your hints you want to be area hints. The rest will be location hints.""" + display_name = "Area Hint Percentage" + range_start = 0 + range_end = 100 + default = 33 class DeathLink(Toggle): @@ -227,5 +239,6 @@ class TheWitnessOptions(PerGameCommonOptions): trap_percentage: TrapPercentage puzzle_skip_amount: PuzzleSkipAmount hint_amount: HintAmount + area_hint_percentage: AreaHintPercentage death_link: DeathLink death_link_amnesty: DeathLinkAmnesty diff --git a/worlds/witness/presets.py b/worlds/witness/presets.py index 1fee1a7968b2..3f02de550b15 100644 --- a/worlds/witness/presets.py +++ b/worlds/witness/presets.py @@ -32,6 +32,7 @@ "trap_percentage": TrapPercentage.default, "puzzle_skip_amount": PuzzleSkipAmount.default, "hint_amount": HintAmount.default, + "area_hint_percentage": AreaHintPercentage.default, "death_link": DeathLink.default, }, @@ -64,6 +65,7 @@ "trap_percentage": TrapPercentage.default, "puzzle_skip_amount": 15, "hint_amount": HintAmount.default, + "area_hint_percentage": AreaHintPercentage.default, "death_link": DeathLink.default, }, @@ -96,6 +98,7 @@ "trap_percentage": TrapPercentage.default, "puzzle_skip_amount": 15, "hint_amount": HintAmount.default, + "area_hint_percentage": AreaHintPercentage.default, "death_link": DeathLink.default, }, } diff --git a/worlds/witness/regions.py b/worlds/witness/regions.py index 3a1a1781b77e..350017c6943a 100644 --- a/worlds/witness/regions.py +++ b/worlds/witness/regions.py @@ -129,9 +129,9 @@ def create_regions(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic regions_to_check.add(target.name) reachable_regions.add(target.name) - final_regions_list = [v for k, v in regions_by_name.items() if k in reachable_regions] + self.created_regions = {k: v for k, v in regions_by_name.items() if k in reachable_regions} - world.multiworld.regions += final_regions_list + world.multiworld.regions += self.created_regions.values() def __init__(self, locat: WitnessPlayerLocations, world: "WitnessWorld"): difficulty = world.options.puzzle_randomization @@ -145,3 +145,4 @@ def __init__(self, locat: WitnessPlayerLocations, world: "WitnessWorld"): self.locat = locat self.created_entrances: Dict[Tuple[str, str], List[Entrance]] = KeyedDefaultDict(lambda _: []) + self.created_regions: Dict[str, Region] = dict() diff --git a/worlds/witness/settings/Door_Shuffle/Complex_Door_Panels.txt b/worlds/witness/settings/Door_Shuffle/Complex_Door_Panels.txt index 472403962065..70223bd74924 100644 --- a/worlds/witness/settings/Door_Shuffle/Complex_Door_Panels.txt +++ b/worlds/witness/settings/Door_Shuffle/Complex_Door_Panels.txt @@ -1,7 +1,7 @@ Items: Glass Factory Entry (Panel) -Tutorial Outpost Entry (Panel) -Tutorial Outpost Exit (Panel) +Outside Tutorial Outpost Entry (Panel) +Outside Tutorial Outpost Exit (Panel) Symmetry Island Lower (Panel) Symmetry Island Upper (Panel) Desert Light Room Entry (Panel) diff --git a/worlds/witness/settings/Door_Shuffle/Complex_Doors.txt b/worlds/witness/settings/Door_Shuffle/Complex_Doors.txt index 2f2b32171079..87ec69f59c81 100644 --- a/worlds/witness/settings/Door_Shuffle/Complex_Doors.txt +++ b/worlds/witness/settings/Door_Shuffle/Complex_Doors.txt @@ -58,9 +58,9 @@ Town Tower Third (Door) Theater Entry (Door) Theater Exit Left (Door) Theater Exit Right (Door) -Jungle Bamboo Laser Shortcut (Door) +Jungle Laser Shortcut (Door) Jungle Popup Wall (Door) -River Monastery Garden Shortcut (Door) +Jungle Monastery Garden Shortcut (Door) Bunker Entry (Door) Bunker Tinted Glass Door Bunker UV Room Entry (Door) @@ -85,7 +85,7 @@ Mountain Floor 2 Staircase Near (Door) Mountain Floor 2 Exit (Door) Mountain Floor 2 Staircase Far (Door) Mountain Bottom Floor Giant Puzzle Exit (Door) -Mountain Bottom Floor Final Room Entry (Door) +Mountain Bottom Floor Pillars Room Entry (Door) Mountain Bottom Floor Rock (Door) Caves Entry (Door) Caves Pillar Door @@ -143,8 +143,8 @@ Town Wooden Roof Lower Row 5 Town RGB House Entry Panel Town Church Entry Panel Town Maze Panel -Town Windmill Entry Panel -Town Sound Room Right +Windmill Entry Panel +Town RGB House Sound Room Right Town Red Rooftop 5 Town Church Lattice Town Tall Hexagonal @@ -154,7 +154,7 @@ Theater Exit Left Panel Theater Exit Right Panel Jungle Laser Shortcut Panel Jungle Popup Wall Control -River Monastery Garden Shortcut Panel +Jungle Monastery Garden Shortcut Panel Bunker Entry Panel Bunker Tinted Glass Door Panel Bunker Glass Room 3 @@ -186,8 +186,8 @@ Mountain Floor 2 Light Bridge Controller Near Mountain Floor 2 Light Bridge Controller Far Mountain Floor 2 Far Row 6 Mountain Bottom Floor Giant Puzzle -Mountain Bottom Floor Final Room Entry Left -Mountain Bottom Floor Final Room Entry Right +Mountain Bottom Floor Pillars Room Entry Left +Mountain Bottom Floor Pillars Room Entry Right Mountain Bottom Floor Discard Mountain Bottom Floor Rock Control Mountain Bottom Floor Caves Entry Panel diff --git a/worlds/witness/settings/Door_Shuffle/Simple_Doors.txt b/worlds/witness/settings/Door_Shuffle/Simple_Doors.txt index 91a7132ec113..2059f43af62c 100644 --- a/worlds/witness/settings/Door_Shuffle/Simple_Doors.txt +++ b/worlds/witness/settings/Door_Shuffle/Simple_Doors.txt @@ -76,8 +76,8 @@ Town Wooden Roof Lower Row 5 Town RGB House Entry Panel Town Church Entry Panel Town Maze Panel -Town Windmill Entry Panel -Town Sound Room Right +Windmill Entry Panel +Town RGB House Sound Room Right Town Red Rooftop 5 Town Church Lattice Town Tall Hexagonal @@ -87,7 +87,7 @@ Theater Exit Left Panel Theater Exit Right Panel Jungle Laser Shortcut Panel Jungle Popup Wall Control -River Monastery Garden Shortcut Panel +Jungle Monastery Garden Shortcut Panel Bunker Entry Panel Bunker Tinted Glass Door Panel Bunker Glass Room 3 @@ -119,8 +119,8 @@ Mountain Floor 2 Light Bridge Controller Near Mountain Floor 2 Light Bridge Controller Far Mountain Floor 2 Far Row 6 Mountain Bottom Floor Giant Puzzle -Mountain Bottom Floor Final Room Entry Left -Mountain Bottom Floor Final Room Entry Right +Mountain Bottom Floor Pillars Room Entry Left +Mountain Bottom Floor Pillars Room Entry Right Mountain Bottom Floor Discard Mountain Bottom Floor Rock Control Mountain Bottom Floor Caves Entry Panel diff --git a/worlds/witness/settings/Door_Shuffle/Simple_Panels.txt b/worlds/witness/settings/Door_Shuffle/Simple_Panels.txt index 42258bca1a47..23501d20d3a7 100644 --- a/worlds/witness/settings/Door_Shuffle/Simple_Panels.txt +++ b/worlds/witness/settings/Door_Shuffle/Simple_Panels.txt @@ -1,6 +1,6 @@ Items: Symmetry Island Panels -Tutorial Outpost Panels +Outside Tutorial Outpost Panels Desert Panels Quarry Outside Panels Quarry Stoneworks Panels diff --git a/worlds/witness/settings/EP_Shuffle/EP_Sides.txt b/worlds/witness/settings/EP_Shuffle/EP_Sides.txt index 82ab63329500..d561ffdc183f 100644 --- a/worlds/witness/settings/EP_Shuffle/EP_Sides.txt +++ b/worlds/witness/settings/EP_Shuffle/EP_Sides.txt @@ -16,12 +16,12 @@ Added Locations: 0xFFE23 (Treehouse Obelisk Side 4) 0xFFE24 (Treehouse Obelisk Side 5) 0xFFE25 (Treehouse Obelisk Side 6) -0xFFE30 (River Obelisk Side 1) -0xFFE31 (River Obelisk Side 2) -0xFFE32 (River Obelisk Side 3) -0xFFE33 (River Obelisk Side 4) -0xFFE34 (River Obelisk Side 5) -0xFFE35 (River Obelisk Side 6) +0xFFE30 (Mountainside Obelisk Side 1) +0xFFE31 (Mountainside Obelisk Side 2) +0xFFE32 (Mountainside Obelisk Side 3) +0xFFE33 (Mountainside Obelisk Side 4) +0xFFE34 (Mountainside Obelisk Side 5) +0xFFE35 (Mountainside Obelisk Side 6) 0xFFE40 (Quarry Obelisk Side 1) 0xFFE41 (Quarry Obelisk Side 2) 0xFFE42 (Quarry Obelisk Side 3) diff --git a/worlds/witness/settings/Exclusions/Vaults.txt b/worlds/witness/settings/Exclusions/Vaults.txt index f23a13183326..d9e5d28cd694 100644 --- a/worlds/witness/settings/Exclusions/Vaults.txt +++ b/worlds/witness/settings/Exclusions/Vaults.txt @@ -8,9 +8,9 @@ Disabled Locations: 0x00AFB (Shipwreck Vault) 0x03535 (Shipwreck Vault Box) 0x17BB4 (Shipwreck Vault Door) -0x15ADD (River Vault) -0x03702 (River Vault Box) -0x15287 (River Vault Door) +0x15ADD (Jungle Vault) +0x03702 (Jungle Vault Box) +0x15287 (Jungle Vault Door) 0x002A6 (Mountainside Vault) 0x03542 (Mountainside Vault Box) 0x00085 (Mountainside Vault Door) diff --git a/worlds/witness/settings/Postgame/Mountain_Lower.txt b/worlds/witness/settings/Postgame/Mountain_Lower.txt index 354e3feb82c3..aecddec5adde 100644 --- a/worlds/witness/settings/Postgame/Mountain_Lower.txt +++ b/worlds/witness/settings/Postgame/Mountain_Lower.txt @@ -7,9 +7,9 @@ Disabled Locations: 0x09EFF (Giant Puzzle Top Left) 0x09FDA (Giant Puzzle) 0x09F89 (Exit Door) -0x01983 (Final Room Entry Left) -0x01987 (Final Room Entry Right) -0x0C141 (Final Room Entry Door) +0x01983 (Pillars Room Entry Left) +0x01987 (Pillars Room Entry Right) +0x0C141 (Pillars Room Entry Door) 0x0383A (Right Pillar 1) 0x09E56 (Right Pillar 2) 0x09E5A (Right Pillar 3) diff --git a/worlds/witness/static_logic.py b/worlds/witness/static_logic.py index 0e8d649af6ff..5a3e8b1b580e 100644 --- a/worlds/witness/static_logic.py +++ b/worlds/witness/static_logic.py @@ -56,6 +56,11 @@ def read_logic_file(self, lines): """ current_region = dict() + current_area = { + "name": "Misc", + "regions": [], + } + self.ALL_AREAS_BY_NAME["Misc"] = current_area for line in lines: if line == "" or line[0] == "#": @@ -67,6 +72,16 @@ def read_logic_file(self, lines): region_name = current_region["name"] self.ALL_REGIONS_BY_NAME[region_name] = current_region self.STATIC_CONNECTIONS_BY_REGION_NAME[region_name] = new_region_and_connections[1] + current_area["regions"].append(region_name) + continue + + if line[0] == "=": + area_name = line[2:-2] + current_area = { + "name": area_name, + "regions": [], + } + self.ALL_AREAS_BY_NAME[area_name] = current_area continue line_split = line.split(" - ") @@ -88,7 +103,8 @@ def read_logic_file(self, lines): "entity_hex": entity_hex, "region": None, "id": None, - "entityType": location_id + "entityType": location_id, + "area": current_area, } self.ENTITIES_BY_NAME[self.ENTITIES_BY_HEX[entity_hex]["checkName"]] = self.ENTITIES_BY_HEX[entity_hex] @@ -120,7 +136,6 @@ def read_logic_file(self, lines): location_type = "Laser" elif "Obelisk Side" in entity_name: location_type = "Obelisk Side" - full_entity_name = entity_name elif "EP" in entity_name: location_type = "EP" else: @@ -151,7 +166,8 @@ def read_logic_file(self, lines): "entity_hex": entity_hex, "region": current_region, "id": int(location_id), - "entityType": location_type + "entityType": location_type, + "area": current_area, } self.ENTITY_ID_TO_NAME[entity_hex] = full_entity_name @@ -167,6 +183,7 @@ def __init__(self, lines=None): # All regions with a list of panels in them and the connections to other regions, before logic adjustments self.ALL_REGIONS_BY_NAME = dict() + self.ALL_AREAS_BY_NAME = dict() self.STATIC_CONNECTIONS_BY_REGION_NAME = dict() self.ENTITIES_BY_HEX = dict() @@ -188,6 +205,7 @@ class StaticWitnessLogic: _progressive_lookup: Dict[str, str] = {} ALL_REGIONS_BY_NAME = dict() + ALL_AREAS_BY_NAME = dict() STATIC_CONNECTIONS_BY_REGION_NAME = dict() OBELISK_SIDE_ID_TO_EP_HEXES = dict() @@ -265,6 +283,7 @@ def __init__(self): self.parse_items() self.ALL_REGIONS_BY_NAME.update(self.sigma_normal.ALL_REGIONS_BY_NAME) + self.ALL_AREAS_BY_NAME.update(self.sigma_normal.ALL_AREAS_BY_NAME) self.STATIC_CONNECTIONS_BY_REGION_NAME.update(self.sigma_normal.STATIC_CONNECTIONS_BY_REGION_NAME) self.ENTITIES_BY_HEX.update(self.sigma_normal.ENTITIES_BY_HEX) diff --git a/worlds/witness/utils.py b/worlds/witness/utils.py index fbb670fd0877..b1f1b6d83100 100644 --- a/worlds/witness/utils.py +++ b/worlds/witness/utils.py @@ -2,6 +2,21 @@ from math import floor from typing import List, Collection, FrozenSet, Tuple, Dict, Any, Set from pkgutil import get_data +from random import random + + +def weighted_sample(world_random: random, population: List, weights: List[float], k: int): + positions = range(len(population)) + indices = [] + while True: + needed = k - len(indices) + if not needed: + break + for i in world_random.choices(positions, weights, k=needed): + if weights[i]: + weights[i] = 0.0 + indices.append(i) + return [population[i] for i in indices] def build_weighted_int_list(inputs: Collection[float], total: int) -> List[int]: