12 files changed, 238 insertions, 0 deletions
diff --git a/data/connections.txtpb b/data/connections.txtpb
index 8f4b8e6..4f77466 100644
--- a/data/connections.txtpb
+++ b/data/connections.txtpb

@@ -1057,3 +1057,19 @@ connections {
    }
  }
 }
+connections {
+  from {
+    painting {
+      map: "the_stormy"
+      room: "X2 Room"
+      name: "PARTHENON"
+    }
+  }
+  to {
+    room {
+      map: "the_parthenon"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
diff --git a/data/ids.yaml b/data/ids.yaml
index c7ba689..f86e7ac 100644
--- a/data/ids.yaml
+++ b/data/ids.yaml

@@ -1677,6 +1677,34 @@ maps:
          Obverse: 1179
    doors:
      Entrance: 1161
+  the_stormy:
+    rooms:
+      Center:
+        panels:
+          CLOUD: 1182
+          REACTOR: 1180
+          VOLCANO: 1181
+          WIND: 1183
+      Nuclear Side:
+        panels:
+          GERM: 1184
+      Nuclear Vestibule:
+        panels:
+          STORM: 1185
+      Rain Side:
+        panels:
+          CLOUD: 1186
+          WIND: 1187
+      Tornado Side:
+        panels:
+          PUDDLE: 1188
+      Tornado Vestibule:
+        panels:
+          SHIP: 1189
+      Volcano Side:
+        panels:
+          RAIN: 1191
+          SNOW: 1190
 letters:
  a1: 596
  a2: 6
@@ -1713,6 +1741,7 @@ letters:
  u1: 263
  w1: 681
  x1: 394
+  x2: 1192
  y1: 621
  z1: 851
 special:
diff --git a/data/maps/the_stormy/connections.txtpb b/data/maps/the_stormy/connections.txtpb
new file mode 100644
index 0000000..d935e68
--- /dev/null
+++ b/data/maps/the_stormy/connections.txtpb

@@ -0,0 +1,35 @@
+connections {
+  from_room: "Center"
+  to_room: "Nuclear Side"
+  door { name: "Nuclear Wall" }
+}
+connections {
+  from_room: "Center"
+  to_room: "Rain Side"
+  door { name: "Rain Wall" }
+}
+connections {
+  from_room: "Center"
+  to_room: "Tornado Side"
+  door { name: "Tornado Wall" }
+}
+connections {
+  from_room: "Center"
+  to_room: "Volcano Side"
+  door { name: "Volcano Wall" }
+}
+connections {
+  from_room: "Nuclear Side"
+  to_room: "Nuclear Vestibule"
+  door { name: "Side Doors" }
+}
+connections {
+  from_room: "Tornado Side"
+  to_room: "Tornado Vestibule"
+  door { name: "Side Doors" }
+}
+connections {
+  from_room: "Nuclear Side"
+  to_room: "X2 Room"
+  door { name: "X Door" }
+}
diff --git a/data/maps/the_stormy/doors.txtpb b/data/maps/the_stormy/doors.txtpb
new file mode 100644
index 0000000..c3ee7cb
--- /dev/null
+++ b/data/maps/the_stormy/doors.txtpb

@@ -0,0 +1,40 @@
+doors {
+  name: "Nuclear Wall"
+  type: EVENT
+  panels { room: "Center" name: "REACTOR" }
+}
+doors {
+  name: "Rain Wall"
+  type: EVENT
+  panels { room: "Center" name: "CLOUD" }
+}
+doors {
+  name: "Tornado Wall"
+  type: EVENT
+  panels { room: "Center" name: "WIND" }
+}
+doors {
+  name: "Volcano Wall"
+  type: EVENT
+  panels { room: "Center" name: "VOLCANO" }
+}
+doors {
+  name: "Side Doors"
+  type: EVENT
+  panels { room: "Center" name: "REACTOR" }
+  panels { room: "Center" name: "VOLCANO" }
+  panels { room: "Center" name: "CLOUD" }
+  panels { room: "Center" name: "WIND" }
+  panels { room: "Nuclear Side" name: "GERM" }
+  panels { room: "Tornado Side" name: "PUDDLE" }
+  panels { room: "Rain Side" name: "CLOUD" }
+  panels { room: "Rain Side" name: "WIND" }
+  panels { room: "Volcano Side" name: "SNOW" }
+  panels { room: "Volcano Side" name: "RAIN" }
+}
+doors {
+  name: "X Door"
+  type: EVENT
+  panels { room: "Nuclear Vestibule" name: "STORM" }
+  panels { room: "Tornado Vestibule" name: "SHIP" }
+}
diff --git a/data/maps/the_stormy/rooms/Center.txtpb b/data/maps/the_stormy/rooms/Center.txtpb
new file mode 100644
index 0000000..9ea360e
--- /dev/null
+++ b/data/maps/the_stormy/rooms/Center.txtpb

@@ -0,0 +1,35 @@
+name: "Center"
+display_name: "Stormy"
+panels {
+  name: "REACTOR"
+  path: "Panels/Room_1/panel_7"
+  clue: "reactor"
+  answer: "meltdown"
+  symbols: "cross"
+}
+panels {
+  name: "VOLCANO"
+  path: "Panels/Room_1/panel_8"
+  clue: "volcano"
+  answer: "eruption"
+  symbols: "age"
+}
+panels {
+  name: "CLOUD"
+  path: "Panels/Room_1/panel_9"
+  clue: "cloud"
+  answer: "rain"
+  symbols: "age"
+}
+panels {
+  name: "WIND"
+  path: "Panels/Room_1/panel_10"
+  clue: "wind"
+  answer: "tornado"
+  symbols: "cross"
+}
+ports {
+  name: "ENTRY"
+  path: "Components/Warps/worldport"
+  orientation: "west"
+}
diff --git a/data/maps/the_stormy/rooms/Nuclear Side.txtpb b/data/maps/the_stormy/rooms/Nuclear Side.txtpb
new file mode 100644
index 0000000..38ddc14
--- /dev/null
+++ b/data/maps/the_stormy/rooms/Nuclear Side.txtpb

@@ -0,0 +1,9 @@
+name: "Nuclear Side"
+display_name: "Stormy"
+panels {
+  name: "GERM"
+  path: "Panels/Room_1/panel_2"
+  clue: "germ"
+  answer: "pandemic"
+  symbols: "planet"
+}
diff --git a/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb b/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb
new file mode 100644
index 0000000..4dfabc5
--- /dev/null
+++ b/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb

@@ -0,0 +1,9 @@
+name: "Nuclear Vestibule"
+display_name: "Stormy"
+panels {
+  name: "STORM"
+  path: "Panels/Room 2/panel_11"
+  clue: "storm"
+  answer: "hurricane"
+  symbols: "pyramid"
+}
diff --git a/data/maps/the_stormy/rooms/Rain Side.txtpb b/data/maps/the_stormy/rooms/Rain Side.txtpb
new file mode 100644
index 0000000..9a7a84f
--- /dev/null
+++ b/data/maps/the_stormy/rooms/Rain Side.txtpb

@@ -0,0 +1,16 @@
+name: "Rain Side"
+display_name: "Stormy"
+panels {
+  name: "CLOUD"
+  path: "Panels/Room_1/panel_4"
+  clue: "cloud"
+  answer: "lightning"
+  symbols: "cross"
+}
+panels {
+  name: "WIND"
+  path: "Panels/Room_1/panel_5"
+  clue: "wind"
+  answer: "whirlwind"
+  symbols: "pyramid"
+}
diff --git a/data/maps/the_stormy/rooms/Tornado Side.txtpb b/data/maps/the_stormy/rooms/Tornado Side.txtpb
new file mode 100644
index 0000000..14848a0
--- /dev/null
+++ b/data/maps/the_stormy/rooms/Tornado Side.txtpb

@@ -0,0 +1,9 @@
+name: "Tornado Side"
+display_name: "Stormy"
+panels {
+  name: "PUDDLE"
+  path: "Panels/Room_1/panel_6"
+  clue: "puddle"
+  answer: "flood"
+  symbols: "pyramid"
+}
diff --git a/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb b/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb
new file mode 100644
index 0000000..2f2e3bf
--- /dev/null
+++ b/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb

@@ -0,0 +1,9 @@
+name: "Tornado Vestibule"
+display_name: "Stormy"
+panels {
+  name: "SHIP"
+  path: "Panels/Room 2/panel_12"
+  clue: "ship"
+  answer: "shipwreck"
+  symbols: "age"
+}
diff --git a/data/maps/the_stormy/rooms/Volcano Side.txtpb b/data/maps/the_stormy/rooms/Volcano Side.txtpb
new file mode 100644
index 0000000..c089cf0
--- /dev/null
+++ b/data/maps/the_stormy/rooms/Volcano Side.txtpb

@@ -0,0 +1,16 @@
+name: "Volcano Side"
+display_name: "Stormy"
+panels {
+  name: "SNOW"
+  path: "Panels/Room_1/panel_1"
+  clue: "snow"
+  answer: "blizzard"
+  symbols: "pyramid"
+}
+panels {
+  name: "RAIN"
+  path: "Panels/Room_1/panel_3"
+  clue: "rain"
+  answer: "hail"
+  symbols: "cross"
+}
diff --git a/data/maps/the_stormy/rooms/X2 Room.txtpb b/data/maps/the_stormy/rooms/X2 Room.txtpb
new file mode 100644
index 0000000..7d46956
--- /dev/null
+++ b/data/maps/the_stormy/rooms/X2 Room.txtpb

@@ -0,0 +1,15 @@
+name: "X2 Room"
+display_name: "Stormy"
+letters {
+  key: "x"
+  level2: true
+  path: "Components/Collectables/collectable"
+}
+paintings {
+  name: "PARTHENON"
+  path: "Components/Paintings/parthenon"
+  orientation: "west"
+  # Probably shouldn't let this be an exit because then what's the point of the
+  # rest of the map.
+  enter_only: true
+}

diff --git a/data/connections.txtpb b/data/connections.txtpb index 8f4b8e6..4f77466 100644 --- a/data/connections.txtpb +++ b/data/connections.txtpb
@@ -1057,3 +1057,19 @@ connections {
1057	}	1057	}
1058	}	1058	}
1059	}	1059	}
		1060	connections {
		1061	from {
		1062	painting {
		1063	map: "the_stormy"
		1064	room: "X2 Room"
		1065	name: "PARTHENON"
		1066	}
		1067	}
		1068	to {
		1069	room {
		1070	map: "the_parthenon"
		1071	name: "Main Area"
		1072	}
		1073	}
		1074	oneway: true
		1075	}


