1 files changed, 132 insertions, 0 deletions
diff --git a/assets/areas.yaml b/assets/areas.yaml
index 501db5a..1df2771 100755
--- a/assets/areas.yaml
+++ b/assets/areas.yaml

@@ -9,12 +9,20 @@
    map: [1589, 1029]
  Hub Room:
    map: [1589, 924]
+  Dead End Area:
+    map: [1785, 1125]
  Pilgrim Room:
    map: [1493, 1564]
+  Pilgrim Antechamber:
+    fold_into: Pilgrim Room
  Crossroads:
    map: [1294, 720]
+  Lost Area:
+    fold_into: Crossroads
  Amen Name Area:
    fold_into: Crossroads
+  Suits Area:
+    map: [1566, 322]
  The Tenacious:
    map: [1589, 780]
  Warts Straw Area:
@@ -25,6 +33,12 @@
    map: [1766, 700]
  Hallway Room:
    map: [573, 1631]
+  Hallway Room (2):
+    fold_into: Hallway Room
+  Hallway Room (3):
+    fold_into: Hallway Room
+  Hallway Room (4):
+    fold_into: Hallway Room
  Dread Hallway:
    fold_into: Outside The Agreeable
  The Agreeable:
@@ -35,10 +49,16 @@
    map: [2251, 600]
  The Fearless:
    map: [1790, 2220]
+  The Fearless (First Floor):
+    fold_into: The Fearless
+  The Fearless (Second Floor):
+    fold_into: The Fearless
  The Observant:
    map: [2252, 193]
  The Incomparable:
    map: [2642, 872]
+  Eight Room:
+    fold_into: The Incomparable
  Orange Tower First Floor:
    map: [1285, 928]
  Color Hunt:
@@ -47,6 +67,8 @@
    map: [1935, 1575]
  Orange Tower Fourth Floor:
    map: [1365, 394]
+  Hot Crusts Area:
+    fold_into: Orange Tower Fourth Floor
  Orange Tower Fifth Floor:
    map: [1252, 1259]
  Orange Tower Seventh Floor:
@@ -55,8 +77,32 @@
    map: [1587, 2000]
  Courtyard:
    map: [863, 387]
+  First Second Third Fourth:
+    fold_into: Courtyard
+  Yellow Backside Area:
+    fold_into: Courtyard
  The Colorful:
    map: [863, 200]
+  The Colorful (Black):
+    fold_into: The Colorful
+  The Colorful (Blue):
+    fold_into: The Colorful
+  The Colorful (Brown):
+    fold_into: The Colorful
+  The Colorful (Gray):
+    fold_into: The Colorful
+  The Colorful (Green):
+    fold_into: The Colorful
+  The Colorful (Orange):
+    fold_into: The Colorful
+  The Colorful (Purple):
+    fold_into: The Colorful
+  The Colorful (Red):
+    fold_into: The Colorful
+  The Colorful (White):
+    fold_into: The Colorful
+  The Colorful (Yellow):
+    fold_into: The Colorful
  Welcome Back Area:
    map: [1472, 1233]
  Owl Hallway:
@@ -85,24 +131,96 @@
    map: [1845, 1883]
  The Bearer:
    map: [2155, 1764]
+  Bearer Side Area:
+    fold_into: The Bearer
+  The Bearer (East):
+    fold_into: The Bearer
+  The Bearer (North):
+    fold_into: The Bearer
+  The Bearer (South):
+    fold_into: The Bearer
+  The Bearer (West):
+    fold_into: The Bearer
  The Steady:
    map: [2121, 2182]
+  The Steady (Amber):
+    fold_into: The Steady
+  The Steady (Amethyst):
+    fold_into: The Steady
+  The Steady (Blueberry):
+    fold_into: The Steady
+  The Steady (Carnation):
+    fold_into: The Steady
+  The Steady (Cherry):
+    fold_into: The Steady
+  The Steady (Emerald):
+    fold_into: The Steady
+  The Steady (Lemon):
+    fold_into: The Steady
+  The Steady (Lilac):
+    fold_into: The Steady
+  The Steady (Lime):
+    fold_into: The Steady
+  The Steady (Orange):
+    fold_into: The Steady
+  The Steady (Plum):
+    fold_into: The Steady
+  The Steady (Rose):
+    fold_into: The Steady
+  The Steady (Ruby):
+    fold_into: The Steady
+  The Steady (Sapphire):
+    fold_into: The Steady
+  The Steady (Sunflower):
+    fold_into: The Steady
+  The Steady (Topaz):
+    fold_into: The Steady
  Knight Night Room:
    map: [1990, 1322]
