7 files changed, 78 insertions, 1 deletions
diff --git a/data/maps/the_unyielding/doors.txtpb b/data/maps/the_unyielding/doors.txtpb
index b969c0b..265442c 100644
--- a/data/maps/the_unyielding/doors.txtpb
+++ b/data/maps/the_unyielding/doors.txtpb

@@ -183,6 +183,21 @@ doors {
  panels { room: "Central Connected Area" name: "CHIN" }
  panels { room: "Central Connected Area" name: "DING" }
  location_room: "Central Connected Area"
+  location_name: "East Room 2"
+}
+doors {
+  name: "East Room 1"
+  type: LOCATION_ONLY
+  panels { room: "East Room 1" name: "CHIN" }
+  panels { room: "East Room 1" name: "HEAT" }
+  panels { room: "East Room 1" name: "END" }
+  panels { room: "East Room 1" name: "FLY" }
+  panels { room: "East Room 1" name: "OUCH" }
+  panels { room: "East Room 1" name: "HAG" }
+  panels { room: "East Room 1" name: "TIN" }
+  panels { room: "East Room 1" name: "RID" }
+  panels { room: "East Room 1" name: "TUG" }
+  location_room: "East Room 1"
 }
 doors {
  name: "Orange Alcove"
@@ -199,6 +214,7 @@ doors {
 }
 doors {
  name: "Black Alcove"
+  type: EVENT
  panels { room: "Star Rooms" name: "TURN" }
  panels { room: "Central Connected Area" name: "HAD" }
  panels { room: "Central Connected Area" name: "SOW" }
@@ -218,6 +234,7 @@ doors {
  panels { room: "Northeast Room 1" name: "CAR" }
  panels { room: "Northeast Room 1" name: "SIR" }
  location_room: "Northeast Room 1"
+  location_name: "Northeast Room 1"
 }
 doors {
  name: "Northeast Corner Behind"
@@ -245,6 +262,7 @@ doors {
  panels { room: "Northwest Room" name: "HER" }
  panels { room: "Northwest Room" name: "DAM" }
  location_room: "Northwest Room"
+  location_name: "Northwest Room"
 }
 doors {
  name: "Cyan Alcove"
@@ -274,6 +292,7 @@ doors {
  panels { room: "Southwest Room 3" name: "HOST" }
  panels { room: "Southwest Room 3" name: "MUG" }
  location_room: "Southwest Room 3"
+  location_name: "Southwest Room 3"
 }
 doors {
  name: "Southwest Room 2 Entrance"
@@ -293,6 +312,7 @@ doors {
  panels { room: "Southwest Room 2" name: "ION" }
  panels { room: "Southwest Room 2" name: "INN" }
  location_room: "Southwest Room 2"
+  location_name: "Southwest Room 2"
 }
 doors {
  name: "Southwest 4"
@@ -411,6 +431,7 @@ doors {
  panels { room: "Central Connected Area" name: "SON (1)" }
  panels { room: "Central Connected Area" name: "URGE" }
  location_room: "Central Connected Area"
+  location_name: "Northeast Room 2"
 }
 doors {
  name: "South Right Painting"
@@ -478,5 +499,47 @@ doors {
 doors {
  name: "Cyan Doors"
  type: EVENT
-  switches: "double_letters"
+  receivers: "Components/Doors/entry_4"
+  receivers: "Panels/Miscellaneous/entry_2/teleportListener"
+  receivers: "Panels/Miscellaneous/entry_3/teleportListener"
+  double_letters: true
+}
+doors {
+  name: "Blue D Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Central Connected Area" name: "FOX" }
+  panels { room: "Central Connected Area" name: "LOCKS" }
+  panels { room: "Central Connected Area" name: "BOX" }
+  panels { room: "Central Connected Area" name: "SQUAWKS" }
+  panels { room: "Central Connected Area" name: "HAWKS" }
+  panels { room: "Central Connected Area" name: "TALKS" }
+  location_room: "Central Connected Area"
+}
+doors {
+  name: "Color Hallway Panels"
+  type: LOCATION_ONLY
+  panels { room: "Brown Alcove" name: "BROW" }
+  panels { room: "Central Connected Area" name: "RANGE" }
+  panels { room: "Central Connected Area" name: "WHIT" }
+  panels { room: "Central Connected Area" name: "ALMOND" }
+  panels { room: "Central Connected Area" name: "DAY" }
+  panels { room: "Central Connected Area" name: "REAM" }
+  panels { room: "Central Connected Area" name: "SON (2)" }
+  panels { room: "Central Connected Area" name: "RAY" }
+  panels { room: "Central Connected Area" name: "BURROWING" }
+  panels { room: "Orange Alcove" name: "ON" }
+  panels { room: "Plaza Entrance" name: "GEE" }
+  panels { room: "Plaza Entrance" name: "SEA" }
+  panels { room: "Gray Alcove" name: "GRAVELY" }
+  panels { room: "Cyan Alcove" name: "CAN" }
+  panels { room: "Star Rooms" name: "CYANIDE" }
+  panels { room: "Star Rooms" name: "BACK" }
+  panels { room: "Black Alcove" name: "LACK" }
+  panels { room: "White Corners" name: "ARCH" }
+  panels { room: "White Corners" name: "ZERO" }
+  panels { room: "White Corners" name: "DAM" }
+  panels { room: "White Corners" name: "WHEN" }
+  panels { room: "Hero Room" name: "HER" }
+  panels { room: "Daisy Alcove" name: "CYANIDES" }
+  location_room: "Central Connected Area"
 }
diff --git a/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb b/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb
index 4c1440f..6ce69da 100644
--- a/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb

@@ -1,5 +1,8 @@
 name: "Bearer Entrance"
 ports {
  name: "BEARER"
+  display_name: "East of Yellow Worldport"
  path: "Components/Warps/worldport4"
+  destination { x: 23 y: 0 z: -29 }
+  rotation: 90
 }
diff --git a/data/maps/the_unyielding/rooms/Digital Entrance.txtpb b/data/maps/the_unyielding/rooms/Digital Entrance.txtpb
index 74665a2..853c5f0 100644
--- a/data/maps/the_unyielding/rooms/Digital Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Digital Entrance.txtpb

@@ -8,5 +8,8 @@ panels {
 }
 ports {
  name: "DIGITAL"
+  display_name: "South of Yellow Worldport"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
 }
diff --git a/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb b/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb
index f011b32..454dc3f 100644
--- a/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb

@@ -1,5 +1,8 @@
 name: "Nuanced Entrance"
 ports {
  name: "NUANCED"
+  display_name: "West of Yellow Worldport"
  path: "Components/Warps/worldport3"
+  destination { x: -23 y: 0 z: -29 }
+  rotation: 270
 }
diff --git a/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb b/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb
index 0bc60a7..f866d87 100644
--- a/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb

@@ -15,5 +15,8 @@ panels {
 }
 ports {
  name: "PLAZA"
+  display_name: "Dark Hallway"
  path: "Components/Warps/worldport5"
+  destination { x: 35 y: 0 z: 44 }
+  rotation: 270
 }
diff --git a/data/maps/the_unyielding/rooms/Yellow Left.txtpb b/data/maps/the_unyielding/rooms/Yellow Left.txtpb
index 9c7d023..192d901 100644
--- a/data/maps/the_unyielding/rooms/Yellow Left.txtpb
+++ b/data/maps/the_unyielding/rooms/Yellow Left.txtpb

@@ -5,4 +5,5 @@ panels {
  clue: "sickness"
  answer: "health"
  symbols: SUN
+  required_door { name: "Cyan Doors" }
 }
diff --git a/data/maps/the_unyielding/rooms/Yellow Right.txtpb b/data/maps/the_unyielding/rooms/Yellow Right.txtpb
index 0599f29..d554c73 100644
--- a/data/maps/the_unyielding/rooms/Yellow Right.txtpb
+++ b/data/maps/the_unyielding/rooms/Yellow Right.txtpb

@@ -5,4 +5,5 @@ panels {
  clue: "health"
  answer: "sickness"
  symbols: SUN
+  required_door { name: "Cyan Doors" }
 }

diff --git a/data/maps/the_unyielding/doors.txtpb b/data/maps/the_unyielding/doors.txtpb index b969c0b..265442c 100644 --- a/data/maps/the_unyielding/doors.txtpb +++ b/data/maps/the_unyielding/doors.txtpb
@@ -183,6 +183,21 @@ doors {
183	panels { room: "Central Connected Area" name: "CHIN" }	183	panels { room: "Central Connected Area" name: "CHIN" }
184	panels { room: "Central Connected Area" name: "DING" }	184	panels { room: "Central Connected Area" name: "DING" }
185	location_room: "Central Connected Area"	185	location_room: "Central Connected Area"
		186	location_name: "East Room 2"
		187	}
		188	doors {
		189	name: "East Room 1"
		190	type: LOCATION_ONLY
		191	panels { room: "East Room 1" name: "CHIN" }
		192	panels { room: "East Room 1" name: "HEAT" }
		193	panels { room: "East Room 1" name: "END" }
		194	panels { room: "East Room 1" name: "FLY" }
		195	panels { room: "East Room 1" name: "OUCH" }
		196	panels { room: "East Room 1" name: "HAG" }
		197	panels { room: "East Room 1" name: "TIN" }
		198	panels { room: "East Room 1" name: "RID" }
		199	panels { room: "East Room 1" name: "TUG" }
		200	location_room: "East Room 1"
186	}	201	}
187	doors {	202	doors {
188	name: "Orange Alcove"	203	name: "Orange Alcove"
@@ -199,6 +214,7 @@ doors {
199	}	214	}
200	doors {	215	doors {
201	name: "Black Alcove"	216	name: "Black Alcove"
		217	type: EVENT
202	panels { room: "Star Rooms" name: "TURN" }	218	panels { room: "Star Rooms" name: "TURN" }
203	panels { room: "Central Connected Area" name: "HAD" }	219	panels { room: "Central Connected Area" name: "HAD" }
204	panels { room: "Central Connected Area" name: "SOW" }	220	panels { room: "Central Connected Area" name: "SOW" }
@@ -218,6 +234,7 @@ doors {
218	panels { room: "Northeast Room 1" name: "CAR" }	234	panels { room: "Northeast Room 1" name: "CAR" }
219	panels { room: "Northeast Room 1" name: "SIR" }	235	panels { room: "Northeast Room 1" name: "SIR" }
220	location_room: "Northeast Room 1"	236	location_room: "Northeast Room 1"
		237	location_name: "Northeast Room 1"
221	}	238	}
222	doors {	239	doors {
223	name: "Northeast Corner Behind"	240	name: "Northeast Corner Behind"
@@ -245,6 +262,7 @@ doors {
245	panels { room: "Northwest Room" name: "HER" }	262	panels { room: "Northwest Room" name: "HER" }
246	panels { room: "Northwest Room" name: "DAM" }	263	panels { room: "Northwest Room" name: "DAM" }
247	location_room: "Northwest Room"	264	location_room: "Northwest Room"
		265	location_name: "Northwest Room"
248	}	266	}
249	doors {	267	doors {
250	name: "Cyan Alcove"	268	name: "Cyan Alcove"
@@ -274,6 +292,7 @@ doors {
274	panels { room: "Southwest Room 3" name: "HOST" }	292	panels { room: "Southwest Room 3" name: "HOST" }
275	panels { room: "Southwest Room 3" name: "MUG" }	293	panels { room: "Southwest Room 3" name: "MUG" }
276	location_room: "Southwest Room 3"	294	location_room: "Southwest Room 3"
		295	location_name: "Southwest Room 3"
277	}	296	}
278	doors {	297	doors {
279	name: "Southwest Room 2 Entrance"	298	name: "Southwest Room 2 Entrance"
@@ -293,6 +312,7 @@ doors {
293	panels { room: "Southwest Room 2" name: "ION" }	312	panels { room: "Southwest Room 2" name: "ION" }
294	panels { room: "Southwest Room 2" name: "INN" }	313	panels { room: "Southwest Room 2" name: "INN" }
295	location_room: "Southwest Room 2"	314	location_room: "Southwest Room 2"
		315	location_name: "Southwest Room 2"
296	}	316	}
297	doors {	317	doors {
298	name: "Southwest 4"	318	name: "Southwest 4"
@@ -411,6 +431,7 @@ doors {
411	panels { room: "Central Connected Area" name: "SON (1)" }	431	panels { room: "Central Connected Area" name: "SON (1)" }
412	panels { room: "Central Connected Area" name: "URGE" }	432	panels { room: "Central Connected Area" name: "URGE" }
413	location_room: "Central Connected Area"	433	location_room: "Central Connected Area"
		434	location_name: "Northeast Room 2"
414	}	435	}
415	doors {	436	doors {
416	name: "South Right Painting"	437	name: "South Right Painting"
@@ -478,5 +499,47 @@ doors {
478	doors {	499	doors {
479	name: "Cyan Doors"	500	name: "Cyan Doors"
480	type: EVENT	501	type: EVENT
481	switches: "double_letters"	502	receivers: "Components/Doors/entry_4"
		503	receivers: "Panels/Miscellaneous/entry_2/teleportListener"
		504	receivers: "Panels/Miscellaneous/entry_3/teleportListener"
		505	double_letters: true
		506	}
		507	doors {
		508	name: "Blue D Room Puzzles"
		509	type: LOCATION_ONLY
		510	panels { room: "Central Connected Area" name: "FOX" }
		511	panels { room: "Central Connected Area" name: "LOCKS" }
		512	panels { room: "Central Connected Area" name: "BOX" }
		513	panels { room: "Central Connected Area" name: "SQUAWKS" }
		514	panels { room: "Central Connected Area" name: "HAWKS" }
		515	panels { room: "Central Connected Area" name: "TALKS" }
		516	location_room: "Central Connected Area"
		517	}
		518	doors {
		519	name: "Color Hallway Panels"
		520	type: LOCATION_ONLY
		521	panels { room: "Brown Alcove" name: "BROW" }
		522	panels { room: "Central Connected Area" name: "RANGE" }
		523	panels { room: "Central Connected Area" name: "WHIT" }
		524	panels { room: "Central Connected Area" name: "ALMOND" }
		525	panels { room: "Central Connected Area" name: "DAY" }
		526	panels { room: "Central Connected Area" name: "REAM" }
		527	panels { room: "Central Connected Area" name: "SON (2)" }
		528	panels { room: "Central Connected Area" name: "RAY" }
		529	panels { room: "Central Connected Area" name: "BURROWING" }
		530	panels { room: "Orange Alcove" name: "ON" }
		531	panels { room: "Plaza Entrance" name: "GEE" }
		532	panels { room: "Plaza Entrance" name: "SEA" }
		533	panels { room: "Gray Alcove" name: "GRAVELY" }
		534	panels { room: "Cyan Alcove" name: "CAN" }
		535	panels { room: "Star Rooms" name: "CYANIDE" }
		536	panels { room: "Star Rooms" name: "BACK" }
		537	panels { room: "Black Alcove" name: "LACK" }
		538	panels { room: "White Corners" name: "ARCH" }
		539	panels { room: "White Corners" name: "ZERO" }
		540	panels { room: "White Corners" name: "DAM" }
		541	panels { room: "White Corners" name: "WHEN" }
		542	panels { room: "Hero Room" name: "HER" }
		543	panels { room: "Daisy Alcove" name: "CYANIDES" }
		544	location_room: "Central Connected Area"
482	}	545	}


diff --git a/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb b/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb index 4c1440f..6ce69da 100644 --- a/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb +++ b/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb
@@ -1,5 +1,8 @@
1	name: "Bearer Entrance"	1	name: "Bearer Entrance"
2	ports {	2	ports {
3	name: "BEARER"	3	name: "BEARER"
		4	display_name: "East of Yellow Worldport"
4	path: "Components/Warps/worldport4"	5	path: "Components/Warps/worldport4"
		6	destination { x: 23 y: 0 z: -29 }
		7	rotation: 90
5	}	8	}


diff --git a/data/maps/the_unyielding/rooms/Digital Entrance.txtpb b/data/maps/the_unyielding/rooms/Digital Entrance.txtpb index 74665a2..853c5f0 100644 --- a/data/maps/the_unyielding/rooms/Digital Entrance.txtpb +++ b/data/maps/the_unyielding/rooms/Digital Entrance.txtpb
@@ -8,5 +8,8 @@ panels {
8	}	8	}
9	ports {	9	ports {
10	name: "DIGITAL"	10	name: "DIGITAL"
		11	display_name: "South of Yellow Worldport"
11	path: "Components/Warps/worldport"	12	path: "Components/Warps/worldport"
		13	destination { x: 0 y: 0 z: 0 }
		14	rotation: 0
12	}	15	}


diff --git a/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb b/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb index f011b32..454dc3f 100644 --- a/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb +++ b/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb
@@ -1,5 +1,8 @@
1	name: "Nuanced Entrance"	1	name: "Nuanced Entrance"
2	ports {	2	ports {
3	name: "NUANCED"	3	name: "NUANCED"
		4	display_name: "West of Yellow Worldport"
4	path: "Components/Warps/worldport3"	5	path: "Components/Warps/worldport3"
		6	destination { x: -23 y: 0 z: -29 }
		7	rotation: 270
5	}	8	}


diff --git a/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb b/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb index 0bc60a7..f866d87 100644 --- a/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb +++ b/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb
@@ -15,5 +15,8 @@ panels {
15	}	15	}
16	ports {	16	ports {
17	name: "PLAZA"	17	name: "PLAZA"
		18	display_name: "Dark Hallway"
18	path: "Components/Warps/worldport5"	19	path: "Components/Warps/worldport5"
		20	destination { x: 35 y: 0 z: 44 }
		21	rotation: 270
19	}	22	}


diff --git a/data/maps/the_unyielding/rooms/Yellow Left.txtpb b/data/maps/the_unyielding/rooms/Yellow Left.txtpb index 9c7d023..192d901 100644 --- a/data/maps/the_unyielding/rooms/Yellow Left.txtpb +++ b/data/maps/the_unyielding/rooms/Yellow Left.txtpb
@@ -5,4 +5,5 @@ panels {
5	clue: "sickness"	5	clue: "sickness"
6	answer: "health"	6	answer: "health"
7	symbols: SUN	7	symbols: SUN
		8	required_door { name: "Cyan Doors" }
8	}	9	}


diff --git a/data/maps/the_unyielding/rooms/Yellow Right.txtpb b/data/maps/the_unyielding/rooms/Yellow Right.txtpb index 0599f29..d554c73 100644 --- a/data/maps/the_unyielding/rooms/Yellow Right.txtpb +++ b/data/maps/the_unyielding/rooms/Yellow Right.txtpb
@@ -5,4 +5,5 @@ panels {
5	clue: "health"	5	clue: "health"
6	answer: "sickness"	6	answer: "sickness"
7	symbols: SUN	7	symbols: SUN
		8	required_door { name: "Cyan Doors" }
8	}	9	}