about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-10-23 11:48:45 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2025-10-23 11:48:45 -0400
commit3cb2ced48dec3b9ea60e008b2a3598a322458adf (patch)
tree448c68670b89bf7f8d666ac57fa45c8265e06a2a
parent71ac41d5e3b426456f30229df3130989abceae99 (diff)
downloadlingo2-archipelago-3cb2ced48dec3b9ea60e008b2a3598a322458adf.tar.gz
lingo2-archipelago-3cb2ced48dec3b9ea60e008b2a3598a322458adf.tar.bz2
lingo2-archipelago-3cb2ced48dec3b9ea60e008b2a3598a322458adf.zip
Fixed typos in the_advanced locations
-rw-r--r--data/maps/the_advanced/doors.txtpb6
-rw-r--r--tools/validator/validator.cpp20
2 files changed, 16 insertions, 10 deletions
diff --git a/data/maps/the_advanced/doors.txtpb b/data/maps/the_advanced/doors.txtpb index d1e420c..fbe7ab1 100644 --- a/data/maps/the_advanced/doors.txtpb +++ b/data/maps/the_advanced/doors.txtpb
@@ -20,7 +20,7 @@ doors {
20 panels { room: "Main Area" name: "DECK (1)" } 20 panels { room: "Main Area" name: "DECK (1)" }
21 panels { room: "Main Area" name: "DECK (2)" } 21 panels { room: "Main Area" name: "DECK (2)" }
22 panels { room: "Main Area" name: "DECK (3)" } 22 panels { room: "Main Area" name: "DECK (3)" }
23 location_name: "Main Area" 23 location_room: "Main Area"
24} 24}
25doors { 25doors {
26 name: "North Wall Puzzles" 26 name: "North Wall Puzzles"
@@ -30,7 +30,7 @@ doors {
30 panels { room: "Main Area" name: "REST" } 30 panels { room: "Main Area" name: "REST" }
31 panels { room: "Main Area" name: "THE" } 31 panels { room: "Main Area" name: "THE" }
32 panels { room: "Main Area" name: "LIVES" } 32 panels { room: "Main Area" name: "LIVES" }
33 location_name: "Main Area" 33 location_room: "Main Area"
34} 34}
35doors { 35doors {
36 name: "East Wall Puzzles" 36 name: "East Wall Puzzles"
@@ -44,7 +44,7 @@ doors {
44 panels { room: "Main Area" name: "FRUIT (1)" } 44 panels { room: "Main Area" name: "FRUIT (1)" }
45 panels { room: "Main Area" name: "FRUIT (2)" } 45 panels { room: "Main Area" name: "FRUIT (2)" }
46 panels { room: "Main Area" name: "FRUIT FRUIT" } 46 panels { room: "Main Area" name: "FRUIT FRUIT" }
47 location_name: "Main Area" 47 location_room: "Main Area"
48} 48}
49doors { 49doors {
50 name: "CBA Door" 50 name: "CBA Door"
diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp index d651e04..43d842d 100644 --- a/tools/validator/validator.cpp +++ b/tools/validator/validator.cpp
@@ -225,13 +225,19 @@ class Validator {
225 << " needs an explicit location name." << std::endl; 225 << " needs an explicit location name." << std::endl;
226 } 226 }
227 227
228 if (h_door.double_letters() && 228 if (h_door.type() == DoorType::STANDARD ||
229 (h_door.type() == DoorType::STANDARD || 229 h_door.type() == DoorType::LOCATION_ONLY ||
230 h_door.type() == DoorType::LOCATION_ONLY || 230 h_door.type() == DoorType::GRAVESTONE) {
231 h_door.type() == DoorType::GRAVESTONE)) { 231 if (h_door.double_letters()) {
232 std::cout << "Door " << door_identifier.ShortDebugString() 232 std::cout << "Door " << door_identifier.ShortDebugString()
233 << " is a location that depends on double_letters." 233 << " is a location that depends on double_letters."
234 << std::endl; 234 << std::endl;
235 }
236
237 if (!h_door.has_location_room()) {
238 std::cout << "Door " << door_identifier.ShortDebugString()
239 << " is missing a location_room." << std::endl;
240 }
235 } 241 }
236 242
237 bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch()); 243 bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch());