diff options
Diffstat (limited to 'apworld')
| -rw-r--r-- | apworld/player_logic.py | 2 | ||||
| -rw-r--r-- | apworld/static_logic.py | 4 |
2 files changed, 3 insertions, 3 deletions
| diff --git a/apworld/player_logic.py b/apworld/player_logic.py index c2850d5..f67d7f9 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py | |||
| @@ -89,7 +89,7 @@ class Lingo2PlayerLogic: | |||
| 89 | self.real_items.append(door_item_name) | 89 | self.real_items.append(door_item_name) |
| 90 | 90 | ||
| 91 | for door in world.static_logic.objects.doors: | 91 | for door in world.static_logic.objects.doors: |
| 92 | if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY]: | 92 | if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]: |
| 93 | self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id, | 93 | self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id, |
| 94 | self.get_door_reqs(door.id))) | 94 | self.get_door_reqs(door.id))) |
| 95 | 95 | ||
| diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 6a05f3d..af1e985 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py | |||
| @@ -17,11 +17,11 @@ class Lingo2StaticLogic: | |||
| 17 | self.objects.ParseFromString(bytearray(file)) | 17 | self.objects.ParseFromString(bytearray(file)) |
| 18 | 18 | ||
| 19 | for door in self.objects.doors: | 19 | for door in self.objects.doors: |
| 20 | if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY]: | 20 | if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]: |
| 21 | location_name = f"{self.objects.maps[door.map_id].name} - {door.name}" | 21 | location_name = f"{self.objects.maps[door.map_id].name} - {door.name}" |
| 22 | self.location_id_to_name[door.ap_id] = location_name | 22 | self.location_id_to_name[door.ap_id] = location_name |
| 23 | 23 | ||
| 24 | if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY]: | 24 | if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]: |
| 25 | item_name = self.get_door_item_name(door.id) | 25 | item_name = self.get_door_item_name(door.id) |
| 26 | self.item_id_to_name[door.ap_id] = item_name | 26 | self.item_id_to_name[door.ap_id] = item_name |
| 27 | 27 | ||