Worked on daed-only mode daed-only

1 files changed, 6 insertions, 4 deletions

@@ -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