From 7dd96bd6fe0a4b2cc9d0ee126dec8f27831ead33 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sat, 3 Sep 2022 12:09:00 -0500 Subject: [PATCH] Finally coordinate check scene Co-authored-by: sigonasr2 --- SeasonsOfLoneliness.cpp | 22 +++++++++++++++++ assets/maps/map5 | 53 +++++++++++++++++++++-------------------- data.h | 25 ++++++++++++------- 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/SeasonsOfLoneliness.cpp b/SeasonsOfLoneliness.cpp index 3f529b5..0f56f91 100644 --- a/SeasonsOfLoneliness.cpp +++ b/SeasonsOfLoneliness.cpp @@ -90,6 +90,8 @@ namespace cutscene{ STORY_REVIEW, STORY_REVIEW2, FINAL_REVIEW, + CHECK_COORDS_4, + LAUNCHPAD_OPEN, }; } @@ -128,6 +130,7 @@ namespace gameflag{ CHECK_ROVER_3, STORY_REVIEW, NEXT_COORDS2, + CHECK_ROVER_4, }; } @@ -627,6 +630,7 @@ public: Map*MAP_2=new Map("map2"); Map*MAP_3=new Map("map3"); Map*MAP_4=new Map("map4"); + Map*MAP_5=new Map("map5"); Decal*DOME_DECAL,*FOOD_METER_DECAL,*OXYGEN_METER_DECAL,*PLANT_DECAL, *PLAYER_DECAL, @@ -1434,6 +1438,8 @@ public: }break; case cutscene::STORY_REVIEW2:{ GAME_STATE=GAMEWORLD; + LoadMap(MAP_5); + updatePlayerState(); StartCutscene(cutscene::FINAL_REVIEW); fadeIn(); }break; @@ -2505,6 +2511,16 @@ public: } } }break; + case cutscene::CHECK_COORDS_4:{ + if (!messageBoxVisible) { + if (!CUTSCENE_FLAGS[0]) { + CUTSCENE_FLAGS[0]=true; + DisplayMessageBox(47); + } else { + EndCutscene(); + } + } + }break; } if (GAME_STATE==CUTSCENE_3&&!SOUND_IS_PLAYING) { @@ -2678,6 +2694,12 @@ public: DisplayMessageBox(35); StartCutscene(cutscene::CHECK_COORDS_3); CUTSCENE_OBJS[0]=CreateObject({PLAYER_COORDS[0],PLAYER_COORDS[1]},PLAYER_DECAL,playerAnim,true); + } else + if (!GAME_FLAGS[gameflag::CHECK_ROVER_4]&&GAME_FLAGS[gameflag::NEXT_COORDS2]&&PLAYER_COORDS[0]>=31&&PLAYER_COORDS[0]<=35&&PLAYER_COORDS[1]>=33&&PLAYER_COORDS[1]<=37) { + GAME_FLAGS[gameflag::CHECK_ROVER_4]=true; + DisplayMessageBox(46); + StartCutscene(cutscene::CHECK_COORDS_4); + CUTSCENE_OBJS[0]=CreateObject({PLAYER_COORDS[0],PLAYER_COORDS[1]},PLAYER_DECAL,playerAnim,true); } if(WALK_STEPS++>60&&!IN_BATTLE_ENCOUNTER) { PLAYER_HP=std::clamp(PLAYER_HP+1,0,PLAYER_MAXHP); diff --git a/assets/maps/map5 b/assets/maps/map5 index 7ca7d8b..b3ffec1 100644 --- a/assets/maps/map5 +++ b/assets/maps/map5 @@ -2,36 +2,36 @@ 78 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000005000550000500000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000005000550000000000000050000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500005055000050000550005050000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005500550000050000500050050000550005000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000055555555555555555555555555000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000055555555555555555555555555550000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000000555555555555555555555500000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505000555555555555555555555505055000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055000500005555555555555555555000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050000500555555555555550000050000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000555555550000500500000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505505000000555555550055000000000000000000000000000000000000000000000000000000000000000000000000000 +000000777777777700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000077777777000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000005000550000500000000000000000000000000000000000000000000000000000000000000000000000000 +000000077777777000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000005000550000000000000050000000000000000000000000000000000000000000000000000000000000000000000 +000000000077000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500005055000050000550005050000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000077000000000000007000000000000000000000000000000000000000000000000000000000000000000000000005500550000050000500050050000550005000000000000000000000000000000000000000000000000000000000000000000000 +000000000777700000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000055555555555555555555555555000000000000000000000000000000000000000000000000000000000000000000000 +000000007777770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000055555555555555555555555555550000000000000000000000000000000000000000000000000000000000000000000 +000000000777700000000000000000700000000070000000000000000000000000000000000000000000000000000000000005000000000555555555555555555555500000000000000000000000000000000000000000000000000000000000000000000000 +000000007777770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505000555555555555555555555505055000000000000000000000000000000000000000000000000000000000000000000 +000000000077000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000055000500005555555555555555555000000000000000000000000000000000000000000000000000000000000000000000000 +000000007777770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050000500555555555555550000050000000000000000000000000000000000000000000000000000000000000000000000 +000000077777777000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000555555550000500500000000000000000000000000000000000000000000000000000000000000000000000 +000000007777770000000700000000077000000000000000000000000000000000000000000000000000000000000000000000000505505000000555555550055000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000555555550500550000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050500000000500005050000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055000000000000500050000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050000500500000550000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000007000000000000000000700000000000000000000000000000000000000000000000000000000000000000055000000000000500050000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000050000500500000550000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000007000000000000000700000000000000000000000000000000000000000000000000000000000000000000000000550000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000005550000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000555000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005500000000000000000050000055500000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055500000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000070000000000000000007000000000000000000000000000000000000000000000000000000000000555000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000 +000070000000700000000000000000000000000000000000000000000000000000000000000000000000000000000005500000000000000000050000055500000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000070000000000000000000000000000000000000000000000000055500000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000007000000000007000000000000000000000000000000000000000000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066000000000066000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000007000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066000000000066000000000000000000000000000000000000000000000000 +000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000660000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000111111111111111111111111111111111110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 @@ -118,4 +118,5 @@ 122;13;NADO 121;9;SILICON_PIECE 20;73;SILICON_PIECE -195;56;SILICON_PIECE \ No newline at end of file +195;56;SILICON_PIECE +11;4;SILICON_PIECE \ No newline at end of file diff --git a/data.h b/data.h index 60c641a..fabc776 100644 --- a/data.h +++ b/data.h @@ -1,5 +1,7 @@ #include +using namespace olc; + std::string STORY_TEXT1=R"(ERROR CODE -1: Transmission Failed. Lost Receiving Target Location. GPSNAV-17 - UNABLE TO LOCATE @@ -183,15 +185,22 @@ I studied carefully and learned everything there is to know about how weather wo R"( $PLAYER Hopefully R.O.V.E.R. is calibrated now!)",//45 +R"( +R.O.V.E.R. 2001 +SIGNS INDICATE TRACES OF SILICON LOCATION ::: NORTH)",//46 +R"( +$PLAYER +This is it. Once I collect this one we can finally get a powerful enough signal (Finally!))",//47 }; -olc::Pixel TILE_COLORS[]={ - olc::Pixel(112, 88, 64), //0 DIRT - olc::Pixel(60, 97, 49), //1 GRASS - olc::Pixel(30, 84, 87), //2 WATER - olc::Pixel(180, 191, 209), //3 MARBLE - olc::Pixel(112, 88, 64), //4 WALL (DIRT) - olc::Pixel(33, 12, 28), //5 Volcanic Ground - olc::Pixel(118, 180, 181), //6 Slate +Pixel TILE_COLORS[]={ + Pixel(112, 88, 64), //0 DIRT + Pixel(60, 97, 49), //1 GRASS + Pixel(30, 84, 87), //2 WATER + Pixel(180, 191, 209), //3 MARBLE + Pixel(112, 88, 64), //4 WALL (DIRT) + Pixel(33, 12, 28), //5 Volcanic Ground + Pixel(118, 180, 181), //6 Slate + Pixel(179, 69, 41),//7 Heated Floor }; \ No newline at end of file