2 files changed, 149 insertions, 8 deletions

@@ -27,6 +27,29 @@ enum DoorType {
 
   // This door is an item if gravestone shuffle is enabled, and is a location as long as panelsanity is not on.
   GRAVESTONE = 6;
+
+  // This door is never a location, and is an item as long as gallery painting shuffle is on.
+  GALLERY_PAINTING = 7;
+}
+
+enum DoorGroupType {
+  DOOR_GROUP_TYPE_UNKNOWN = 0;
+
+  // These doors border a worldport. They should be grouped when connections are
+  // not shuffled.
+  CONNECTOR = 1;
+
+  // Similar to CONNECTOR, but these doors are also ordinarily opened by solving
+  // the COLOR panel in the Control Center. These should be grouped when
+  // connections are not shuffled, but are not items at all when control center
+  // colors are not shuffled.
+  COLOR_CONNECTOR = 2;
+
+  // Groups with this type become an item if cyan door behavior is set to item.
+  CYAN_DOORS = 3;
+
+  // Groups with this type always become an item if door shuffle is on.
+  SHUFFLE_GROUP = 4;
 }
 
 enum AxisDirection {
@@ -64,6 +87,18 @@ enum PuzzleSymbol {
   QUESTION = 19;
 }
 
+message Vec3d {
+  optional double x = 1;
+  optional double y = 2;
+  optional double z = 3;
+}
+
+message VersionNumber {
+  optional uint64 major = 1;
+  optional uint64 minor = 2;
+  optional uint64 patch = 3;
+}
+
 message ProxyIdentifier {
   optional uint64 panel = 1;
   optional string answer = 2;
@@ -84,6 +119,11 @@ message Connection {
     uint64 painting = 5;
     ProxyIdentifier panel = 6;
   }
+
+  optional bool roof_access = 7;
+  optional bool purple_ending = 8;
+  optional bool cyan_ending = 9;
+  optional bool vanilla_only = 10;
 }
 
 message Door {
@@ -100,13 +140,16 @@ message Door {
   optional uint64 complete_at = 12;
 
   optional string control_center_color = 6;
-  repeated string switches = 7;
   repeated KeyholderAnswer keyholders = 13;
   repeated uint64 rooms = 14;
   repeated uint64 doors = 15;
   repeated uint64 endings = 16;
+  optional bool double_letters = 18;
+  repeated string senders = 19;
 
   optional DoorType type = 8;
+
+  optional string location_name = 17;
 }
 
 message PanelData {
@@ -124,9 +167,11 @@ message PanelData {
 
   optional uint64 required_door = 9;
   optional uint64 required_room = 11;
+
+  optional string display_name = 12;
 }
 
-message Painting {
+message PaintingData {
   optional uint64 id = 1;
   optional uint64 room_id = 2;
   optional string name = 9;
@@ -148,19 +193,24 @@ message Port {
   optional uint64 room_id = 2;
   optional string name = 3;
 
+  optional string display_name = 10;
   optional string path = 4;
-  optional string orientation = 5;
+  optional Vec3d destination = 5;
+  optional double rotation = 8;
   optional AxisDirection gravity = 7;
+  optional bool no_shuffle = 9;
 
   optional uint64 required_door = 6;
 }
 
-message Keyholder {
+message KeyholderData {
   optional uint64 id = 1;
+  optional uint64 ap_id = 6;
   optional uint64 room_id = 2;
 
   optional string name = 3;
   optional string path = 4;
+  optional string key = 5;
 }
 
 message Letter {
@@ -198,6 +248,7 @@ message Room {
   optional uint64 map_id = 8;
   optional string name = 2;
   optional string display_name = 3;
+  optional string panel_display_name = 13;
 
   repeated uint64 panels = 4;
   repeated uint64 paintings = 5;
@@ -215,17 +266,36 @@ message Map {
   optional string display_name = 3;
 }
 
+message Progressive {
+  optional uint64 id = 1;
+  optional string name = 2;
+  optional uint64 ap_id = 3;
+  repeated uint64 doors = 4;
+}
+
+message DoorGroup {
+  optional uint64 id = 1;
+  optional string name = 2;
+  optional uint64 ap_id = 3;
+  optional DoorGroupType type = 4;
+  repeated uint64 doors = 5;
+}
+
 message AllObjects {
+  optional VersionNumber version = 15;
+
   repeated Map maps = 7;
   repeated Room rooms = 1;
   repeated Door doors = 2;
   repeated PanelData panels = 3;
-  repeated Painting paintings = 4;
+  repeated PaintingData paintings = 4;
   repeated Port ports = 5;
-  repeated Keyholder keyholders = 11;
+  repeated KeyholderData keyholders = 11;
   repeated Letter letters = 9;
   repeated Mastery masteries = 10;
   repeated Ending endings = 12;
   repeated Connection connections = 6;
+  repeated Progressive progressives = 13;
+  repeated DoorGroup door_groups = 14;
   map<string, uint64> special_ids = 8;
 }
@@ -62,6 +62,25 @@ message HumanConnection {
 
   optional bool oneway = 3;
   optional DoorIdentifier door = 4;
+
+  // If true, this connection will only be logically allowed if the Daedalus
+  // Roof Access option is enabled.
+  optional bool roof_access = 7;
+
+  // This means that the connection intentionally skips the target object's
+  // required door.
+  optional bool bypass_target_door = 8;
+
+  // This means that the connection should additionally require all purple
+  // letters when the Strict Purple Ending option is on.
+  optional bool purple_ending = 9;
+
+  // 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 {
@@ -82,14 +101,19 @@ message HumanDoor {
   optional uint64 complete_at = 9;
 
   optional string control_center_color = 6;
-  repeated string switches = 7;
   repeated KeyholderIdentifier keyholders = 10;
   repeated RoomIdentifier rooms = 11;
   repeated DoorIdentifier doors = 12;
   repeated string endings = 13;
+  optional bool double_letters = 15;
+
+  // Sender nodes to be added to the list of requirements for triggering the
+  // location. Only for senders that have no logic requirements.
+  repeated string senders = 16;
 
   optional DoorType type = 4;
   optional string location_room = 5;
+  optional string location_name = 14;
 }
 
 message HumanDoors {
@@ -108,6 +132,8 @@ message HumanPanel {
 
   optional DoorIdentifier required_door = 7;
   optional RoomIdentifier required_room = 8;
+
+  optional string display_name = 9;
 }
 
 message HumanPainting {
@@ -127,9 +153,16 @@ message HumanPainting {
 
 message HumanPort {
   optional string name = 1;
+  optional string display_name = 8;
   optional string path = 2;
 
-  optional string orientation = 3;
+  optional bool no_shuffle = 7;
+
+  // These specify how the player should be placed when a randomized entrance
+  // sends them to this port. "rotation" is in degrees and is counter-clockwise 
+  // from the positive X axis.
+  optional Vec3d destination = 3;
+  optional double rotation = 6;
   optional AxisDirection gravity = 5 [default = Y_MINUS];
 
   optional DoorIdentifier required_door = 4;
@@ -138,6 +171,13 @@ message HumanPort {
 message HumanKeyholder {
   optional string name = 1;
   optional string path = 2;
+
+  // If this is set, the keyholder will become a location when keyholder shuffle
+  // is enabled. This value specifies the key that is required to clear the
+  // location. It should be the same as the key needed for Green Ending. The
+  // only cases when this shouldn't be set is the two disappearing keyholders in
+  // The Congruent.
+  optional string key = 3;
 }
 
 message HumanLetter {
@@ -161,6 +201,10 @@ message HumanRoom {
   optional string name = 1;
   optional string display_name = 2;
 
+  // This is used in panelsanity location names and location names for STANDARD
+  // doors generated from panels in the same area.
+  optional string panel_display_name = 10;
+
   repeated HumanPanel panels = 3;
   repeated HumanPainting paintings = 4;
   repeated HumanLetter letters = 5;
@@ -175,10 +219,35 @@ message HumanMap {
   repeated string excluded_nodes = 2;
 }
 
+message HumanProgressive {
+  optional string name = 1;
+  repeated DoorIdentifier doors = 2;
+}
+
+message HumanProgressives {
+  repeated HumanProgressive progressives = 1;
+}
+
+message HumanDoorGroup {
+  optional string name = 1;
+  optional DoorGroupType type = 2;
+  repeated DoorIdentifier doors = 3;
+}
+
+message HumanDoorGroups {
+  repeated HumanDoorGroup door_groups = 1;
+}
+
+message HumanGlobalMetadata {
+  repeated string special_names = 1;
+  optional VersionNumber version = 2;
+}
+
 message IdMappings {
   message RoomIds {
     map<string, uint64> panels = 1;
     map<string, uint64> masteries = 2;
+    map<string, uint64> keyholders = 3;
   }
 
   message MapIds {
@@ -190,4 +259,6 @@ message IdMappings {
   map<string, uint64> special = 2;
   map<string, uint64> letters = 3;
   map<string, uint64> endings = 4;
+  map<string, uint64> progressives = 5;
+  map<string, uint64> door_groups = 6;
 }