about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--data/maps/the_entry/rooms/Starting Room.txtpb2
-rw-r--r--proto/data.proto2
-rw-r--r--proto/human.proto2
-rw-r--r--tools/datapacker/main.cpp4
4 files changed, 9 insertions, 1 deletions
diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb index d01d807..d7ff7eb 100644 --- a/data/maps/the_entry/rooms/Starting Room.txtpb +++ b/data/maps/the_entry/rooms/Starting Room.txtpb
@@ -48,7 +48,7 @@ panels {
48} 48}
49panels { 49panels {
50 name: "Gift Maps" 50 name: "Gift Maps"
51 # TODO: exclude from panelsanity 51 exclude_from_panelsanity: true
52 path: "Components/GiftMapEntrance/Panel" 52 path: "Components/GiftMapEntrance/Panel"
53 clue: "player" 53 clue: "player"
54 answer: "" 54 answer: ""
diff --git a/proto/data.proto b/proto/data.proto index 01f8d9e..d6cc8cb 100644 --- a/proto/data.proto +++ b/proto/data.proto
@@ -184,6 +184,8 @@ message PanelData {
184 optional uint64 required_door = 9; 184 optional uint64 required_door = 9;
185 optional uint64 required_room = 11; 185 optional uint64 required_room = 11;
186 186
187 optional bool exclude_from_panelsanity = 13;
188
187 optional string display_name = 12; 189 optional string display_name = 12;
188} 190}
189 191
diff --git a/proto/human.proto b/proto/human.proto index c599341..73a3ed3 100644 --- a/proto/human.proto +++ b/proto/human.proto
@@ -145,6 +145,8 @@ message HumanPanel {
145 optional DoorIdentifier required_door = 7; 145 optional DoorIdentifier required_door = 7;
146 optional RoomIdentifier required_room = 8; 146 optional RoomIdentifier required_room = 8;
147 147
148 optional bool exclude_from_panelsanity = 10;
149
148 optional string display_name = 9; 150 optional string display_name = 9;
149} 151}
150 152
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 9acc33c..9808a98 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp
@@ -199,6 +199,10 @@ class DataPacker {
199 panel.set_display_name(h_panel.display_name()); 199 panel.set_display_name(h_panel.display_name());
200 } 200 }
201 201
202 if (h_panel.has_exclude_from_panelsanity()) {
203 panel.set_exclude_from_panelsanity(h_panel.exclude_from_panelsanity());
204 }
205
202 return panel_id; 206 return panel_id;
203 } 207 }
204 208