1 files changed, 3 insertions, 7 deletions

@@ -1,3 +1,4 @@
+from .generated import common_pb2 as common_pb2
 from typing import TYPE_CHECKING, NamedTuple
 
 if TYPE_CHECKING:
@@ -5,7 +6,6 @@ if TYPE_CHECKING:
 
 
 class PlayerLocation(NamedTuple):
-    name: str
     code: int | None
 
 
@@ -15,10 +15,6 @@ class Lingo2PlayerLogic:
     def __init__(self, world: "Lingo2World"):
         self.locations_by_room = {}
 
-        code = 1
         for door in world.static_logic.objects.doors:
-            if not door.HasField("room_id"):
-                continue
-
-            self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.name, code))
-            code += 1
+            if door.type == common_pb2.DoorType.STANDARD:
+                self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id))