From 7f82beb120e222ace6c258fc3982b5988f9ae070 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Tue, 2 Sep 2025 14:09:35 -0400 Subject: Added keyholder sanity --- apworld/static_logic.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'apworld/static_logic.py') diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 0613474..a945bc0 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py @@ -44,6 +44,11 @@ class Lingo2StaticLogic: for progressive in self.objects.progressives: self.item_id_to_name[progressive.ap_id] = progressive.name + for keyholder in self.objects.keyholders: + if keyholder.HasField("key"): + location_name = f"{self.get_room_object_location_prefix(keyholder)} - {keyholder.key.upper()} Keyholder" + self.location_id_to_name[keyholder.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()} @@ -57,13 +62,7 @@ class Lingo2StaticLogic: return self.get_door_item_name(door_id) def get_door_location_name(self, door: data_pb2.Door) -> str: - game_map = self.objects.maps[door.map_id] - room = self.objects.rooms[door.room_id] - - if room.HasField("panel_display_name"): - map_part = f"{game_map.display_name} ({room.panel_display_name})" - else: - map_part = game_map.display_name + map_part = self.get_room_object_location_prefix(door) if door.HasField("location_name"): return f"{map_part} - {door.location_name}" @@ -129,3 +128,12 @@ class Lingo2StaticLogic: def get_room_object_map_name(self, obj) -> str: return self.get_map_object_map_name(self.objects.rooms[obj.room_id]) + + def get_room_object_location_prefix(self, obj) -> str: + room = self.objects.rooms[obj.room_id] + game_map = self.objects.maps[room.map_id] + + if room.HasField("panel_display_name"): + return f"{game_map.display_name} ({room.panel_display_name})" + else: + return game_map.display_name -- cgit 1.4.1