+  Knight Night (Final):
+    fold_into: Knight Night Room
+  Knight Night (Outer Ring):
+    fold_into: Knight Night Room
+  Knight Night (Right Lower Segment):
+    fold_into: Knight Night Room
+  Knight Night (Right Upper Segment):
+    fold_into: Knight Night Room
+  Knight Night Exit:
+    fold_into: Knight Night Room
  The Artistic:
    map: [1151, 1793]
  The Artistic (Smiley):
    fold_into: The Artistic
+  The Artistic (Apple):
+    fold_into: The Artistic
+  The Artistic (Hint Room):
+    fold_into: The Artistic
+  The Artistic (Lattice):
+    fold_into: The Artistic
+  The Artistic (Panda):
+    fold_into: The Artistic
  The Discerning:
    map: [1098, 807]
  The Ecstatic:
    map: [972, 805]
  The Eyes They See:
    map: [955, 933]
+  Far Window:
+   fold_into: The Eyes They See
  Outside The Wondrous:
    map: [691, 524]
  The Wondrous:
    map: [648, 338]
+  The Wondrous (Bookcase):
+    fold_into: The Wondrous
+  The Wondrous (Chandelier):
+    fold_into: The Wondrous
+  The Wondrous (Table):
+    fold_into: The Wondrous
+  The Wondrous (Window):
+    fold_into: The Wondrous
+  Arrow Garden:
+    map: [555, 155]
  Elements Area:
    map: [908, 1632]
  The Wanderer:
@@ -117,8 +235,14 @@
    map: [1587, 1492]
  Rhyme Room (Target):
    fold_into: Rhyme Room
+  Rhyme Room (Circle):
+    fold_into: Rhyme Room
+  Rhyme Room (Looped Square):
+    fold_into: Rhyme Room
  Room Room:
    map: [2553, 2153]
+  Cellar:
+    fold_into: Room Room
  Outside The Wise:
    map: [1087, 1986]
  The Wise:
@@ -129,5 +253,13 @@
    map: [1368, 2103]
  Art Gallery:
    map: [2474, 1366]
+  Art Gallery (Second Floor):
+    fold_into: Art Gallery
+  Art Gallery (Third Floor):
+    fold_into: Art Gallery
+  Art Gallery (Fourth Floor):
+    fold_into: Art Gallery
  Challenge Room:
    map: [1486, 1357]
+  Roof:
+    map: [227, 1271]

diff --git a/assets/areas.yaml b/assets/areas.yaml index 501db5a..1df2771 100755 --- a/assets/areas.yaml +++ b/assets/areas.yaml
@@ -9,12 +9,20 @@
9	map: [1589, 1029]	9	map: [1589, 1029]
10	Hub Room:	10	Hub Room:
11	map: [1589, 924]	11	map: [1589, 924]
		12	Dead End Area:
		13	map: [1785, 1125]
12	Pilgrim Room:	14	Pilgrim Room:
13	map: [1493, 1564]	15	map: [1493, 1564]
		16	Pilgrim Antechamber:
		17	fold_into: Pilgrim Room
14	Crossroads:	18	Crossroads:
15	map: [1294, 720]	19	map: [1294, 720]
		20	Lost Area:
		21	fold_into: Crossroads
16	Amen Name Area:	22	Amen Name Area:
17	fold_into: Crossroads	23	fold_into: Crossroads
		24	Suits Area:
		25	map: [1566, 322]
18	The Tenacious:	26	The Tenacious:
19	map: [1589, 780]	27	map: [1589, 780]
20	Warts Straw Area:	28	Warts Straw Area:
@@ -25,6 +33,12 @@
25	map: [1766, 700]	33	map: [1766, 700]
26	Hallway Room:	34	Hallway Room:
27	map: [573, 1631]	35	map: [573, 1631]
		36	Hallway Room (2):
		37	fold_into: Hallway Room
		38	Hallway Room (3):
		39	fold_into: Hallway Room
		40	Hallway Room (4):
		41	fold_into: Hallway Room
