about summary refs log tree commit diff stats
path: root/apworld
diff options
context:
space:
mode:
Diffstat (limited to 'apworld')
-rw-r--r--apworld/options.py2
-rw-r--r--apworld/player_logic.py4
-rw-r--r--apworld/static_logic.py3
3 files changed, 5 insertions, 4 deletions
diff --git a/apworld/options.py b/apworld/options.py index a56b40d..f687434 100644 --- a/apworld/options.py +++ b/apworld/options.py
@@ -197,7 +197,7 @@ class MasteriesRequirement(Range):
197 the maximum.""" 197 the maximum."""
198 display_name = "Masteries Requirement" 198 display_name = "Masteries Requirement"
199 range_start = 0 199 range_start = 0
200 range_end = 18 200 range_end = 19
201 default = 0 201 default = 0
202 202
203 203
diff --git a/apworld/player_logic.py b/apworld/player_logic.py index d7b18c2..1d68e4a 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py
@@ -299,7 +299,8 @@ 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]:
303 continue 304 continue
304 305
305 if door.id in self.item_by_door: 306 if door.id in self.item_by_door:
@@ -511,7 +512,6 @@ class Lingo2PlayerLogic:
511 reqs.possibilities.append(panel_reqs) 512 reqs.possibilities.append(panel_reqs)
512 513
513 if door.HasField("control_center_color"): 514 if door.HasField("control_center_color"):
514 # TODO: Logic for ensuring two CC states aren't needed at once.
515 reqs.rooms.add("Control Center - Main Area") 515 reqs.rooms.add("Control Center - Main Area")
516 self.add_solution_reqs(reqs, door.control_center_color) 516 self.add_solution_reqs(reqs, door.control_center_color)
517 517
diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 8e07b82..702f30b 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py
@@ -31,7 +31,8 @@ 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]:
35 item_name = self.get_door_item_name(door) 36 item_name = self.get_door_item_name(door)
36 self.item_id_to_name[door.ap_id] = item_name 37 self.item_id_to_name[door.ap_id] = item_name
37 38