4 files changed, 385 insertions, 354 deletions

@@ -67,6 +67,8 @@
     map: [2642, 872]

   Eight Room:

     fold_into: The Incomparable

+  Eight Alcove:

+    fold_into: The Incomparable

   Orange Tower First Floor:

     map: [1285, 928]

   Color Hunt:

@@ -83,8 +85,10 @@
     map: [1252, 1259]

   Orange Tower Seventh Floor:

     map: [1587, 1900]

-  Orange Tower Basement:

+  Orange Tower Sixth Floor:

     map: [1587, 2000]

+  Orange Tower Basement:

+    map: [1587, 2100]

   Courtyard:

     map: [863, 387]

   First Second Third Fourth:

@@ -224,11 +228,15 @@
   The Eyes They See:

     map: [955, 933]

   Far Window:

-   fold_into: The Eyes They See

+    fold_into: The Eyes They See

+  Wondrous Lobby:

+    fold_into: The Eyes They See

   Outside The Wondrous:

     map: [691, 524]

   The Wondrous:

     map: [648, 338]

+  The Wondrous (Doorknob):

+    fold_into: The Wondrous

   The Wondrous (Bookcase):

     fold_into: The Wondrous

   The Wondrous (Chandelier):

@@ -271,6 +279,8 @@
     map: [1368, 2103]

   Art Gallery:

     map: [2474, 1366]

+  Art Gallery (First Floor):

+    fold_into: Art Gallery

   Art Gallery (Second Floor):

     fold_into: Art Gallery

   Art Gallery (Third Floor):

@@ -1,123 +1,117 @@
 ---
-- pos: [1050, 954]
+- pos: [1051, 954]
   room: Starting Room
   door: Back Right Door
 - pos: [986, 1034]
   room: Starting Room
   door: Rhyme Room Entrance
-- pos: [990, 956]
-  special: starting_room_paintings # Early Color Hallways painting is a hardcoded special case
-  paintings:
-    - arrows_painting
-- pos: [905, 841]
+- pos: [996, 964]
+  special: starting_room_overhead
+  painting: arrows_painting
+- pos: [1044, 1012]
+  special: early_color_hallways
+  painting: color_hallways
+- pos: [915, 851]
   room: Hedge Maze
   door: Painting Shortcut
-  paintings:
-    - garden_painting_tower2
-  tags:
+  painting: garden_painting_tower2
+  entrances:
     - garden_starting
-- pos: [1066, 841]
+- pos: [1076, 851]
   room: Courtyard
   door: Painting Shortcut
-  paintings:
-    - flower_painting_8
-  tags:
+  painting: flower_painting_8
+  entrances:
     - flower_starting
-- pos: [905, 895]
+- pos: [915, 905]
   room: The Wondrous (Doorknob)
   door: Painting Shortcut
-  paintings:
-    - symmetry_painting_a_starter
-  tags:
+  painting: symmetry_painting_a_starter
+  entrances:
     - symmetry_starting
-- pos: [1066, 868]
+- pos: [1076, 905]
   room: Outside The Bold
   door: Painting Shortcut
-  paintings:
-    - pencil_painting6
-  tags:
+  painting: pencil_painting6
+  entrances:
     - pencil_starting
-- pos: [1066, 895]
+- pos: [1076, 878]
   room: Outside The Undeterred
   door: Painting Shortcut
-  paintings:
-    - blueman_painting_3
-  tags:
+  painting: blueman_painting_3
+  entrances:
     - blueman_starting
-- pos: [905, 868]
+- pos: [915, 878]
   room: Outside The Agreeable
   door: Painting Shortcut
-  paintings:
-    - eyes_yellow_painting2
-  tags:
+  painting: eyes_yellow_painting2
+  entrances:
     - street_starting
 - pos: [1211, 879]
   room: Hidden Room
   door: Dead End Door
-- pos: [1291, 906]
+- pos: [1292, 906]
   room: Hidden Room
   door: Knight Night Entrance
-- pos: [1103, 980]
+- pos: [1104, 981]
   room: Hidden Room
   door: Seeker Entrance
-- pos: [1173, 980]
+- pos: [1174, 981]
   room: Hidden Room
   door: Rhyme Room Entrance