28	Dread Hallway:	42	Dread Hallway:
29	fold_into: Outside The Agreeable	43	fold_into: Outside The Agreeable
30	The Agreeable:	44	The Agreeable:
@@ -35,10 +49,16 @@
35	map: [2251, 600]	49	map: [2251, 600]
36	The Fearless:	50	The Fearless:
37	map: [1790, 2220]	51	map: [1790, 2220]
		52	The Fearless (First Floor):
		53	fold_into: The Fearless
		54	The Fearless (Second Floor):
		55	fold_into: The Fearless
38	The Observant:	56	The Observant:
39	map: [2252, 193]	57	map: [2252, 193]
40	The Incomparable:	58	The Incomparable:
41	map: [2642, 872]	59	map: [2642, 872]
		60	Eight Room:
		61	fold_into: The Incomparable
42	Orange Tower First Floor:	62	Orange Tower First Floor:
43	map: [1285, 928]	63	map: [1285, 928]
44	Color Hunt:	64	Color Hunt:
@@ -47,6 +67,8 @@
47	map: [1935, 1575]	67	map: [1935, 1575]
48	Orange Tower Fourth Floor:	68	Orange Tower Fourth Floor:
49	map: [1365, 394]	69	map: [1365, 394]
		70	Hot Crusts Area:
		71	fold_into: Orange Tower Fourth Floor
50	Orange Tower Fifth Floor:	72	Orange Tower Fifth Floor:
51	map: [1252, 1259]	73	map: [1252, 1259]
52	Orange Tower Seventh Floor:	74	Orange Tower Seventh Floor:
@@ -55,8 +77,32 @@
55	map: [1587, 2000]	77	map: [1587, 2000]
56	Courtyard:	78	Courtyard:
57	map: [863, 387]	79	map: [863, 387]
		80	First Second Third Fourth:
		81	fold_into: Courtyard
		82	Yellow Backside Area:
		83	fold_into: Courtyard
58	The Colorful:	84	The Colorful:
59	map: [863, 200]	85	map: [863, 200]
		86	The Colorful (Black):
		87	fold_into: The Colorful
		88	The Colorful (Blue):
		89	fold_into: The Colorful
		90	The Colorful (Brown):
		91	fold_into: The Colorful
		92	The Colorful (Gray):
		93	fold_into: The Colorful
		94	The Colorful (Green):
		95	fold_into: The Colorful
		96	The Colorful (Orange):
		97	fold_into: The Colorful
		98	The Colorful (Purple):
		99	fold_into: The Colorful
		100	The Colorful (Red):
		101	fold_into: The Colorful
		102	The Colorful (White):
		103	fold_into: The Colorful
		104	The Colorful (Yellow):
		105	fold_into: The Colorful
60	Welcome Back Area:	106	Welcome Back Area:
61	map: [1472, 1233]	107	map: [1472, 1233]
62	Owl Hallway:	108	Owl Hallway:
@@ -85,24 +131,96 @@
85	map: [1845, 1883]	131	map: [1845, 1883]
86	The Bearer:	132	The Bearer:
87	map: [2155, 1764]	133	map: [2155, 1764]
		134	Bearer Side Area:
		135	fold_into: The Bearer
		136	The Bearer (East):
		137	fold_into: The Bearer
		138	The Bearer (North):
		139	fold_into: The Bearer
		140	The Bearer (South):
		141	fold_into: The Bearer
		142	The Bearer (West):
		143	fold_into: The Bearer
