about summary refs log tree commit diff stats
path: root/tools/datapacker/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/datapacker/main.cpp')
-rw-r--r--tools/datapacker/main.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 4b74217..4ecde74 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp
@@ -105,6 +105,11 @@ class DataPacker {
105 map.set_rte_room(container_.FindOrAddRoom(map_name, metadata.rte_room(), 105 map.set_rte_room(container_.FindOrAddRoom(map_name, metadata.rte_room(),
106 std::nullopt)); 106 std::nullopt));
107 } 107 }
108
109 if (metadata.has_rte_trigger_pos()) {
110 *map.mutable_rte_trigger_pos() = metadata.rte_trigger_pos();
111 *map.mutable_rte_trigger_scale() = metadata.rte_trigger_scale();
112 }
108 } 113 }
109 114
110 void ProcessRooms(std::filesystem::path path, 115 void ProcessRooms(std::filesystem::path path,
@@ -528,6 +533,11 @@ class DataPacker {
528 r_connection.set_cyan_ending(human_connection.cyan_ending()); 533 r_connection.set_cyan_ending(human_connection.cyan_ending());
529 } 534 }
530 535
536 if (human_connection.has_mint_ending()) {
537 f_connection.set_mint_ending(human_connection.mint_ending());
538 r_connection.set_mint_ending(human_connection.mint_ending());
539 }
540
531 if (human_connection.has_vanilla_only()) { 541 if (human_connection.has_vanilla_only()) {
532 f_connection.set_vanilla_only(human_connection.vanilla_only()); 542 f_connection.set_vanilla_only(human_connection.vanilla_only());
533 r_connection.set_vanilla_only(human_connection.vanilla_only()); 543 r_connection.set_vanilla_only(human_connection.vanilla_only());
@@ -716,6 +726,11 @@ class DataPacker {
716 container_.all_objects().mutable_ports(port_id)->set_ap_id(ap_id); 726 container_.all_objects().mutable_ports(port_id)->set_ap_id(ap_id);
717 } 727 }
718 } 728 }
729
730 if (map.has_rte()) {
731 uint64_t map_id = container_.FindOrAddMap(map_name);
732 container_.all_objects().mutable_maps(map_id)->set_rte_ap_id(map.rte());
733 }
719 } 734 }
720 735
721 auto& specials = *container_.all_objects().mutable_special_ids(); 736 auto& specials = *container_.all_objects().mutable_special_ids();