diff --git a/Adventures in Lestoria/Player.cpp b/Adventures in Lestoria/Player.cpp index be57907b..96095e9c 100644 --- a/Adventures in Lestoria/Player.cpp +++ b/Adventures in Lestoria/Player.cpp @@ -305,7 +305,9 @@ State::State Player::GetState(){ } void Player::Knockback(vf2d vel){ - this->vel+=vel; + if(!HasIframes()){ + this->vel+=vel; + } } void Player::Update(float fElapsedTime){ diff --git a/Adventures in Lestoria/SlimeKing.cpp b/Adventures in Lestoria/SlimeKing.cpp index 7d24883b..48b716ee 100644 --- a/Adventures in Lestoria/SlimeKing.cpp +++ b/Adventures in Lestoria/SlimeKing.cpp @@ -211,8 +211,10 @@ void Monster::STRATEGY::SLIMEKING(Monster&m,float fElapsedTime,std::string strat lineToPlayer={m.GetPos(),m.GetPos()+vf2d{cos(randomDir),sin(randomDir)}*1}; } game->GetPlayer()->Knockback(lineToPlayer.vector().norm()*float(ConfigInt("JumpKnockbackFactor"))); - if(m.phase!=2){ //In phase 2, the player can get slammed multiple times. No iframes for messing up. - game->GetPlayer()->SetIframes(1); + if(m.phase!=2){ + game->GetPlayer()->SetIframes(1.f); + }else{ //In phase 2 you can get hit by multiple knockbacks, so the iframe time is a lot shorter. + game->GetPlayer()->SetIframes(0.2f); } } m.SetZ(0); diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 45bb2936..6ce3f286 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 2 -#define VERSION_BUILD 8953 +#define VERSION_BUILD 8955 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index fc490e9d..623615ec 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