diff --git a/data/ids.yaml b/data/ids.yaml index c7ba689..f86e7ac 100644 --- a/data/ids.yaml +++ b/data/ids.yaml
@@ -1677,6 +1677,34 @@ maps:
1677	Obverse: 1179	1677	Obverse: 1179
1678	doors:	1678	doors:
1679	Entrance: 1161	1679	Entrance: 1161
		1680	the_stormy:
		1681	rooms:
		1682	Center:
		1683	panels:
		1684	CLOUD: 1182
		1685	REACTOR: 1180
		1686	VOLCANO: 1181
		1687	WIND: 1183
		1688	Nuclear Side:
		1689	panels:
		1690	GERM: 1184
		1691	Nuclear Vestibule:
		1692	panels:
		1693	STORM: 1185
		1694	Rain Side:
		1695	panels:
		1696	CLOUD: 1186
		1697	WIND: 1187
		1698	Tornado Side:
		1699	panels:
		1700	PUDDLE: 1188
		1701	Tornado Vestibule:
		1702	panels:
		1703	SHIP: 1189
		1704	Volcano Side:
		1705	panels:
		1706	RAIN: 1191
		1707	SNOW: 1190
1680	letters:	1708	letters:
1681	a1: 596	1709	a1: 596
1682	a2: 6	1710	a2: 6
@@ -1713,6 +1741,7 @@ letters:
1713	u1: 263	1741	u1: 263
1714	w1: 681	1742	w1: 681
1715	x1: 394	1743	x1: 394
		1744	x2: 1192
