diff --git a/Adventures in Lestoria/MajorHawk.cpp b/Adventures in Lestoria/MajorHawk.cpp index 08623a80..99e6b48b 100644 --- a/Adventures in Lestoria/MajorHawk.cpp +++ b/Adventures in Lestoria/MajorHawk.cpp @@ -49,8 +49,8 @@ using A=Attribute; void Monster::STRATEGY::MAJOR_HAWK(Monster&m,float fElapsedTime,std::string strategy){ //Runs the Hawk strategy and has an aggressive mode when the amount of this monster falls below an amount. - const int majorHawkCount=std::reduce(MONSTER_LIST.begin(),MONSTER_LIST.end(),0,[&](const int&acc,const std::unique_ptr&monster){return std::move(acc)+((monster->GetName()==ConfigString("Aggressive Name Check"))?1:0);}); - + const int majorHawkCount=std::reduce(MONSTER_LIST.begin(),MONSTER_LIST.end(),0,[&](const int&acc,const std::unique_ptr&monster){return std::move(acc)+((monster->IsAlive()&&monster->GetName()==ConfigString("Aggressive Name Check"))?1:0);}); + if(majorHawkCount<=ConfigInt("Aggressive Hawk Count"))HAWK(m,fElapsedTime,"Major Hawk"); else HAWK(m,fElapsedTime,"Hawk"); //Use normal hawk behaviors when there are too many Major Hawks. } \ No newline at end of file diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 31676561..d49fa3b3 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -21,7 +21,6 @@ When a monster spawns, if it spawns inside a collision tile, attempt to set it o New Monster Sound Effects - DEMO ==== Go back and apply new rendering code. \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 185b55ec..e30c777d 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 0 -#define VERSION_BUILD 9378 +#define VERSION_BUILD 9381 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/Monsters.txt b/Adventures in Lestoria/assets/config/Monsters.txt index 46f0361a..eb3c07d7 100644 --- a/Adventures in Lestoria/assets/config/Monsters.txt +++ b/Adventures in Lestoria/assets/config/Monsters.txt @@ -854,7 +854,6 @@ Monsters # Dropdown/Rising speed in pixels per second while attacking. Attack Z Speed = 160px/s - Flight Charge Cooldown = 8s Attack Wait Time = 1s ################################# ##### END HAWK PROPERTY OVERRIDES diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index cbb3121f..a97cc81b 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