-- pos: [1116, 939]
-  paintings:
-    - owl_painting
-  tags:
+- pos: [1114, 937]
+  painting: owl_painting
+  entrances:
     - owl_hidden
 - pos: [986, 793]
   room: Second Room
   door: Exit Door
-- pos: [798, 584]
+- pos: [799, 584]
   room: Hub Room
   door: Crossroads Entrance
-- pos: [932, 665]
+- pos: [933, 665]
   room: Hub Room
   door: Tenacious Entrance
-- pos: [1361, 578]
+- pos: [1361, 579]
   room: Hub Room
   door: Shortcut to Hedge Maze
-- pos: [1312, 841]
+- pos: [1313, 842]
   room: Hub Room
   door: Near RAT Door
-- pos: [1371, 729]
+- pos: [1372, 729]
   room: Hub Room
   door: Traveled Entrance
-- pos: [1313, 686]
-  paintings:
-    - maze_painting
-  tags:
+- pos: [1312, 696]
+  painting: maze_painting
+  exits:
     - green_owl
     - green_numbers
-- pos: [1172, 760]
+- pos: [1174, 761]
   sunwarp:
     dots: 1
     type: enter
 - pos: [1302, 638]
   room: Outside The Undeterred
   door: Fours
-- pos: [1243, 819]
+- pos: [1243, 820]
   room: Outside The Undeterred
   door: Fours
-- pos: [1276, 819]
-  room: Outside The Undeterred
+- pos: [1276, 820]
+  room: Number Hunt
   door: Eights
-- pos: [1263, 867]
-  paintings:
-    - smile_painting_6
-  tags:
+- pos: [1253, 889]
+  painting: smile_painting_6
+  entrances:
     - smiley_deadend
-- pos: [1012, 1086]
+- pos: [1013, 1087]
   sunwarp:
     dots: 6
     type: final
-- pos: [938, 1002]
+- pos: [948, 1012]
   room: Pilgrim Antechamber
   door: Sun Painting
   special: sun_painting
+  painting: pilgrim_painting2
 - pos: [1053, 1090]
   invisible: true
   special: sun_painting_exit
@@ -136,7 +130,7 @@
 - pos: [932, 477]
   room: Crossroads
   door: Tenacious Entrance
-- pos: [638, 477]
+- pos: [509, 477]
   room: Crossroads
   door: Discerning Entrance
 - pos: [905, 290]
@@ -145,16 +139,15 @@
 - pos: [894, 423]
   room: Crossroads
   door: Words Sword Door
-- pos: [632, 643]
+- pos: [718, 557]
   room: Crossroads
   door: Eye Wall
-- pos: [638, 520]
+- pos: [509, 434]
   room: Crossroads
   door: Roof Access
-- pos: [756, 400]
-  paintings:
-    - smile_painting_4
-  tags:
+- pos: [712, 514]
+  painting: smile_painting_4
+  entrances:
     - smiley_crossroads
 - pos: [878, 509]
   sunwarp:
@@ -168,13 +161,12 @@
   door: Exit
 - pos: [986, 290]
   room: Number Hunt
-  door: Eights
+  door: Nines
 - pos: [954, 247]
   room: Amen Name Area
   door: Exit
-- pos: [954, 222]
-  paintings:
-    - west_afar
+- pos: [985, 235]
+  painting: west_afar
 - pos: [986, 697]
   room: The Tenacious
   door: Shortcut to Hub Room
@@ -205,22 +197,20 @@
 - pos: [1216, 525]
   room: Outside The Agreeable
   door: Agreeable Entrance
-- pos: [1138, 287]
-  paintings:
-    - eyes_yellow_painting
-  tags:
+- pos: [1156, 299]
+  painting: eyes_yellow_painting
+  exits:
     - street_starting
 - pos: [1088, 385]
   sunwarp:
     dots: 6
     type: enter
-- pos: [1195, 450]
+- pos: [1195, 445]
   room: Compass Room
   door: Lookout Entrance
-- pos: [1214, 457]
-  paintings:
-    - pencil_painting7
-  tags:
+- pos: [1226, 481]
+  painting: pencil_painting7
+  entrances:
     - pencil_compass
 - pos: [1196, 417]
   invisible: true
