From d2bc5b2811171685e8bdc895122987b53defcf0a Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 30 Aug 2025 12:00:03 -0400
Subject: Changed how door location names are formatted

STANDARD type doors with at most four panels in the same map area and no
other trigger objects will have their location names generated from the
names of the panels used to open the door, similar to Lingo 1. Other
door types will use the door's name. In either case, the name can be
overridden using the new location_name field.

Rooms can also set a panel_display_name field, which will be used in
location names for doors, and is used to group panels into areas.

Panels themselves can set display names, which differentiates their
locations from other panels in the same area.

Many maps were updated for this, but note that the_symbolic and
the_unyielding have validator failures because of duplicate panel names.
This won't matter until panelsanity is implemented.
---
 data/maps/four_rooms/doors.txtpb                | 4 ++++
 data/maps/four_rooms/rooms/A2 Room.txtpb        | 1 -
 data/maps/four_rooms/rooms/Examples Room.txtpb  | 1 -
 data/maps/four_rooms/rooms/Hallway.txtpb        | 1 -
 data/maps/four_rooms/rooms/Intensify Room.txtpb | 1 -
 data/maps/four_rooms/rooms/Keyholder Room.txtpb | 1 -
 data/maps/four_rooms/rooms/Synonyms Room.txtpb  | 1 -
 data/maps/four_rooms/rooms/Time Room.txtpb      | 1 -
 8 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'data/maps/four_rooms')

diff --git a/data/maps/four_rooms/doors.txtpb b/data/maps/four_rooms/doors.txtpb
index f0bf060..e58adb2 100644
--- a/data/maps/four_rooms/doors.txtpb
+++ b/data/maps/four_rooms/doors.txtpb
@@ -11,6 +11,7 @@ doors {
   panels { room: "Intensify Room" name: "INJURY" }
   panels { room: "Intensify Room" name: "SWAY" }
   location_room: "Intensify Room"
+  location_name: "Intensify Room"
 }
 doors {
   name: "Examples Door"
@@ -25,6 +26,7 @@ doors {
   panels { room: "Examples Room" name: "URN" }
   panels { room: "Examples Room" name: "ART" }
   location_room: "Examples Room"
+  location_name: "Examples Room"
 }
 doors {
   name: "Synonyms Door"
@@ -39,6 +41,7 @@ doors {
   panels { room: "Synonyms Room" name: "SERIOUS" }
   panels { room: "Synonyms Room" name: "FURY" }
   location_room: "Synonyms Room"
+  location_name: "Synonyms Room"
 }
 doors {
   name: "Time Door"
@@ -53,6 +56,7 @@ doors {
   panels { room: "Time Room" name: "HOLE" }
   panels { room: "Time Room" name: "RHYTHM" }
   location_room: "Time Room"
+  location_name: "Time Room"
 }
 doors {
   name: "A2 Door"
diff --git a/data/maps/four_rooms/rooms/A2 Room.txtpb b/data/maps/four_rooms/rooms/A2 Room.txtpb
index 236ce01..ea2ae64 100644
--- a/data/maps/four_rooms/rooms/A2 Room.txtpb	
+++ b/data/maps/four_rooms/rooms/A2 Room.txtpb	
@@ -1,5 +1,4 @@
 name: "A2 Room"
-display_name: "Hallway"
 letters {
   key: "a"
   level2: true
diff --git a/data/maps/four_rooms/rooms/Examples Room.txtpb b/data/maps/four_rooms/rooms/Examples Room.txtpb
index 3d82e22..dc82971 100644
--- a/data/maps/four_rooms/rooms/Examples Room.txtpb	
+++ b/data/maps/four_rooms/rooms/Examples Room.txtpb	
@@ -1,5 +1,4 @@
 name: "Examples Room"
-display_name: "Examples Room"
 panels {
   name: "SIZE (1)"
   path: "Panels/Room 2 Examples/entry_1"
diff --git a/data/maps/four_rooms/rooms/Hallway.txtpb b/data/maps/four_rooms/rooms/Hallway.txtpb
index f80cf73..124a5b3 100644
--- a/data/maps/four_rooms/rooms/Hallway.txtpb
+++ b/data/maps/four_rooms/rooms/Hallway.txtpb
@@ -1,5 +1,4 @@
 name: "Hallway"
-display_name: "Hallway"
 panels {
   name: "SUSPICION"
   path: "Panels/Reward Room/reward_1"
diff --git a/data/maps/four_rooms/rooms/Intensify Room.txtpb b/data/maps/four_rooms/rooms/Intensify Room.txtpb
index fb95a1e..2cbb214 100644
--- a/data/maps/four_rooms/rooms/Intensify Room.txtpb	
+++ b/data/maps/four_rooms/rooms/Intensify Room.txtpb	
@@ -1,5 +1,4 @@
 name: "Intensify Room"
-display_name: "Intensify Room"
 panels {
   name: "SMALL"
   path: "Panels/Room 1 Intensify/entry_1"
diff --git a/data/maps/four_rooms/rooms/Keyholder Room.txtpb b/data/maps/four_rooms/rooms/Keyholder Room.txtpb
index 9605fad..e7c7fa6 100644
--- a/data/maps/four_rooms/rooms/Keyholder Room.txtpb	
+++ b/data/maps/four_rooms/rooms/Keyholder Room.txtpb	
@@ -1,5 +1,4 @@
 name: "Keyholder Room"
-display_name: "Hallway"
 keyholders {
   name: "A"
   path: "Components/KeyHolders/keyHolderA"
diff --git a/data/maps/four_rooms/rooms/Synonyms Room.txtpb b/data/maps/four_rooms/rooms/Synonyms Room.txtpb
index 054e4ef..4dd5b5d 100644
--- a/data/maps/four_rooms/rooms/Synonyms Room.txtpb	
+++ b/data/maps/four_rooms/rooms/Synonyms Room.txtpb	
@@ -1,5 +1,4 @@
 name: "Synonyms Room"
-display_name: "Synonyms Room"
 panels {
   name: "MINUTE"
   path: "Panels/Room 3 Synonyms/entry_1"
diff --git a/data/maps/four_rooms/rooms/Time Room.txtpb b/data/maps/four_rooms/rooms/Time Room.txtpb
index 38f529d..d684685 100644
--- a/data/maps/four_rooms/rooms/Time Room.txtpb	
+++ b/data/maps/four_rooms/rooms/Time Room.txtpb	
@@ -1,5 +1,4 @@
 name: "Time Room"
-display_name: "Time Room"
 panels {
   name: "BROODING"
   path: "Panels/Room 4 Time/entry_1"
-- 
cgit 1.4.1