diff --git a/SeasonsOfLoneliness.cpp b/SeasonsOfLoneliness.cpp index bb1d209..99cfcc9 100644 --- a/SeasonsOfLoneliness.cpp +++ b/SeasonsOfLoneliness.cpp @@ -673,7 +673,7 @@ public: *SANDWORM_DECAL,*SNAKE_DECAL,*MOTH_DECAL,*FLASH_FLOOD_DECAL,*SUNNY_DAY_DECAL,*FIRESTORM_DECAL,*SOLARFLARE_DECAL, *HP_REGEN_DECAL,*SLOWED_DECAL, *SPEED_DECAL,*HIDDEN_DECAL,*BOOK_DECAL,*BOOK2_DECAL, *LAUNCHPAD_CLOSED_DECAL,*LAUNCHPAD_HALF1_DECAL,*LAUNCHPAD_HALF2_DECAL,*LAUNCHPAD_DECAL,*Y_Y_DECAL, - *PETRIFY_DECAL; + *PETRIFY_DECAL,*A_A_DECAL,*A_A_RECHARGE_DECAL; std::map BASE_OBJECTS; std::vector ENCOUNTERS; Encounter ENCOUNTER_SPIDEY_1; @@ -682,6 +682,7 @@ public: Encounter ENCOUNTER_MEGAMOTH; Encounter ENCOUNTER_SNAKEPACK; Encounter ENCOUNTER_Y_Y; + Encounter ENCOUNTER_A_A; Encounter CURRENT_ENCOUNTER; std::vectorMOVESET_SPIDEY; std::vectorMOVESET_SANDWORM; @@ -692,6 +693,7 @@ public: std::vectorMOVESET_MEGAMOTH; std::vectorMOVESET_SIDEWINDER; std::vectorMOVESET_Y_Y; + std::vectorMOVESET_A_A; std::vectorSEEDS; std::vectorTREES; bool SOUND_IS_MUTED=false; @@ -849,6 +851,8 @@ public: LAUNCHPAD_DECAL=new Decal(new Sprite("assets/launchpad_back.png")); Y_Y_DECAL=new Decal(new Sprite("assets/Y.Y.png")); PETRIFY_DECAL=new Decal(new Sprite("assets/petrify.png")); + A_A_DECAL=new Decal(new Sprite("assets/A.A.png")); + A_A_RECHARGE_DECAL=new Decal(new Sprite("assets/A.A_recharge.png")); playerAnim->spr=PLAYER_DECAL; playerAnimRight->spr=PLAYER_DECAL; @@ -1110,6 +1114,12 @@ public: ENCOUNTER_Y_Y.playerX=4; ENCOUNTER_Y_Y.playerY=6; ENCOUNTER_Y_Y.map=MAP_6; + ENCOUNTER_A_A.entities.push_back(new Entity(A_A_DECAL,"A.A",4-2,0,4096,4096,MOVESET_A_A,{2,2},true)); + ENCOUNTER_A_A.x=1000-4; + ENCOUNTER_A_A.y=1000-3.5; + ENCOUNTER_A_A.playerX=4; + ENCOUNTER_A_A.playerY=6; + ENCOUNTER_A_A.map=MAP_6; //ENCOUNTERS.push_back(ENCOUNTER_Y_Y); @@ -1480,7 +1490,11 @@ public: }break; case GAME_OVER_TERMINAL:{ LoadPreviousPlayerState(); - GAME_STATE=GAMEWORLD; + if (GAME_FLAGS[gameflag::BOARDED_ROCKET]) { + GAME_STATE=IN_SPACE; + } else { + GAME_STATE=GAMEWORLD; + } fadeIn(); }break; case CUTSCENE_5:{ diff --git a/Seasons_of_Loneliness b/Seasons_of_Loneliness index 5715495..cc0e80c 100755 Binary files a/Seasons_of_Loneliness and b/Seasons_of_Loneliness differ diff --git a/assets/A.A_recharge.png b/assets/A.A_recharge.png new file mode 100644 index 0000000..516820f Binary files /dev/null and b/assets/A.A_recharge.png differ diff --git a/data.h b/data.h index 91c0fb0..93c06f1 100644 --- a/data.h +++ b/data.h @@ -236,6 +236,21 @@ Wait- I'M THE INTRUDER?!)",//56 R"( Y.Y PREPARE TO BE ELIMINATED.)",//57 +R"( +$PLAYER +...)",//58 +R"( +$PLAYER +Are we good now?)",//59 +R"( +Y.Y +Bzt...Krr...)",//60 +R"( +A.A +-- BEGIN TRANSFORMATION SEQUENCE --)",//61 +R"( +A.A +HUMAN! IF YOU TRULY DESERVE TO LEAVE THIS WASTELAND, THEN PROVE IT TO US. SHOW US YOU ARE WORTHY.)",//62 };