Assigned IDs for the_colorful

Also fixed bug where the ID assigner didn't read letter and mastery IDs
and would thus reuse them. I reassigned all IDs because of this (since
we don't need to worry about ID stability yet).

2 files changed, 21 insertions, 0 deletions

@@ -61,6 +61,12 @@ class AssignIds {
             next_id_ = id;
           }
         }
+
+        for (const auto& [_, id] : room.masteries()) {
+          if (id > next_id_) {
+            next_id_ = id;
+          }
+        }
       }
     }
 
@@ -70,6 +76,12 @@ class AssignIds {
       }
     }
 
+    for (const auto& [_, id] : id_mappings_.letters()) {
+      if (id > next_id_) {
+        next_id_ = id;
+      }
+    }
+
     next_id_++;
   }
 
@@ -139,6 +139,15 @@ class DataPacker {
           map_name, h_panel.required_door().name(), current_map_name));
     }
 
+    if (h_panel.has_required_room()) {
+      std::optional<std::string> map_name =
+          h_panel.required_room().has_map()
+              ? std::optional<std::string>(h_panel.required_room().map())
+              : std::nullopt;
+      panel.set_required_room(container_.FindOrAddRoom(
+          map_name, h_panel.required_room().name(), current_map_name));
+    }
+
     return panel_id;
   }