Moar

NewSoupVi · Dec 26, 2024 · 18bd7ec · 18bd7ec
1 parent fdcb659
commit 18bd7ec
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 21 deletions.
diff --git a/worlds/witness/data/WitnessLogic.txt b/worlds/witness/data/WitnessLogic.txt
@@ -1013,7 +1013,7 @@ Mountaintop (Mountaintop) - Mountain Floor 1 - 0x17C34:
 Mountain Floor 1 (Mountain Floor 1) - Mountain Floor 1 Bridge - 0x09E39:
 158408 - 0x09E39 (Light Bridge Controller) - True - Black/White Squares & Colored Squares & Eraser
 
-Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay:
+Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay - Mountain Floor 1 Trash Pillar - TrueOneWay - Mountain Floor 1 Back Section - 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
@@ -1026,11 +1026,15 @@ Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneW
 158418 - 0x09E6C (Left Row 5) - 0x09E79 - Stars & Black/White Squares & Stars + Same Colored Symbol
 158419 - 0x09E6F (Left Row 6) - 0x09E6C - Stars & Rotated Shapers & Shapers
 158420 - 0x09E6B (Left Row 7) - 0x09E6F - Stars & Dots
+158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers
+158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shaper
+
+Mountain Floor 1 Trash Pillar (Mountain Floor 1):
+
+Mountain Floor 1 Back Section (Mountain Floor 1):
 158421 - 0x33AF5 (Back Row 1) - True - Black/White Squares & Symmetry
 158422 - 0x33AF7 (Back Row 2) - 0x33AF5 - Black/White Squares & Stars
 158423 - 0x09F6E (Back Row 3) - 0x33AF7 - Symmetry & Dots
-158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers
-158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shapers
 
 Mountain Floor 1 At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B

diff --git a/worlds/witness/data/WitnessLogicExpert.txt b/worlds/witness/data/WitnessLogicExpert.txt
@@ -1013,7 +1013,7 @@ Mountaintop (Mountaintop) - Mountain Floor 1 - 0x17C34:
 Mountain Floor 1 (Mountain Floor 1) - Mountain Floor 1 Bridge - 0x09E39:
 158408 - 0x09E39 (Light Bridge Controller) - True - Eraser & Triangles
 
-Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay:
+Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay - Mountain Floor 1 Trash Pillar - TrueOneWay - Mountain Floor 1 Back Section - 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
@@ -1026,11 +1026,15 @@ Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneW
 158418 - 0x09E6C (Left Row 5) - 0x09E79 - Stars & Shapers & Negative Shapers & Stars + Same Colored Symbol
 158419 - 0x09E6F (Left Row 6) - 0x09E6C - Symmetry & Stars & Colored Squares & Black/White Squares & Stars + Same Colored Symbol & Symmetry & Eraser
 158420 - 0x09E6B (Left Row 7) - 0x09E6F - Symmetry & Dots & Full Dots & Triangles
+158424 - 0x09EAD (Trash Pillar 1) - True - Rotated Shapers & Stars
+158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Rotated Shapers & Triangles
+
+Mountain Floor 1 Trash Pillar (Mountain Floor 1):
+
+Mountain Floor 1 Back Section (Mountain Floor 1):
 158421 - 0x33AF5 (Back Row 1) - True - Symmetry & Black/White Squares & Triangles
 158422 - 0x33AF7 (Back Row 2) - 0x33AF5 - Symmetry & Stars & Triangles & Stars + Same Colored Symbol
 158423 - 0x09F6E (Back Row 3) - 0x33AF7 - Symmetry & Stars & Shapers & Stars + Same Colored Symbol
-158424 - 0x09EAD (Trash Pillar 1) - True - Rotated Shapers & Stars
-158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Rotated Shapers & Triangles
 
 Mountain Floor 1 At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B

diff --git a/worlds/witness/data/WitnessLogicVanilla.txt b/worlds/witness/data/WitnessLogicVanilla.txt
@@ -1013,7 +1013,7 @@ Mountaintop (Mountaintop) - Mountain Floor 1 - 0x17C34:
 Mountain Floor 1 (Mountain Floor 1) - Mountain Floor 1 Bridge - 0x09E39:
 158408 - 0x09E39 (Light Bridge Controller) - True - Black/White Squares & Rotated Shapers
 
-Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay:
+Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay - Mountain Floor 1 Trash Pillar - TrueOneWay - Mountain Floor 1 Back Section - 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
@@ -1026,11 +1026,15 @@ Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneW
 158418 - 0x09E6C (Left Row 5) - 0x09E79 - Stars & Black/White Squares
 158419 - 0x09E6F (Left Row 6) - 0x09E6C - Shapers & Dots
 158420 - 0x09E6B (Left Row 7) - 0x09E6F - Dots
+158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers
+158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shapers
+
+Mountain Floor 1 Trash Pillar (Mountain Floor 1):
+
+Mountain Floor 1 Back Section (Mountain Floor 1):
 158421 - 0x33AF5 (Back Row 1) - True - Black/White Squares & Symmetry
 158422 - 0x33AF7 (Back Row 2) - 0x33AF5 - Black/White Squares
 158423 - 0x09F6E (Back Row 3) - 0x33AF7 - Symmetry & Dots
-158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers
-158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shapers
 
 Mountain Floor 1 At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B

