48 files changed, 81 insertions, 6 deletions

@@ -101,6 +101,10 @@ class Lingo2PlayerLogic:
             self.locations_by_room.setdefault(mastery.room_id, []).append(PlayerLocation(mastery.ap_id,
                                                                                          AccessRequirements()))
 
+        for ending in world.static_logic.objects.endings:
+            self.locations_by_room.setdefault(ending.room_id, []).append(PlayerLocation(ending.ap_id,
+                                                                                        AccessRequirements()))
+
     def get_panel_reqs(self, panel_id: int, answer: str | None) -> AccessRequirements:
         if answer is None:
             if panel_id not in self.panel_reqs:
@@ -30,7 +30,7 @@ def create_regions(world: "Lingo2World"):
         region = create_region(room, world)
         regions[region.name] = region
 
-    regions["Menu"].connect(regions["the_entry - Starting Room"], "Start Game")
+    regions["Menu"].connect(regions["The Entry - Starting Room"], "Start Game")
 
     # TODO: The requirements of the opposite trigger also matter.
     for connection in world.static_logic.objects.connections:
@@ -18,7 +18,7 @@ class Lingo2StaticLogic:
 
         for door in self.objects.doors:
             if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
-                location_name = f"{self.objects.maps[door.map_id].name} - {door.name}"
+                location_name = f"{self.get_map_object_map_name(door)} - {door.name}"
                 self.location_id_to_name[door.ap_id] = location_name
 
             if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
@@ -27,16 +27,20 @@ class Lingo2StaticLogic:
 
         for letter in self.objects.letters:
             letter_name = f"{letter.key.upper()}{'2' if letter.level2 else '1'}"
-            location_name = f"{self.objects.maps[self.objects.rooms[letter.room_id].map_id].name} - {letter_name}"
+            location_name = f"{self.get_room_object_map_name(letter)} - {letter_name}"
             self.location_id_to_name[letter.ap_id] = location_name
 
             if not letter.level2:
                 self.item_id_to_name[letter.ap_id] = letter_name
 
         for mastery in self.objects.masteries:
-            location_name = f"{self.objects.maps[self.objects.rooms[mastery.room_id].map_id].name} - Mastery"
+            location_name = f"{self.get_room_object_map_name(mastery)} - Mastery"
             self.location_id_to_name[mastery.ap_id] = location_name
 
+        for ending in self.objects.endings:
+            location_name = f"{self.get_room_object_map_name(ending)} - {ending.name.title()} Ending"
+            self.location_id_to_name[ending.ap_id] = location_name
+
         self.item_id_to_name[self.objects.special_ids["Nothing"]] = "Nothing"
 
         self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()}
@@ -44,8 +48,14 @@ class Lingo2StaticLogic:
 
     def get_door_item_name(self, door_id: int) -> str:
         door = self.objects.doors[door_id]
-        return f"{self.objects.maps[door.map_id].name} - {door.name}"
+        return f"{self.get_map_object_map_name(door)} - {door.name}"
 
     def get_room_region_name(self, room_id: int) -> str:
         room = self.objects.rooms[room_id]
-        return f"{self.objects.maps[room.map_id].name} - {room.name}"
+        return f"{self.get_map_object_map_name(room)} - {room.name}"
+
+    def get_map_object_map_name(self, obj) -> str:
+        return self.objects.maps[obj.map_id].display_name
+
+    def get_room_object_map_name(self, obj) -> str:
+        return self.get_map_object_map_name(self.objects.rooms[obj.room_id])
@@ -0,0 +1 @@
+display_name: "Four Rooms"
@@ -0,0 +1 @@
+display_name: "The Ancient"
@@ -0,0 +1 @@
+display_name: "The Bearer"
@@ -0,0 +1 @@
+display_name: "The Between"
@@ -0,0 +1 @@
+display_name: "The Butterfly"
@@ -1,2 +1,3 @@
+display_name: "The Colorful"
 # This has something to do with the FISH/FISHES proxy.
 excluded_nodes: "Components/panel_fake"
@@ -0,0 +1 @@
+display_name: "The Congruent"
@@ -0,0 +1 @@
+display_name: "The Darkroom"
@@ -0,0 +1 @@
+display_name: "The Digital"
@@ -0,0 +1 @@
+display_name: "The Door"
@@ -0,0 +1 @@
+display_name: "The Double Sided"
@@ -1,3 +1,4 @@
+display_name: "The Entry"
 # This is a debug warp to The Ancient and as far as I can tell there is no way
 # to access it.
 excluded_nodes: "Components/Warps/worldport-test"
@@ -1,2 +1,3 @@
+display_name: "The Extravagant"
 # This appears to be completely inaccessible.
 excluded_nodes: "Components/Warps/worldport"