1716	y1: 621	1745	y1: 621
1717	z1: 851	1746	z1: 851
1718	special:	1747	special:


diff --git a/data/maps/the_stormy/connections.txtpb b/data/maps/the_stormy/connections.txtpb new file mode 100644 index 0000000..d935e68 --- /dev/null +++ b/data/maps/the_stormy/connections.txtpb
@@ -0,0 +1,35 @@
		1	connections {
		2	from_room: "Center"
		3	to_room: "Nuclear Side"
		4	door { name: "Nuclear Wall" }
		5	}
		6	connections {
		7	from_room: "Center"
		8	to_room: "Rain Side"
		9	door { name: "Rain Wall" }
		10	}
		11	connections {
		12	from_room: "Center"
		13	to_room: "Tornado Side"
		14	door { name: "Tornado Wall" }
		15	}
		16	connections {
		17	from_room: "Center"
		18	to_room: "Volcano Side"
		19	door { name: "Volcano Wall" }
		20	}
		21	connections {
		22	from_room: "Nuclear Side"
		23	to_room: "Nuclear Vestibule"
		24	door { name: "Side Doors" }
		25	}
		26	connections {
		27	from_room: "Tornado Side"
		28	to_room: "Tornado Vestibule"
		29	door { name: "Side Doors" }
		30	}
		31	connections {
		32	from_room: "Nuclear Side"
		33	to_room: "X2 Room"
		34	door { name: "X Door" }
		35	}


diff --git a/data/maps/the_stormy/doors.txtpb b/data/maps/the_stormy/doors.txtpb new file mode 100644 index 0000000..c3ee7cb --- /dev/null +++ b/data/maps/the_stormy/doors.txtpb
@@ -0,0 +1,40 @@
		1	doors {
		2	name: "Nuclear Wall"
		3	type: EVENT
		4	panels { room: "Center" name: "REACTOR" }
		5	}
		6	doors {
		7	name: "Rain Wall"
		8	type: EVENT
		9	panels { room: "Center" name: "CLOUD" }
		10	}
		11	doors {
		12	name: "Tornado Wall"
		13	type: EVENT
		14	panels { room: "Center" name: "WIND" }
		15	}
		16	doors {
		17	name: "Volcano Wall"
		18	type: EVENT
		19	panels { room: "Center" name: "VOLCANO" }
		20	}
		21	doors {
		22	name: "Side Doors"
		23	type: EVENT
		24	panels { room: "Center" name: "REACTOR" }
		25	panels { room: "Center" name: "VOLCANO" }
		26	panels { room: "Center" name: "CLOUD" }
		27	panels { room: "Center" name: "WIND" }
		28	panels { room: "Nuclear Side" name: "GERM" }
		29	panels { room: "Tornado Side" name: "PUDDLE" }
		30	panels { room: "Rain Side" name: "CLOUD" }
		31	panels { room: "Rain Side" name: "WIND" }
		32	panels { room: "Volcano Side" name: "SNOW" }
		33	panels { room: "Volcano Side" name: "RAIN" }
		34	}
		35	doors {
		36	name: "X Door"
		37	type: EVENT
		38	panels { room: "Nuclear Vestibule" name: "STORM" }
		39	panels { room: "Tornado Vestibule" name: "SHIP" }
		40	}


diff --git a/data/maps/the_stormy/rooms/Center.txtpb b/data/maps/the_stormy/rooms/Center.txtpb new file mode 100644 index 0000000..9ea360e --- /dev/null +++ b/data/maps/the_stormy/rooms/Center.txtpb
@@ -0,0 +1,35 @@
		1	name: "Center"
		2	display_name: "Stormy"
		3	panels {
		4	name: "REACTOR"
		5	path: "Panels/Room_1/panel_7"
		6	clue: "reactor"
		7	answer: "meltdown"
		8	symbols: "cross"
		9	}
		10	panels {
		11	name: "VOLCANO"
		12	path: "Panels/Room_1/panel_8"
		13	clue: "volcano"
		14	answer: "eruption"
		15	symbols: "age"
		16	}
		17	panels {
		18	name: "CLOUD"
		19	path: "Panels/Room_1/panel_9"
		20	clue: "cloud"
		21	answer: "rain"
		22	symbols: "age"
		23	}
		24	panels {
		25	name: "WIND"
		26	path: "Panels/Room_1/panel_10"
		27	clue: "wind"
		28	answer: "tornado"
		29	symbols: "cross"
		30	}
		31	ports {
		32	name: "ENTRY"
		33	path: "Components/Warps/worldport"
		34	orientation: "west"
		35	}


diff --git a/data/maps/the_stormy/rooms/Nuclear Side.txtpb b/data/maps/the_stormy/rooms/Nuclear Side.txtpb new file mode 100644 index 0000000..38ddc14 --- /dev/null +++ b/data/maps/the_stormy/rooms/Nuclear Side.txtpb
@@ -0,0 +1,9 @@
		1	name: "Nuclear Side"
		2	display_name: "Stormy"
		3	panels {
		4	name: "GERM"
		5	path: "Panels/Room_1/panel_2"
		6	clue: "germ"
		7	answer: "pandemic"
		8	symbols: "planet"
		9	}


diff --git a/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb b/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb new file mode 100644 index 0000000..4dfabc5 --- /dev/null +++ b/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb
@@ -0,0 +1,9 @@
		1	name: "Nuclear Vestibule"
		2	display_name: "Stormy"
		3	panels {
		4	name: "STORM"
		5	path: "Panels/Room 2/panel_11"
		6	clue: "storm"
		7	answer: "hurricane"
		8	symbols: "pyramid"
		9	}


diff --git a/data/maps/the_stormy/rooms/Rain Side.txtpb b/data/maps/the_stormy/rooms/Rain Side.txtpb new file mode 100644 index 0000000..9a7a84f --- /dev/null +++ b/data/maps/the_stormy/rooms/Rain Side.txtpb
@@ -0,0 +1,16 @@
		1	name: "Rain Side"
		2	display_name: "Stormy"
		3	panels {
		4	name: "CLOUD"
		5	path: "Panels/Room_1/panel_4"
		6	clue: "cloud"
		7	answer: "lightning"
		8	symbols: "cross"
		9	}
		10	panels {
		11	name: "WIND"
		12	path: "Panels/Room_1/panel_5"
		13	clue: "wind"
		14	answer: "whirlwind"
		15	symbols: "pyramid"
		16	}


diff --git a/data/maps/the_stormy/rooms/Tornado Side.txtpb b/data/maps/the_stormy/rooms/Tornado Side.txtpb new file mode 100644 index 0000000..14848a0 --- /dev/null +++ b/data/maps/the_stormy/rooms/Tornado Side.txtpb
@@ -0,0 +1,9 @@
		1	name: "Tornado Side"
		2	display_name: "Stormy"
		3	panels {
		4	name: "PUDDLE"
		5	path: "Panels/Room_1/panel_6"
		6	clue: "puddle"
		7	answer: "flood"
		8	symbols: "pyramid"
		9	}


diff --git a/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb b/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb new file mode 100644 index 0000000..2f2e3bf --- /dev/null +++ b/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb
@@ -0,0 +1,9 @@
		1	name: "Tornado Vestibule"
		2	display_name: "Stormy"
		3	panels {
		4	name: "SHIP"
		5	path: "Panels/Room 2/panel_12"
		6	clue: "ship"
		7	answer: "shipwreck"
		8	symbols: "age"
		9	}


diff --git a/data/maps/the_stormy/rooms/Volcano Side.txtpb b/data/maps/the_stormy/rooms/Volcano Side.txtpb new file mode 100644 index 0000000..c089cf0 --- /dev/null +++ b/data/maps/the_stormy/rooms/Volcano Side.txtpb
@@ -0,0 +1,16 @@
		1	name: "Volcano Side"
		2	display_name: "Stormy"
		3	panels {
		4	name: "SNOW"
		5	path: "Panels/Room_1/panel_1"
		6	clue: "snow"
		7	answer: "blizzard"
		8	symbols: "pyramid"
		9	}
		10	panels {
		11	name: "RAIN"
		12	path: "Panels/Room_1/panel_3"
		13	clue: "rain"
		14	answer: "hail"
		15	symbols: "cross"
		16	}


diff --git a/data/maps/the_stormy/rooms/X2 Room.txtpb b/data/maps/the_stormy/rooms/X2 Room.txtpb new file mode 100644 index 0000000..7d46956 --- /dev/null +++ b/data/maps/the_stormy/rooms/X2 Room.txtpb
@@ -0,0 +1,15 @@
		1	name: "X2 Room"
		2	display_name: "Stormy"
		3	letters {
		4	key: "x"
		5	level2: true
		6	path: "Components/Collectables/collectable"
		7	}
		8	paintings {
		9	name: "PARTHENON"
		10	path: "Components/Paintings/parthenon"
		11	orientation: "west"
		12	# Probably shouldn't let this be an exit because then what's the point of the
		13	# rest of the map.
		14	enter_only: true
		15	}