|
|
@ -493,17 +493,23 @@ void Player::Update(float fElapsedTime){ |
|
|
|
deadlyDashAfterDashTimer-=fElapsedTime; |
|
|
|
deadlyDashAfterDashTimer-=fElapsedTime; |
|
|
|
if(deadlyDashWaitTimer<=0.f){ |
|
|
|
if(deadlyDashWaitTimer<=0.f){ |
|
|
|
deadlyDashWaitTimer=INFINITY; |
|
|
|
deadlyDashWaitTimer=INFINITY; |
|
|
|
|
|
|
|
}else |
|
|
|
|
|
|
|
if(deadlyDashAdditiveBlendingToggleTimer<=0.f){ |
|
|
|
|
|
|
|
deadlyDashAdditiveBlendingToggleTimer=0.05f; |
|
|
|
|
|
|
|
SetAdditiveBlending(!IsUsingAdditiveBlending()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(deadlyDashAfterDashTimer<=0.f){ |
|
|
|
if(deadlyDashAfterDashTimer<=0.f){ |
|
|
|
deadlyDashAfterDashTimer=INFINITY; |
|
|
|
deadlyDashAfterDashTimer=INFINITY; |
|
|
|
SoundEffect::PlaySFX("Deadly Dash",GetPos()); |
|
|
|
SoundEffect::PlaySFX("Deadly Dash",GetPos()); |
|
|
|
SetPos(deadlyDashEndingPos); |
|
|
|
SetPos(deadlyDashEndingPos); |
|
|
|
SetState(State::NORMAL); |
|
|
|
SetState(State::NORMAL); |
|
|
|
|
|
|
|
SetAdditiveBlending(false); |
|
|
|
} |
|
|
|
} |
|
|
|
}break; |
|
|
|
}break; |
|
|
|
default:{ |
|
|
|
default:{ |
|
|
|
spin_angle=0.f; |
|
|
|
spin_angle=0.f; |
|
|
|
ySquishFactor=1.f; |
|
|
|
ySquishFactor=1.f; |
|
|
|
|
|
|
|
SetAdditiveBlending(false); |
|
|
|
//Update animations normally.
|
|
|
|
//Update animations normally.
|
|
|
|
animation.UpdateState(internal_animState,fElapsedTime); |
|
|
|
animation.UpdateState(internal_animState,fElapsedTime); |
|
|
|
} |
|
|
|
} |
|
|
@ -1642,3 +1648,11 @@ const float Player::GetModdedStatBonuses(std::string_view stat)const{ |
|
|
|
const float Player::GetModdedStatBonuses(ItemAttribute stat)const{ |
|
|
|
const float Player::GetModdedStatBonuses(ItemAttribute stat)const{ |
|
|
|
return GetModdedStatBonuses(stat.ActualName()); |
|
|
|
return GetModdedStatBonuses(stat.ActualName()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Player::SetAdditiveBlending(const bool additiveBlending){ |
|
|
|
|
|
|
|
renderedSpriteUsesAdditiveBlending=additiveBlending; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const bool Player::IsUsingAdditiveBlending()const{ |
|
|
|
|
|
|
|
return renderedSpriteUsesAdditiveBlending; |
|
|
|
|
|
|
|
} |