diff --git a/SeasonsOfLoneliness.cpp b/SeasonsOfLoneliness.cpp index 0f56f91..a2867cf 100644 --- a/SeasonsOfLoneliness.cpp +++ b/SeasonsOfLoneliness.cpp @@ -17,6 +17,7 @@ using namespace olc; #define SKIP_BOSS true #define SKIP_SILICON2 true #define SKIP_CHAPTER2 true +#define SKIP_STORYBOOK true #define SKIP_CHAPTER3 false #define STARTING_MAP MAP_1 @@ -648,6 +649,7 @@ public: Encounter ENCOUNTER_X_X; Encounter ENCOUNTER_SANDWORM_1; Encounter ENCOUNTER_MEGAMOTH; + Encounter ENCOUNTER_SNAKEPACK; Encounter CURRENT_ENCOUNTER; std::vectorMOVESET_SPIDEY; std::vectorMOVESET_SANDWORM; @@ -722,6 +724,15 @@ public: GAME_FLAGS[gameflag::COLLECTED_SILICON_2]=true; GAME_STATE=GAMEWORLD; } + if (SKIP_STORYBOOK) { + //GAME_FLAGS[gameflag::CHECK_ROVER_3]=true; + GAME_FLAGS[gameflag::CHECK_ROVER_3]=true; + GAME_FLAGS[gameflag::STORY_REVIEW]=true; + GAME_FLAGS[gameflag::NEXT_COORDS2]=true; + PLAYER_HP=PLAYER_MAXHP=100; + PLAYER_COORDS[0]=38; + PLAYER_COORDS[1]=37; + } SONG_MAIN = sound::Wave("./assets/SeasonsOfLoneliness.wav"); @@ -895,7 +906,6 @@ public: HAILSTORM->playerOwnCount=3; HURRICANE->playerOwnCount=1; METEOR_RAIN->playerOwnCount=5; - SNOWSTORM->playerOwnCount=3; PETAL_STORM->seedProduction=2; //Produce two seeds. HURRICANE->seedScatter=2; @@ -997,6 +1007,18 @@ public: ENCOUNTER_MEGAMOTH.playerY=0.5; ENCOUNTER_MEGAMOTH.map=MAP_4; ENCOUNTERS.push_back(ENCOUNTER_MEGAMOTH); + ENCOUNTER_SNAKEPACK.entities.push_back(new Entity(SNAKE_DECAL,"Snake",1,1,225,225,MOVESET_SNAKE)); + ENCOUNTER_SNAKEPACK.entities.push_back(new Entity(SNAKE_DECAL,"Snake",3,2,225,225,MOVESET_SNAKE)); + ENCOUNTER_SNAKEPACK.entities.push_back(new Entity(SNAKE_DECAL,"Snake",4,3,225,225,MOVESET_SNAKE)); + ENCOUNTER_SNAKEPACK.entities.push_back(new Entity(SNAKE_DECAL,"Snake",5,3,225,225,MOVESET_SNAKE)); + ENCOUNTER_SNAKEPACK.entities.push_back(new Entity(SNAKE_DECAL,"Snake",6,1,225,225,MOVESET_SNAKE)); + ENCOUNTER_SNAKEPACK.x=11-4; + ENCOUNTER_SNAKEPACK.y=5-3.5; + ENCOUNTER_SNAKEPACK.playerX=4; + ENCOUNTER_SNAKEPACK.playerY=6; + ENCOUNTER_SNAKEPACK.map=MAP_5; + ENCOUNTERS.push_back(ENCOUNTER_SNAKEPACK); + BASE_OBJECTS["DOME"]=new ObjectLoadInfo(DOME_DECAL); BASE_OBJECTS["PLANT"]=new ObjectLoadInfo(PLANT_DECAL); @@ -1029,7 +1051,11 @@ public: pixels[i]=new effect::Pixel(); } - LoadMap(STARTING_MAP); + if (SKIP_STORYBOOK) { + LoadMap(MAP_5); + } else { + LoadMap(STARTING_MAP); + } return true; } @@ -1344,6 +1370,14 @@ public: } switch (CURRENT_CUTSCENE) { case cutscene::TRANSITION_CUTSCENE:{ + if (GAME_FLAGS[gameflag::NEXT_COORDS2]) { + LoadMap(MAP_5); + PLAYER_COORDS[0]=40.5; + PLAYER_COORDS[1]=37.5; + updatePlayerState(); + fadeIn(); + EndCutscene(); + } else if (GAME_FLAGS[gameflag::CHECK_ROVER_2]) { LoadMap(MAP_4); PLAYER_COORDS[0]=40.5; diff --git a/Seasons_of_Loneliness b/Seasons_of_Loneliness index 828f3d0..01e1f8b 100755 Binary files a/Seasons_of_Loneliness and b/Seasons_of_Loneliness differ