25 files changed, 109 insertions, 6 deletions

@@ -73,7 +73,7 @@ class AccessRequirements:
         self.cyans = self.cyans or other.cyans
 
         for disjunction in other.or_logic:
-            self.or_logic.append(disjunction)
+            self.or_logic.append([sub_req.copy() for sub_req in disjunction])
 
         if other.complete_at is not None:
             # Merging multiple requirements that use complete_at sucks, and is part of why we want to minimize use of
@@ -84,7 +84,7 @@ class AccessRequirements:
 
                 left_req = AccessRequirements()
                 left_req.complete_at = self.complete_at
-                left_req.possibilities = self.possibilities
+                left_req.possibilities = [sub_req.copy() for sub_req in self.possibilities]
                 self.or_logic.append([left_req])
 
                 self.complete_at = None
@@ -92,11 +92,11 @@ class AccessRequirements:
 
                 right_req = AccessRequirements()
                 right_req.complete_at = other.complete_at
-                right_req.possibilities = other.possibilities
+                right_req.possibilities = [sub_req.copy() for sub_req in other.possibilities]
                 self.or_logic.append([right_req])
             else:
                 self.complete_at = other.complete_at
-                self.possibilities = other.possibilities
+                self.possibilities = [sub_req.copy() for sub_req in other.possibilities]
 
     def is_empty(self) -> bool:
         return (len(self.items) == 0 and len(self.progressives) == 0 and len(self.rooms) == 0 and len(self.letters) == 0
@@ -1 +1,5 @@
 display_name: "The Congruent"
+worldport_entrance {
+  room: "Main Area"
+  name: "DARKROOM"
+}
@@ -1 +1,5 @@
 display_name: "The Double Sided"
+worldport_entrance {
+  room: "Start"
+  name: "DARKROOM"
+}
@@ -1 +1,5 @@
 display_name: "The Jubilant"
+worldport_entrance {
+  room: "Main Area"
+  name: "GREAT"
+}
@@ -1 +1,5 @@
 display_name: "The Keen"
+worldport_entrance {
+  room: "Main Area"
+  name: "GREAT"
+}
@@ -1 +1,5 @@
 display_name: "The Liberated"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "ENTRY"
+}
@@ -1 +1,5 @@
 display_name: "The Linear"
+worldport_entrance {
+  room: "Room"
+  name: "GREAT"
+}
@@ -1 +1,5 @@
 display_name: "The Lionized"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "ENTRY"
+}
@@ -1 +1,5 @@
 display_name: "The Literate"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "ENTRY"
+}
@@ -1 +1,5 @@
 display_name: "The Lively"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "BETWEEN"
+}
@@ -1 +1,5 @@
 display_name: "The Nuanced"
+worldport_entrance {
+  room: "Main Room"
+  name: "UNYIELDING"
+}
@@ -1 +1,5 @@
 display_name: "The Perceptive"
+worldport_entrance {
+  room: "Main Area"
+  name: "CC"
+}
@@ -1 +1,5 @@
 display_name: "The Quiet"
+worldport_entrance {
+  room: "Main Area"
+  name: "DAEDALUS"
+}
@@ -1 +1,5 @@
 display_name: "The Sirenic"
+worldport_entrance {
+  room: "Start"
+  name: "PLAZA"
+}
@@ -1 +1,5 @@
 display_name: "The Sun Temple"
+worldport_entrance {
+  room: "Entrance"
+  name: "UNKEMPT"
+}
@@ -1 +1,5 @@
 display_name: "The Symbolic"
+worldport_entrance {
+  room: "White Room"
+  name: "PLAZA"
+}
@@ -1 +1,5 @@
 display_name: "The Talented"
+worldport_entrance {
+  room: "Main Area"
+  name: "GREAT"
+}
@@ -1 +1,5 @@
 display_name: "The Tower"
+worldport_entrance {
+  room: "First Floor"
+  name: "GREAT"
+}
@@ -1 +1,5 @@
 display_name: "The Wondrous"
+worldport_entrance {
+  room: "Entry"
+  name: "DAEDALUS"
+}
@@ -264,6 +264,7 @@ message Map {
   optional uint64 id = 1;
   optional string name = 2;
   optional string display_name = 3;
+  optional uint64 worldport_entrance = 4;
 }
 
 message Progressive {
@@ -217,6 +217,7 @@ message HumanRoom {
 message HumanMap {
   optional string display_name = 1;
   repeated string excluded_nodes = 2;
+  optional PortIdentifier worldport_entrance = 3;
 }
 
 message HumanProgressive {
@@ -91,6 +91,13 @@ class DataPacker {
     if (metadata.has_display_name()) {
       map.set_display_name(metadata.display_name());
     }
+
+    if (metadata.has_worldport_entrance()) {
+      map.set_worldport_entrance(container_.FindOrAddPort(
+          metadata.worldport_entrance().map(),
+          metadata.worldport_entrance().room(),
+          metadata.worldport_entrance().name(), map_name, std::nullopt));
+    }
   }
 
   void ProcessRooms(std::filesystem::path path,
@@ -77,6 +77,17 @@ class HumanProcessor {
     for (const std::string& path : metadata.excluded_nodes()) {
       map_info.game_nodes[path].uses++;
     }
+
+    if (metadata.has_worldport_entrance()) {
+      auto port_identifier = GetCompletePortIdentifier(
+          metadata.worldport_entrance(), current_map_name, std::nullopt);
+      if (port_identifier) {
+        PortInfo& port_info = info_.ports[*port_identifier];
+        port_info.map_worldport_entrances.push_back(current_map_name);
+      } else {
+        map_info.malformed_worldport_entrance = metadata.worldport_entrance();
+      }
+    }
   }
 
   void ProcessRooms(std::filesystem::path path,
@@ -27,6 +27,8 @@ struct GameNodeInfo {
 
 struct MapInfo {
   std::map<std::string, GameNodeInfo> game_nodes;
+
+  std::optional<PortIdentifier> malformed_worldport_entrance;
 };
 
 struct RoomInfo {
@@ -57,6 +59,7 @@ struct PortInfo {
 
   std::vector<HumanConnection> connections_referenced_by;
   std::vector<HumanConnection> target_connections_referenced_by;
+  std::vector<std::string> map_worldport_entrances;
 };
 
 struct PaintingInfo {
@@ -69,6 +69,11 @@ class Validator {
                   << " is not defined in the game file." << std::endl;
       }
     }
+
+    if (map_info.malformed_worldport_entrance) {
+      std::cout << "The worldport entrance for map " << map_name
+                << " is malformed." << std::endl;
+    }
   }
 
   void ValidateRoom(const RoomIdentifier& room_identifier,
@@ -253,6 +258,10 @@ class Validator {
         std::cout << "    CONNECTION " << connection.ShortDebugString()
                   << std::endl;
       }
+
+      for (const std::string& map_name : port_info.map_worldport_entrances) {
+        std::cout << "    MAP (worldport_entrance) " << map_name << std::endl;
+      }
     } else if (port_info.definitions.size() > 1) {
       std::cout << "Port " << port_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
@@ -283,8 +292,7 @@ class Validator {
         }
         if (!port.has_rotation()) {
           std::cout << "Port " << port_identifier.ShortDebugString()
-                    << " is shuffleable and missing a rotation."
-                    << std::endl;
+                    << " is shuffleable and missing a rotation." << std::endl;
         }
       }
     }