@@ -248,10 +238,9 @@
 - pos: [1714, 434]
   room: Hedge Maze
   door: Observant Entrance
-- pos: [1477, 343]
-  paintings:
-    - garden_painting_tower
-  tags:
+- pos: [1526, 401]
+  painting: garden_painting_tower
+  exits:
     - garden_starting
 - pos: [1565, 311]
   room: The Fearless (First Floor)
@@ -262,45 +251,48 @@
 - pos: [1414, 209]
   room: The Observant
   door: Backside Door
-- pos: [1624, 188]
+- pos: [1592, 188]
   room: The Observant
   door: Stairs
-- pos: [1667, 686]
+- pos: [1694, 659]
   room: The Incomparable
   door: Eight Door
-- pos: [1784, 569]
-  paintings:
-    - crown_painting
-  tags:
+- pos: [1799, 583]
+  painting: crown_painting
+  exits:
     - crown_tower6
-- pos: [1653, 717]
-  paintings:
-    - eight_painting2
-  tags:
+- pos: [1644, 685]
+  painting: eight_painting2
+  entrances:
     - eight_alcove
-- pos: [1653, 662]
-  paintings:
-    - eight_painting
-  tags:
+- pos: [1660, 664]
+  painting: eight_painting
+  exits:
     - eight_alcove
-- pos: [697, 1471]
+- pos: [695, 1471]
   room: Orange Tower
   door: Second Floor
-- pos: [633, 1406]
+  tilted: true
+- pos: [631, 1406]
   room: Orange Tower
   door: Third Floor
-- pos: [570, 1343]
+  tilted: true
+- pos: [567, 1341]
   room: Orange Tower
   door: Fourth Floor
-- pos: [504, 1279]
+  tilted: true
+- pos: [502, 1277]
   room: Orange Tower
   door: Fifth Floor
-- pos: [440, 1215]
+  tilted: true
+- pos: [438, 1213]
   room: Orange Tower
   door: Sixth Floor
-- pos: [379, 1153]
+  tilted: true
+- pos: [378, 1152]
   room: Orange Tower
   door: Seventh Floor
+  tilted: true
 - pos: [905, 793]
   room: Orange Tower First Floor
   door: Shortcut to Hub Room
@@ -320,7 +312,7 @@
 - pos: [722, 1439]
   tags:
     - tower2_undeterred
-- pos: [533, 1375]
+- pos: [549, 1375]
   tags:
     - tower3_tower3
 - pos: [662, 1375]
@@ -377,10 +369,10 @@
 - pos: [1173, 1248]
   room: Orange Tower Third Floor
   door: Rhyme Room Entrance
-- pos: [1270, 1231]
-  paintings:
-    - arrows_painting_6
-    - flower_painting_5
+- pos: [1274, 1253]
+  painting: arrows_painting_6
+- pos: [1293, 1234]
+  painting: flower_painting_5
 - pos: [1216, 1216]
   sunwarp:
     dots: 2
@@ -396,77 +388,83 @@
   sunwarp:
     dots: 5
     type: enter
-- pos: [877, 155]
+- pos: [878, 155]
   room: Number Hunt
   door: Eights
-- pos: [844, 134]
-  paintings:
-    - smile_painting_8
-  tags:
+- pos: [862, 144]
+  painting: smile_painting_8
+  entrances:
     - smiley_hotcrusts
-- pos: [797, 155]
+- pos: [798, 155]
   sunwarp:
     dots: 2
     type: enter
-- pos: [679, 985]
+- pos: [680, 986]
   room: Number Hunt
   door: Nines
 - pos: [723, 953]
   room: Orange Tower Fifth Floor
   door: Welcome Back
-- pos: [683, 944]
-  paintings:
-    - east_afar
-- pos: [548, 1221]
-  paintings:
-    - hi_solved_painting3
-- pos: [1574, 1425]
-  paintings:
-    - hi_solved_painting2
-- pos: [411, 1186]
-  paintings:
-    - arrows_painting_10
-    - owl_painting_3
-    - clock_painting
-    - scenery_painting_5d_2
-    - symmetry_painting_b_7
-    - panda_painting_2
-    - crown_painting2
-    - colors_painting2
-    - cherry_painting2
-    - hi_solved_painting
-  tags:
-    - owl_tower6
-    - clock_tower6
+- pos: [690, 937]
+  painting: east_afar
+- pos: [535, 1205]
+  painting: hi_solved_painting3
+- pos: [1574, 1424]
+  painting: hi_solved_painting2
+- pos: [316, 1269]
+  painting: arrows_painting_10
+- pos: [332, 1253]
+  painting: scenery_painting_5d_2
+- pos: [347, 1237]
+  painting: panda_painting_2
+  entrances:
     - panda_tower6
