From 21013ec0d1e3953276f11bd8cce12f33d46a33ec Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 1 Nov 2025 12:18:25 -0400
Subject: (Almost) all panels are locations or connections now

---
 tools/assign_ids/main.cpp     | 3 ++-
 tools/datapacker/main.cpp     | 4 ++++
 tools/validator/validator.cpp | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/assign_ids/main.cpp b/tools/assign_ids/main.cpp
index 8010a9a..4cf7c3f 100644
--- a/tools/assign_ids/main.cpp
+++ b/tools/assign_ids/main.cpp
@@ -112,7 +112,8 @@ class AssignIds {
 
   void ProcessDoor(const HumanDoor& h_door,
                    const std::string& current_map_name) {
-    if (h_door.type() == DoorType::EVENT && !h_door.latch()) {
+    if (h_door.type() == DoorType::EVENT && !h_door.latch() &&
+        !h_door.legacy_location()) {
       return;
     }
 
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp
index cf811c9..8109bf5 100644
--- a/tools/datapacker/main.cpp
+++ b/tools/datapacker/main.cpp
@@ -436,6 +436,10 @@ class DataPacker {
     if (h_door.has_latch()) {
       door.set_latch(h_door.latch());
     }
+
+    if (h_door.has_legacy_location()) {
+      door.set_legacy_location(h_door.legacy_location());
+    }
   }
 
   void ProcessConnectionsFile(std::filesystem::path path,
diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp
index a99447a..fe36be7 100644
--- a/tools/validator/validator.cpp
+++ b/tools/validator/validator.cpp
@@ -227,8 +227,7 @@ class Validator {
 
       if (h_door.type() == DoorType::STANDARD ||
           h_door.type() == DoorType::LOCATION_ONLY ||
-          h_door.type() == DoorType::GRAVESTONE ||
-          h_door.type() == DoorType::LEGACY_LOCATION) {
+          h_door.type() == DoorType::GRAVESTONE || h_door.legacy_location()) {
         if (h_door.double_letters()) {
           std::cout << "Door " << door_identifier.ShortDebugString()
                     << " is a location that depends on double_letters."
@@ -241,7 +240,8 @@ class Validator {
         }
       }
 
-      bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch());
+      bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch() ||
+                       h_door.legacy_location());
       if (door_info.has_id != needs_id) {
         if (needs_id) {
           std::cout << "Door " << door_identifier.ShortDebugString()
-- 
cgit 1.4.1