From 9b5c160f60a4e6c679b0c1afca82d9a58523eaab Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 30 Jan 2026 10:50:01 -0500 Subject: Worked on daed-only mode --- apworld/regions.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'apworld/regions.py') diff --git a/apworld/regions.py b/apworld/regions.py index 1118603..2f9b571 100644 --- a/apworld/regions.py +++ b/apworld/regions.py @@ -62,7 +62,7 @@ def create_regions(world: "Lingo2World"): # locations. This allows us to reference the actual region objects in the access rules for the locations, which is # faster than having to look them up during access checking. for room in world.static_logic.objects.rooms: - if room.map_id not in world.player_logic.shuffled_maps: + if not world.player_logic.should_shuffle_room(room.id): continue region = create_region(room, world) @@ -72,7 +72,10 @@ def create_regions(world: "Lingo2World"): for (region, room) in region_and_room: create_locations(room, region, world, regions) - regions["Menu"].connect(regions["The Entry - Starting Room"], "Start Game") + if world.options.daedalus_only: + regions["Menu"].connect(regions["Daedalus - Starting Room"], "Start Game") + else: + regions["Menu"].connect(regions["The Entry - Starting Room"], "Start Game") for connection in world.static_logic.objects.connections: if connection.roof_access and not world.options.daedalus_roof_access: @@ -160,8 +163,7 @@ def shuffle_entrances(world: "Lingo2World"): port_id_by_name: dict[str, int] = {} shuffleable_ports = [port for port in world.static_logic.objects.ports - if not port.no_shuffle - and world.static_logic.get_room_object_map_id(port) in world.player_logic.shuffled_maps] + if not port.no_shuffle and world.player_logic.should_shuffle_room(port.room_id)] if len(shuffleable_ports) % 2 == 1: # We have an odd number of shuffleable ports! Pick a port from a room that has more than one, and make it a -- cgit 1.4.1