+- pos: [363, 1221]
+  painting: colors_painting2
+- pos: [380, 1205]
+  painting: clock_painting
+  entrances:
+    - clock_tower6
+- pos: [396, 1221]
+  painting: hi_solved_painting
+  exits:
+    - hi_scientific
+- pos: [380, 1237]
+  painting: crown_painting2
+  entrances:
     - crown_tower6
+- pos: [363, 1253]
+  painting: owl_painting_3
+  entrances:
+    - owl_tower6
+- pos: [347, 1269]
+  painting: symmetry_painting_b_7
+- pos: [332, 1285]
+  painting: cherry_painting2
+  entrances:
     - apple_tower6
-    - hi_scientific
-- pos: [349, 1124]
-  paintings:
-    - map_painting2
+- pos: [360, 1135]
+  # TODO: there isn't really a spot for this one
+  painting: map_painting2
 - pos: [436, 1159]
   room: Orange Tower Seventh Floor
   door: Mastery
-- pos: [544, 1159]
-  paintings:
-    - arrows_painting_11
+- pos: [535, 1146]
+  painting: arrows_painting_11
 - pos: [498, 284]
   room: Courtyard
   door: Green Barrier
-- pos: [556, 233]
-  paintings:
-    - flower_painting_7
-  tags:
+- pos: [589, 230]
+  painting: flower_painting_7
+  exits:
     - flower_starting
     - flower_arrow
 - pos: [600, 332]
   room: Number Hunt
   door: Nines
-- pos: [579, 350]
-  paintings:
-    - blueman_painting
-  tags:
+- pos: [589, 369]
+  painting: blueman_painting
+  entrances:
     - blueman_courtyard
 - pos: [530, 310]
   room: First Second Third Fourth
@@ -501,14 +499,13 @@
 - pos: [922, 107]
   room: The Colorful (Gray)
   door: Progress Door
-- pos: [967, 107]
-  paintings:
-    - arrows_painting_12
+- pos: [969, 96]
+  painting: arrows_painting_12
 - pos: [878, 954]
   room: Welcome Back Area
   door: Shortcut to Starting Room
 - pos: [773, 954]
-  tags:
+  exits:
     - hub_wb
     - wondrous_wb
     - undeterred_wb
@@ -519,45 +516,48 @@
     - scientific_wb
     - cellar_wb
 - pos: [1107, 749]
-  tags:
+  entrances:
     - hub_wb
 - pos: [408, 817]
-  tags:
+  entrances:
     - wondrous_wb
 - pos: [281, 1017]
-  tags:
+  entrances:
     - undeterred_wb
 - pos: [1017, 289]
-  tags:
+  entrances:
     - agreeable_wb
 - pos: [907, 1385]
-  tags:
+  entrances:
     - wanderer_wb
 - pos: [1737, 1053]
-  tags:
+  entrances:
     - gallery_wb
-- pos: [1690, 268]
-  tags:
+- pos: [1784, 395]
+  entrances:
     - observant_wb
-- pos: [250, 604]
-  tags:
+- pos: [122, 350]
+  entrances:
     - scientific_wb
 - pos: [1553, 1467]
-  tags:
+  entrances:
     - cellar_wb
 - pos: [1478, 498]
   room: Owl Hallway
   door: Shortcut to Hedge Maze
-- pos: [1480, 551]
-  paintings:
-    - arrows_painting_8
-    - maze_painting_2
-    - owl_painting_2
-    - clock_painting_4
-  tags:
+- pos: [1467, 535]
+  painting: arrows_painting_8
+- pos: [1467, 562]
+  painting: maze_painting_2
+  entrances:
     - green_owl
+- pos: [1510, 535]
+  painting: owl_painting_2
+  exits:
     - owl_hidden
     - owl_tower6
+- pos: [1510, 562]
+  painting: clock_painting_4
 - pos: [1478, 938]
   room: Number Hunt
   door: Sevens
@@ -582,41 +582,39 @@
 - pos: [1511, 841]
   room: Outside The Initiated
   door: Initiated Entrance
-- pos: [1141, 1441]
+- pos: [1071, 1441]
   room: Orange Tower Third Floor
   door: Orange Barrier
-- pos: [1173, 1441]
+- pos: [1104, 1441]
   room: Outside The Initiated
   door: Green Barrier
-- pos: [1206, 1441]
+- pos: [1137, 1441]
   room: Outside The Initiated
   door: Purple Barrier
-- pos: [1189, 1355]
+- pos: [1120, 1355]
   room: Outside The Initiated
   door: Entrance
 - pos: [1580, 729]
-  room: Outside The Initiated
-  door: Eight Door
-- pos: [1530, 938]
-  paintings:
-    - clock_painting_5
-  tags:
+  room: The Incomparable
+  door: "Eight Door (Outside The Initiated)"
+- pos: [1548, 948]
+  painting: clock_painting_5
+  entrances:
     - clock_initiated
-- pos: [1546, 938]
-  paintings:
-    - clock_painting_2
-    - arrows_painting_2
-  tags:
+- pos: [1575, 969]
+  painting: arrows_painting_2
+- pos: [1575, 926]
+  painting: clock_painting_2
+  exits:
     - clock_tower6
     - clock_initiated
-- pos: [1579, 813]
+- pos: [1580, 814]
   sunwarp:
     dots: 3
     type: exit
-- pos: [1444, 896]
-  paintings:
-    - smile_painting_1
-  tags:
+- pos: [1462, 915]
+  painting: smile_painting_1
+  entrances:
     - smiley_initiated
 - pos: [1430, 691]
   room: Outside The Undeterred
@@ -624,16 +622,25 @@
 - pos: [1468, 728]
   room: The Traveled
   door: Color Hallways Entrance
-- pos: [1533, 707]
+- pos: [1535, 644]
   tags:
     - red_ch
+- pos: [1535, 667]
+  tags:
     - blue_ch
+- pos: [1535, 689]
+  tags:
     - yellow_ch
+- pos: [1535, 711]
+  tags:
     - green_ch
+- pos: [1499, 678]
+  exits:
+    - early_ch
 - pos: [1567, 1264]
   tags:
     - red_ch
-- pos: [150, 808]
+- pos: [150, 748]
   tags:
     - blue_ch
 - pos: [626, 371]
@@ -651,21 +658,21 @@
 - pos: [1468, 1377]
   room: Outside The Bold
   door: Bold Entrance
-- pos: [1425, 1358]
-  paintings:
-    - pencil_painting2
-    - north_missing2
-  tags:
+- pos: [1446, 1344]
+  painting: pencil_painting2
+  exits:
     - pencil_compass
     - pencil_starting
     - pencil_directional
+- pos: [1580, 1344]
+  painting: north_missing2
 - pos: [1334, 1419]
   room: Outside The Bold
   door: Steady Entrance
 - pos: [445, 1048]
-  tags:
+  exits:
     - undeterred_artistic
-- pos: [279, 1071]
+- pos: [273, 1071]
   room: Number Hunt
   door: Zero Door
 - pos: [338, 1071]
@@ -680,20 +687,16 @@
 - pos: [242, 1071]
   room: Outside The Undeterred
   door: Undeterred Entrance
-- pos: [60, 1017]
-  paintings:
-    - blueman_painting_2
-  tags:
+- pos: [149, 937]
+  painting: blueman_painting_2
+  exits:
     - blueman_courtyard
     - blueman_starting
-- pos: [60, 970]
-  special: early_color_hallways
-- pos: [402, 1012]
+- pos: [412, 1017]
   room: Outside The Undeterred
   door: Green Painting
-  paintings:
-    - maze_painting_3
-  tags:
+  painting: maze_painting_3
+  entrances:
     - green_numbers
 - pos: [134, 1007]
   sunwarp:
@@ -702,7 +705,7 @@
 - pos: [719, 1039]
   room: Outside The Undeterred
   door: Challenge Entrance
