From 5fe3fd37b65d9e4650053dfff4d077d192f31739 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 7 Mar 2021 10:29:38 -0500 Subject: Added connection between mirror map and hallucination_interior --- res/maps/hallucination_interior.tmx | 32 ++++++++++++++++++++------------ res/maps/hallucination_mirror.tmx | 10 +++++++++- res/scripts/hallucination_interior.lua | 4 ++++ res/scripts/hallucination_mirror.lua | 4 ++++ src/main.cpp | 4 ++-- 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 @@ - + @@ -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 @@ + + + + + + + + @@ -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, 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 @@ - + @@ -123,6 +123,14 @@ + + + + + + + + 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() 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) 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() 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) 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) { game.emplaceSystem(); game.emplaceSystem(); - 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().initSprite(lucasSprite, warpLoc); -- cgit 1.4.1