@@ -1,3 +1,4 @@
+display_name: "The Gallery"
 # These are the eyes in the foyer, and aren't normal paintings.
 excluded_nodes: "Components/Paintings/Starting/eye"
 excluded_nodes: "Components/Paintings/Starting/eye2"
@@ -0,0 +1 @@
+display_name: "The Gold"
@@ -1,3 +1,4 @@
+display_name: "The Graveyard"
 # These really shouldn't be shuffled because it would make Black Ending trivial.
 excluded_nodes: "Components/Paintings/grave"
 excluded_nodes: "Components/Paintings/grave2"
@@ -1,3 +1,4 @@
+display_name: "The Great"
 # This can't be shuffled because it is tilted.
 excluded_nodes: "Components/Paintings/u"
 # This can't be shuffled because it is on the ground.
@@ -1,3 +1,4 @@
+display_name: "The Hinterlands"
 # I'm not currently planning on shuffling anything in here.
 excluded_nodes: "Components/Paintings/C"
 excluded_nodes: "Components/Paintings/E"
@@ -0,0 +1 @@
+display_name: "The Hive"
@@ -1,3 +1,4 @@
+display_name: "The Impressive"
 # These are apparently little eyes on the Green Eye panel pedestals? I don't
 # think they're ever visible in gameplay.
 excluded_nodes: "Meshes/eye"
@@ -0,0 +1 @@
+display_name: "The Invisible"
@@ -0,0 +1 @@
+display_name: "The Jubilant"
@@ -0,0 +1 @@
+display_name: "The Keen"
@@ -0,0 +1 @@
+display_name: "The Liberated"
@@ -0,0 +1 @@
+display_name: "The Linear"
@@ -0,0 +1 @@
+display_name: "The Lionized"
@@ -0,0 +1 @@
+display_name: "The Literate"
@@ -0,0 +1 @@
+display_name: "The Lively"
@@ -0,0 +1 @@
+display_name: "The Nuanced"
@@ -1,3 +1,4 @@
+display_name: "The Orb"
 # These are inaccessible, and were probably just copy pasted from the other
 # rooms.
 excluded_nodes: "Components/Warps/worldport2"
@@ -0,0 +1 @@
+display_name: "The Owl"
@@ -0,0 +1 @@
+display_name: "The Parthenon"
@@ -0,0 +1 @@
+display_name: "The Partial"
@@ -0,0 +1 @@
+display_name: "The Perceptive"
@@ -0,0 +1 @@
+display_name: "The Plaza"
@@ -0,0 +1 @@
+display_name: "The Quiet"
@@ -0,0 +1 @@
+display_name: "The Relentless"
@@ -1,3 +1,4 @@
+display_name: "The Repetitive"
 # The anti-collectable doesn't fit into our system right now so let's ignore it.
 excluded_nodes: "Components/Collectables/anticollectable"
 # These paintings are directly above/behind panels and thus can't be entered.
@@ -1,2 +1,3 @@
+display_name: "The Revitalized"
 # Let's not include the demo (for now).
 excluded_nodes: "Components/panel_demo"
@@ -0,0 +1 @@
+display_name: "The Shop"
@@ -0,0 +1 @@
+display_name: "The Sirenic"
@@ -0,0 +1 @@
+display_name: "The Stormy"
@@ -1,3 +1,4 @@
+display_name: "The Sturdy"
 # Let's ignore the second half of the rainbow for now.
 #excluded_nodes: "Components/Doors/Rainbow2/Hinge/rainbowMirrored"
 # I don't know why there's a second copy of the rainbow.
@@ -187,6 +187,7 @@ message Room {
 message Map {
   optional uint64 id = 1;
   optional string name = 2;
+  optional string display_name = 3;
 }
 
 message AllObjects {
@@ -68,11 +68,28 @@ class DataPacker {
   void ProcessMap(std::filesystem::path path) {
     std::string map_name = path.filename().string();
 
+    ProcessMapMetadataFile(path / "metadata.txtpb", map_name);
     ProcessConnectionsFile(path / "connections.txtpb", map_name);
     ProcessDoorsFile(path / "doors.txtpb", map_name);
     ProcessRooms(path / "rooms", map_name);
   }
 
+  void ProcessMapMetadataFile(std::filesystem::path path,
+                              const std::string& map_name) {
+    if (!std::filesystem::exists(path)) {
+      return;
+    }
+
+    auto metadata = ReadMessageFromFile<HumanMap>(path.string());
+
+    uint64_t map_id = container_.FindOrAddMap(map_name);
+    Map& map = *container_.all_objects().mutable_maps(map_id);
+
+    if (metadata.has_display_name()) {
+      map.set_display_name(metadata.display_name());
+    }
+  }
+
   void ProcessRooms(std::filesystem::path path,
                     const std::string& current_map_name) {
     for (auto const& dir_entry : std::filesystem::directory_iterator(path)) {