8 files changed, 15 insertions, 6 deletions

@@ -34,9 +34,6 @@ part of an Archipelago multiworld game.
 
 To continue an earlier game, you can perform the exact same steps as above.
 
-**Note**: Running the randomizer modifies the game's memory. If you want to play
-the base game after playing the randomizer, you need to restart Lingo 2 first.
-
 ## Frequently Asked Questions
 
 ### Why aren't the starting room letters shuffled?
@@ -277,7 +277,7 @@ class Lingo2ClientContext(CommonContext):
                 "operations": [{"operation": "default", "value": 0}]
             }]
 
-            if self.slot_data["shuffle_worldports"]:
+            if self.slot_data.get("shuffle_worldports", False):
                 self.set_notify(self.get_datastorage_key("worldports"))
                 msg_batch.append({
                     "cmd": "Set",
@@ -75,6 +75,9 @@ def create_regions(world: "Lingo2World"):
         if connection.roof_access and not world.options.daedalus_roof_access:
             continue
 
+        if connection.vanilla_only and world.options.shuffle_doors:
+            continue
+
         from_region = world.static_logic.get_room_region_name(connection.from_room)
         to_region = world.static_logic.get_room_region_name(connection.to_room)
 
@@ -183,12 +183,12 @@ connections {
   from_room: "Starting Room"
   to_room: "Digital Entrance"
   door { name: "Second Room Left Door" }
-  oneway: true
 }
 connections {
   from_room: "Digital Entrance"
   to_room: "Starting Room"
   oneway: true
+  vanilla_only: true
 }
 connections {
   from_room: "Starting Room"
@@ -7,12 +7,12 @@ connections {
   from_room: "Main Room"
   to_room: "Plaza Connector"
   door { name: "Black Hallway" }
-  oneway: true
 }
 connections {
   from_room: "Plaza Connector"
   to_room: "Main Room"
   oneway: true
+  vanilla_only: true
 }
 connections {
   from_room: "Main Room"
@@ -123,6 +123,7 @@ message Connection {
   optional bool roof_access = 7;
   optional bool purple_ending = 8;
   optional bool cyan_ending = 9;
+  optional bool vanilla_only = 10;
 }
 
 message Door {
@@ -78,6 +78,9 @@ message HumanConnection {
   // This means that the connection should additionally require all cyan letters
   // when the Strict Cyan Ending option is on.
   optional bool cyan_ending = 10;
+
+  // This means that the connection only exists when doors are not shuffled.
+  optional bool vanilla_only = 11;
 }
 
 message HumanConnections {
@@ -490,6 +490,11 @@ class DataPacker {
       r_connection.set_cyan_ending(human_connection.cyan_ending());
     }
 
+    if (human_connection.has_vanilla_only()) {
+      f_connection.set_vanilla_only(human_connection.vanilla_only());
+      r_connection.set_vanilla_only(human_connection.vanilla_only());
+    }
+
     container_.AddConnection(f_connection);
     if (!human_connection.oneway()) {
       container_.AddConnection(r_connection);