1 files changed, 13 insertions, 3 deletions

@@ -1,5 +1,5 @@
 from .generated import data_pb2 as data_pb2
-from .items import SYMBOL_ITEMS
+from .items import SYMBOL_ITEMS, ANTI_COLLECTABLE_TRAPS
 import pkgutil
 
 class Lingo2StaticLogic:
@@ -12,11 +12,14 @@ class Lingo2StaticLogic:
     item_name_groups: dict[str, list[str]]
     location_name_groups: dict[str, list[str]]
 
+    letter_weights: dict[str, int]
+
     def __init__(self):
         self.item_id_to_name = {}
         self.location_id_to_name = {}
         self.item_name_groups = {}
         self.location_name_groups = {}
+        self.letter_weights = {}
 
         file = pkgutil.get_data(__name__, "generated/data.binpb")
         self.objects = data_pb2.AllObjects()
@@ -68,9 +71,16 @@ class Lingo2StaticLogic:
         for symbol_name in SYMBOL_ITEMS.values():
             self.item_id_to_name[self.objects.special_ids[symbol_name]] = symbol_name
 
+        for trap_name in ANTI_COLLECTABLE_TRAPS:
+            self.item_id_to_name[self.objects.special_ids[trap_name]] = trap_name
+
         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
+
     def get_door_item_name(self, door: data_pb2.Door) -> str:
         return f"{self.get_map_object_map_name(door)} - {door.name}"
 
@@ -94,7 +104,7 @@ class Lingo2StaticLogic:
         if door.type != data_pb2.DoorType.STANDARD:
             return None
 
-        if len(door.keyholders) > 0 or len(door.endings) > 0:
+        if len(door.keyholders) > 0 or len(door.endings) > 0 or door.HasField("complete_at"):
             return None
 
         if len(door.panels) > 4:
@@ -130,7 +140,7 @@ class Lingo2StaticLogic:
                        for panel_id in door.panels]
         panel_names.sort()
 
-        return f"{map_part} - {", ".join(panel_names)}"
+        return map_part + " - " + ", ".join(panel_names)
 
     def get_door_location_name_by_id(self, door_id: int) -> str:
         door = self.objects.doors[door_id]