diff --git a/SeasonsOfLoneliness.cpp b/SeasonsOfLoneliness.cpp index 5a8d489..ff61a6d 100644 --- a/SeasonsOfLoneliness.cpp +++ b/SeasonsOfLoneliness.cpp @@ -21,6 +21,14 @@ enum CUTSCENE{ CUTSCENE_4, }; +enum WEATHER_POWER{ + HAILSTORM, + HURRICANE, + METEOR_SHOWER, + METEOR_STORM, + SNOW_STORM +}; + #define WIDTH 256 #define HEIGHT 224 #define ALPHA_SCREEN1 128 @@ -140,6 +148,20 @@ public: Animation POWER_SNOWSTORM_ANIMATION; std::vector entityList; bool IN_BATTLE_ENCOUNTER = false; + int WEATHER_POWERS[15] = { + 3, + 1, + 5, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0,0,0}; olc::Decal*DOME_DECAL,*FOOD_METER_DECAL,*OXYGEN_METER_DECAL,*PLANT_DECAL, @@ -405,8 +427,8 @@ public: bool changed=false; if (GetKey(olc::D).bHeld||GetKey(olc::RIGHT).bHeld||GetKey(olc::NP6).bHeld) { PLAYER_COORDS[0]=clamp(PLAYER_COORDS[0]+MOVE_SPD,0.1,(double)MAP_WIDTH); - ConsoleClear(); - cout<<"("<=obj.x&&PLAYER_COORDS[0]<=obj.x+obj.anim->width&& + PLAYER_COORDS[1]>=obj.y&&PLAYER_COORDS[1]<=obj.y+obj.anim->height; + } else { + return PLAYER_COORDS[0]>=obj.x&&PLAYER_COORDS[0]<=obj.x+obj.spr->sprite->width&& + PLAYER_COORDS[1]>=obj.y&&PLAYER_COORDS[1]<=obj.y+obj.spr->sprite->height; + } + } }; diff --git a/Seasons_of_Loneliness b/Seasons_of_Loneliness index 532bf5a..9e06578 100755 Binary files a/Seasons_of_Loneliness and b/Seasons_of_Loneliness differ