1 files changed, 166 insertions, 130 deletions

@@ -278,10 +278,10 @@
         tag: forbid
         check: True
         achievement: The Seeker
-      BEAR:
+      BEAR (1):
         id: Heteronym Room/Panel_bear_bear
         tag: midwhite
-      MINE:
+      MINE (1):
         id: Heteronym Room/Panel_mine_mine
         tag: double midwhite
         subtag: left
@@ -297,7 +297,7 @@
       DOES:
         id: Heteronym Room/Panel_does_does
         tag: midwhite
-      MOBILE:
+      MOBILE (1):
         id: Heteronym Room/Panel_mobile_mobile
         tag: double midwhite
         subtag: left
@@ -399,8 +399,7 @@
         door: Crossroads Entrance
       The Tenacious:
         door: Tenacious Entrance
-      Warts Straw Area:
-        door: Symmetry Door
+      Near Far Area: True
       Hedge Maze:
         door: Shortcut to Hedge Maze
       Orange Tower First Floor:
@@ -427,14 +426,6 @@
         id: Palindrome Room/Panel_slaughter_laughter
         colors: red
         tag: midred
-      NEAR:
-        id: Symmetry Room/Panel_near_far
-        colors: black
-        tag: botblack
-      FAR:
-        id: Symmetry Room/Panel_far_near
-        colors: black
-        tag: botblack
       TRACE:
         id: Maze Room/Panel_trace_trace
         tag: midwhite
@@ -477,14 +468,6 @@
         group: Entrances to The Tenacious
         panels:
           - SLAUGHTER
-      Symmetry Door:
-        id:
-          - Symmetry Room Area Doors/Door_near_far
-          - Symmetry Room Area Doors/Door_far_near
-        group: Symmetry Doors
-        panels:
-          - NEAR
-          - FAR
       Shortcut to Hedge Maze:
         id: Maze Area Doors/Door_trace_trace
         group: Hedge Maze Doors
@@ -548,7 +531,7 @@
         id: Lingo Room/Panel_shortcut
         colors: yellow
         tag: midyellow
-      PILGRIMAGE:
+      PILGRIM:
         id: Lingo Room/Panel_pilgrim
         colors: blue
         tag: midblue
@@ -569,7 +552,7 @@
       Exit:
         event: True
         panels:
-          - PILGRIMAGE
+          - PILGRIM
   Pilgrim Room:
     entrances:
       The Seeker:
@@ -755,7 +738,7 @@
         panels:
           - TURN
           - room: Orange Tower Fourth Floor
-            panel: RUNT
+            panel: RUNT (1)
       Words Sword Door:
         id:
           - Shuffle Room Area Doors/Door_words_shuffle_3
@@ -962,11 +945,36 @@
           - LEVEL (White)
           - RACECAR (White)
           - SOLOS (White)
+  Near Far Area:
+    entrances:
+      Hub Room: True
+      Warts Straw Area:
+        door: Door
+    panels:
+      NEAR:
+        id: Symmetry Room/Panel_near_far
+        colors: black
+        tag: botblack
+      FAR:
+        id: Symmetry Room/Panel_far_near
+        colors: black
+        tag: botblack
+    doors:
+      Door:
+        id:
+          - Symmetry Room Area Doors/Door_near_far
+          - Symmetry Room Area Doors/Door_far_near
+        group: Symmetry Doors
+        item_name: Symmetry Room - Near Far Door
+        location_name: Symmetry Room - NEAR, FAR
+        panels:
+          - NEAR
+          - FAR
   Warts Straw Area:
     entrances:
-      Hub Room:
-        room: Hub Room
-        door: Symmetry Door
+      Near Far Area:
+        room: Near Far Area
+        door: Door
       Leaf Feel Area:
         door: Door
     panels:
@@ -984,6 +992,8 @@
           - Symmetry Room Area Doors/Door_warts_straw
           - Symmetry Room Area Doors/Door_straw_warts
         group: Symmetry Doors
+        item_name: Symmetry Room - Warts Straw Door
+        location_name: Symmetry Room - WARTS, STRAW
         panels:
           - WARTS
           - STRAW
