10 files changed, 167 insertions, 2 deletions
diff --git a/data/connections.txtpb b/data/connections.txtpb
index a8ed671..923cc6e 100644
--- a/data/connections.txtpb
+++ b/data/connections.txtpb

@@ -28,7 +28,6 @@
 # the_gallery/Main Area/RAINBOW
 # the_gallery/Main Area/WORDS
 # the_gallery/Main Area/CASTLE
-# the_gallery/Main Area/SUNTEMPLE
 # the_great/Purple Room/DAEDALUS
 # the_great/Daedalus Entrance/DAEDALUS (keep in mind the door only blocks one direction of this)
 # the_great/West Side/CC
@@ -54,6 +53,7 @@
 # the_repetitive/Main Room/CC
 # cc <-> the shop (keyholder door only needed one way)
 # the_sturdy/S2 Area/RAINBOW
+# the_sun_temple/Entrance/UNKEMPT
 connections {
  from {
    port {
@@ -1104,3 +1104,19 @@ connections {
    }
  }
 }
+connections {
+  from {
+    painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "SUNTEMPLE"
+    }
+  }
+  to {
+    room {
+      map: "the_sun_temple"
+      name: "Entrance"
+    }
+  }
+  oneway: true
+}
diff --git a/data/ids.yaml b/data/ids.yaml
index 0c55991..9088205 100644
--- a/data/ids.yaml
+++ b/data/ids.yaml

@@ -1720,6 +1720,25 @@ maps:
      S2 Area:
        panels:
          COLORS: 1201
+  the_sun_temple:
+    rooms:
+      Entrance:
+        panels:
+          SUN: 1212
+      Mastery:
+        masteries:
+          MASTERY: 1213
+      Temple:
+        panels:
+          ARM: 1219
+          DELAY: 1214
+          EQUINOX: 1220
+          HEAVY: 1217
+          JUMP: 1216
+          KNIFE: 1218
+          LAWN: 1215
+    doors:
+      Entrance: 1210
 letters:
  a1: 596
  a2: 6
@@ -1767,6 +1786,7 @@ endings:
  GRAY: 1204
  GREEN: 1203
  PLUM: 1205
+  PURPLE: 1211
  YELLOW: 1206
 special:
  Nothing: 1160
diff --git a/data/maps/the_gallery/doors.txtpb b/data/maps/the_gallery/doors.txtpb
index 0851215..d66e032 100644
--- a/data/maps/the_gallery/doors.txtpb
+++ b/data/maps/the_gallery/doors.txtpb

@@ -141,7 +141,7 @@ doors {
  name: "Sun Temple Painting"
  type: ITEM_ONLY
  move_paintings { room: "Main Area" name: "SUNTEMPLE" }
-  # TODO: Enter The Sun Temple
+  rooms { map: "the_sun_temple" name: "Entrance" }
 }
 doors {
  name: "Ancient Painting"
diff --git a/data/maps/the_sun_temple/connections.txtpb b/data/maps/the_sun_temple/connections.txtpb
new file mode 100644
index 0000000..b0b3a0a
--- /dev/null
+++ b/data/maps/the_sun_temple/connections.txtpb

@@ -0,0 +1,15 @@
+connections {
+  from_room: "Entrance"
+  to_room: "Temple"
+  door { name: "Entrance" }
+}
+connections {
+  from_room: "Temple"
+  to_room: "Ending"
+  door { name: "Ending" }
+}
+connections {
+  from_room: "Temple"
+  to_room: "Mastery"
+  door { name: "Mastery" }
+}
diff --git a/data/maps/the_sun_temple/doors.txtpb b/data/maps/the_sun_temple/doors.txtpb
new file mode 100644
index 0000000..7ee2c56
--- /dev/null
+++ b/data/maps/the_sun_temple/doors.txtpb

@@ -0,0 +1,23 @@
+doors {
+  name: "Entrance"
+  type: STANDARD
+  receivers: "Components/Doors/entry_1"
+  panels { room: "Entrance" name: "SUN" }
+  location_room: "Entrance"
+}
+doors {
+  name: "Ending"
+  type: EVENT
+  panels { room: "Temple" name: "EQUINOX" answer: "equinox" }
+}
+doors {
+  name: "Mastery"
+  type: EVENT
+  panels { room: "Entrance" name: "SUN" answer: "moon" }
+  panels { room: "Temple" name: "DELAY" answer: "night" }
+  panels { room: "Temple" name: "LAWN" answer: "dusk" }
+  panels { room: "Temple" name: "JUMP" answer: "autumn" }
+  panels { room: "Temple" name: "HEAVY" answer: "dark" }
+  panels { room: "Temple" name: "KNIFE" answer: "death" }
+  panels { room: "Temple" name: "ARM" answer: "chill" }
+}
diff --git a/data/maps/the_sun_temple/metadata.txtpb b/data/maps/the_sun_temple/metadata.txtpb
new file mode 100644
index 0000000..97f9290
--- /dev/null
+++ b/data/maps/the_sun_temple/metadata.txtpb

@@ -0,0 +1 @@
+display_name: "The Sun Temple"
diff --git a/data/maps/the_sun_temple/rooms/Ending.txtpb b/data/maps/the_sun_temple/rooms/Ending.txtpb
new file mode 100644
index 0000000..a94e606
--- /dev/null
+++ b/data/maps/the_sun_temple/rooms/Ending.txtpb

@@ -0,0 +1,6 @@
+name: "Ending"
+display_name: "Sun Temple"
+endings {
+  name: "PURPLE"
+  path: "Components/purple_ending"
+}
diff --git a/data/maps/the_sun_temple/rooms/Entrance.txtpb b/data/maps/the_sun_temple/rooms/Entrance.txtpb
new file mode 100644
index 0000000..0b2a0bd
--- /dev/null
+++ b/data/maps/the_sun_temple/rooms/Entrance.txtpb

@@ -0,0 +1,14 @@
+name: "Entrance"
+display_name: "Sun Temple"
+panels {
+  name: "SUN"
+  path: "Panels/Main/panel_1"
+  clue: "sun"
+  answer: "sun"
+  #proxies { answer: "sun" path: "Panels/Sun/panel_8" }
+  proxies { answer: "moon" path: "Panels/Moon/panel_15" }
+}
+ports {
+  name: "UNKEMPT"
+  path: "Components/Warps/worldport"
+}
diff --git a/data/maps/the_sun_temple/rooms/Mastery.txtpb b/data/maps/the_sun_temple/rooms/Mastery.txtpb
new file mode 100644
index 0000000..b416a9a
--- /dev/null
+++ b/data/maps/the_sun_temple/rooms/Mastery.txtpb

@@ -0,0 +1,6 @@
+name: "Mastery"
+display_name: "Sun Temple"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
diff --git a/data/maps/the_sun_temple/rooms/Temple.txtpb b/data/maps/the_sun_temple/rooms/Temple.txtpb
new file mode 100644
index 0000000..510bfb0
--- /dev/null
+++ b/data/maps/the_sun_temple/rooms/Temple.txtpb

@@ -0,0 +1,64 @@
+name: "Temple"
+display_name: "Sun Temple"
+panels {
+  name: "DELAY"
+  path: "Panels/Main/panel_2"
+  clue: "delay"
+  answer: "day"
+  symbols: "sparkles"
+  #proxies { answer: "day" path: "Panels/Sun/panel_9" }
+  proxies { answer: "night" path: "Panels/Moon/panel_16" }
+}
+panels {
+  name: "LAWN"
+  path: "Panels/Main/panel_3"
+  clue: "lawn"
+  answer: "dawn"
+  symbols: "sparkles"
+  #proxies { answer: "dawn" path: "Panels/Sun/panel_10" }
+  proxies { answer: "dusk" path: "Panels/Moon/panel_17" }
+}
+panels {
+  name: "JUMP"
+  path: "Panels/Main/panel_4"
+  clue: "jump"
+  answer: "spring"
+  symbols: "sun"
+  #proxies { answer: "spring" path: "Panels/Sun/panel_11" }
+  proxies { answer: "autumn" path: "Panels/Moon/panel_18" }
+}
+panels {
+  name: "HEAVY"
+  path: "Panels/Main/panel_5"
+  clue: "heavy"
+  answer: "light"
+  symbols: "sun"
+  #proxies { answer: "light" path: "Panels/Sun/panel_12" }
+  proxies { answer: "dark" path: "Panels/Moon/panel_19" }
+}
+panels {
+  name: "KNIFE"
+  path: "Panels/Main/panel_6"
+  clue: "knife"
+  answer: "life"
+  symbols: "zero"
+  #proxies { answer: "life" path: "Panels/Sun/panel_13" }
+  proxies { answer: "death" path: "Panels/Moon/panel_20" }
+}
+panels {
+  name: "ARM"
+  path: "Panels/Main/panel_7"
+  clue: "arm"
+  answer: "warmth"
+  symbols: "sparkles"
+  #proxies { answer: "warmth" path: "Panels/Sun/panel_14" }
+  proxies { answer: "chill" path: "Panels/Moon/panel_21" }
+}
+panels {
+  name: "EQUINOX"
+  path: "Panels/End/panel_22"
+  clue: "equinox"
+  answer: "equinox"
+  proxies { answer: "solstice" path: "Panels/End/panel_23" }
+  #proxies { answer: "equinox" path: "Panels/End/panel_24" }
+}

diff --git a/data/connections.txtpb b/data/connections.txtpb index a8ed671..923cc6e 100644 --- a/data/connections.txtpb +++ b/data/connections.txtpb
@@ -28,7 +28,6 @@
28	# the_gallery/Main Area/RAINBOW	28	# the_gallery/Main Area/RAINBOW
29	# the_gallery/Main Area/WORDS	29	# the_gallery/Main Area/WORDS
30	# the_gallery/Main Area/CASTLE	30	# the_gallery/Main Area/CASTLE
31	# the_gallery/Main Area/SUNTEMPLE
32	# the_great/Purple Room/DAEDALUS	31	# the_great/Purple Room/DAEDALUS
33	# the_great/Daedalus Entrance/DAEDALUS (keep in mind the door only blocks one direction of this)	32	# the_great/Daedalus Entrance/DAEDALUS (keep in mind the door only blocks one direction of this)
34	# the_great/West Side/CC	33	# the_great/West Side/CC
@@ -54,6 +53,7 @@
54	# the_repetitive/Main Room/CC	53	# the_repetitive/Main Room/CC
55	# cc <-> the shop (keyholder door only needed one way)	54	# cc <-> the shop (keyholder door only needed one way)
56	# the_sturdy/S2 Area/RAINBOW	55	# the_sturdy/S2 Area/RAINBOW
		56	# the_sun_temple/Entrance/UNKEMPT
57	connections {	57	connections {
58	from {	58	from {
59	port {	59	port {
@@ -1104,3 +1104,19 @@ connections {
1104	}	1104	}
1105	}	1105	}
1106	}	1106	}
		1107	connections {
		1108	from {
		1109	painting {
		1110	map: "the_gallery"
		1111	room: "Main Area"
		1112	name: "SUNTEMPLE"
		1113	}
		1114	}
		1115	to {
		1116	room {
		1117	map: "the_sun_temple"
		1118	name: "Entrance"
		1119	}
		1120	}
		1121	oneway: true
		1122	}


diff --git a/data/ids.yaml b/data/ids.yaml index 0c55991..9088205 100644 --- a/data/ids.yaml +++ b/data/ids.yaml
@@ -1720,6 +1720,25 @@ maps:
1720	S2 Area:	1720	S2 Area:
1721	panels:	1721	panels:
1722	COLORS: 1201	1722	COLORS: 1201
		1723	the_sun_temple:
		1724	rooms:
		1725	Entrance:
		1726	panels:
		1727	SUN: 1212
		1728	Mastery:
		1729	masteries:
		1730	MASTERY: 1213
		1731	Temple:
		1732	panels:
		1733	ARM: 1219
		1734	DELAY: 1214
		1735	EQUINOX: 1220
		1736	HEAVY: 1217
		1737	JUMP: 1216
		1738	KNIFE: 1218
		1739	LAWN: 1215
		1740	doors:
		1741	Entrance: 1210
1723	letters:	1742	letters:
1724	a1: 596	1743	a1: 596
1725	a2: 6	1744	a2: 6
@@ -1767,6 +1786,7 @@ endings:
1767	GRAY: 1204	1786	GRAY: 1204
1768	GREEN: 1203	1787	GREEN: 1203
1769	PLUM: 1205	1788	PLUM: 1205
		1789	PURPLE: 1211
1770	YELLOW: 1206	1790	YELLOW: 1206
1771	special:	1791	special:
1772	Nothing: 1160	1792	Nothing: 1160


diff --git a/data/maps/the_gallery/doors.txtpb b/data/maps/the_gallery/doors.txtpb index 0851215..d66e032 100644 --- a/data/maps/the_gallery/doors.txtpb +++ b/data/maps/the_gallery/doors.txtpb
@@ -141,7 +141,7 @@ doors {
141	name: "Sun Temple Painting"	141	name: "Sun Temple Painting"
142	type: ITEM_ONLY	142	type: ITEM_ONLY
143	move_paintings { room: "Main Area" name: "SUNTEMPLE" }	143	move_paintings { room: "Main Area" name: "SUNTEMPLE" }
144	# TODO: Enter The Sun Temple	144	rooms { map: "the_sun_temple" name: "Entrance" }
145	}	145	}
146	doors {	146	doors {
147	name: "Ancient Painting"	147	name: "Ancient Painting"


diff --git a/data/maps/the_sun_temple/connections.txtpb b/data/maps/the_sun_temple/connections.txtpb new file mode 100644 index 0000000..b0b3a0a --- /dev/null +++ b/data/maps/the_sun_temple/connections.txtpb
@@ -0,0 +1,15 @@
		1	connections {
		2	from_room: "Entrance"
		3	to_room: "Temple"
		4	door { name: "Entrance" }
		5	}
		6	connections {
		7	from_room: "Temple"
		8	to_room: "Ending"
		9	door { name: "Ending" }
		10	}
		11	connections {
		12	from_room: "Temple"
		13	to_room: "Mastery"
		14	door { name: "Mastery" }
		15	}


diff --git a/data/maps/the_sun_temple/doors.txtpb b/data/maps/the_sun_temple/doors.txtpb new file mode 100644 index 0000000..7ee2c56 --- /dev/null +++ b/data/maps/the_sun_temple/doors.txtpb
@@ -0,0 +1,23 @@
		1	doors {
		2	name: "Entrance"
		3	type: STANDARD
		4	receivers: "Components/Doors/entry_1"
		5	panels { room: "Entrance" name: "SUN" }
		6	location_room: "Entrance"
		7	}
		8	doors {
		9	name: "Ending"
		10	type: EVENT
		11	panels { room: "Temple" name: "EQUINOX" answer: "equinox" }
		12	}
		13	doors {
		14	name: "Mastery"
		15	type: EVENT
		16	panels { room: "Entrance" name: "SUN" answer: "moon" }
		17	panels { room: "Temple" name: "DELAY" answer: "night" }
		18	panels { room: "Temple" name: "LAWN" answer: "dusk" }
		19	panels { room: "Temple" name: "JUMP" answer: "autumn" }
		20	panels { room: "Temple" name: "HEAVY" answer: "dark" }
		21	panels { room: "Temple" name: "KNIFE" answer: "death" }
		22	panels { room: "Temple" name: "ARM" answer: "chill" }
		23	}


diff --git a/data/maps/the_sun_temple/metadata.txtpb b/data/maps/the_sun_temple/metadata.txtpb new file mode 100644 index 0000000..97f9290 --- /dev/null +++ b/data/maps/the_sun_temple/metadata.txtpb
@@ -0,0 +1 @@
			display_name: "The Sun Temple"


diff --git a/data/maps/the_sun_temple/rooms/Ending.txtpb b/data/maps/the_sun_temple/rooms/Ending.txtpb new file mode 100644 index 0000000..a94e606 --- /dev/null +++ b/data/maps/the_sun_temple/rooms/Ending.txtpb
@@ -0,0 +1,6 @@
		1	name: "Ending"
		2	display_name: "Sun Temple"
		3	endings {
		4	name: "PURPLE"
		5	path: "Components/purple_ending"
		6	}


diff --git a/data/maps/the_sun_temple/rooms/Entrance.txtpb b/data/maps/the_sun_temple/rooms/Entrance.txtpb new file mode 100644 index 0000000..0b2a0bd --- /dev/null +++ b/data/maps/the_sun_temple/rooms/Entrance.txtpb
@@ -0,0 +1,14 @@
		1	name: "Entrance"
		2	display_name: "Sun Temple"
		3	panels {
		4	name: "SUN"
		5	path: "Panels/Main/panel_1"
		6	clue: "sun"
		7	answer: "sun"
		8	#proxies { answer: "sun" path: "Panels/Sun/panel_8" }
		9	proxies { answer: "moon" path: "Panels/Moon/panel_15" }
		10	}
		11	ports {
		12	name: "UNKEMPT"
		13	path: "Components/Warps/worldport"
		14	}


diff --git a/data/maps/the_sun_temple/rooms/Mastery.txtpb b/data/maps/the_sun_temple/rooms/Mastery.txtpb new file mode 100644 index 0000000..b416a9a --- /dev/null +++ b/data/maps/the_sun_temple/rooms/Mastery.txtpb
@@ -0,0 +1,6 @@
		1	name: "Mastery"
		2	display_name: "Sun Temple"
		3	masteries {
		4	name: "MASTERY"
		5	path: "Components/Collectables/collectable"
		6	}


diff --git a/data/maps/the_sun_temple/rooms/Temple.txtpb b/data/maps/the_sun_temple/rooms/Temple.txtpb new file mode 100644 index 0000000..510bfb0 --- /dev/null +++ b/data/maps/the_sun_temple/rooms/Temple.txtpb
@@ -0,0 +1,64 @@
		1	name: "Temple"
		2	display_name: "Sun Temple"
		3	panels {
		4	name: "DELAY"
		5	path: "Panels/Main/panel_2"
		6	clue: "delay"
		7	answer: "day"
		8	symbols: "sparkles"
		9	#proxies { answer: "day" path: "Panels/Sun/panel_9" }
		10	proxies { answer: "night" path: "Panels/Moon/panel_16" }
		11	}
		12	panels {
		13	name: "LAWN"
		14	path: "Panels/Main/panel_3"
		15	clue: "lawn"
		16	answer: "dawn"
		17	symbols: "sparkles"
		18	#proxies { answer: "dawn" path: "Panels/Sun/panel_10" }
		19	proxies { answer: "dusk" path: "Panels/Moon/panel_17" }
		20	}
		21	panels {
		22	name: "JUMP"
		23	path: "Panels/Main/panel_4"
		24	clue: "jump"
		25	answer: "spring"
		26	symbols: "sun"
		27	#proxies { answer: "spring" path: "Panels/Sun/panel_11" }
		28	proxies { answer: "autumn" path: "Panels/Moon/panel_18" }
		29	}
		30	panels {
		31	name: "HEAVY"
		32	path: "Panels/Main/panel_5"
		33	clue: "heavy"
		34	answer: "light"
		35	symbols: "sun"
		36	#proxies { answer: "light" path: "Panels/Sun/panel_12" }
		37	proxies { answer: "dark" path: "Panels/Moon/panel_19" }
		38	}
		39	panels {
		40	name: "KNIFE"
		41	path: "Panels/Main/panel_6"
		42	clue: "knife"
		43	answer: "life"
		44	symbols: "zero"
		45	#proxies { answer: "life" path: "Panels/Sun/panel_13" }
		46	proxies { answer: "death" path: "Panels/Moon/panel_20" }
		47	}
		48	panels {
		49	name: "ARM"
		50	path: "Panels/Main/panel_7"
		51	clue: "arm"
		52	answer: "warmth"
		53	symbols: "sparkles"
		54	#proxies { answer: "warmth" path: "Panels/Sun/panel_14" }
		55	proxies { answer: "chill" path: "Panels/Moon/panel_21" }
		56	}
		57	panels {
		58	name: "EQUINOX"
		59	path: "Panels/End/panel_22"
		60	clue: "equinox"
		61	answer: "equinox"
		62	proxies { answer: "solstice" path: "Panels/End/panel_23" }
		63	#proxies { answer: "equinox" path: "Panels/End/panel_24" }
		64	}