1 files changed, 31 insertions, 4 deletions

@@ -2,6 +2,7 @@ from .generated import data_pb2 as data_pb2
 from .items import SYMBOL_ITEMS, ANTI_COLLECTABLE_TRAPS
 import pkgutil
 
+
 class Lingo2StaticLogic:
     item_id_to_name: dict[int, str]
     location_id_to_name: dict[int, str]
@@ -14,6 +15,11 @@ class Lingo2StaticLogic:
 
     letter_weights: dict[str, int]
 
+    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 = {}
@@ -67,19 +73,32 @@ class Lingo2StaticLogic:
                 self.location_name_groups.setdefault("Keyholders", []).append(location_name)
 
         self.item_id_to_name[self.objects.special_ids["A Job Well Done"]] = "A Job Well Done"
+        self.item_id_to_name[self.objects.special_ids["Numbers"]] = "Numbers"
 
+        self.item_name_groups["Symbols"] = []
         for symbol_name in SYMBOL_ITEMS.values():
             self.item_id_to_name[self.objects.special_ids[symbol_name]] = symbol_name
+            self.item_name_groups["Symbols"].append(symbol_name)
 
         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()}
 
         for panel in self.objects.panels:
             for letter in panel.answer.upper():
-                self.letter_weights[letter] = self.letter_weights.get(letter, 0) + 1
+                if letter.isalpha():
+                    self.letter_weights[letter] = self.letter_weights.get(letter, 0) + 1
+
+        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}"
@@ -104,7 +123,7 @@ class Lingo2StaticLogic:
         if door.type != data_pb2.DoorType.STANDARD:
             return None
 
-        if len(door.keyholders) > 0 or len(door.endings) > 0 or door.HasField("complete_at"):
+        if len(door.keyholders) > 0 or door.white_ending or door.HasField("complete_at"):
             return None
 
         if len(door.panels) > 4:
@@ -165,5 +184,13 @@ class Lingo2StaticLogic:
         else:
             return game_map.display_name
 
-    def get_data_version(self) -> int:
-        return self.objects.version
+    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]