summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-08-09 09:50:55 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2025-08-09 09:50:55 -0400
commit4db9ccf6adc4c90b5899a2bf8bf4c47a7392004b (patch)
treeed40569209b89735c89a120af7311b6d4439b14d
parent5ca1b6dbfd0dc112f7f1c5eebbd16e74f43f9c46 (diff)
downloadlingo2-archipelago-4db9ccf6adc4c90b5899a2bf8bf4c47a7392004b.tar.gz
lingo2-archipelago-4db9ccf6adc4c90b5899a2bf8bf4c47a7392004b.tar.bz2
lingo2-archipelago-4db9ccf6adc4c90b5899a2bf8bf4c47a7392004b.zip
Propagate complete_at to packed datafile
-rw-r--r--proto/data.proto2
-rw-r--r--tools/datapacker/main.cpp8
2 files changed, 8 insertions, 2 deletions
diff --git a/proto/data.proto b/proto/data.proto index 3737934..bd8cdc3 100644 --- a/proto/data.proto +++ b/proto/data.proto
@@ -32,6 +32,8 @@ message Door {
32 repeated uint64 move_paintings = 4; 32 repeated uint64 move_paintings = 4;
33 33
34 repeated ProxyIdentifier panels = 5; 34 repeated ProxyIdentifier panels = 5;
35 uint64 complete_at = 12;
36
35 string control_center_color = 6; 37 string control_center_color = 6;
36 repeated string switches = 7; 38 repeated string switches = 7;
37 39
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 92ff151..28dbc6b 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp
@@ -49,10 +49,10 @@ class DataPacker {
49 container_.all_objects().SerializeToOstream(&outputfile); 49 container_.all_objects().SerializeToOstream(&outputfile);
50 } 50 }
51 51
52 std::string output; 52 /*std::string output;
53 google::protobuf::TextFormat::PrintToString(container_.all_objects(), 53 google::protobuf::TextFormat::PrintToString(container_.all_objects(),
54 &output); 54 &output);
55 std::cout << output << std::endl; 55 std::cout << output << std::endl;*/
56 } 56 }
57 57
58 private: 58 private:
@@ -255,6 +255,10 @@ class DataPacker {
255 door.set_control_center_color(h_door.control_center_color()); 255 door.set_control_center_color(h_door.control_center_color());
256 } 256 }
257 257
258 if (h_door.has_complete_at()) {
259 door.set_complete_at(h_door.complete_at());
260 }
261
258 door.set_type(h_door.type()); 262 door.set_type(h_door.type());
259 } 263 }
260 264