diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2025-09-02 14:09:35 -0400 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2025-09-02 14:09:35 -0400 |
| commit | 7f82beb120e222ace6c258fc3982b5988f9ae070 (patch) | |
| tree | 6a9fdf65badf1ed5e7d26b9a07bf0b0e840ca10e /tools/datapacker | |
| parent | 7f5f14ddb5a67e1ccfdc7aa3d68d829473d0b745 (diff) | |
| download | lingo2-archipelago-7f82beb120e222ace6c258fc3982b5988f9ae070.tar.gz lingo2-archipelago-7f82beb120e222ace6c258fc3982b5988f9ae070.tar.bz2 lingo2-archipelago-7f82beb120e222ace6c258fc3982b5988f9ae070.zip | |
Added keyholder sanity
Diffstat (limited to 'tools/datapacker')
| -rw-r--r-- | tools/datapacker/main.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
| diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 5ed82cc..d7e0b69 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp | |||
| @@ -293,6 +293,10 @@ class DataPacker { | |||
| 293 | 293 | ||
| 294 | keyholder.set_path(h_keyholder.path()); | 294 | keyholder.set_path(h_keyholder.path()); |
| 295 | 295 | ||
| 296 | if (h_keyholder.has_key()) { | ||
| 297 | keyholder.set_key(h_keyholder.key()); | ||
| 298 | } | ||
| 299 | |||
| 296 | return keyholder_id; | 300 | return keyholder_id; |
| 297 | } | 301 | } |
| 298 | 302 | ||
| @@ -592,6 +596,14 @@ class DataPacker { | |||
| 592 | .mutable_masteries(mastery_id) | 596 | .mutable_masteries(mastery_id) |
| 593 | ->set_ap_id(ap_id); | 597 | ->set_ap_id(ap_id); |
| 594 | } | 598 | } |
| 599 | |||
| 600 | for (const auto& [keyholder_name, ap_id] : room.keyholders()) { | ||
| 601 | uint64_t keyholder_id = container_.FindOrAddKeyholder( | ||
| 602 | map_name, room_name, keyholder_name, std::nullopt, std::nullopt); | ||
| 603 | container_.all_objects() | ||
| 604 | .mutable_keyholders(keyholder_id) | ||
| 605 | ->set_ap_id(ap_id); | ||
| 606 | } | ||
| 595 | } | 607 | } |
| 596 | } | 608 | } |
| 597 | 609 | ||