5 files changed, 117 insertions, 2 deletions

@@ -160,4 +160,8 @@ class Lingo2PlayerLogic:
             for room in door.rooms:
                 reqs.rooms.add(self.world.static_logic.get_room_region_name(room))
 
+            for sub_door_id in door.doors:
+                sub_reqs = self.get_door_reqs(sub_door_id)
+                reqs.merge(sub_reqs)
+
         return reqs
@@ -2169,6 +2169,109 @@ maps {
     }
   }
 }
+maps {
+  key: "the_gallery"
+  value {
+    doors {
+      key: "Ancient Painting"
+      value: 431
+    }
+    doors {
+      key: "Between Painting"
+      value: 417
+    }
+    doors {
+      key: "Butterfly Painting"
+      value: 413
+    }
+    doors {
+      key: "Castle Painting"
+      value: 429
+    }
+    doors {
+      key: "Colorful Painting"
+      value: 428
+    }
+    doors {
+      key: "Control Center Painting"
+      value: 423
+    }
+    doors {
+      key: "Darkroom Painting"
+      value: 412
+    }
+    doors {
+      key: "Ending Door"
+      value: 433
+    }
+    doors {
+      key: "Entry Painting"
+      value: 418
+    }
+    doors {
+      key: "Gallery Extension"
+      value: 432
+    }
+    doors {
+      key: "Graveyard Painting"
+      value: 422
+    }
+    doors {
+      key: "Rainbow Painting"
+      value: 426
+    }
+    doors {
+      key: "Sun Temple Painting"
+      value: 430
+    }
+    doors {
+      key: "Tower Painting"
+      value: 424
+    }
+    doors {
+      key: "Tree Painting"
+      value: 420
+    }
+    doors {
+      key: "Unyielding Painting"
+      value: 421
+    }
+    doors {
+      key: "Wise Painting"
+      value: 419
+    }
+    doors {
+      key: "Wondrous Painting"
+      value: 425
+    }
+    doors {
+      key: "Words Painting"
+      value: 427
+    }
+    rooms {
+      key: "Back Room"
+      value {
+        panels {
+          key: "TREE"
+          value: 416
+        }
+        panels {
+          key: "UNYIELDING"
+          value: 415
+        }
+      }
+    }
+    rooms {
+      key: "Daedalus Extension"
+      value {
+        panels {
+          key: "WHERE"
+          value: 414
+        }
+      }
+    }
+  }
+}
 letters {
   key: "a2"
   value: 278
@@ -28,7 +28,7 @@ doors {
   name: "Butterfly Painting"
   type: ITEM_ONLY
   move_paintings { room: "Main Area" name: "BUTTERFLY" }
-  required_room { map: "the_butterfly" name: "Main Area" }
+  rooms { map: "the_butterfly" name: "Main Area" }
 }
 doors {
   name: "Between Painting"
@@ -129,7 +129,7 @@ doors {
   name: "Colorful Painting"
   type: ITEM_ONLY
   move_paintings { room: "Main Area" name: "COLORFUL" }
-  required_room { map: "the_colorful" name: "White Room" }
+  rooms { map: "the_colorful" name: "White Room" }
 }
 doors {
   name: "Castle Painting"
@@ -76,6 +76,7 @@ message Door {
   repeated string switches = 7;
   repeated KeyholderAnswer keyholders = 13;
   repeated uint64 rooms = 14;
+  repeated uint64 doors = 15;
 
   optional DoorType type = 8;
 }
@@ -339,6 +339,13 @@ class DataPacker {
           container_.FindOrAddRoom(map_name, ri.name(), current_map_name));
     }
 
+    for (const DoorIdentifier& di : h_door.doors()) {
+      std::optional<std::string> map_name =
+          di.has_map() ? std::optional<std::string>(di.map()) : std::nullopt;
+      door.add_doors(
+          container_.FindOrAddDoor(map_name, di.name(), current_map_name));
+    }
+
     if (h_door.has_control_center_color()) {
       door.set_control_center_color(h_door.control_center_color());
     }