about summary refs log tree commit diff stats
path: root/apworld
diff options
context:
space:
mode:
Diffstat (limited to 'apworld')
-rw-r--r--apworld/client/player.gd9
-rw-r--r--apworld/player_logic.py5
-rw-r--r--apworld/static_logic.py3
3 files changed, 10 insertions, 7 deletions
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():
604 continue 604 continue
605 605
606 if ( 606 if (
607 door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY 607 not (door.has_legacy_location() and door.get_legacy_location())
608 or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING 608 and (
609 or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR 609 door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
610 or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
611 or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
612 )
610 ): 613 ):
611 continue 614 continue
612 615
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:
299 if door.map_id not in self.shuffled_maps: 299 if door.map_id not in self.shuffled_maps:
300 continue 300 continue
301 301
302 if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE, 302 if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
303 data_pb2.DoorType.LEGACY_LOCATION]:
304 continue 303 continue
305 304
306 if door.id in self.item_by_door: 305 if door.id in self.item_by_door:
@@ -417,6 +416,8 @@ class Lingo2PlayerLogic:
417 for symbol_name in SYMBOL_ITEMS.values(): 416 for symbol_name in SYMBOL_ITEMS.values():
418 self.real_items.append(symbol_name) 417 self.real_items.append(symbol_name)
419 418
419 print("hi")
420
420 def get_panel_reqs(self, panel_id: int, answer: str | None) -> AccessRequirements: 421 def get_panel_reqs(self, panel_id: int, answer: str | None) -> AccessRequirements:
421 if answer is None: 422 if answer is None:
422 if panel_id not in self.panel_reqs: 423 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:
31 location_name = self.get_door_location_name(door) 31 location_name = self.get_door_location_name(door)
32 self.location_id_to_name[door.ap_id] = location_name 32 self.location_id_to_name[door.ap_id] = location_name
33 33
34 if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE, 34 if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
35 data_pb2.DoorType.LEGACY_LOCATION]:
36 item_name = self.get_door_item_name(door) 35 item_name = self.get_door_item_name(door)
37 self.item_id_to_name[door.ap_id] = item_name 36 self.item_id_to_name[door.ap_id] = item_name
38 37