Renamed Painting and Keyholder protos

author: Star Rauchenberger <fefferburbia@gmail.com> 2025-08-27 23:22:04 -0400
committer: Star Rauchenberger <fefferburbia@gmail.com> 2025-08-27 23:22:04 -0400
commit: 6789f3551ef228f7e4aff73fef96038fab0fb2e6 (patch)
tree: 4bc26dce83309f6b0729672ad4f2220f327760e0
parent: d78d166d5f07359f5fc0e7efc5d57802db21fcfb (diff)
download: lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.tar.gz
lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.tar.bz2
lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.zip
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());
author	Star Rauchenberger <fefferburbia@gmail.com>	2025-08-27 23:22:04 -0400
committer	Star Rauchenberger <fefferburbia@gmail.com>	2025-08-27 23:22:04 -0400
commit	6789f3551ef228f7e4aff73fef96038fab0fb2e6 (patch)
tree	4bc26dce83309f6b0729672ad4f2220f327760e0
parent	d78d166d5f07359f5fc0e7efc5d57802db21fcfb (diff)
download	lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.tar.gz lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.tar.bz2 lingo2-archipelago-6789f3551ef228f7e4aff73fef96038fab0fb2e6.zip

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 {
126	optional uint64 required_room = 11;	126	optional uint64 required_room = 11;
127	}	127	}
128		128
129	message Painting {	129	message PaintingData {
130	optional uint64 id = 1;	130	optional uint64 id = 1;
131	optional uint64 room_id = 2;	131	optional uint64 room_id = 2;
132	optional string name = 9;	132	optional string name = 9;
@@ -155,7 +155,7 @@ message Port {
155	optional uint64 required_door = 6;	155	optional uint64 required_door = 6;
156	}	156	}
157		157
158	message Keyholder {	158	message KeyholderData {
159	optional uint64 id = 1;	159	optional uint64 id = 1;
160	optional uint64 room_id = 2;	160	optional uint64 room_id = 2;
161		161
@@ -220,9 +220,9 @@ message AllObjects {
220	repeated Room rooms = 1;	220	repeated Room rooms = 1;
221	repeated Door doors = 2;	221	repeated Door doors = 2;
222	repeated PanelData panels = 3;	222	repeated PanelData panels = 3;
223	repeated Painting paintings = 4;	223	repeated PaintingData paintings = 4;
224	repeated Port ports = 5;	224	repeated Port ports = 5;
225	repeated Keyholder keyholders = 11;	225	repeated KeyholderData keyholders = 11;
226	repeated Letter letters = 9;	226	repeated Letter letters = 9;
227	repeated Mastery masteries = 10;	227	repeated Mastery masteries = 10;
228	repeated Ending endings = 12;	228	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(
79	auto it = room_container.find(painting_name);	79	auto it = room_container.find(painting_name);
80	if (it == room_container.end()) {	80	if (it == room_container.end()) {
81	uint64_t new_id = all_objects_.paintings_size();	81	uint64_t new_id = all_objects_.paintings_size();
82	Painting* painting = all_objects_.add_paintings();	82	PaintingData* painting = all_objects_.add_paintings();
83	painting->set_id(new_id);	83	painting->set_id(new_id);
84	painting->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));	84	painting->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
85	painting->set_name(painting_name);	85	painting->set_name(painting_name);
@@ -289,7 +289,7 @@ uint64_t Container::FindOrAddKeyholder(
289	auto it = room_container.find(keyholder_name);	289	auto it = room_container.find(keyholder_name);
290	if (it == room_container.end()) {	290	if (it == room_container.end()) {
291	uint64_t new_id = all_objects_.keyholders_size();	291	uint64_t new_id = all_objects_.keyholders_size();
292	Keyholder* keyholder = all_objects_.add_keyholders();	292	KeyholderData* keyholder = all_objects_.add_keyholders();
293	keyholder->set_id(new_id);	293	keyholder->set_id(new_id);
294	keyholder->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));	294	keyholder->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
295	keyholder->set_name(keyholder_name);	295	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 {
184	uint64_t painting_id = container_.FindOrAddPainting(	184	uint64_t painting_id = container_.FindOrAddPainting(
185	current_map_name, current_room_name, h_painting.name(), std::nullopt,	185	current_map_name, current_room_name, h_painting.name(), std::nullopt,
186	std::nullopt);	186	std::nullopt);
187	Painting& painting =	187	PaintingData& painting =
188	*container_.all_objects().mutable_paintings(painting_id);	188	*container_.all_objects().mutable_paintings(painting_id);
189		189
190	painting.set_path(h_painting.path());	190	painting.set_path(h_painting.path());
@@ -279,7 +279,7 @@ class DataPacker {
279	uint64_t keyholder_id = container_.FindOrAddKeyholder(	279	uint64_t keyholder_id = container_.FindOrAddKeyholder(
280	current_map_name, current_room_name, h_keyholder.name(), std::nullopt,	280	current_map_name, current_room_name, h_keyholder.name(), std::nullopt,
281	std::nullopt);	281	std::nullopt);
282	Keyholder& keyholder =	282	KeyholderData& keyholder =
283	*container_.all_objects().mutable_keyholders(keyholder_id);	283	*container_.all_objects().mutable_keyholders(keyholder_id);
284		284
285	keyholder.set_path(h_keyholder.path());	285	keyholder.set_path(h_keyholder.path());