88	The Steady:	144	The Steady:
89	map: [2121, 2182]	145	map: [2121, 2182]
		146	The Steady (Amber):
		147	fold_into: The Steady
		148	The Steady (Amethyst):
		149	fold_into: The Steady
		150	The Steady (Blueberry):
		151	fold_into: The Steady
		152	The Steady (Carnation):
		153	fold_into: The Steady
		154	The Steady (Cherry):
		155	fold_into: The Steady
		156	The Steady (Emerald):
		157	fold_into: The Steady
		158	The Steady (Lemon):
		159	fold_into: The Steady
		160	The Steady (Lilac):
		161	fold_into: The Steady
		162	The Steady (Lime):
		163	fold_into: The Steady
		164	The Steady (Orange):
		165	fold_into: The Steady
		166	The Steady (Plum):
		167	fold_into: The Steady
		168	The Steady (Rose):
		169	fold_into: The Steady
		170	The Steady (Ruby):
		171	fold_into: The Steady
		172	The Steady (Sapphire):
		173	fold_into: The Steady
		174	The Steady (Sunflower):
		175	fold_into: The Steady
		176	The Steady (Topaz):
		177	fold_into: The Steady
90	Knight Night Room:	178	Knight Night Room:
91	map: [1990, 1322]	179	map: [1990, 1322]
		180	Knight Night (Final):
		181	fold_into: Knight Night Room
		182	Knight Night (Outer Ring):
		183	fold_into: Knight Night Room
		184	Knight Night (Right Lower Segment):
		185	fold_into: Knight Night Room
		186	Knight Night (Right Upper Segment):
		187	fold_into: Knight Night Room
		188	Knight Night Exit:
		189	fold_into: Knight Night Room
92	The Artistic:	190	The Artistic:
93	map: [1151, 1793]	191	map: [1151, 1793]
94	The Artistic (Smiley):	192	The Artistic (Smiley):
95	fold_into: The Artistic	193	fold_into: The Artistic
		194	The Artistic (Apple):
		195	fold_into: The Artistic
		196	The Artistic (Hint Room):
		197	fold_into: The Artistic
		198	The Artistic (Lattice):
		199	fold_into: The Artistic
		200	The Artistic (Panda):
		201	fold_into: The Artistic
96	The Discerning:	202	The Discerning:
97	map: [1098, 807]	203	map: [1098, 807]
98	The Ecstatic:	204	The Ecstatic:
99	map: [972, 805]	205	map: [972, 805]
100	The Eyes They See:	206	The Eyes They See:
101	map: [955, 933]	207	map: [955, 933]
		208	Far Window:
		209	fold_into: The Eyes They See
102	Outside The Wondrous:	210	Outside The Wondrous:
103	map: [691, 524]	211	map: [691, 524]
104	The Wondrous:	212	The Wondrous:
105	map: [648, 338]	213	map: [648, 338]
		214	The Wondrous (Bookcase):
		215	fold_into: The Wondrous
		216	The Wondrous (Chandelier):
		217	fold_into: The Wondrous
		218	The Wondrous (Table):
		219	fold_into: The Wondrous
		220	The Wondrous (Window):
		221	fold_into: The Wondrous
		222	Arrow Garden:
		223	map: [555, 155]
106	Elements Area:	224	Elements Area:
107	map: [908, 1632]	225	map: [908, 1632]
108	The Wanderer:	226	The Wanderer:
@@ -117,8 +235,14 @@
117	map: [1587, 1492]	235	map: [1587, 1492]
118	Rhyme Room (Target):	236	Rhyme Room (Target):
119	fold_into: Rhyme Room	237	fold_into: Rhyme Room
		238	Rhyme Room (Circle):
		239	fold_into: Rhyme Room
		240	Rhyme Room (Looped Square):
		241	fold_into: Rhyme Room
120	Room Room:	242	Room Room:
121	map: [2553, 2153]	243	map: [2553, 2153]
		244	Cellar:
		245	fold_into: Room Room
122	Outside The Wise:	246	Outside The Wise:
123	map: [1087, 1986]	247	map: [1087, 1986]
124	The Wise:	248	The Wise:
@@ -129,5 +253,13 @@
129	map: [1368, 2103]	253	map: [1368, 2103]
130	Art Gallery:	254	Art Gallery:
131	map: [2474, 1366]	255	map: [2474, 1366]
		256	Art Gallery (Second Floor):
		257	fold_into: Art Gallery
		258	Art Gallery (Third Floor):
		259	fold_into: Art Gallery
		260	Art Gallery (Fourth Floor):
		261	fold_into: Art Gallery
132	Challenge Room:	262	Challenge Room:
133	map: [1486, 1357]	263	map: [1486, 1357]
		264	Roof:
		265	map: [227, 1271]