16 files changed, 22 insertions, 18 deletions

@@ -197,7 +197,7 @@ class MasteriesRequirement(Range):
     the maximum."""
     display_name = "Masteries Requirement"
     range_start = 0
-    range_end = 18
+    range_end = 19
     default = 0
 
 
@@ -299,7 +299,8 @@ class Lingo2PlayerLogic:
             if door.map_id not in self.shuffled_maps:
                 continue
 
-            if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
+            if door.type in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE,
+                             data_pb2.DoorType.LEGACY_LOCATION]:
                 continue
 
             if door.id in self.item_by_door:
@@ -511,7 +512,6 @@ class Lingo2PlayerLogic:
                 reqs.possibilities.append(panel_reqs)
 
         if door.HasField("control_center_color"):
-            # TODO: Logic for ensuring two CC states aren't needed at once.
             reqs.rooms.add("Control Center - Main Area")
             self.add_solution_reqs(reqs, door.control_center_color)
 
@@ -31,7 +31,8 @@ class Lingo2StaticLogic:
                 location_name = self.get_door_location_name(door)
                 self.location_id_to_name[door.ap_id] = location_name
 
-            if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
+            if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE,
+                                 data_pb2.DoorType.LEGACY_LOCATION]:
                 item_name = self.get_door_item_name(door)
                 self.item_id_to_name[door.ap_id] = item_name
 
@@ -2789,6 +2789,7 @@ maps:
           FINCH: 886
           FOUR: 885
     doors:
+      Control Center Entrance: 865
       F Door: 866
       L Entered: 2843
       Main Room Puzzles: 863
@@ -2974,8 +2975,10 @@ maps:
           MORE: 1022
     doors:
       Left Only Puzzles: 3020
+      Left/Turn Door: 984
       Shop Only Puzzles: 3019
       Turn Only Puzzles: 3018
+      Turn/Shop Door: 985
   the_repetitive:
     rooms:
       Anti Room:
@@ -5,6 +5,8 @@ ports {
   path: "Components/Warps/worldport8"
   destination { x: -27 y: 0 z: -34 }
   rotation: 90
-  # TODO: shuffle entrances with dependent keyholders
+  # This is because there's no port on the other side of the connection, so if
+  # this connection was removed and gallery paintings aren't shuffled then
+  # there'd be no way into The Ancient.
   no_shuffle: true
 }
@@ -1,7 +1,5 @@
 name: "Hotel"
 panel_display_name: "Southwest Area"
-# TODO: Something has to be changed in-game so that the puzzles don't disappear
-# and thus cause them to become unsolvable.
 panels {
   name: "MARLIN"
   path: "Panels/Connections/connections_2"
@@ -1,4 +1,3 @@
-# TODO: The gallery painting
 doors {
   name: "Panels"
   type: EVENT
@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
   name: "White Door"
   type: STANDARD
@@ -2,5 +2,4 @@ name: "C Keyholder"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolder"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
@@ -2,5 +2,4 @@ name: "G Keyholder"
 keyholders {
   name: "G"
   path: "Components/KeyHolders/keyHolder2"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
   name: "Double Letter Panel Blockers"
   type: EVENT
@@ -304,7 +304,6 @@ doors {
 doors {
   name: "Red Room Painting"
   type: STANDARD
-  #move_paintings { room: "Right Eye" name: "PSYCHIC" }
   receivers: "Components/Paintings/psychic/teleportListener"
   panels { room: "Right Eye" name: "FAINT" }
   location_room: "Right Eye"
@@ -312,7 +311,6 @@ doors {
 doors {
   name: "Third Eye Painting"
   type: LOCATION_ONLY
-  # move_paintings { room: "Eye Room" name: "GALLERY" }
   # TODO: ummmm
   panels { room: "Eye Room" name: "I" }
   location_room: "Eye Room"
@@ -49,9 +49,10 @@ doors {
 }
 doors {
   name: "Control Center Entrance"
-  type: EVENT
+  type: LEGACY_LOCATION
   #receivers: "Components/Doors/controlDoor"
   panels { room: "Control Center Entrance" name: "RETURN" }
+  location_room: "Control Center Entrance"
 }
 doors {
   name: "F Door"
@@ -26,17 +26,18 @@ doors {
 }
 doors {
   name: "Left/Turn Door"
-  type: EVENT
+  type: LEGACY_LOCATION
   panels { room: "Left Room" name: "HIDE" }
   panels { room: "Left Room" name: "LEFT" }
   panels { room: "Left Room" name: "MORE" }
   panels { room: "Turn Room" name: "HIDE (1)" }
   panels { room: "Turn Room" name: "HIDE (2)" }
   panels { room: "Turn Room" name: "MORE" }
+  location_room: "Turn Room"
 }
 doors {
   name: "Turn/Shop Door"
-  type: EVENT
+  type: LEGACY_LOCATION
   panels { room: "Turn Room" name: "HIDE (1)" }
   panels { room: "Turn Room" name: "HIDE (2)" }
   panels { room: "Turn Room" name: "MORE" }
@@ -45,6 +46,7 @@ doors {
   panels { room: "Shop Room" name: "EXIT (1)" }
   panels { room: "Shop Room" name: "EXIT (2)" }
   panels { room: "Shop Room" name: "EXIT (3)" }
+  location_room: "Turn Room"
 }
 doors {
   name: "All Doors"
@@ -30,6 +30,9 @@ enum DoorType {
 
   // This door is never a location, and is an item as long as gallery painting shuffle is on.
   GALLERY_PAINTING = 7;
+
+  // This location is not added to new worlds, but the client can send it out for backwards compataibility purposes.
+  LEGACY_LOCATION = 8;
 }
 
 enum DoorGroupType {
@@ -227,7 +227,8 @@ class Validator {
 
       if (h_door.type() == DoorType::STANDARD ||
           h_door.type() == DoorType::LOCATION_ONLY ||
-          h_door.type() == DoorType::GRAVESTONE) {
+          h_door.type() == DoorType::GRAVESTONE ||
+          h_door.type() == DoorType::LEGACY_LOCATION) {
         if (h_door.double_letters()) {
           std::cout << "Door " << door_identifier.ShortDebugString()
                     << " is a location that depends on double_letters."