From 6789f3551ef228f7e4aff73fef96038fab0fb2e6 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 27 Aug 2025 23:22:04 -0400
Subject: Renamed Painting and Keyholder protos

---
 proto/data.proto               | 8 ++++----
 tools/datapacker/container.cpp | 4 ++--
 tools/datapacker/main.cpp      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/proto/data.proto b/proto/data.proto
index 211a7ac..93f2227 100644
--- a/proto/data.proto
+++ b/proto/data.proto
@@ -126,7 +126,7 @@ message PanelData {
   optional uint64 required_room = 11;
 }
 
-message Painting {
+message PaintingData {
   optional uint64 id = 1;
   optional uint64 room_id = 2;
   optional string name = 9;
@@ -155,7 +155,7 @@ message Port {
   optional uint64 required_door = 6;
 }
 
-message Keyholder {
+message KeyholderData {
   optional uint64 id = 1;
   optional uint64 room_id = 2;
 
@@ -220,9 +220,9 @@ message AllObjects {
   repeated Room rooms = 1;
   repeated Door doors = 2;
   repeated PanelData panels = 3;
-  repeated Painting paintings = 4;
+  repeated PaintingData paintings = 4;
   repeated Port ports = 5;
-  repeated Keyholder keyholders = 11;
+  repeated KeyholderData keyholders = 11;
   repeated Letter letters = 9;
   repeated Mastery masteries = 10;
   repeated Ending endings = 12;
diff --git a/tools/datapacker/container.cpp b/tools/datapacker/container.cpp
index 0d3417e..2c68552 100644
--- a/tools/datapacker/container.cpp
+++ b/tools/datapacker/container.cpp
@@ -79,7 +79,7 @@ uint64_t Container::FindOrAddPainting(
   auto it = room_container.find(painting_name);
   if (it == room_container.end()) {
     uint64_t new_id = all_objects_.paintings_size();
-    Painting* painting = all_objects_.add_paintings();
+    PaintingData* painting = all_objects_.add_paintings();
     painting->set_id(new_id);
     painting->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
     painting->set_name(painting_name);
@@ -289,7 +289,7 @@ uint64_t Container::FindOrAddKeyholder(
   auto it = room_container.find(keyholder_name);
   if (it == room_container.end()) {
     uint64_t new_id = all_objects_.keyholders_size();
-    Keyholder* keyholder = all_objects_.add_keyholders();
+    KeyholderData* keyholder = all_objects_.add_keyholders();
     keyholder->set_id(new_id);
     keyholder->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
     keyholder->set_name(keyholder_name);
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp
index d9fcbe2..d820360 100644
--- a/tools/datapacker/main.cpp
+++ b/tools/datapacker/main.cpp
@@ -184,7 +184,7 @@ class DataPacker {
     uint64_t painting_id = container_.FindOrAddPainting(
         current_map_name, current_room_name, h_painting.name(), std::nullopt,
         std::nullopt);
-    Painting& painting =
+    PaintingData& painting =
         *container_.all_objects().mutable_paintings(painting_id);
 
     painting.set_path(h_painting.path());
@@ -279,7 +279,7 @@ class DataPacker {
     uint64_t keyholder_id = container_.FindOrAddKeyholder(
         current_map_name, current_room_name, h_keyholder.name(), std::nullopt,
         std::nullopt);
-    Keyholder& keyholder =
+    KeyholderData& keyholder =
         *container_.all_objects().mutable_keyholders(keyholder_id);
 
     keyholder.set_path(h_keyholder.path());
-- 
cgit 1.4.1