diff --git a/SeasonsOfLoneliness.cpp b/SeasonsOfLoneliness.cpp index 9240f15..70934d7 100644 --- a/SeasonsOfLoneliness.cpp +++ b/SeasonsOfLoneliness.cpp @@ -523,7 +523,7 @@ public: WEATHER_POWER*FLASH_FLOOD = new WEATHER_POWER("Flash Flood","Causes massive seed growth and heavy damage. 30+1d20",POWER_FLASHFLOOD_ANIMATION,POWER_FLASHFLOOD_ANIMATION,30,20,200,Pixel(27, 41, 87,255),Pixel(138, 161, 237,255),120,FLASH_FLOOD_EFF); WEATHER_POWER*SUNNY_DAY = new WEATHER_POWER("Sunny Day","Fertilize soil, multiplying seed growth and causing trees to drop seeds. 10+1d10",POWER_SUNNYDAY_ANIMATION,POWER_SUNNYDAY_ANIMATION,10,10,200,Pixel(179, 164, 71,255),Pixel(222, 198, 44,255),120,SUNNYDAY_EFF); WEATHER_POWER*FIRESTORM = new WEATHER_POWER("Fire Storm","Cause devastating fires, destroying everything in sight. 65+1d40",POWER_FIRESTORM_ANIMATION,POWER_FIRESTORM_ANIMATION,65,40,145,Pixel(176, 95, 44,255),Pixel(237, 100, 14,255),120,FIRESTORM_EFF); - WEATHER_POWER*SOLAR_FLARE = new WEATHER_POWER("Solar Flare","A concentrated sunbeam of death. Burns down all trees. 175+1d40",POWER_SOLARFLARE_ANIMATION,POWER_SOLARFLARE_ANIMATION,10,10,200,Pixel(176, 53, 37,255),Pixel(217, 98, 0,255),120,SOLARFLARE_EFF); + WEATHER_POWER*SOLAR_FLARE = new WEATHER_POWER("Solar Flare","A concentrated sunbeam of death. Burns down all trees. 175+1d40",POWER_SOLARFLARE_ANIMATION,POWER_SOLARFLARE_ANIMATION,175,40,32,Pixel(176, 53, 37,255),Pixel(217, 98, 0,255),120,SOLARFLARE_EFF); bool IN_BATTLE_ENCOUNTER = false; int BATTLE_ENTRY_TIMER = 0; int EFFECT_TIMER = 0; @@ -1513,6 +1513,26 @@ public: performCropUpdate(8); displayPowerInfo(FLASH_FLOOD); } else + if (obj->name.compare("FIRESTORM_NODE")==0&&collidesWithPlayer(obj)) { + int amountGained=rand()%4+2; + FIRESTORM->playerOwnCount+=amountGained; + std::cout<<"Increased FIRESTORM power inventory count by "<x,(int)obj->y}); + OBJECTS.erase(OBJECTS.begin()+i--); + delete obj; + performCropUpdate(8); + displayPowerInfo(FIRESTORM); + } else + if (obj->name.compare("SOLARFLARE_NODE")==0&&collidesWithPlayer(obj)) { + int amountGained=rand()%4+2; + SOLAR_FLARE->playerOwnCount+=amountGained; + std::cout<<"Increased SOLARFLARE power inventory count by "<x,(int)obj->y}); + OBJECTS.erase(OBJECTS.begin()+i--); + delete obj; + performCropUpdate(8); + displayPowerInfo(SOLAR_FLARE); + } else if (obj->name.compare("SILICON_PIECE")==0&&collidesWithPlayer(obj)) { GAME_STATE=COLLECTED_SILICON; DisplayMessageBox(14); diff --git a/Seasons_of_Loneliness b/Seasons_of_Loneliness index 5a987c4..d2f9bf1 100755 Binary files a/Seasons_of_Loneliness and b/Seasons_of_Loneliness differ