diff --git a/Adventures in Lestoria/Entity.cpp b/Adventures in Lestoria/Entity.cpp index d855f337..f80bb6de 100644 --- a/Adventures in Lestoria/Entity.cpp +++ b/Adventures in Lestoria/Entity.cpp @@ -56,5 +56,5 @@ const vf2d Entity::GetPos()const{ void Entity::SetIframeTime(const float iframeTime){ if(is(Player*))get(Player*)->ApplyIframes(iframeTime); else if(is(Monster*))get(Monster*)->ApplyIframes(iframeTime); - ERR("Entity is not a valid type! THIS SHOULD NOT BE HAPPENING!"); + else ERR("Entity is not a valid type! THIS SHOULD NOT BE HAPPENING!"); } \ No newline at end of file diff --git a/Adventures in Lestoria/GiantOctopus.cpp b/Adventures in Lestoria/GiantOctopus.cpp index ea37e076..b1cf91f1 100644 --- a/Adventures in Lestoria/GiantOctopus.cpp +++ b/Adventures in Lestoria/GiantOctopus.cpp @@ -100,6 +100,7 @@ void Monster::STRATEGY::GIANT_OCTOPUS(Monster&m,float fElapsedTime,std::string s case NORMAL:{ m.F(A::SHOOT_TIMER)-=fElapsedTime; m.F(A::CASTING_TIMER)-=fElapsedTime; + m.F(A::LAST_SHOOT_TIMER)-=fElapsedTime; if(m.F(A::SHOOT_ANIMATION_TIME)>0.f){ m.F(A::SHOOT_ANIMATION_TIME)-=fElapsedTime; if(m.F(A::SHOOT_ANIMATION_TIME)<=0.f)m.PerformIdleAnimation(); @@ -142,10 +143,13 @@ void Monster::STRATEGY::GIANT_OCTOPUS(Monster&m,float fElapsedTime,std::string s m.F(A::SHOOT_TIMER)=ConfigFloat("Shoot Frequency"); CreateBullet(Bullet)(m.GetPos(),util::pointTo(m.GetPos(),game->GetPlayer()->GetPos())*ConfigFloat("Bullet Speed"),ConfigFloat("Bullet Radius"),ConfigFloat("Bullet Damage"),m.OnUpperLevel(),false,ConfigPixel("Bullet Color"),{ConfigFloat("Bullet Radius"),ConfigFloat("Bullet Radius")})EndBullet; } - - m.PerformShootAnimation(); + m.F(A::LAST_SHOOT_TIMER)=1.f; + m.PerformShootAnimation(m.GetFacingDirectionToTarget(game->GetPlayer()->GetPos())); m.I(A::ATTACK_COUNT)++; } + if(m.F(A::LAST_SHOOT_TIMER)<=0.f){ + m.PerformIdleAnimation(m.GetFacingDirectionToTarget(game->GetPlayer()->GetPos())); + } }break; case HURT_ANIMATION:{ diff --git a/Adventures in Lestoria/MonsterAttribute.h b/Adventures in Lestoria/MonsterAttribute.h index 71ee9e57..f920f52d 100644 --- a/Adventures in Lestoria/MonsterAttribute.h +++ b/Adventures in Lestoria/MonsterAttribute.h @@ -160,4 +160,5 @@ enum class Attribute{ SUBMERGE_STRAT_ID, ATTACK_ANIMATION_SPEED, ARM_SPEEDS_INCREASED, + LAST_SHOOT_TIMER, }; \ No newline at end of file diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 27bc7eab..7f1d8cd0 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -1,5 +1,3 @@ -New Item/Accessory Graphics! - Ghost of Pirate Captain Boss Graphics Ghost of Pirate Captain Boss Implementation diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index e8c09e46..f47dcc7b 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 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 11893 +#define VERSION_BUILD 11895 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index 2d85be94..2ec91e55 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index ce9a0271..e31bf3c3 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