diff --git a/SeasonsOfLoneliness.cpp b/SeasonsOfLoneliness.cpp index c78c431..cb5e1d0 100644 --- a/SeasonsOfLoneliness.cpp +++ b/SeasonsOfLoneliness.cpp @@ -791,24 +791,6 @@ public: PLAYER_COORDS[1]=38; } - if (SKIP_LAUNCHPAD) { - GAME_STATE=IN_SPACE; - PlayCutscene(cutscene::READY_TO_BOARD); - fadeOut(); - HAILSTORM->playerOwnCount=6; - PETAL_STORM->playerOwnCount=6; - HURRICANE->playerOwnCount=6; - METEOR_RAIN->playerOwnCount=6; - METEOR_STORM->playerOwnCount=6; - SNOWSTORM->playerOwnCount=6; - FLASH_FLOOD->playerOwnCount=6; - SUNNY_DAY->playerOwnCount=6; - FIRESTORM->playerOwnCount=6; - SOLAR_FLARE->playerOwnCount=6; - foodCount=16; - PLAYER_HP=PLAYER_MAXHP=130; - } - SONG_MAIN = sound::Wave("./assets/SeasonsOfLoneliness.wav"); //ConsoleShow(F1,false); @@ -984,6 +966,27 @@ public: HURRICANE->playerOwnCount=1; METEOR_RAIN->playerOwnCount=5; + if (SKIP_LAUNCHPAD) { + GAME_STATE=IN_SPACE; + ROCKET_BOARD_OPTION=true; + PlayCutscene(cutscene::READY_TO_BOARD); + fadeOut(); + HAILSTORM->playerOwnCount=12; + PETAL_STORM->playerOwnCount=12; + HURRICANE->playerOwnCount=12; + METEOR_RAIN->playerOwnCount=12; + METEOR_STORM->playerOwnCount=12; + SNOWSTORM->playerOwnCount=12; + FLASH_FLOOD->playerOwnCount=12; + SUNNY_DAY->playerOwnCount=12; + FIRESTORM->playerOwnCount=12; + SOLAR_FLARE->playerOwnCount=12; + foodCount=16; + PLAYER_HP=PLAYER_MAXHP=130; + PLAYER_COORDS[0]=1000; + PLAYER_COORDS[1]=1000; + } + PETAL_STORM->seedProduction=2; //Produce two seeds. HURRICANE->seedScatter=2; HURRICANE->growSeeds=true; @@ -1006,6 +1009,7 @@ public: MEGA_FANG->pctDmg=0.49; END_OF_THE_CENTURY_BEAM->dealsPctDmg=true; END_OF_THE_CENTURY_BEAM->pctDmg=0.96; + RADIOACTIVE_TRANSMISSION->appliesRadioactive=true; LIGHT_STORM->lowPriority=true; @@ -2915,7 +2919,10 @@ public: CUTSCENE_FLAGS[2]=true; CUTSCENE_OBJS[0]=CreateObject({999.5,999.25},PLAYER_DECAL,playerAnim,true); } else - if (MoveObjectTowardsPoint({999.5,1002},CUTSCENE_OBJS[0],VERT_FIRST)) { + if (!CUTSCENE_FLAGS[5]&&MoveObjectTowardsPoint({999.5,1002},CUTSCENE_OBJS[0],VERT_FIRST)) { + CUTSCENE_FLAGS[5]=true; + } else + if (CUTSCENE_FLAGS[5]) { if (!CUTSCENE_FLAGS[3]) { DisplayMessageBox(56); CUTSCENE_FLAGS[3]=true; @@ -2924,13 +2931,9 @@ public: DisplayMessageBox(57); CUTSCENE_FLAGS[4]=true; } else { - printf("In here.(1)"); updatePlayerState(); - printf("In here.(2)"); EndCutscene(); - printf("In here.(3)"); ENCOUNTERS.push_back(ENCOUNTER_Y_Y); - printf("In here.(4)"); } } } @@ -2980,13 +2983,9 @@ public: CUTSCENE_FLAGS[1]=true; DisplayMessageBox(62); } else { - printf("In here.(1)"); updatePlayerState(); - printf("In here.(2)"); EndCutscene(); - printf("In here.(3)"); ENCOUNTERS.push_back(ENCOUNTER_A_A); - printf("In here.(4)"); } } } @@ -3307,6 +3306,7 @@ public: DrawDecal({WIDTH/2-BOOK2_DECAL->sprite->width*2/2,HEIGHT/2-BOOK2_DECAL->sprite->height*2/2},BOOK2_DECAL,{2,2}); }break; case IN_SPACE:{ + SetDrawTarget(2); Clear(BLACK); DrawStars(); if (!IN_BATTLE_ENCOUNTER) { @@ -3316,7 +3316,6 @@ public: DrawDecal({WIDTH/2-32*BOSS_SIZE.x,HEIGHT/2-32*BOSS_SIZE.y},Y_Y_DECAL,BOSS_SIZE,SHIP_COLOR); } DrawGameWorld(); - SetDrawTarget(2); if (IN_BATTLE_ENCOUNTER) { DrawPartialDecal({(float)((BATTLE_PLAYER_COORDS.x-PLAYER_COORDS[0])*32+WIDTH/2-16+(current_playerAnim->flipped?32:0)),(float)((BATTLE_PLAYER_COORDS.y-PLAYER_COORDS[1])*32+HEIGHT/2-16)},current_playerAnim->spr,current_playerAnim->getCurrentFrame(),{32,32},{(float)(current_playerAnim->flipped?-1:1),1}); } @@ -3748,6 +3747,7 @@ public: } } } + return false; } bool collidesWithPlayer(Encounter obj) { diff --git a/Seasons_of_Loneliness b/Seasons_of_Loneliness index eb420c3..4463215 100755 Binary files a/Seasons_of_Loneliness and b/Seasons_of_Loneliness differ