@@ -1009,6 +1019,8 @@
           - Symmetry Room Area Doors/Door_leaf_feel
           - Symmetry Room Area Doors/Door_feel_leaf
         group: Symmetry Doors
+        item_name: Symmetry Room - Leaf Feel Door
+        location_name: Symmetry Room - LEAF, FEEL
         panels:
           - LEAF
           - FEEL
@@ -1120,7 +1132,7 @@
         tag: forbid
         required_panel:
           - room: Outside The Bold
-            panel: MOUTH
+            panel: SOUND
           - room: Outside The Bold
             panel: YEAST
           - room: Outside The Bold
@@ -1436,7 +1448,7 @@
     entrances:
       The Perceptive: True
     panels:
-      NAPS:
+      SPAN:
         id: Naps Room/Panel_naps_span
         colors: black
         tag: midblack
@@ -1462,7 +1474,7 @@
         location_name: The Fearless - First Floor Puzzles
         group: Fearless Doors
         panels:
-          - NAPS
+          - SPAN
           - TEAM
           - TEEM
           - IMPATIENT
@@ -1564,11 +1576,11 @@
         required_door:
           door: Stairs
         achievement: The Observant
-      BACK:
+      FOUR (1):
         id: Look Room/Panel_four_back
         colors: green
         tag: forbid
-      SIDE:
+      FOUR (2):
         id: Look Room/Panel_four_side
         colors: green
         tag: forbid
@@ -1578,87 +1590,87 @@
         hunt: True
         required_door:
           door: Backside Door
-      STAIRS:
+      SIX:
         id: Look Room/Panel_six_stairs
         colors: green
         tag: forbid
-      WAYS:
+      FOUR (3):
         id: Look Room/Panel_four_ways
         colors: green
         tag: forbid
-      "ON":
+      TWO (1):
         id: Look Room/Panel_two_on
         colors: green
         tag: forbid
-      UP:
+      TWO (2):
         id: Look Room/Panel_two_up
         colors: green
         tag: forbid
-      SWIMS:
+      FIVE:
         id: Look Room/Panel_five_swims
         colors: green
         tag: forbid
-      UPSTAIRS:
+      BELOW (1):
         id: Look Room/Panel_eight_upstairs
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      TOIL:
+      BLUE:
         id: Look Room/Panel_blue_toil
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      STOP:
+      BELOW (2):
         id: Look Room/Panel_four_stop
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      TOP:
+      MINT (1):
         id: Look Room/Panel_aqua_top
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      HI:
+      ESACREWOL:
         id: Look Room/Panel_blue_hi
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      HI (2):
+      EULB:
         id: Look Room/Panel_blue_hi2
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      "31":
+      NUMBERS (1):
         id: Look Room/Panel_numbers_31
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      "52":
+      NUMBERS (2):
         id: Look Room/Panel_numbers_52
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      OIL:
+      MINT (2):
         id: Look Room/Panel_aqua_oil
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      BACKSIDE (GREEN):
+      GREEN (1):
         id: Look Room/Panel_eight_backside
         colors: green
         tag: forbid
         required_door:
           door: Stairs
-      SIDEWAYS:
+      GREEN (2):
         id: Look Room/Panel_eight_sideways
         colors: green
         tag: forbid
@@ -1669,13 +1681,13 @@
         id: Maze Area Doors/Door_backside
         group: Backside Doors
         panels:
-          - BACK
-          - SIDE
+          - FOUR (1)
+          - FOUR (2)
       Stairs:
         id: Maze Area Doors/Door_stairs
         group: Observant Doors
         panels:
-          - STAIRS
+          - SIX
   The Incomparable:
     entrances:
       The Observant: True # Assuming that access to The Observant includes access to the right entrance
@@ -2005,7 +2017,7 @@
       Courtyard: True
       Roof: True # through the sunwarp
     panels:
-      RUNT:
+      RUNT (1):
         id: Shuffle Room/Panel_turn_runt2
         colors: yellow
         tag: midyellow
@@ -2219,6 +2231,7 @@
           - Master Room Doors/Door_master_down
           - Master Room Doors/Door_master_down2
         skip_location: True
+        item_name: Mastery
         panels:
           - THE MASTER
       Mastery Panels:
@@ -2235,25 +2248,25 @@
             panel: MASTERY
           - room: Hedge Maze
             panel: MASTERY (1)
-          - room: Roof
-            panel: MASTERY (1)
-          - room: Roof
-            panel: MASTERY (2)
+          - room: Behind A Smile
+            panel: MASTERY
+          - room: Sixteen Colorful Squares
+            panel: MASTERY
           - MASTERY
           - room: Hedge Maze
             panel: MASTERY (2)
-          - room: Roof
-            panel: MASTERY (3)
-          - room: Roof
-            panel: MASTERY (4)
-          - room: Roof
-            panel: MASTERY (5)
+          - room: Among Treetops
+            panel: MASTERY
+          - room: Horizon's Edge
+            panel: MASTERY
+          - room: Beneath The Lookout
+            panel: MASTERY
           - room: Elements Area
             panel: MASTERY
           - room: Pilgrim Antechamber
             panel: MASTERY
-          - room: Roof
-            panel: MASTERY (6)
+          - room: Rooftop Staircase
+            panel: MASTERY
     paintings:
       - id: map_painting2
         orientation: north
@@ -2265,52 +2278,75 @@
       Crossroads:
         room: Crossroads
         door: Roof Access
+  Behind A Smile:
+    entrances:
+      Roof: True
     panels:
-      MASTERY (1):
+      MASTERY:
         id: Master Room/Panel_mastery_mastery6
         tag: midwhite
         hunt: True
         required_door:
           room: Orange Tower Seventh Floor
           door: Mastery
-      MASTERY (2):
+      STAIRCASE:
+        id: Open Areas/Panel_staircase
+        tag: midwhite
+  Sixteen Colorful Squares:
+    entrances:
+      Roof: True
+    panels:
+      MASTERY:
         id: Master Room/Panel_mastery_mastery7
         tag: midwhite
         hunt: True
         required_door:
           room: Orange Tower Seventh Floor
           door: Mastery
-      MASTERY (3):
+  Among Treetops:
+    entrances:
+      Roof: True
+    panels:
+      MASTERY:
         id: Master Room/Panel_mastery_mastery10
         tag: midwhite
         hunt: True
         required_door:
           room: Orange Tower Seventh Floor
           door: Mastery
-      MASTERY (4):
+  Horizon's Edge:
+    entrances:
+      Roof: True
+    panels:
+      MASTERY:
         id: Master Room/Panel_mastery_mastery11
         tag: midwhite
         hunt: True
         required_door:
           room: Orange Tower Seventh Floor
           door: Mastery
-      MASTERY (5):
+  Beneath The Lookout:
+    entrances:
+      Roof: True
+    panels:
+      MASTERY:
         id: Master Room/Panel_mastery_mastery12
         tag: midwhite
         hunt: True
         required_door:
           room: Orange Tower Seventh Floor
           door: Mastery
-      MASTERY (6):
+  Rooftop Staircase:
+    entrances:
+      Roof: True
+    panels:
+      MASTERY:
         id: Master Room/Panel_mastery_mastery15
         tag: midwhite
         hunt: True
         required_door:
           room: Orange Tower Seventh Floor
           door: Mastery
-      STAIRCASE:
-        id: Open Areas/Panel_staircase
-        tag: midwhite
   Orange Tower Basement:
     entrances:
       Orange Tower Sixth Floor:
@@ -2632,9 +2668,7 @@
         tag: forbid
     doors:
       Progress Door:
-        id:
-          - Doorway Room Doors/Door_gray
-          - Doorway Room Doors/Door_gray2 # See comment below
+        id: Doorway Room Doors/Door_gray
         item_name: The Colorful - Gray Door
         location_name: The Colorful - Gray
         group: Colorful Doors
@@ -2784,6 +2818,7 @@
         door: Exit
       Eight Alcove:
         door: Eight Door
+      The Optimistic: True
     panels:
       SEVEN (1):
         id: Backside Room/Panel_seven_seven_5
@@ -2833,21 +2868,11 @@
         id: Rhyme Room/Panel_locked_knocked
         colors: purple
         tag: midpurp
-      BACKSIDE:
-        id: Backside Room/Panel_backside_1
-        tag: midwhite
-      The Optimistic:
-        id: Countdown Panels/Panel_optimistic_optimistic
-        check: True
-        tag: forbid
-        required_door:
-          door: Backsides
-        achievement: The Optimistic
-      PAST:
+      PAST (1):
         id: Shuffle Room/Panel_past_present
         colors: brown
         tag: botbrown
-      FUTURE:
+      FUTURE (1):
         id: Shuffle Room/Panel_future_present
         colors:
           - brown
@@ -2944,17 +2969,6 @@
             panel: GREEN
           - room: Outside The Agreeable
             panel: PURPLE
-      Backsides:
-        event: True
-        panels:
-          - room: The Observant
-            panel: BACKSIDE
-          - room: Yellow Backside Area
-            panel: BACKSIDE
-          - room: Directional Gallery
-            panel: BACKSIDE
-          - room: The Bearer
-            panel: BACKSIDE
       Eight Door:
         id: Red Blue Purple Room Area Doors/Door_a_strands2
         skip_location: True
@@ -3064,6 +3078,28 @@
         id: Rhyme Room/Panel_bed_dead
         colors: purple
         tag: toppurp
+  The Optimistic:
+    entrances:
+      Outside The Initiated: True
+    panels:
+      BACKSIDE:
+        id: Backside Room/Panel_backside_1
+        tag: midwhite
+      Achievement:
+        id: Countdown Panels/Panel_optimistic_optimistic
+        check: True
+        tag: forbid
+        required_panel:
+          - panel: BACKSIDE
+          - room: The Observant
+            panel: BACKSIDE
+          - room: Yellow Backside Area
+            panel: BACKSIDE
+          - room: Directional Gallery
+            panel: BACKSIDE
+          - room: The Bearer
+            panel: BACKSIDE
+        achievement: The Optimistic
   The Traveled:
     entrances:
       Hub Room:
@@ -3164,7 +3200,7 @@
       Outside The Undeterred: True
       Crossroads: True
       Hedge Maze: True
-      Outside The Initiated: True # backside
+      The Optimistic: True # backside
       Directional Gallery: True # backside
       Yellow Backside Area: True
       The Bearer:
@@ -3181,7 +3217,7 @@
         door: Shortcut to The Steady
       The Bearer:
         room: The Bearer
-        door: Shortcut to The Bold
+        door: Entrance
       Directional Gallery:
         # There is a painting warp here from the Directional Gallery, but it
         # only appears when the sixes are revealed. It could be its own item if
@@ -3252,7 +3288,7 @@
         tag: midwhite
         required_door:
           door: Stargazer Door
-      MOUTH:
+      SOUND:
         id: Cross Room/Panel_mouth_south
         colors: purple
         tag: midpurp
@@ -3596,7 +3632,7 @@
         id: Blue Room/Panel_bone_skeleton
         colors: blue
         tag: botblue
-      EYE:
+      EYE (1):
         id: Blue Room/Panel_mouth_face
         colors: blue
         tag: double botblue
@@ -4115,7 +4151,7 @@
   The Bearer:
     entrances:
       Outside The Bold:
-        door: Shortcut to The Bold
+        door: Entrance
       Orange Tower Fifth Floor:
         room: Art Gallery
         door: Exit
@@ -4192,7 +4228,7 @@
           - yellow
         tag: mid red yellow
     doors:
-      Shortcut to The Bold:
+      Entrance:
         id: Red Blue Purple Room Area Doors/Door_middle_middle
         panels:
           - MIDDLE
@@ -4321,21 +4357,21 @@
         door: Side Area Shortcut
       Roof: True
     panels:
-      SNOW:
+      SMILE:
         id: Cross Room/Panel_smile_lime
         colors:
           - red
           - yellow
         tag: mid yellow red
-      SMILE:
+        required_panel:
+          room: The Bearer (North)
+          panel: WARTS
+      SNOW:
         id: Cross Room/Panel_snow_won
         colors:
           - red
           - yellow
         tag: mid red yellow
-        required_panel:
-          room: The Bearer (North)
-          panel: WARTS
     doors:
       Side Area Shortcut:
         event: True
