Process the rest of the defined protos

3 files changed, 21 insertions, 24 deletions

@@ -8,6 +8,22 @@ message Proxy {
 }
 
 message Letter {
-  string letter = 1;
+  string key = 1;
   bool double = 2;
 }
+
+enum DoorType {
+  DOOR_TYPE_UNKNOWN = 0;
+
+  // This door is a location unless panelsanity is on, and it is an item as long as door shuffle is on.
+  STANDARD = 1;
+
+  // This door is never an item or a location.
+  EVENT = 2;
+
+  // This door is never a location, and is an item as long as door shuffle is on.
+  ITEM_ONLY = 3;
+
+  // This door is never a location, and is an item as long as control center color shuffle is on.
+  CONTROL_CENTER_COLOR = 4;
+}
@@ -23,7 +23,7 @@ message Connection {
 
 message Door {
   uint64 id = 1;
-  uint64 map_id = 10;
+  uint64 map_id = 9;
   string name = 2;
 
   repeated string receivers = 3;
@@ -33,8 +33,7 @@ message Door {
   string control_center_color = 6;
   repeated string switches = 7;
 
-  repeated string location_tags = 8;
-  repeated string item_tags = 9;
+  DoorType type = 8;
 }
 
 message Panel {
@@ -42,8 +41,7 @@ message Panel {
   uint64 room_id = 2;
   string name = 3;
 
-  string nodepath = 4;
-
+  string path = 4;
   string clue = 5;
   string answer = 6;
   repeated string symbols = 7;
@@ -62,22 +62,6 @@ message HumanConnections {
 }
 
 message HumanDoor {
-  enum DoorType {
-    DOOR_TYPE_UNKNOWN = 0;
-
-    // This door is a location unless panelsanity is on, and it is an item as long as door shuffle is on.
-    STANDARD = 1;
-
-    // This door is never an item or a location.
-    EVENT = 2;
-
-    // This door is never a location, and is an item as long as door shuffle is on.
-    ITEM_ONLY = 3;
-
-    // This door is never a location, and is an item as long as control center color shuffle is on.
-    CONTROL_CENTER_COLOR = 4;
-  }
-
   string name = 1;
 
   repeated string receivers = 2;
@@ -87,8 +71,7 @@ message HumanDoor {
   string control_center_color = 6;
   repeated string switches = 7;
 
-  repeated string location_tags = 4;
-  repeated string item_tags = 5;
+  DoorType type = 4;
 }
 
 message HumanDoors {