-- pos: [438, 1039]
+- pos: [456, 1039]
   room: Outside The Undeterred
   door: Number Hunt
 - pos: [563, 1071]
@@ -723,12 +726,11 @@
 - pos: [525, 1002]
   room: Number Hunt
   door: Door to Directional Gallery
-- pos: [659, 1014]
+- pos: [572, 1017]
   room: Number Hunt
   door: Eights
-  paintings:
-    - smile_painting_5
-  tags:
+  painting: smile_painting_5
+  entrances:
     - smiley_numbers
 - pos: [557, 953]
   room: Number Hunt
@@ -745,87 +747,67 @@
 - pos: [268, 825]
   room: Directional Gallery
   door: Yellow Barrier
-- pos: [231, 681]
+- pos: [214, 563]
   room: Number Hunt
   door: Sixes
 - pos: [242, 980]
   room: Directional Gallery
   door: Shortcut to The Undeterred
-- pos: [351, 927]
-  paintings:
-    - boxes_painting
-  tags:
+- pos: [364, 942]
+  painting: boxes_painting
+  entrances:
     - lattice_directional
-- pos: [272, 927]
-  paintings:
-    - smile_painting_7
-  tags:
+- pos: [278, 942]
+  painting: smile_painting_7
+  entrances:
     - smiley_directional
-- pos: [214, 822]
-  paintings:
-    - cherry_painting
-  tags:
+- pos: [278, 803]
+  painting: cherry_painting
+  entrances:
     - apple_directional
-- pos: [266, 735]
+- pos: [262, 573]
   room: Number Hunt
   door: Sixes
-  paintings:
-    - pencil_painting3
-  tags:
+  painting: pencil_painting3
+  entrances:
     - pencil_directional
-- pos: [215, 735]
-  paintings:
-    - flower_painting_4
+- pos: [278, 685]
+  painting: flower_painting_4
 - pos: [626, 851]
   sunwarp:
     dots: 6
     type: exit
-- pos: [1141, 1441]
-  room: Orange Tower Third Floor
-  door: Orange Barrier
-- pos: [1174, 1441]
-  room: Outside The Initiated
-  door: Green Barrier
-- pos: [1205, 1441]
-  room: Outside The Initiated
-  door: Purple Barrier
 - pos: [1334, 1377]
   room: Color Hunt
   door: Shortcut to The Steady
-- pos: [1280, 1375]
-  paintings:
-    - arrows_painting_7
-- pos: [1233, 1321]
+- pos: [1312, 1333]
+  painting: arrows_painting_7
+- pos: [1226, 1333]
   room: Outside The Initiated
   door: Entrance
-  paintings:
-    - fruitbowl_painting3
-- pos: [1290, 1323]
+  painting: fruitbowl_painting3
+- pos: [1260, 1323]
   sunwarp:
     dots: 5
     type: exit
-- pos: [1189, 1356]
-  room: Outside The Initiated
-  door: Entrance
-- pos: [1154, 1332]
-  paintings:
-    - colors_painting
+- pos: [1092, 1333]
+  painting: colors_painting
 - pos: [1640, 1260]
   room: The Bearer
   door: Backside Door
 - pos: [1468, 1287]
   room: The Bearer
   door: Entrance
-- pos: [1430, 1232]
+- pos: [1431, 1233]
   room: Number Hunt
   door: Sixes
 - pos: [1388, 1152]
   room: Bearer Side Area
   door: Shortcut to Tower
-- pos: [1273, 1142]
-  paintings:
-    - pencil_painting5
-    - pencil_painting4
+- pos: [1264, 1430]
+  painting: pencil_painting5
+- pos: [1291, 1430]
+  painting: pencil_painting4
 - pos: [1355, 1092]
   room: Knight Night (Final)
   door: Exit
@@ -836,10 +818,9 @@
   # Complex case, because this is also blocked by Knight Night (Final) - Exit
   room: Number Hunt
   door: Sevens
-- pos: [1653, 101]
-  paintings:
-    - smile_painting_9
-  tags:
+- pos: [1687, 117]
+  painting: smile_painting_9
+  exits:
     - smiley_crossroads
     - smiley_deadend
     - smiley_hotcrusts