@@ -4414,7 +4450,7 @@
           - room: The Bearer (West)
             panel: SMILE
           - room: Outside The Bold
-            panel: MOUTH
+            panel: SOUND
           - room: Outside The Bold
             panel: YEAST
           - room: Outside The Bold
@@ -6129,7 +6165,7 @@
         id: Painting Room/Panel_our_four
         colors: blue
         tag: midblue
-      ONE ROAD MANY TURNS:
+      ORDER:
         id: Painting Room/Panel_order_onepathmanyturns
         tag: forbid
         colors:
@@ -6186,7 +6222,7 @@
         include_reduce: True
         item_name: Orange Tower Fifth Floor - Quadruple Intersection
         panels:
-          - ONE ROAD MANY TURNS
+          - ORDER
     paintings:
       - id: smile_painting_3
         orientation: west
@@ -6678,7 +6714,7 @@
           - room: Rhyme Room (Target)
             panel: PISTOL
           - room: Rhyme Room (Target)
-            panel: QUARTZ
+            panel: GEM
   Rhyme Room (Target):
     entrances:
       Rhyme Room (Smiley): # one-way
@@ -6706,7 +6742,7 @@
         tag: syn rhyme
         subtag: top
         link: rhyme CRYSTAL
-      QUARTZ:
+      GEM:
         id: Double Room/Panel_crystal_syn
         colors: purple
         tag: syn rhyme
@@ -6731,7 +6767,7 @@
         group: Rhyme Room Doors
         panels:
           - PISTOL
-          - QUARTZ
+          - GEM
           - INNOVATIVE (Top)
           - INNOVATIVE (Bottom)
     paintings:
@@ -6789,22 +6825,18 @@
         id: Panel Room/Panel_room_floor_5
         colors: gray
         tag: forbid
-      FLOOR (7):
+      FLOOR (6):
         id: Panel Room/Panel_room_floor_7
         colors: gray
         tag: forbid
-      FLOOR (8):
+      FLOOR (7):
         id: Panel Room/Panel_room_floor_8
         colors: gray
         tag: forbid
-      FLOOR (9):
+      FLOOR (8):
         id: Panel Room/Panel_room_floor_9
         colors: gray
         tag: forbid
-      FLOOR (10):
-        id: Panel Room/Panel_room_floor_10
-        colors: gray
-        tag: forbid
       CEILING (1):
         id: Panel Room/Panel_room_ceiling_1
         colors: gray
@@ -6825,6 +6857,10 @@
         id: Panel Room/Panel_room_ceiling_5
         colors: gray
         tag: forbid
+      CEILING (6):
+        id: Panel Room/Panel_room_floor_10
+        colors: gray
+        tag: forbid
       WALL (1):
         id: Panel Room/Panel_room_wall_1
         colors: gray
@@ -7083,7 +7119,7 @@
         id: Hangry Room/Panel_red_top_3
         colors: red
         tag: topred
-      FLUMMOXED:
+      FLUSTERED:
         id: Hangry Room/Panel_red_top_4
         colors: red
         tag: topred
@@ -7586,7 +7622,7 @@
           - black
           - blue
         tag: chain mid black blue
-      BREAD:
+      CHEESE:
         id: Challenge Room/Panel_bread_mold
         colors: brown
         tag: double botbrown
@@ -7633,7 +7669,7 @@
         id: Challenge Room/Panel_double_anagram_5
         colors: yellow
         tag: midyellow
-      FACTS:
+      FACTS (Chain):
         id: Challenge Room/Panel_facts
         colors:
           - red
@@ -7643,18 +7679,18 @@
         id: Challenge Room/Panel_facts2
         colors: red
         tag: forbid
-      FACTS (3):
+      FACTS (2):
         id: Challenge Room/Panel_facts3
         tag: forbid
-      FACTS (4):
+      FACTS (3):
         id: Challenge Room/Panel_facts4
         colors: blue
         tag: forbid
-      FACTS (5):
+      FACTS (4):
         id: Challenge Room/Panel_facts5
         colors: blue
         tag: forbid
-      FACTS (6):
+      FACTS (5):
         id: Challenge Room/Panel_facts6
         colors: blue
         tag: forbid