2 files changed, 105 insertions, 6 deletions

@@ -52,6 +52,13 @@ enum DoorGroupType {
   SHUFFLE_GROUP = 4;
 }
 
+enum MapType {
+  NORMAL_MAP = 0;
+  ICARUS = 1;
+  GIFT_MAP = 2;
+  DEMO = 3;
+}
+
 enum AxisDirection {
   AXIS_DIRECTION_UNKNOWN = 0;
 
@@ -87,6 +94,24 @@ enum PuzzleSymbol {
   QUESTION = 19;
 }
 
+enum DaedalusOnlyMode {
+  DAED_ONLY_DISALLOW = 0;
+  DAED_ONLY_PARTIAL = 1;
+  DAED_ONLY_ALLOW = 2;
+}
+
+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;
@@ -111,6 +136,8 @@ message Connection {
   optional bool roof_access = 7;
   optional bool purple_ending = 8;
   optional bool cyan_ending = 9;
+  optional bool mint_ending = 11;
+  optional bool vanilla_only = 10;
 }
 
 message Door {
@@ -130,13 +157,17 @@ message Door {
   repeated KeyholderAnswer keyholders = 13;
   repeated uint64 rooms = 14;
   repeated uint64 doors = 15;
-  repeated uint64 endings = 16;
+  optional bool white_ending = 16;
   optional bool double_letters = 18;
   repeated string senders = 19;
 
   optional DoorType type = 8;
+  optional bool latch = 20;
+  optional bool legacy_location = 21;
 
   optional string location_name = 17;
+  optional bool daedalus_only_allow = 22;
+  optional bool daedalus_only_always_item = 23;
 }
 
 message PanelData {
@@ -155,6 +186,8 @@ message PanelData {
   optional uint64 required_door = 9;
   optional uint64 required_room = 11;
 
+  optional bool exclude_from_panelsanity = 13;
+
   optional string display_name = 12;
 }
 
@@ -177,12 +210,16 @@ message PaintingData {
 
 message Port {
   optional uint64 id = 1;
+  optional uint64 ap_id = 11;
   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;
 }
@@ -233,6 +270,7 @@ message Room {
   optional string name = 2;
   optional string display_name = 3;
   optional string panel_display_name = 13;
+  optional bool daedalus_only_allow = 14;
 
   repeated uint64 panels = 4;
   repeated uint64 paintings = 5;
@@ -248,6 +286,14 @@ message Map {
   optional uint64 id = 1;
   optional string name = 2;
   optional string display_name = 3;
+  optional DaedalusOnlyMode daedalus_only_mode = 6;
+  optional uint64 worldport_entrance = 4;
+  optional MapType type = 5;
+
+  optional uint64 rte_room = 7;
+  optional uint64 rte_ap_id = 8;
+  optional Vec3d rte_trigger_pos = 9;
+  optional Vec3d rte_trigger_scale = 10;
 }
 
 message Progressive {
@@ -263,10 +309,12 @@ message DoorGroup {
   optional uint64 ap_id = 3;
   optional DoorGroupType type = 4;
   repeated uint64 doors = 5;
+
+  optional bool daedalus_only_always_item = 6;
 }
 
 message AllObjects {
-  optional uint64 version = 15;
+  optional VersionNumber version = 15;
 
   repeated Map maps = 7;
   repeated Room rooms = 1;
@@ -78,6 +78,13 @@ 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 should additionally require being able to
+  // type a specific text string when Custom Mint Ending is on.
+  optional bool mint_ending = 12;
+
+  // This means that the connection only exists when doors are not shuffled.
+  optional bool vanilla_only = 11;
 }
 
 message HumanConnections {
@@ -101,7 +108,7 @@ message HumanDoor {
   repeated KeyholderIdentifier keyholders = 10;
   repeated RoomIdentifier rooms = 11;
   repeated DoorIdentifier doors = 12;
-  repeated string endings = 13;
+  optional bool white_ending = 13;
   optional bool double_letters = 15;
 
   // Sender nodes to be added to the list of requirements for triggering the
@@ -111,6 +118,19 @@ message HumanDoor {
   optional DoorType type = 4;
   optional string location_room = 5;
   optional string location_name = 14;
+
+  // Non-item doors that are latched will stay open once opened, even if the
+  // opening trigger is deactivated. This applies to EVENT/LOCATION_ONLY doors,
+  // as well as item-locked doors when not shuffling doors.
+  optional bool latch = 17;
+
+  // If true, the client will treat this door like a location, even though no
+  // location is created for it in the generator. This helps provide backwards
+  // compatability with older worlds.
+  optional bool legacy_location = 18;
+
+  optional bool daedalus_only_allow = 19;
+  optional bool daedalus_only_always_item = 20;
 }
 
 message HumanDoors {
@@ -130,6 +150,8 @@ message HumanPanel {
   optional DoorIdentifier required_door = 7;
   optional RoomIdentifier required_room = 8;
 
+  optional bool exclude_from_panelsanity = 10;
+
   optional string display_name = 9;
 }
 
@@ -150,9 +172,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;
@@ -195,6 +224,8 @@ message HumanRoom {
   // doors generated from panels in the same area.
   optional string panel_display_name = 10;
 
+  optional bool daedalus_only_allow = 11;
+
   repeated HumanPanel panels = 3;
   repeated HumanPainting paintings = 4;
   repeated HumanLetter letters = 5;
@@ -206,7 +237,23 @@ message HumanRoom {
 
 message HumanMap {
   optional string display_name = 1;
+  optional MapType type = 4;
+
+  optional DaedalusOnlyMode daedalus_only_mode = 6;
+
+  optional PortIdentifier worldport_entrance = 3;
+  optional string rte_room = 7;
+  optional Vec3d rte_trigger_pos = 8;
+  optional Vec3d rte_trigger_scale = 9;
+
+  // These two fields are used by the validator and nothing else. excluded_nodes
+  // are objects in the tscn that are intentionally not mentioned in the txtpb.
+  // custom_nodes are the reverse of that; objects that are mentioned in the
+  // txtpb but not present in the tscn. These are generally created dynamically
+  // by the game mod, but may also be used for places where the validator is
+  // just wrong about the contents of the map file.
   repeated string excluded_nodes = 2;
+  repeated string custom_nodes = 5;
 }
 
 message HumanProgressive {
@@ -222,6 +269,8 @@ message HumanDoorGroup {
   optional string name = 1;
   optional DoorGroupType type = 2;
   repeated DoorIdentifier doors = 3;
+
+  optional bool daedalus_only_always_item = 4;
 }
 
 message HumanDoorGroups {
@@ -230,7 +279,7 @@ message HumanDoorGroups {
 
 message HumanGlobalMetadata {
   repeated string special_names = 1;
-  optional uint64 version = 2;
+  optional VersionNumber version = 2;
 }
 
 message IdMappings {
@@ -238,11 +287,13 @@ message IdMappings {
     map<string, uint64> panels = 1;
     map<string, uint64> masteries = 2;
     map<string, uint64> keyholders = 3;
+    map<string, uint64> ports = 4;
   }
 
   message MapIds {
     map<string, uint64> doors = 1;
     map<string, RoomIds> rooms = 2;
+    optional uint64 rte = 3;
   }
 
   map<string, MapIds> maps = 1;