diff options
-rw-r--r-- | apworld/static_logic.py | 2 | ||||
-rw-r--r-- | data/maps/the_entry/doors.txtpb | 4 | ||||
-rw-r--r-- | tools/validator/validator.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 07800f8..1ace1e7 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py | |||
@@ -94,7 +94,7 @@ class Lingo2StaticLogic: | |||
94 | if door.type != data_pb2.DoorType.STANDARD: | 94 | if door.type != data_pb2.DoorType.STANDARD: |
95 | return None | 95 | return None |
96 | 96 | ||
97 | if len(door.keyholders) > 0 or len(door.endings) > 0: | 97 | if len(door.keyholders) > 0 or len(door.endings) > 0 or not door.HasField("complete_at"): |
98 | return None | 98 | return None |
99 | 99 | ||
100 | if len(door.panels) > 4: | 100 | if len(door.panels) > 4: |
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb index 6bef160..466f5ce 100644 --- a/data/maps/the_entry/doors.txtpb +++ b/data/maps/the_entry/doors.txtpb | |||
@@ -137,8 +137,10 @@ doors { | |||
137 | type: STANDARD | 137 | type: STANDARD |
138 | receivers: "Components/Doors/back_left_2" | 138 | receivers: "Components/Doors/back_left_2" |
139 | panels { room: "Colored Doors Area" name: "OPEN" answer: "orange" } | 139 | panels { room: "Colored Doors Area" name: "OPEN" answer: "orange" } |
140 | # "wall" is supposed to also work. idk man | 140 | panels { room: "Colored Doors Area" name: "OPEN" answer: "wall" } |
141 | complete_at: 1 | ||
141 | location_room: "Colored Doors Area" | 142 | location_room: "Colored Doors Area" |
143 | location_name: "OPEN" | ||
142 | } | 144 | } |
143 | doors { | 145 | doors { |
144 | name: "Lime Room Entrance" | 146 | name: "Lime Room Entrance" |
diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp index e4c6324..dd41f5c 100644 --- a/tools/validator/validator.cpp +++ b/tools/validator/validator.cpp | |||
@@ -106,7 +106,8 @@ class Validator { | |||
106 | return false; | 106 | return false; |
107 | } | 107 | } |
108 | 108 | ||
109 | if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0) { | 109 | if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0 || |
110 | h_door.complete_at() > 0) { | ||
110 | return true; | 111 | return true; |
111 | } | 112 | } |
112 | 113 | ||