5 files changed, 39 insertions, 15 deletions

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
  <properties>
   <property name="music" value="red_green_yellow_yellow"/>
  </properties>
@@ -31,11 +31,11 @@
 63,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,
 1,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,
 1,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,
-2,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,
-2,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,
-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,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,
-2,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,
-2,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,
+2,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,
+2,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,
+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,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,
+2,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,
+2,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,
 2,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,
 2,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,
 2,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 @@
   <object id="4" name="exit_area_from_time_passage" type="warp" x="144" y="592">
    <point/>
   </object>
+  <object id="5" name="moveRight" type="trigger" x="1022.25" y="428.702" width="11.6334" height="52.969">
+   <properties>
+    <property name="script" value="off_right"/>
+   </properties>
+  </object>
+  <object id="6" name="fromRight" type="warp" x="1007.9" y="445.781">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="64" height="64">
   <properties>
@@ -178,12 +186,12 @@
 93,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,
 93,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,
 114,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,
-87,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,
-89,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,
-87,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,
-89,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,
-87,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,
-89,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,
+87,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,
+89,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,
+87,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,
+89,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,
+87,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,
+89,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,
 87,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,
 89,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,
 87,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,
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
  <properties>
   <property name="maskZone" value="mask"/>
  </properties>
@@ -123,6 +123,14 @@
     <property name="interactionScript" value="examine_mirror"/>
    </properties>
   </object>
+  <object id="13" name="moveLeft" type="trigger" x="-7" y="125.75" width="8.75" height="65.5">
+   <properties>
+    <property name="script" value="off_left"/>
+   </properties>
+  </object>
+  <object id="14" name="fromLeft" type="warp" x="16" y="151.75">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="4" name="Upper" width="48" height="16">
   <properties>
@@ -8,6 +8,10 @@ function hallucination_interior.off_top()
   ChangeMap("hallucination_cliff", "fromBottom")
 end
 
+function hallucination_interior.off_right()
+  ChangeMap("hallucination_mirror", "fromLeft")
+end
+
 function hallucination_interior.mailbox1()
   StartCutscene()
   DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE)
@@ -22,6 +22,10 @@ function hallucination_mirror.init()
   end
 end
 
+function hallucination_mirror.off_left()
+  ChangeMap("hallucination_interior", "fromRight")
+end
+
 function hallucination_mirror.mailbox()
   StartCutscene()
   DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE)
@@ -29,9 +29,9 @@ void loop(Renderer& renderer, std::mt19937& rng) {
   game.emplaceSystem<MessageSystem>();
   game.emplaceSystem<EffectSystem>();
 
-  game.loadMap("pink_shell");
+  game.loadMap("hallucination_interior");
 
-  vec2i warpLoc = game.getMap().getWarpPoint("fromOutside");
+  vec2i warpLoc = game.getMap().getWarpPoint("debugWarp_rightside");
 
   int lucasSprite = game.emplaceSprite("lucas");
   game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc);