summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-03-07 10:29:38 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-03-07 10:29:38 -0500
commit5fe3fd37b65d9e4650053dfff4d077d192f31739 (patch)
treedd02b4912025334156e57d6965868677dc1f6f00
parent33467f58a04a37085f72324b095ee75b59d61355 (diff)
downloadtanetane-5fe3fd37b65d9e4650053dfff4d077d192f31739.tar.gz
tanetane-5fe3fd37b65d9e4650053dfff4d077d192f31739.tar.bz2
tanetane-5fe3fd37b65d9e4650053dfff4d077d192f31739.zip
Added connection between mirror map and hallucination_interior
-rw-r--r--res/maps/hallucination_interior.tmx32
-rw-r--r--res/maps/hallucination_mirror.tmx10
-rw-r--r--res/scripts/hallucination_interior.lua4
-rw-r--r--res/scripts/hallucination_mirror.lua4
-rw-r--r--src/main.cpp4
5 files changed, 39 insertions, 15 deletions
diff --git a/res/maps/hallucination_interior.tmx b/res/maps/hallucination_interior.tmx index 6d3b88a..d42cadc 100644 --- a/res/maps/hallucination_interior.tmx +++ b/res/maps/hallucination_interior.tmx
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5"> 2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="7">
3 <properties> 3 <properties>
4 <property name="music" value="red_green_yellow_yellow"/> 4 <property name="music" value="red_green_yellow_yellow"/>
5 </properties> 5 </properties>
@@ -31,11 +31,11 @@
3163,63,50,2147483698,2147483697,1,1073741873,3221225532,3221225521,1,49,2,2,9,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,9,40,9,56,57,3221225522,1073741884,3221225531,3221225535,2,2,2,2,7,7,7,7,7,69,70,7,32,30,31,33,2,2, 3163,63,50,2147483698,2147483697,1,1073741873,3221225532,3221225521,1,49,2,2,9,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,9,40,9,56,57,3221225522,1073741884,3221225531,3221225535,2,2,2,2,7,7,7,7,7,69,70,7,32,30,31,33,2,2,
321,1,49,2147483697,1,1073741873,1073741874,2147483657,3221225522,66,67,14,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,9,9,51,8,9,9,9,9,40,9,2,2,2,2,14,15,7,1073741852,1073741852,1073741860,7,7,58,7,3221225508,2,2,2,2, 321,1,49,2147483697,1,1073741873,1073741874,2147483657,3221225522,66,67,14,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,9,9,51,8,9,9,9,9,40,9,2,2,2,2,14,15,7,1073741852,1073741852,1073741860,7,7,58,7,3221225508,2,2,2,2,
331,1,1,1,1,9,9,2,2,1,13,14,15,16,2,2,2,2,13,14,15,16,2,2,2,2,2,2,2,2,2,4,5,12,3,4,5,12,9,9,9,9,9,61,51,8,9,2,2,2,2,14,15,16,1073741853,3221225500,3221225506,3221225500,3221225500,14,2,2,2,2, 331,1,1,1,1,9,9,2,2,1,13,14,15,16,2,2,2,2,13,14,15,16,2,2,2,2,2,2,2,2,2,4,5,12,3,4,5,12,9,9,9,9,9,61,51,8,9,2,2,2,2,14,15,16,1073741853,3221225500,3221225506,3221225500,3221225500,14,2,2,2,2,
342,2,2,2,2,2,2,2,2,1,1,1,13,14,15,16,2,2,1,1,1,1,2,2,2,2,2,2,2,2,2,9,35,4,5,12,17,18,19,9,9,9,9,9,9,2,2,2,2,2,2,2,2,1,66,67,1,64,48,1,13,14,2,2, 342,2,2,2,2,2,2,2,2,1,1,1,13,14,15,16,2,2,1,1,1,1,2,2,2,2,2,2,2,2,2,9,35,4,5,12,17,18,19,9,9,9,9,9,9,2,2,2,2,2,2,2,2,1,66,67,1,64,48,1,13,14,15,16,
352,2,2,2,2,2,2,2,2,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,61,40,9,9,9,20,21,22,9,9,9,9,2,2,2,2,2,2,2,2,2,2,2,1,1,48,1,13,14,15,16,2,2, 352,2,2,2,2,2,2,2,2,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,61,40,9,9,9,20,21,22,9,9,9,9,2,2,2,2,2,2,2,2,2,2,2,1,1,48,1,13,14,15,16,13,14,
362,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,2,2,50,61,9,9,9,25,26,27,40,9,4,5,2,2,2,2,2,2,2,2,1,13,14,15,16,66,67,1,1,13,14,2,2, 362,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,2,2,50,61,9,9,9,25,26,27,40,9,4,5,2,2,2,2,2,2,2,2,1,13,14,15,16,66,67,1,1,1,1,1,1,
372,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,5,12,3,4,5,12,13,14,15,16,1,49,50,56,57,9,9,9,9,41,42,9,9,2,2,2,13,14,15,16,13,14,15,16,1,64,1,1,1,64,2,2,2,2, 372,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,5,12,3,4,5,12,13,14,15,16,1,49,50,56,57,9,9,9,9,41,42,9,9,2,2,2,13,14,15,16,13,14,15,16,1,64,1,1,1,64,1,1,1,1,
382,2,13,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,5,12,35,4,5,12,2147483657,14,15,16,13,14,15,16,49,59,50,9,9,9,55,52,53,2,2,2,2,2,1,1,1,1,2,1,1,66,67,1,1073741895,1073741884,2,2,1073741826,2,2,2, 382,2,13,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,5,12,35,4,5,12,2147483657,14,15,16,13,14,15,16,49,59,50,9,9,9,55,52,53,2,2,2,2,2,1,1,1,1,2,1,1,66,67,1,1073741895,1073741884,2,2,1073741826,2,2,1,
392,2,13,14,15,16,2,2,2,2,2,2,2,2,2,2,2,9,3221225481,3221225481,40,3221225481,3221225481,2147483698,2147483707,2147483697,1,37,38,1,1,1,64,1,49,50,9,9,9,9,9,9,2,2,2,2,2,2,2,2,2,2,1,1,1073741895,1073741884,1073741886,1073741833,2,2,2,2,2,2, 392,2,13,14,15,16,2,2,2,2,2,2,2,2,2,2,2,9,3221225481,3221225481,40,3221225481,3221225481,2147483698,2147483707,2147483697,1,37,38,1,1,1,64,1,49,50,9,9,9,9,9,9,2,2,2,2,2,2,2,2,2,2,1,1,1073741895,1073741884,1073741886,1073741833,2,2,2,2,2,2,
402,2,1,1,1,1,2,2,2,2,2,2,2,4,5,12,3221225481,3221225481,3221225481,51,8,3221225481,2147483698,2147483697,13,14,15,16,1,1,37,38,1,37,38,38,2,2,2,59,2147483697,2,2,2,2,2,2,2,2,2,2,2,1073741884,1073741887,1073741886,1073741833,3,4,5,12,2,2,2,2, 402,2,1,1,1,1,2,2,2,2,2,2,2,4,5,12,3221225481,3221225481,3221225481,51,8,3221225481,2147483698,2147483697,13,14,15,16,1,1,37,38,1,37,38,38,2,2,2,59,2147483697,2,2,2,2,2,2,2,2,2,2,2,1073741884,1073741887,1073741886,1073741833,3,4,5,12,2,2,2,2,
412,2,2,2,2,2,2,2,2,2,2,2,3221225481,3221225481,3,4,5,12,56,57,3221225481,9,3221225522,3221225521,66,67,1,37,38,1,1,67,1,66,67,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,5,12,2147483705,2147483704,9,9,9,2,2,2,2,2, 412,2,2,2,2,2,2,2,2,2,2,2,3221225481,3221225481,3,4,5,12,56,57,3221225481,9,3221225522,3221225521,66,67,1,37,38,1,1,67,1,66,67,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,5,12,2147483705,2147483704,9,9,9,2,2,2,2,2,
@@ -148,6 +148,14 @@
148 <object id="4" name="exit_area_from_time_passage" type="warp" x="144" y="592"> 148 <object id="4" name="exit_area_from_time_passage" type="warp" x="144" y="592">
149 <point/> 149 <point/>
150 </object> 150 </object>
151 <object id="5" name="moveRight" type="trigger" x="1022.25" y="428.702" width="11.6334" height="52.969">
152 <properties>
153 <property name="script" value="off_right"/>
154 </properties>
155 </object>
156 <object id="6" name="fromRight" type="warp" x="1007.9" y="445.781">
157 <point/>
158 </object>
151 </objectgroup> 159 </objectgroup>
152 <layer id="1" name="Upper" width="64" height="64"> 160 <layer id="1" name="Upper" width="64" height="64">
153 <properties> 161 <properties>
@@ -178,12 +186,12 @@
17893,93,93,93,93,93,93,93,93,93,110,111,102,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,99,35,93,93,93,93,93,103,119,87,88,89,90,87,101,114,115,93,93,93,93,106,95,89,90,87,88, 18693,93,93,93,93,93,93,93,93,93,110,111,102,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,99,35,93,93,93,93,93,103,119,87,88,89,90,87,101,114,115,93,93,93,93,106,95,89,90,87,88,
17993,93,93,93,93,93,93,93,93,93,103,98,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,91,92,93,93,93,93,93,35,94,95,89,90,87,88,89,90,91,92,93,93,93,93,103,98,87,88,89,90, 18793,93,93,93,93,93,93,93,93,93,103,98,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,91,92,93,93,93,93,93,35,94,95,89,90,87,88,89,90,91,92,93,93,93,93,103,98,87,88,89,90,
180114,115,110,111,114,115,110,111,114,115,108,109,97,98,87,88,89,90,91,96,97,98,87,88,89,90,87,88,89,90,91,96,97,98,91,96,104,105,93,93,93,93,93,93,103,119,87,88,89,90,87,88,89,99,93,93,93,93,94,95,89,90,87,88, 188114,115,110,111,114,115,110,111,114,115,108,109,97,98,87,88,89,90,91,96,97,98,87,88,89,90,87,88,89,90,91,96,97,98,91,96,104,105,93,93,93,93,93,93,103,119,87,88,89,90,87,88,89,99,93,93,93,93,94,95,89,90,87,88,
18187,101,102,90,87,101,102,90,91,92,93,93,108,109,97,98,87,88,89,99,94,95,89,90,87,88,89,90,87,88,89,99,108,109,104,105,93,93,93,93,110,111,114,115,94,95,89,90,87,88,89,90,87,101,114,115,93,93,103,98,87,88,89,90, 18987,101,102,90,87,101,102,90,91,92,93,93,108,109,97,98,87,88,89,99,94,95,89,90,87,88,89,90,87,88,89,99,108,109,104,105,93,93,93,93,110,111,114,115,94,95,89,90,87,88,89,90,87,101,114,115,93,93,103,98,91,96,97,98,
18289,90,87,88,89,90,87,88,89,99,110,111,114,115,106,95,89,90,87,101,102,90,87,88,89,90,87,88,89,90,91,92,35,93,93,93,93,93,93,93,103,98,87,101,102,90,87,88,89,90,87,88,89,90,91,92,93,93,108,109,97,98,87,88, 19089,90,87,88,89,90,87,88,89,99,110,111,114,115,106,95,89,90,87,101,102,90,87,88,89,90,87,88,89,90,91,92,35,93,93,93,93,93,93,93,103,98,87,101,102,90,87,88,89,90,87,88,89,90,91,92,93,93,108,109,104,105,108,109,
18387,88,89,90,87,88,89,90,87,101,102,90,87,101,102,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,99,93,93,93,93,93,93,93,35,108,109,97,98,87,88,89,90,87,88,89,90,91,96,104,105,93,93,93,93,106,95,89,90, 19187,88,89,90,87,88,89,90,87,101,102,90,87,101,102,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,99,93,93,93,93,93,93,93,35,108,109,97,98,87,88,89,90,87,88,89,90,91,96,104,105,93,93,93,93,93,93,93,93,
18489,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,91,96,97,98,91,96,97,98,91,96,97,98,91,92,93,93,93,93,93,93,93,93,93,93,94,95,89,90,91,96,97,98,91,96,104,105,93,93,93,93,110,111,102,90,87,88, 19289,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,91,96,97,98,91,96,97,98,91,96,97,98,91,92,93,93,93,93,93,93,93,93,93,93,94,95,89,90,91,96,97,98,91,96,104,105,93,93,93,93,110,111,114,115,93,93,
18587,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,91,96,104,105,108,109,104,105,108,95,89,99,108,109,104,105,93,93,93,93,93,93,93,112,110,111,89,90,87,88,89,99,94,95,89,99,93,93,93,93,110,111,102,90,87,88,89,90, 19387,88,89,90,87,88,89,90,87,88,89,90,87,88,89,90,91,96,104,105,108,109,104,105,108,95,89,99,108,109,104,105,93,93,93,93,93,93,93,112,110,111,89,90,87,88,89,99,94,95,89,99,93,93,93,93,110,111,102,90,87,101,114,115,
18689,90,91,96,97,98,87,88,89,90,87,88,89,90,87,88,89,99,93,93,35,93,93,93,118,98,91,92,93,93,93,93,93,93,93,116,114,115,93,113,103,119,87,88,89,90,87,101,102,90,87,101,114,115,93,93,100,98,87,88,89,90,87,88, 19489,90,91,96,97,98,87,88,89,90,87,88,89,90,87,88,89,99,93,93,35,93,93,93,118,98,91,92,93,93,93,93,93,93,93,116,114,115,93,113,103,119,87,88,89,90,87,101,102,90,87,101,114,115,93,93,100,98,87,88,89,90,87,101,
18787,88,89,99,94,95,89,90,87,88,89,90,91,96,97,98,91,92,93,93,93,93,93,93,108,109,104,105,93,93,93,93,93,93,118,119,87,101,114,115,94,95,89,90,87,88,89,90,87,88,89,90,91,92,93,93,108,109,97,90,87,88,89,90, 19587,88,89,99,94,95,89,90,87,88,89,90,91,96,97,98,91,92,93,93,93,93,93,93,108,109,104,105,93,93,93,93,93,93,118,119,87,101,114,115,94,95,89,90,87,88,89,90,87,88,89,90,91,92,93,93,108,109,97,90,87,88,89,90,
18889,90,87,101,102,90,87,88,89,90,87,88,89,99,108,109,104,105,93,93,93,93,93,93,93,93,93,93,93,93,93,116,114,115,94,95,89,90,87,101,102,90,87,88,89,90,87,88,89,90,87,96,104,105,93,93,93,93,106,88,89,90,87,88, 19689,90,87,101,102,90,87,88,89,90,87,88,89,99,108,109,104,105,93,93,93,93,93,93,93,93,93,93,93,93,93,116,114,115,94,95,89,90,87,101,102,90,87,88,89,90,87,88,89,90,87,96,104,105,93,93,93,93,106,88,89,90,87,88,
18987,88,89,90,87,88,89,90,91,96,97,98,91,92,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,118,119,87,101,102,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,99,93,93,93,93,110,111,102,90,87,88,89,90, 19787,88,89,90,87,88,89,90,91,96,97,98,91,92,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,118,119,87,101,102,90,87,88,89,90,87,88,89,90,87,88,89,90,87,88,89,99,93,93,93,93,110,111,102,90,87,88,89,90,
diff --git a/res/maps/hallucination_mirror.tmx b/res/maps/hallucination_mirror.tmx index c2c8053..61ef761 100644 --- a/res/maps/hallucination_mirror.tmx +++ b/res/maps/hallucination_mirror.tmx
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="13"> 2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="15">
3 <properties> 3 <properties>
4 <property name="maskZone" value="mask"/> 4 <property name="maskZone" value="mask"/>
5 </properties> 5 </properties>
@@ -123,6 +123,14 @@
123 <property name="interactionScript" value="examine_mirror"/> 123 <property name="interactionScript" value="examine_mirror"/>
124 </properties> 124 </properties>
125 </object> 125 </object>
126 <object id="13" name="moveLeft" type="trigger" x="-7" y="125.75" width="8.75" height="65.5">
127 <properties>
128 <property name="script" value="off_left"/>
129 </properties>
130 </object>
131 <object id="14" name="fromLeft" type="warp" x="16" y="151.75">
132 <point/>
133 </object>
126 </objectgroup> 134 </objectgroup>
127 <layer id="4" name="Upper" width="48" height="16"> 135 <layer id="4" name="Upper" width="48" height="16">
128 <properties> 136 <properties>
diff --git a/res/scripts/hallucination_interior.lua b/res/scripts/hallucination_interior.lua index 9ef808e..f009196 100644 --- a/res/scripts/hallucination_interior.lua +++ b/res/scripts/hallucination_interior.lua
@@ -8,6 +8,10 @@ function hallucination_interior.off_top()
8 ChangeMap("hallucination_cliff", "fromBottom") 8 ChangeMap("hallucination_cliff", "fromBottom")
9end 9end
10 10
11function hallucination_interior.off_right()
12 ChangeMap("hallucination_mirror", "fromLeft")
13end
14
11function hallucination_interior.mailbox1() 15function hallucination_interior.mailbox1()
12 StartCutscene() 16 StartCutscene()
13 DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE) 17 DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE)
diff --git a/res/scripts/hallucination_mirror.lua b/res/scripts/hallucination_mirror.lua index 73763f9..afacd59 100644 --- a/res/scripts/hallucination_mirror.lua +++ b/res/scripts/hallucination_mirror.lua
@@ -22,6 +22,10 @@ function hallucination_mirror.init()
22 end 22 end
23end 23end
24 24
25function hallucination_mirror.off_left()
26 ChangeMap("hallucination_interior", "fromRight")
27end
28
25function hallucination_mirror.mailbox() 29function hallucination_mirror.mailbox()
26 StartCutscene() 30 StartCutscene()
27 DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE) 31 DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE)
diff --git a/src/main.cpp b/src/main.cpp index 772fff8..9cc25bb 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -29,9 +29,9 @@ void loop(Renderer& renderer, std::mt19937& rng) {
29 game.emplaceSystem<MessageSystem>(); 29 game.emplaceSystem<MessageSystem>();
30 game.emplaceSystem<EffectSystem>(); 30 game.emplaceSystem<EffectSystem>();
31 31
32 game.loadMap("pink_shell"); 32 game.loadMap("hallucination_interior");
33 33
34 vec2i warpLoc = game.getMap().getWarpPoint("fromOutside"); 34 vec2i warpLoc = game.getMap().getWarpPoint("debugWarp_rightside");
35 35
36 int lucasSprite = game.emplaceSprite("lucas"); 36 int lucasSprite = game.emplaceSprite("lucas");
37 game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc); 37 game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc);