sigonasr2/Seasons-Of-Loneliness
1
0
Fork 0
generated from sigonasr2/CPlusPlusProjectTemplate
Code Issues Pull Requests Projects Releases Wiki Activity

Fix game over for space.

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2 2022-09-03 20:17:17 -05:00
parent b1552bf57a
commit 0dfd03138b
4 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SeasonsOfLoneliness.cpp
View File

@ -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<std::string,ObjectLoadInfo*> BASE_OBJECTS;
std::vector<Encounter> 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::vector<WEATHER_POWER*>MOVESET_SPIDEY;
std::vector<WEATHER_POWER*>MOVESET_SANDWORM;
@ -692,6 +693,7 @@ public:
std::vector<WEATHER_POWER*>MOVESET_MEGAMOTH;
std::vector<WEATHER_POWER*>MOVESET_SIDEWINDER;
std::vector<WEATHER_POWER*>MOVESET_Y_Y;
std::vector<WEATHER_POWER*>MOVESET_A_A;
std::vector<Seed*>SEEDS;
std::vector<Seed*>TREES;
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:{

BIN
Seasons_of_Loneliness
View File

Binary file not shown.

BIN
assets/A.A_recharge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

15
data.h
View File

@ -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
};