From 5a89a4baf8984d0d4dab3799f8177f8e293b7317 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 30 Aug 2025 14:56:33 -0400
Subject: [Data] Bad logic in the_owl due to missing warp

---
 data/maps/the_owl/connections.txtpb          | 18 +++++++++---------
 data/maps/the_owl/doors.txtpb                |  8 ++++----
 data/maps/the_owl/rooms/Connected Area.txtpb |  7 +++++++
 data/maps/the_owl/rooms/R2C2 Bottom.txtpb    |  3 ++-
 data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb  | 22 ----------------------
 data/maps/the_owl/rooms/R2C3 Bottom.txtpb    | 15 +++++++++++++++
 6 files changed, 37 insertions(+), 36 deletions(-)
 delete mode 100644 data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb
 create mode 100644 data/maps/the_owl/rooms/R2C3 Bottom.txtpb

(limited to 'data/maps/the_owl')

diff --git a/data/maps/the_owl/connections.txtpb b/data/maps/the_owl/connections.txtpb
index 87c98b3..2bd2380 100644
--- a/data/maps/the_owl/connections.txtpb
+++ b/data/maps/the_owl/connections.txtpb
@@ -10,12 +10,17 @@ connections {
 }
 connections {
   from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "Connected Area"
   door { name: "Gray Owl" }
 }
+connections {
+  from_room: "R2C3 Bottom"
+  to_room: "Connected Area"
+  oneway: true
+}
 connections {
   from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "Connected Area"
   door { name: "First Room Shortcut" }
 }
 connections {
@@ -30,17 +35,12 @@ connections {
 }
 connections {
   from_room: "R2C2 Top"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C3 Bottom"
   door { name: "Gray Bottom Door" }
 }
-connections {
-  from_room: "R2C2 Top"
-  to_room: "R2C2.5 Bottom"
-  door { name: "Gray Owl" }
-}
 connections {
   from_room: "Connected Area"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C3 Bottom"
   door { name: "Gray Owl" }
 }
 connections {
diff --git a/data/maps/the_owl/doors.txtpb b/data/maps/the_owl/doors.txtpb
index 28af5d0..3d2d055 100644
--- a/data/maps/the_owl/doors.txtpb
+++ b/data/maps/the_owl/doors.txtpb
@@ -25,8 +25,8 @@ doors {
   name: "First Room Shortcut"
   type: STANDARD
   receivers: "Components/Doors/entry_6"
-  panels { room: "R2C2.5 Bottom" name: "FIZZLE" }
-  location_room: "R2C2.5 Bottom"
+  panels { room: "Connected Area" name: "FIZZLE" }
+  location_room: "Connected Area"
 }
 doors {
   name: "First Door"
@@ -171,8 +171,8 @@ doors {
   receivers: "Components/Owl/Room 10/WG"
   receivers: "Components/Owl/Room 11/W"
   receivers: "Components/Owl/Room 11/WG"
-  panels { room: "R2C2.5 Bottom" name: "BLACK" }
-  location_room: "R2C2.5 Bottom"
+  panels { room: "R2C3 Bottom" name: "BLACK" }
+  location_room: "R2C3 Bottom"
 }
 doors {
   name: "Black Owl"
diff --git a/data/maps/the_owl/rooms/Connected Area.txtpb b/data/maps/the_owl/rooms/Connected Area.txtpb
index 5862d59..cf5ea1f 100644
--- a/data/maps/the_owl/rooms/Connected Area.txtpb	
+++ b/data/maps/the_owl/rooms/Connected Area.txtpb	
@@ -132,6 +132,13 @@ panels {
   answer: "orange"
   symbols: SPARKLES
 }
+panels {
+  name: "FIZZLE"
+  path: "Panels/Bottom Mid/owl_10"
+  clue: "fizzle"
+  answer: "chisel"
+  symbols: ZERO
+}
 paintings {
   name: "OWL"
   path: "Components/Paintings/owl"
diff --git a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
index 4661877..604a1cc 100644
--- a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb	
+++ b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb	
@@ -10,5 +10,6 @@ ports {
   name: "GALLERY"
   path: "Components/Warps/worldport"
   orientation: "south"
-  # Note that this port is accessible from the other side in the Z1 room. Hmm.
+  # TODO: Note that this port is accessible from the other side in the Z1
+  # room. Hmm.
 }
diff --git a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb
deleted file mode 100644
index 0f5381e..0000000
--- a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb	
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "R2C2.5 Bottom"
-panels {
-  name: "FIZZLE"
-  path: "Panels/Bottom Mid/owl_10"
-  clue: "fizzle"
-  answer: "chisel"
-  symbols: ZERO
-}
-panels {
-  name: "FIGMENT"
-  path: "Panels/Noncritical/owl_14"
-  clue: "figment"
-  answer: "pigment"
-  symbols: SPARKLES
-}
-panels {
-  name: "BLACK"
-  path: "Panels/Colors/owl_5"
-  clue: "black"
-  answer: "white"
-  symbols: SUN
-}
diff --git a/data/maps/the_owl/rooms/R2C3 Bottom.txtpb b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb
new file mode 100644
index 0000000..2b49e26
--- /dev/null
+++ b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb	
@@ -0,0 +1,15 @@
+name: "R2C3 Bottom"
+panels {
+  name: "FIGMENT"
+  path: "Panels/Noncritical/owl_14"
+  clue: "figment"
+  answer: "pigment"
+  symbols: SPARKLES
+}
+panels {
+  name: "BLACK"
+  path: "Panels/Colors/owl_5"
+  clue: "black"
+  answer: "white"
+  symbols: SUN
+}
-- 
cgit 1.4.1