@@ -848,88 +829,113 @@
     - smiley_initiated
     - smiley_gallery
     - smiley_theysee
-- pos: [1656, 139]
+- pos: [1677, 161]
   room: The Artistic (Smiley)
   door: Door to Panda
 - pos: [1711, 140]
-  tags:
+  entrances:
     - undeterred_artistic
-- pos: [1653, 169]
-  paintings:
-    - panda_painting_3
-  tags:
+- pos: [1687, 224]
+  painting: panda_painting_3
+  exits:
     - panda_tower6
     - panda_hallway
-- pos: [1708, 171]
+- pos: [1731, 215]
   room: The Artistic (Panda)
   door: Door to Lattice
-- pos: [1761, 169]
-  paintings:
-    - boxes_painting2
-  tags:
+- pos: [1794, 224]
+  painting: boxes_painting2
+  exits:
     - lattice_directional
-- pos: [1762, 139]
+- pos: [1785, 161]
   room: The Artistic (Lattice)
   door: Door to Apple
-- pos: [1761, 101]
-  paintings:
-    - cherry_painting3
-  tags:
+- pos: [1794, 117]
+  painting: cherry_painting3
+  exits:
     - apple_tower6
     - apple_directional
-- pos: [1708, 107]
+- pos: [1731, 107]
   room: The Artistic (Apple)
   door: Door to Smiley
-- pos: [370, 681]
+- pos: [370, 563]
   room: Number Hunt
   door: Eights
-- pos: [411, 685]
-  paintings:
-    - eye_painting_2
-    - smile_painting_2
-  tags:
+- pos: [637, 605]
+  painting: eye_painting
+  entrances:
+    - crossroads_eyewall
+- pos: [610, 605]
+  exits:
+    - crossroads_eyewall
+- pos: [417, 573]
+  painting: eye_painting_2
+  exits:
+    - crossroads_eyewall
+- pos: [342, 573]
+  painting: smile_painting_2
+  entrances:
     - smiley_theysee
-- pos: [310, 750]
+- pos: [311, 750]
   room: The Eyes They See
   door: Exit
-- pos: [334, 798]
-  paintings:
-    - arrows_painting_5
-- pos: [370, 792]
+- pos: [348, 803]
+  painting: arrows_painting_5
+- pos: [370, 751]
   room: Outside The Wondrous
   door: Wondrous Entrance
-- pos: [367, 752]
-  paintings:
-    - symmetry_painting_a_1
-    - symmetry_painting_b_1
-    - symmetry_painting_a_3
-    - symmetry_painting_a_5
-    - symmetry_painting_b_4
-    - symmetry_painting_a_2
-    - symmetry_painting_b_2
-    - symmetry_painting_a_6
-    - symmetry_painting_b_6
-  tags:
+- pos: [428, 696]
+  painting: symmetry_painting_a_1
+  exits:
     - symmetry_starting
-- pos: [407, 755]
+    - symmetry_a_chandelier
+    - symmetry_a_table
+- pos: [428, 749]
+  painting: symmetry_painting_b_1
+  entrances:
+    - symmetry_b_table
+- pos: [471, 696]
+  painting: symmetry_painting_a_3
+- pos: [538, 699]
+  painting: symmetry_painting_a_5
+  entrances:
+    - symmetry_a_chandelier
+- pos: [562, 728]
+  painting: symmetry_painting_b_4
+- pos: [422, 647]
+  painting: symmetry_painting_a_2
+  entrances:
+    - symmetry_a_table
+- pos: [364, 648]
+  painting: symmetry_painting_b_2
+  exits:
+    - symmetry_b_table
+    - symmetry_b_fire
+- pos: [449, 647]
+  painting: symmetry_painting_a_6
+- pos: [508, 647]
+  painting: symmetry_painting_b_6
+  entrances:
+    - symmetry_b_fire
+- pos: [558, 665]
   room: The Wondrous
   door: Exit
-  paintings:
-    - arrows_painting_9
-- pos: [449, 755]
-  paintings:
-    - flower_painting_6
-  tags:
+- pos: [535, 647]
+  room: The Wondrous
+  door: Exit
+  painting: arrows_painting_9
+- pos: [610, 674]
+  painting: flower_painting_6
+  entrances:
     - flower_arrow
