diff --git a/Adventures in Lestoria/StageMaskPolygon.cpp b/Adventures in Lestoria/StageMaskPolygon.cpp index b4af9031..b52b40dc 100644 --- a/Adventures in Lestoria/StageMaskPolygon.cpp +++ b/Adventures in Lestoria/StageMaskPolygon.cpp @@ -89,7 +89,7 @@ const bool StageMaskPolygon::HasOverlay()const{ } void StageMaskPolygon::SetBlendColor(const Pixel overlayCol){ - if(!HasOverlay())ERR("WARNING! Trying to set the blend color when there is no overlay on this stage mask polygon! THIS IS NOT ALLOWED!"); + if(!HasOverlay())ERR("WARNING! Trying to set the blend color when there is no overlay on this stage mask polygon! To enable the overlay, an overlay image argument must be provided in the constructor of the stage mask polygon."); overlay.value().overlayCol=overlayCol; } diff --git a/Adventures in Lestoria/StoneGolem.cpp b/Adventures in Lestoria/StoneGolem.cpp index ea68617e..d2797ebe 100644 --- a/Adventures in Lestoria/StoneGolem.cpp +++ b/Adventures in Lestoria/StoneGolem.cpp @@ -38,7 +38,12 @@ All rights reserved. #include "Monster.h" #include "MonsterStrategyHelpers.h" +#include "AdventuresInLestoria.h" +#include "DEFINES.h" +INCLUDE_game + +using A=Attribute; void Monster::STRATEGY::STONE_GOLEM(Monster&m,float fElapsedTime,std::string strategy){ enum PhaseName{ @@ -47,7 +52,9 @@ void Monster::STRATEGY::STONE_GOLEM(Monster&m,float fElapsedTime,std::string str switch(m.phase){ case INITIALIZE:{ - + if(m.F(A::CASTING_TIMER)<=0.f){ + m.PerformAnimation("STONE PILLAR CAST",m.GetFacingDirectionToTarget(game->GetPlayer()->GetPos())); + } }break; } } \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 207a1e40..6f76e4fa 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 3 -#define VERSION_BUILD 9576 +#define VERSION_BUILD 9578 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/Zephy.cpp b/Adventures in Lestoria/Zephy.cpp index feef3c0c..d0c25e16 100644 --- a/Adventures in Lestoria/Zephy.cpp +++ b/Adventures in Lestoria/Zephy.cpp @@ -376,7 +376,7 @@ void Monster::STRATEGY::ZEPHY(Monster&m,float fElapsedTime,std::string strategy) CreateBullet(Feather)(ConfigVec("Mid Phase.Large Tornado Position"),vf2d{ConfigPixels("Mid Phase.Feather Speed"),util::random(2*PI)}.cart(),ConfigFloat("Mid Phase.Feather Radius"),ConfigInt("Mid Phase.Feather Damage"),m.OnUpperLevel(),false,INFINITE,false,WHITE)EndBullet; - m.F(A::SHOOT_TIMER)=GetHighestFeatherRateFromConfig(game->BossEncounterMobCount()); + m.F(A::SHOOT_TIMER)=GetHighestFeatherRateFromConfig(game->BossEncounterMobCount()-1); //Subtract one because we aren't counting the boss as part of this. } }break; } diff --git a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx index 1864e10f..bfce38b6 100644 --- a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx +++ b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx @@ -1,5 +1,5 @@ - + @@ -690,7 +690,7 @@ - + @@ -755,7 +755,7 @@ - + @@ -767,5 +767,14 @@ + + + + + + + + + diff --git a/Adventures in Lestoria/assets/config/MonsterStrategies.txt b/Adventures in Lestoria/assets/config/MonsterStrategies.txt index 6907f629..b122ddb4 100644 --- a/Adventures in Lestoria/assets/config/MonsterStrategies.txt +++ b/Adventures in Lestoria/assets/config/MonsterStrategies.txt @@ -891,7 +891,7 @@ MonsterStrategy 1 monster = 4.5/s } - Feather Speed = 150units/s + Feather Speed = 300units/s Feather Radius = 4px Feather Damage = 10 } diff --git a/Adventures in Lestoria/assets/config/levels.txt b/Adventures in Lestoria/assets/config/levels.txt index 65bf98a0..867db4b0 100644 --- a/Adventures in Lestoria/assets/config/levels.txt +++ b/Adventures in Lestoria/assets/config/levels.txt @@ -147,6 +147,12 @@ Levels # Loot[0] = Berries, 1, 5, 100% } BOSS_2_B + { + Map File = Boss_2_B.tmx + # Specify item, min quantity, and max quantity of items. Optionally specify a % drop chance per item. + # Loot[0] = Berries, 1, 5, 100% + } + BOSS_2 { Map File = Boss_2.tmx # Specify item, min quantity, and max quantity of items. Optionally specify a % drop chance per item. diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index df6a581e..234fda2a 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