From 86405cedd7d1a6f376862593dd0a72b6cd1e80a9 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 16 Nov 2023 05:12:44 -0500
Subject: Lingo: Sync config with game update (#2447)

---
 LL1.yaml                 | 30 ++++++++++++++++++++++++------
 ids.yaml                 |  4 +++-
 utils/validate_config.rb |  2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/LL1.yaml b/LL1.yaml
index db1418f..f8b07b8 100644
--- a/LL1.yaml
+++ b/LL1.yaml
@@ -1650,7 +1650,9 @@
       The Observant: True # Assuming that access to The Observant includes access to the right entrance
       Eight Room: True
       Eight Alcove:
-        door: Eight Painting
+        door: Eight Door
+      Orange Tower Sixth Floor:
+        painting: True
     panels:
       Achievement:
         id: Countdown Panels/Panel_incomparable_incomparable
@@ -1715,7 +1717,7 @@
         colors: blue
         tag: forbid
     doors:
-      Eight Painting:
+      Eight Door:
         id: Red Blue Purple Room Area Doors/Door_a_strands
         location_name: Giant Sevens
         group: Observant Doors
@@ -1725,11 +1727,17 @@
             panel: I
           - room: Elements Area
             panel: A
+    paintings:
+      - id: crown_painting
+        orientation: east
   Eight Alcove:
     entrances:
       The Incomparable:
         room: The Incomparable
-        door: Eight Painting
+        door: Eight Door
+      Outside The Initiated:
+        room: Outside The Initiated
+        door: Eight Door
     paintings:
       - id: eight_painting2
         orientation: north
@@ -2126,7 +2134,7 @@
         orientation: north
       - id: panda_painting_2
         orientation: south
-      - id: pencil_painting
+      - id: crown_painting2
         orientation: north
       - id: colors_painting2
         orientation: south
@@ -2638,10 +2646,8 @@
       Hub Room: True
       Outside The Wondrous: True
       Outside The Undeterred: True
-      Outside The Initiated: True
       Outside The Agreeable: True
       Outside The Wanderer: True
-      Eight Alcove: True
       Orange Tower Fifth Floor:
         room: Orange Tower Fifth Floor
         door: Welcome Back
@@ -2713,6 +2719,8 @@
       Orange Tower Fifth Floor:
         room: Art Gallery
         door: Exit
+      Eight Alcove:
+        door: Eight Door
     panels:
       SEVEN (1):
         id: Backside Room/Panel_seven_seven_5
@@ -2878,6 +2886,16 @@
             panel: BACKSIDE
           - room: The Bearer
             panel: BACKSIDE
+      Eight Door:
+        id: Red Blue Purple Room Area Doors/Door_a_strands2
+        skip_location: True
+        panels:
+          - room: The Incomparable
+            panel: I (Seven)
+          - room: Courtyard
+            panel: I
+          - room: Elements Area
+            panel: A
     paintings:
       - id: clock_painting_5
         orientation: east
diff --git a/ids.yaml b/ids.yaml
index f48858a..1a1ceca 100644
--- a/ids.yaml
+++ b/ids.yaml
@@ -1098,7 +1098,7 @@ doors:
       item: 444474
       location: 444569
   The Incomparable:
-    Eight Painting:
+    Eight Door:
       item: 444475
       location: 445219
   Orange Tower:
@@ -1219,6 +1219,8 @@ doors:
     Entrance:
       item: 444516
       location: 445237
+    Eight Door:
+      item: 444578
   The Traveled:
     Color Hallways Entrance:
       item: 444517
diff --git a/utils/validate_config.rb b/utils/validate_config.rb
index ed2e905..bed5188 100644
--- a/utils/validate_config.rb
+++ b/utils/validate_config.rb
@@ -42,7 +42,7 @@ door_groups = {}
 directives = Set["entrances", "panels", "doors", "paintings", "progression"]
 panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting"]
 door_directives = Set["id", "painting_id", "panels", "item_name", "location_name", "skip_location", "skip_item", "group", "include_reduce", "junk_item", "event"]
-painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move"]
+painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"]
 
 non_counting = 0
 
-- 
cgit 1.4.1