Buff/Debuff icons

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
master
sigonasr2 2 years ago
parent 3f73e7547d
commit be7f0f323c
  1. 79
      SeasonsOfLoneliness.cpp
  2. BIN
      Seasons_of_Loneliness
  3. BIN
      assets/hpregen.png
  4. 114
      assets/maps/map4
  5. BIN
      assets/slowed.png
  6. 3
      data.h

@ -80,6 +80,8 @@ namespace cutscene{
INVESTIGATE_X_X, INVESTIGATE_X_X,
CHECK_COORDS, CHECK_COORDS,
SPAWN_WORMS, SPAWN_WORMS,
CHECK_COORDS_2,
MAP_TRANSITION,
}; };
} }
@ -113,6 +115,7 @@ namespace gameflag{
CHECK_ROVER, CHECK_ROVER,
NEXT_COORDS, NEXT_COORDS,
COLLECTED_SILICON_2, COLLECTED_SILICON_2,
CHECK_ROVER_2,
}; };
} }
@ -317,6 +320,7 @@ class WEATHER_POWER{
float treeBurnChance=1; //% chance of trees getting burned by this attack. float treeBurnChance=1; //% chance of trees getting burned by this attack.
float treeSeedChance=0; //% chance of trees producing seeds from this attack. float treeSeedChance=0; //% chance of trees producing seeds from this attack.
bool lowPriority=false; //Will always go last if set to true. bool lowPriority=false; //Will always go last if set to true.
bool appliesSlow=false; //If true, will apply slow to enemies hit.
WEATHER_POWER(std::string name,std::string desc,Animation*icon,Animation*effect,int dmg,int dmgRoll,int range,Pixel bgcol,Pixel textcol,int effectTime,ParticleEffect*parteff) { WEATHER_POWER(std::string name,std::string desc,Animation*icon,Animation*effect,int dmg,int dmgRoll,int range,Pixel bgcol,Pixel textcol,int effectTime,ParticleEffect*parteff) {
this->description=desc; this->description=desc;
this->name=name; this->name=name;
@ -345,7 +349,7 @@ class Entity{
WEATHER_POWER*selectedMove; WEATHER_POWER*selectedMove;
std::vector<WEATHER_POWER*> moveSet; std::vector<WEATHER_POWER*> moveSet;
bool turnComplete=false; bool turnComplete=false;
bool slowed=false; bool slowed=false; //Slowed entities have a low priority.
int damageFrame=0; int damageFrame=0;
int fixedTurnOrderInd=0; int fixedTurnOrderInd=0;
bool fixedTurnOrder=false; //If this is turned on, the selected move will increment in order of the move set (and loop accordingly.) bool fixedTurnOrder=false; //If this is turned on, the selected move will increment in order of the move set (and loop accordingly.)
@ -597,6 +601,7 @@ public:
Map*MAP_1=new Map("map1"); Map*MAP_1=new Map("map1");
Map*MAP_2=new Map("map2"); Map*MAP_2=new Map("map2");
Map*MAP_3=new Map("map3"); Map*MAP_3=new Map("map3");
Map*MAP_4=new Map("map4");
Decal*DOME_DECAL,*FOOD_METER_DECAL,*OXYGEN_METER_DECAL,*PLANT_DECAL, Decal*DOME_DECAL,*FOOD_METER_DECAL,*OXYGEN_METER_DECAL,*PLANT_DECAL,
*PLAYER_DECAL, *PLAYER_DECAL,
@ -605,7 +610,8 @@ public:
*CONSUME_SNACK_DECAL,*CONSUME_MEAL_DECAL,*COMPUTER_DECAL,*BROKEN_ROVER_DECAL, *CONSUME_SNACK_DECAL,*CONSUME_MEAL_DECAL,*COMPUTER_DECAL,*BROKEN_ROVER_DECAL,
*NADO_DECAL,*SILICON_ROCK_DECAL,*PETAL_STORM_DECAL,*ROVER_DECAL,*X_X_DECAL, *NADO_DECAL,*SILICON_ROCK_DECAL,*PETAL_STORM_DECAL,*ROVER_DECAL,*X_X_DECAL,
*LATER_THAT_NIGHT_DECAL,*SLEEP_DECAL,*SEED_DECAL,*TREE_DECAL,*X_X_UNCHARGED_DECAL, *LATER_THAT_NIGHT_DECAL,*SLEEP_DECAL,*SEED_DECAL,*TREE_DECAL,*X_X_UNCHARGED_DECAL,
*SANDWORM_DECAL,*SNAKE_DECAL,*MOTH_DECAL,*FLASH_FLOOD_DECAL,*SUNNY_DAY_DECAL,*FIRESTORM_DECAL,*SOLARFLARE_DECAL; *SANDWORM_DECAL,*SNAKE_DECAL,*MOTH_DECAL,*FLASH_FLOOD_DECAL,*SUNNY_DAY_DECAL,*FIRESTORM_DECAL,*SOLARFLARE_DECAL,
*HP_REGEN_DECAL,*SLOWED_DECAL;
std::map<std::string,ObjectLoadInfo*> BASE_OBJECTS; std::map<std::string,ObjectLoadInfo*> BASE_OBJECTS;
std::vector<Encounter> ENCOUNTERS; std::vector<Encounter> ENCOUNTERS;
Encounter ENCOUNTER_SPIDEY_1; Encounter ENCOUNTER_SPIDEY_1;
@ -719,6 +725,8 @@ public:
SUNNY_DAY_DECAL=new Decal(new Sprite("assets/sunny_day.png")); SUNNY_DAY_DECAL=new Decal(new Sprite("assets/sunny_day.png"));
FIRESTORM_DECAL=new Decal(new Sprite("assets/firestorm.png")); FIRESTORM_DECAL=new Decal(new Sprite("assets/firestorm.png"));
SOLARFLARE_DECAL=new Decal(new Sprite("assets/solarflare.png")); SOLARFLARE_DECAL=new Decal(new Sprite("assets/solarflare.png"));
HP_REGEN_DECAL=new Decal(new Sprite("assets/hpregen.png"));
SLOWED_DECAL=new Decal(new Sprite("assets/slowed.png"));
current_playerAnim->spr=PLAYER_DECAL; current_playerAnim->spr=PLAYER_DECAL;
playerAnim->spr=PLAYER_DECAL; playerAnim->spr=PLAYER_DECAL;
@ -839,6 +847,7 @@ public:
HAILSTORM->playerOwnCount=3; HAILSTORM->playerOwnCount=3;
HURRICANE->playerOwnCount=1; HURRICANE->playerOwnCount=1;
METEOR_RAIN->playerOwnCount=5; METEOR_RAIN->playerOwnCount=5;
SNOWSTORM->playerOwnCount=3;
PETAL_STORM->seedProduction=2; //Produce two seeds. PETAL_STORM->seedProduction=2; //Produce two seeds.
HURRICANE->seedScatter=2; HURRICANE->seedScatter=2;
@ -854,6 +863,7 @@ public:
SOLAR_FLARE->burnTrees=true; SOLAR_FLARE->burnTrees=true;
FIRESTORM->treeBurnChance=1; FIRESTORM->treeBurnChance=1;
FIRESTORM->burnTrees=true; FIRESTORM->burnTrees=true;
SNOWSTORM->appliesSlow=true;
LIGHT_STORM->lowPriority=true; LIGHT_STORM->lowPriority=true;
@ -1320,6 +1330,10 @@ public:
ClearAllTemporaryObjects(); ClearAllTemporaryObjects();
fadeIn(); fadeIn();
}break; }break;
case cutscene::MAP_TRANSITION:{
LoadMap(MAP_4);
fadeIn();
}break;
} }
} }
@ -1851,6 +1865,15 @@ public:
addSeeds(1); addSeeds(1);
} }
} }
if (ref->appliesSlow) {
if (BATTLE_CURRENT_TURN_ENTITY==-1) {
for (int i=0;i<CURRENT_ENCOUNTER.entities.size();i++) {
CURRENT_ENCOUNTER.entities[i]->slowed=true;
}
} else {
//Not implemented for enemies.
}
}
if (EFFECT_TIMER>ref->effectTime) { if (EFFECT_TIMER>ref->effectTime) {
EFFECT_TIMER=0; EFFECT_TIMER=0;
clearPixelEffect(); clearPixelEffect();
@ -1875,6 +1898,7 @@ public:
case battle::WAIT_TURN_ANIMATION2:{ case battle::WAIT_TURN_ANIMATION2:{
EFFECT_TIMER++; EFFECT_TIMER++;
PIXEL_EFFECT_TRANSPARENCY=0.5*cos(M_PI/60*EFFECT_TIMER-M_PI)+0.5; PIXEL_EFFECT_TRANSPARENCY=0.5*cos(M_PI/60*EFFECT_TIMER-M_PI)+0.5;
int WAIT_THRESHOLD=BATTLE_REASON_CODE==reasoncode::DROUGHT?120:60;
if (EFFECT_TIMER==10) { if (EFFECT_TIMER==10) {
switch (BATTLE_REASON_CODE) { switch (BATTLE_REASON_CODE) {
case reasoncode::SEED_GROWTH:{ case reasoncode::SEED_GROWTH:{
@ -1888,7 +1912,7 @@ public:
}break; }break;
} }
} }
if (EFFECT_TIMER==60) { if (EFFECT_TIMER==WAIT_THRESHOLD) {
switch (BATTLE_REASON_CODE) { switch (BATTLE_REASON_CODE) {
case reasoncode::SEED_GROWTH:{ case reasoncode::SEED_GROWTH:{
int healAmt=(int)(-10*(int)(SEEDS.size())*(BATTLE_DROUGHT_ACTIVE?0.5:1)); int healAmt=(int)(-10*(int)(SEEDS.size())*(BATTLE_DROUGHT_ACTIVE?0.5:1));
@ -1910,7 +1934,7 @@ public:
}break; }break;
} }
} }
if (EFFECT_TIMER==120) { if (EFFECT_TIMER==WAIT_THRESHOLD*2) {
EFFECT_TIMER=0; EFFECT_TIMER=0;
clearPixelEffect(); clearPixelEffect();
BATTLE_REASON_CODE=-1; BATTLE_REASON_CODE=-1;
@ -1957,6 +1981,10 @@ public:
if (BATTLE_CURRENT_TURN_ENTITY==-1) { if (BATTLE_CURRENT_TURN_ENTITY==-1) {
BATTLE_DROUGHT_ACTIVE=false; BATTLE_DROUGHT_ACTIVE=false;
std::cout<<"Drought turned off.\n"; std::cout<<"Drought turned off.\n";
} else {
if (CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->slowed&&rand()%3==0) {
CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->slowed=false;
}
} }
BATTLE_CURRENT_TURN_ENTITY=turnOrder.front(); BATTLE_CURRENT_TURN_ENTITY=turnOrder.front();
turnOrder.pop(); turnOrder.pop();
@ -2259,6 +2287,21 @@ public:
} }
} }
}break; }break;
case cutscene::CHECK_COORDS_2:{
if (!messageBoxVisible) {
if (!CUTSCENE_FLAGS[0]) {
CUTSCENE_FLAGS[0]=true;
DisplayMessageBox(32);
} else
if (!CUTSCENE_FLAGS[1]) {
CUTSCENE_FLAGS[1]=true;
DisplayMessageBox(33);
} else {
PlayCutscene(cutscene::MAP_TRANSITION);
fadeOut();
}
}
}break;
} }
if (GAME_STATE==CUTSCENE_3&&!SOUND_IS_PLAYING) { if (GAME_STATE==CUTSCENE_3&&!SOUND_IS_PLAYING) {
@ -2412,6 +2455,12 @@ public:
DisplayMessageBox(27); DisplayMessageBox(27);
StartCutscene(cutscene::CHECK_COORDS); StartCutscene(cutscene::CHECK_COORDS);
CUTSCENE_OBJS[0]=CreateObject({PLAYER_COORDS[0],PLAYER_COORDS[1]},PLAYER_DECAL,playerAnim,true); CUTSCENE_OBJS[0]=CreateObject({PLAYER_COORDS[0],PLAYER_COORDS[1]},PLAYER_DECAL,playerAnim,true);
} else
if (!GAME_FLAGS[gameflag::CHECK_ROVER_2]&&GAME_FLAGS[gameflag::COLLECTED_SILICON_2]&&PLAYER_COORDS[0]>=31&&PLAYER_COORDS[0]<=35&&PLAYER_COORDS[1]>=33&&PLAYER_COORDS[1]<=37) {
GAME_FLAGS[gameflag::CHECK_ROVER_2]=true;
DisplayMessageBox(31);
StartCutscene(cutscene::CHECK_COORDS_2);
CUTSCENE_OBJS[0]=CreateObject({PLAYER_COORDS[0],PLAYER_COORDS[1]},PLAYER_DECAL,playerAnim,true);
} }
if(WALK_STEPS++>60&&!IN_BATTLE_ENCOUNTER) { if(WALK_STEPS++>60&&!IN_BATTLE_ENCOUNTER) {
PLAYER_HP=std::clamp(PLAYER_HP+1,0,PLAYER_MAXHP); PLAYER_HP=std::clamp(PLAYER_HP+1,0,PLAYER_MAXHP);
@ -2534,6 +2583,7 @@ public:
DrawStringDecal({4+1,(float)(HEIGHT-10-GetTextSize("HP:").y+1)},"HP: "+std::to_string(PLAYER_HP),BLACK); DrawStringDecal({4+1,(float)(HEIGHT-10-GetTextSize("HP:").y+1)},"HP: "+std::to_string(PLAYER_HP),BLACK);
DrawStringDecal({4,(float)(HEIGHT-10-GetTextSize("HP:").y)},"HP: "+std::to_string(PLAYER_HP)); DrawStringDecal({4,(float)(HEIGHT-10-GetTextSize("HP:").y)},"HP: "+std::to_string(PLAYER_HP));
DrawHealthbar({2,HEIGHT-10},WIDTH/2,(float)PLAYER_HP/PLAYER_MAXHP,BLACK); DrawHealthbar({2,HEIGHT-10},WIDTH/2,(float)PLAYER_HP/PLAYER_MAXHP,BLACK);
DrawBuffs({64,HEIGHT-26});
for (auto&numb:BATTLE_DISPLAY_NUMBERS) { for (auto&numb:BATTLE_DISPLAY_NUMBERS) {
std::string display=((numb->number>0)?"-"+std::to_string(numb->number):"+"+std::to_string(numb->number*-1)); std::string display=((numb->number>0)?"-"+std::to_string(numb->number):"+"+std::to_string(numb->number*-1));
for (int x=-1;x<=1;x++) { for (int x=-1;x<=1;x++) {
@ -2653,6 +2703,7 @@ public:
} }
if (ent->hp>0) { if (ent->hp>0) {
DrawHealthbar({(enc.x+ent->x-PLAYER_COORDS[0])*32+WIDTH/2,(enc.y+ent->y-PLAYER_COORDS[1])*32+HEIGHT/2+ent->spr->sprite->height*ent->sprScale.y+2},ent->spr->sprite->width*ent->sprScale.x,(float)ent->hp/ent->maxhp,BLACK); DrawHealthbar({(enc.x+ent->x-PLAYER_COORDS[0])*32+WIDTH/2,(enc.y+ent->y-PLAYER_COORDS[1])*32+HEIGHT/2+ent->spr->sprite->height*ent->sprScale.y+2},ent->spr->sprite->width*ent->sprScale.x,(float)ent->hp/ent->maxhp,BLACK);
DrawBuffs({(enc.x+ent->x-PLAYER_COORDS[0])*32+WIDTH/2,(enc.y+ent->y-PLAYER_COORDS[1])*32+HEIGHT/2+ent->spr->sprite->height*ent->sprScale.y+12},ent);
} }
} }
if (targetX!=-1&&targetY!=-1) { if (targetX!=-1&&targetY!=-1) {
@ -3065,7 +3116,7 @@ public:
} }
for (int i=0;i<CURRENT_ENCOUNTER.entities.size();i++) { for (int i=0;i<CURRENT_ENCOUNTER.entities.size();i++) {
if (CURRENT_ENCOUNTER.entities[i]->hp>0&&!CURRENT_ENCOUNTER.entities[i]->turnComplete&& if (CURRENT_ENCOUNTER.entities[i]->hp>0&&!CURRENT_ENCOUNTER.entities[i]->turnComplete&&
isPriorityMove(CURRENT_ENCOUNTER.entities[i]->selectedMove)) { isPriorityMove(CURRENT_ENCOUNTER.entities[i]->selectedMove)&&!CURRENT_ENCOUNTER.entities[i]->slowed) {
turnOrder.push(i); turnOrder.push(i);
CURRENT_ENCOUNTER.entities[i]->turnComplete=true; CURRENT_ENCOUNTER.entities[i]->turnComplete=true;
std::cout<<" Entity "<<i<<" added prio for Seed Storm.\n"; std::cout<<" Entity "<<i<<" added prio for Seed Storm.\n";
@ -3385,6 +3436,7 @@ public:
BATTLE_STATE=battle::NONE; BATTLE_STATE=battle::NONE;
std::cout<<"Battle State set to "<<BATTLE_STATE<<"\n"; std::cout<<"Battle State set to "<<BATTLE_STATE<<"\n";
BATTLE_DROUGHT_ACTIVE=false; BATTLE_DROUGHT_ACTIVE=false;
FOOD_REGEN_TURNS=0;
clearSeeds(); clearSeeds();
clearTrees(); clearTrees();
while (!turnOrder.empty()) { while (!turnOrder.empty()) {
@ -3401,6 +3453,23 @@ public:
resetBattleState(); resetBattleState();
fadeOut(); fadeOut();
} }
void DrawBuffs(vf2d pos) {
DrawBuffs(pos,NULL);
}
void DrawBuffs(vf2d pos,Entity*ent) {
if (ent!=NULL) {
if (ent->slowed) {
DrawDecal(pos,SLOWED_DECAL);
}
} else {
//Draw Player's Buffs.
if (FOOD_REGEN_TURNS>0) {
DrawDecal(pos,HP_REGEN_DECAL);
}
}
}
}; };

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 730 B

@ -0,0 +1,114 @@
204
78
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000005000550000500000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000005000550000000000000050000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500005055000050000550005050000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005500550000050000500050050000550005000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000055555555555555555555555555000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000055555555555555555555555555550000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000000000555555555555555555555500000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505000555555555555555555555505055000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055000500005555555555555555555000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050000500555555555555550000050000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000555555550000500500000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505505000000555555550055000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000555555550500550000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050500000000500005050000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055000000000000500050000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050000500500000550000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000005550000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000555000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005500000000000000000050000055500000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055500000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066000000000066000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000660000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000111111111111111111111111111111111110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000111111111111111111111111111111111110000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000111111111111111111111111111111111110000000000000000000000000000000000000000000000000000000000000666600000000000000066000000000000000006000000000006600000000000000660000000000000000000
000000000000000000000111111111111111111111111111111111110000000000000000000000000000000000000000000000000000000000000000000000000060000000000006600000000660000000000000000000000000000000000000000000000000
000000000000000000000111111111111111111111111111111111110000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000006000600660000000000000000000000
000000000000000000000000000000000002222222222222222222222222222222222222222222200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000606606600006606666000000000000000000
000000000000000000000000000000000002222222222222222222222222222222222222222222200000000000000000000000000000000000000000000000000000600000000000000000000000000066000060006060660006066066000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000222222222222222222222222220000000000000000000000000000000000000000000000000600000600000000000000000066606660660066660066666000000000000
000000000000000000000000000000000000000000000000000000000000000000002222222222222222222222222200000000000000000000000000000000000600000000000660000006600000000000000000606666006666666600000000066000000000
000000000000000000000000000000000000000000000000000000000000000000222222222222222222222222222222220000000000000000000000000000000000000000000000000000000000000000660000006666660060060060000000066000000000
000000000000000000000000000000000000000000000000000000000000000000222222222222222222222222222222222222222222222222222200000000000000000660000000000000000000000000000000006000006000060000000000066000000000
000000000000000000000000000000000000000000000000000000000000000000222222222222222222222222222200000000000000000000000000000000000000000000000000000000000060000000000000006006600606600000000000006600000000
000000000000000000000000000000005000000000000000000000000000000000022222222222222222222222222000000000000000000000000000000000000000000000000000000000000000000000000006000000006000000000000000000660000000
000000000000000000000000000000000000000000000000000000000000000000000222222222222222222222222220000000000000000000000000000000000000000000000066000000000000660000000000000000000000000000000000000660000000
000000000000000000050000000000000000000000000005000000000000000000000002222222222222222222222222200000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000660000000
000000000000000000000000000000000000000000000000000000000000000000000000002222222222222222222222222200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006660000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000006666000000
000000500000000000000005550000000000000000000000000000000000000000000000000000000222200000000000000000000000000000000000000000000000000000000000000000000006600000000000000000000000000000000000006666000000
000000000000000000000055500000000000000000000050000000000000000000000000000000002222220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666000000
000000000000000000000000000055000000000000000000000000000050000000000000000000002222220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000666666600000
000000000000000000000000000005500000000000000000000000000000000000000000000000000222200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666600000
000000000000550000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666600000
000000000000005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006660000000
000000000000000000000550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000
000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000550000000000500000000005550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000050000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000050000000000000000050000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000055500000000000000500000000000000000000000005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000555500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000055555500000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000555550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000055550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000005555000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000555555000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000005555555000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000005555555500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000005555555000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
38;35;DOME
83;53;HAILSTORM_NODE
135;14;HAILSTORM_NODE
14;69;METEORSHOWER_NODE
202;33;METEORSTORM_NODE
167;44;SNOWSTORM_NODE
20;10;HURRICANE_NODE
39;38;SUNNYDAY_NODE
38;38;FLASHFLOOD_NODE
47;57;SNOWSTORM_NODE
9;48;PETALSTORM_NODE
48;74;FLASHFLOOD_NODE
29;54;METEORSHOWER_NODE
6;74;SUNNYDAY_NODE
84;64;HURRICANE_NODE
23;35;HAILSTORM_NODE
33;35;BROKEN_ROVER
82;54;METEORSTORM_NODE
138;36;SOLARFLARE_NODE
96;23;FIRESTORM_NODE
120;8;FIRESTORM_NODE
45;17;SNOWSTORM_NODE
20;71;METEORSTORM_NODE
45;66;SOLARFLARE_NODE
181;42;SNOWSTORM_NODE
116;8;NADO
120;9;NADO
123;7;NADO
122;10;NADO
116;11;NADO
120;11;NADO
122;13;NADO
121;9;SILICON_PIECE
20;73;SILICON_PIECE
195;56;SILICON_PIECE

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 B

@ -131,7 +131,7 @@ $PLAYER
Alright! Another one done. Oh! It's responding!)",//31 Alright! Another one done. Oh! It's responding!)",//31
R"( R"(
R.O.V.E.R. 2001 R.O.V.E.R. 2001
SIGNS INDICATE TRACES OF SILICON LOCATION ::: NORTHEAST)",//32 SIGNS INDICATE TRACES OF SILICON LOCATION ::: EAST)",//32
R"( R"(
$PLAYER $PLAYER
Hopefully no more ambushes... (Or maybe I'll just jinx myself.))",//33 Hopefully no more ambushes... (Or maybe I'll just jinx myself.))",//33
@ -145,4 +145,5 @@ olc::Pixel TILE_COLORS[]={
olc::Pixel(180, 191, 209), //3 MARBLE olc::Pixel(180, 191, 209), //3 MARBLE
olc::Pixel(112, 88, 64), //4 WALL (DIRT) olc::Pixel(112, 88, 64), //4 WALL (DIRT)
olc::Pixel(33, 12, 28), //5 Volcanic Ground olc::Pixel(33, 12, 28), //5 Volcanic Ground
olc::Pixel(118, 180, 181), //6 Slate
}; };
Loading…
Cancel
Save