diff --git a/worlds/witness/data/WitnessLogicVariety.txt b/worlds/witness/data/WitnessLogicVariety.txt
@@ -1013,7 +1013,7 @@ Mountaintop (Mountaintop) - Mountain Floor 1 - 0x17C34:
 Mountain Floor 1 (Mountain Floor 1) - Mountain Floor 1 Bridge - 0x09E39:
 158408 - 0x09E39 (Light Bridge Controller) - True - Black/White Squares & Colored Squares & Eraser
 
-Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay:
+Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneWay - Mountain Floor 1 Trash Pillar - TrueOneWay - Mountain Floor 1 Back Section - TrueOneWay:
 158409 - 0x09E7A (Right Row 1) - True - Black/White Squares & Dots
 158410 - 0x09E71 (Right Row 2) - 0x09E7A - Black/White Squares & Dots & Stars & Stars + Same Colored Symbol
 158411 - 0x09E72 (Right Row 3) - 0x09E71 - Black/White Squares & Shapers & Stars & Stars + Same Colored Symbol
@@ -1026,11 +1026,15 @@ Mountain Floor 1 Bridge (Mountain Floor 1) - Mountain Floor 1 At Door - TrueOneW
 158418 - 0x09E6C (Left Row 5) - 0x09E79 - Arrows & Black/White Squares & Stars & Stars + Same Colored Symbol
 158419 - 0x09E6F (Left Row 6) - 0x09E6C - Arrows & Dots & Full Dots
 158420 - 0x09E6B (Left Row 7) - 0x09E6F - Arrows & Dots & Full Dots
+158424 - 0x09EAD (Trash Pillar 1) - True - Triangles & Arrows
+158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Triangles & Arrows
+
+Mountain Floor 1 Trash Pillar (Mountain Floor 1):
+
+Mountain Floor 1 Back Section (Mountain Floor 1):
 158421 - 0x33AF5 (Back Row 1) - True - Symmetry & Triangles
 158422 - 0x33AF7 (Back Row 2) - 0x33AF5 - Triangles
 158423 - 0x09F6E (Back Row 3) - 0x33AF7 - Symmetry & Triangles
-158424 - 0x09EAD (Trash Pillar 1) - True - Triangles & Arrows
-158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Triangles & Arrows
 
 Mountain Floor 1 At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B

diff --git a/worlds/witness/data/settings/easter_eggs.py b/worlds/witness/data/settings/easter_eggs.py
@@ -2,22 +2,26 @@
 
 EASTER_EGGS = {
     "Tutorial": 1,
-    "Outside Tutorial": 2,
+    "Outside Tutorial": 4,
     "Outside Tutorial Path To Outpost": 1,
+    "Outside Tutorial Outpost": 1,
     "Orchard Beyond First Gate": 1,
     "Orchard End": 1,
     "Inside Glass Factory": 2,
-    "Symmetry Island Lower": 1,
+    "Symmetry Island Lower": 2,
     "Symmetry Island Upper": 1,
     "Desert Outside": 6,
     "Desert Vault": 1,
     "Desert Pond Room": 2,
     "Desert Flood Room": 1,
     "Desert Elevator Room": 1,
     "Outside Quarry": 2,
-    "Quarry": 6,
+    "Quarry": 5,
     "Quarry Stoneworks Upper Floor": 2,
+    "Quarry Boathouse": 2,
     "Shadows": 2,
+    "Shadows Ledge": 1,
+    "Shadows Laser Room": 1,
     "Keep": 1,
     "Keep 3rd Maze": 3,
     "Keep 2nd Pressure Plate": 2,
@@ -30,35 +34,42 @@
     "Monastery Garden": 1,
     "Town": 5,
     "Town Wooden Rooftop": 1,
-    "Town RGB House": 1,
+    "Town RGB House": 2,
     "Town Tower Top": 1,
     "Windmill Interior": 2,
     "Theater": 1,
     "Jungle Peninsula": 5,
-    "Jungle": 1,
+    "Jungle": 2,
     "Jungle Under Popup Wall": 1,
     "Jungle Vault": 1,
-    "Outside Bunker": 2,
+    "Outside Bunker": 3,
+    "Bunker Glass Room": 1,
     "Bunker Under Elevator": 1,
     "Bunker Green Room": 1,
     "Outside Swamp": 2,
+    "Swamp Entry Area": 1,
     "Swamp Platform": 1,
     "Swamp Cyan Underwater": 1,
     "Swamp Near Boat": 1,
     "Swamp Laser Area": 1,
     "Treehouse Beach": 1,
+    "Treehouse Yellow Bridge": 1,
     "Treehouse Junction": 2,
     "Treehouse Second Purple Bridge": 1,
     "Treehouse Green Bridge Left House": 1,
     "Treehouse Laser Room Back Platform": 1,
     "Treehouse Burned House": 1,
-    "Mountainside": 3,
+    "Treehouse Drawbridge Platform": 1,
+    "Mountainside": 4,
     "Mountaintop": 1,
-    "Mountain Floor 1 Bridge": 1,
+    "Mountain Floor 1 Trash Pillar": 1,
+    "Mountain Floor 1 Back Section": 1,
     "Mountain Floor 2": 1,
     "Mountain Bottom Floor Pillars Room": 1,
     "Caves Entry Door": 1,
-    "Caves": 1,
+    "Caves": 2,
+    "Caves Path to Challenge": 1,
     "Challenge": 2,
     "Tunnels": 2,
+    "The Ocean": 2,
 }