2 files changed, 50 insertions, 4 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;
 
@@ -93,6 +100,12 @@ message Vec3d {
   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;
@@ -117,6 +130,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 {
@@ -136,11 +150,13 @@ 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;
 }
@@ -183,9 +199,11 @@ 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 Vec3d destination = 5;
   optional double rotation = 8;
@@ -256,6 +274,8 @@ message Map {
   optional uint64 id = 1;
   optional string name = 2;
   optional string display_name = 3;
+  optional uint64 worldport_entrance = 4;
+  optional MapType type = 5;
 }
 
 message Progressive {
@@ -274,7 +294,7 @@ message DoorGroup {
 }
 
 message AllObjects {
-  optional uint64 version = 15;
+  optional VersionNumber version = 15;
 
   repeated Map maps = 7;
   repeated Room rooms = 1;
@@ -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 {
@@ -101,7 +104,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 +114,16 @@ 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;
 }
 
 message HumanDoors {
@@ -150,6 +163,7 @@ message HumanPainting {
 
 message HumanPort {
   optional string name = 1;
+  optional string display_name = 8;
   optional string path = 2;
 
   optional bool no_shuffle = 7;
@@ -212,7 +226,18 @@ message HumanRoom {
 
 message HumanMap {
   optional string display_name = 1;
+  optional MapType type = 4;
+
+  optional PortIdentifier worldport_entrance = 3;
+
+  // 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 {
@@ -236,7 +261,7 @@ message HumanDoorGroups {
 
 message HumanGlobalMetadata {
   repeated string special_names = 1;
-  optional uint64 version = 2;
+  optional VersionNumber version = 2;
 }
 
 message IdMappings {
@@ -244,6 +269,7 @@ message IdMappings {
     map<string, uint64> panels = 1;
     map<string, uint64> masteries = 2;
     map<string, uint64> keyholders = 3;
+    map<string, uint64> ports = 4;
   }
 
   message MapIds {