-- pos: [1101, 222]
-  paintings:
-    - panda_painting
-  tags:
+- pos: [1156, 262]
+  painting: panda_painting
+  entrances:
     - panda_hallway
 - pos: [1152, 209]
   room: Hallway Room (1)
   door: Exit
-- pos: [1189, 170]
+- pos: [1190, 171]
   room: Hallway Room (2)
   door: Exit
 - pos: [1238, 124]
@@ -944,16 +950,17 @@
 - pos: [1415, 140]
   room: Number Hunt
   door: Nines
-- pos: [1458, 133]
-  paintings:
-    - south_afar
+- pos: [1424, 85]
+  painting: south_afar
 - pos: [826, 1452]
   room: Outside The Wanderer
   door: Wanderer Entrance
+  tilted: true
 - pos: [763, 1465]
   room: Outside The Wanderer
   door: Tower Entrance
-- pos: [1655, 1151]
+  tilted: true
+- pos: [1656, 1152]
   room: Number Hunt
   door: Eights
 - pos: [1623, 1044]
@@ -971,23 +978,26 @@
 - pos: [1511, 1119]
   room: Art Gallery
   door: Exit
-- pos: [1654, 1116]
-  paintings:
-    - smile_painting_3
-    - flower_painting_2
-    - scenery_painting_0a
-    - map_painting
-    - fruitbowl_painting4
-  tags:
+- pos: [1730, 1162]
+  painting: flower_painting_2
+- pos: [1730, 1189]
+  painting: map_painting
+- pos: [1698, 1189]
+  painting: smile_painting_3
+  entrances:
     - smiley_gallery
+- pos: [1714, 1215]
+  painting: fruitbowl_painting4
+- pos: [1714, 1242]
+  painting: scenery_painting_0a
 - pos: [1120, 1286]
   room: Rhyme Room (Smiley)
   door: Door to Target
 - pos: [1120, 1315]
-  tags:
+  entrances: # this could be considered 2 way since the subway map has a one way gate at the exit anyway
     - rhyme_smiley_target
 - pos: [792, 1137]
-  tags:
+  exits:
     - rhyme_smiley_target
 - pos: [895, 1217]
   room: Number Hunt
@@ -998,9 +1008,8 @@
 - pos: [1120, 1195]
   room: Rhyme Room (Circle)
   door: Door to Smiley
-- pos: [1118, 1137]
-  paintings:
-    - arrows_painting_3
+- pos: [1130, 1124]
+  painting: arrows_painting_3
 - pos: [1050, 1142]
   room: Rhyme Room (Looped Square)
   door: Door to Circle
@@ -1013,29 +1022,41 @@
 - pos: [852, 1200]
   room: Rhyme Room (Target)
   door: Door to Cross
-- pos: [850, 1138]
-  paintings:
-    - arrows_painting_4
-- pos: [1652, 1393]
-  room: Room Room
-  door: Excavation
+- pos: [862, 1124]
+  painting: arrows_painting_4
 - pos: [1592, 1442]
   room: Room Room
   door: Cellar Exit
-- pos: [1570, 938]
+- pos: [1623, 938]
   room: Outside The Wise
   door: Wise Entrance
-- pos: [1653, 935]
-  paintings:
-    - clock_painting_3
-- pos: [369, 605]
+- pos: [1665, 920]
+  painting: clock_painting_3
+- pos: [241, 348]
   room: Outside The Scientific
   door: Scientific Entrance
-- pos: [294, 602]
-  paintings:
-    - hi_solved_painting4
-  tags:
+- pos: [176, 326]
+  painting: hi_solved_painting4
+  entrances:
     - hi_scientific
-- pos: [814, 1001]
+- pos: [815, 1002]
   room: Challenge Room
   door: Welcome Door
+- pos: [104, 1208]
+  special: color_black
+- pos: [104, 1249]
+  special: color_red
+- pos: [104, 1290]
+  special: color_yellow
+- pos: [104, 1330]
+  special: color_blue
+- pos: [104, 1371]
+  special: color_purple
+- pos: [104, 1411]
+  special: color_orange
+- pos: [104, 1451]
+  special: color_green
+- pos: [104, 1491]
+  special: color_brown
+- pos: [104, 1531]
+  special: color_gray