From 21013ec0d1e3953276f11bd8cce12f33d46a33ec Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 1 Nov 2025 12:18:25 -0400 Subject: (Almost) all panels are locations or connections now --- apworld/client/player.gd | 9 ++++++--- apworld/player_logic.py | 5 +++-- apworld/static_logic.py | 3 +-- 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'apworld') diff --git a/apworld/client/player.gd b/apworld/client/player.gd index 0e3fb23..35fd793 100644 --- a/apworld/client/player.gd +++ b/apworld/client/player.gd @@ -604,9 +604,12 @@ func _ready(): continue if ( - door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY - or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING - or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR + not (door.has_legacy_location() and door.get_legacy_location()) + and ( + door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY + or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING + or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR + ) ): continue diff --git a/apworld/player_logic.py b/apworld/player_logic.py index 1d68e4a..57fb4f9 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py @@ -299,8 +299,7 @@ class Lingo2PlayerLogic: if door.map_id not in self.shuffled_maps: continue - if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE, - data_pb2.DoorType.LEGACY_LOCATION]: + if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]: continue if door.id in self.item_by_door: @@ -417,6 +416,8 @@ class Lingo2PlayerLogic: for symbol_name in SYMBOL_ITEMS.values(): self.real_items.append(symbol_name) + print("hi") + def get_panel_reqs(self, panel_id: int, answer: str | None) -> AccessRequirements: if answer is None: if panel_id not in self.panel_reqs: diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 702f30b..8e07b82 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py @@ -31,8 +31,7 @@ class Lingo2StaticLogic: location_name = self.get_door_location_name(door) self.location_id_to_name[door.ap_id] = location_name - if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE, - data_pb2.DoorType.LEGACY_LOCATION]: + if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]: item_name = self.get_door_item_name(door) self.item_id_to_name[door.ap_id] = item_name -- cgit 1.4.1