summary refs log tree commit diff stats
path: root/apworld/player_logic.py
diff options
context:
space:
mode:
Diffstat (limited to 'apworld/player_logic.py')
-rw-r--r--apworld/player_logic.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/apworld/player_logic.py b/apworld/player_logic.py index 958abc5..8b240b5 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py
@@ -1,4 +1,4 @@
1from .generated import common_pb2 as common_pb2 1from .generated import data_pb2 as data_pb2
2from typing import TYPE_CHECKING, NamedTuple 2from typing import TYPE_CHECKING, NamedTuple
3 3
4if TYPE_CHECKING: 4if TYPE_CHECKING:
@@ -79,11 +79,11 @@ class Lingo2PlayerLogic:
79 self.real_items = list() 79 self.real_items = list()
80 80
81 for door in world.static_logic.objects.doors: 81 for door in world.static_logic.objects.doors:
82 if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.LOCATION_ONLY]: 82 if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY]:
83 self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id, 83 self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id,
84 self.get_door_reqs(door.id))) 84 self.get_door_reqs(door.id)))
85 85
86 if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors: 86 if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors:
87 self.real_items.append(self.world.static_logic.get_door_item_name(door.id)) 87 self.real_items.append(self.world.static_logic.get_door_item_name(door.id))
88 88
89 for letter in world.static_logic.objects.letters: 89 for letter in world.static_logic.objects.letters:
@@ -146,7 +146,7 @@ class Lingo2PlayerLogic:
146 reqs = AccessRequirements() 146 reqs = AccessRequirements()
147 147
148 use_item = False 148 use_item = False
149 if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors: 149 if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors:
150 use_item = True 150 use_item = True
151 151
152 if use_item: 152 if use_item: