Merge branch 'main' of fourisland.com:/srv/git/lingo2-archipelago

1 files changed, 12 insertions, 0 deletions

@@ -18,6 +18,8 @@ class Lingo2StaticLogic:
     door_id_by_ap_id: dict[int, int]
     port_id_by_ap_id: dict[int, int]
 
+    map_id_by_name: dict[str, int]
+
     def __init__(self):
         self.item_id_to_name = {}
         self.location_id_to_name = {}
@@ -79,6 +81,10 @@ class Lingo2StaticLogic:
         for trap_name in ANTI_COLLECTABLE_TRAPS:
             self.item_id_to_name[self.objects.special_ids[trap_name]] = trap_name
 
+        for game_map in self.objects.maps:
+            if game_map.HasField("rte_room"):
+                self.item_id_to_name[game_map.rte_ap_id] = self.get_map_rte_item_name(game_map.id)
+
         self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()}
         self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()}
 
@@ -90,6 +96,8 @@ class Lingo2StaticLogic:
         self.door_id_by_ap_id = {door.ap_id: door.id for door in self.objects.doors if door.HasField("ap_id")}
         self.port_id_by_ap_id = {port.ap_id: port.id for port in self.objects.ports if port.HasField("ap_id")}
 
+        self.map_id_by_name = {game_map.name: game_map.id for game_map in self.objects.maps}
+
     def get_door_item_name(self, door: data_pb2.Door) -> str:
         return f"{self.get_map_object_map_name(door)} - {door.name}"
 
@@ -177,6 +185,10 @@ class Lingo2StaticLogic:
     def get_room_object_map_id(self, obj) -> int:
         return self.objects.rooms[obj.room_id].map_id
 
+    def get_map_rte_item_name(self, map_id: int) -> str:
+        game_map = self.objects.maps[map_id]
+        return f"Return to {game_map.display_name}"
+
     def get_data_version(self) -> list[int]:
         version = self.objects.version
         return [version.major, version.minor, version.patch]