Zed fixes #16

Merged
dkanus merged 24 commits from :fpfix into master 2022-03-03 15:43:35 +03:00
Showing only changes of commit b8045655f1 - Show all commits

View File

@ -132,7 +132,8 @@ function TakeDamageClient(int Damage, Pawn InstigatedBy, Vector Hitlocation, Vec
PostNetReceive(); PostNetReceive();
Super.TakeDamageClient(Damage, instigatedBy, hitLocation, momentum, damageType, headshotLevel, lockonTime); Super.TakeDamageClient(Damage, instigatedBy, hitLocation, momentum, damageType, headshotLevel, lockonTime);
TwoSecondDamageTotal += OldHealth - Health; TwoSecondDamageTotal += OldHealth - Health;
if( !bDecapitated && TwoSecondDamageTotal > RageDamageThreshold && !bChargingPlayer && // fixed their one hit kill ability when you spam attack during hit animation
if( !bDecapitated && TwoSecondDamageTotal > RageDamageThreshold && !bChargingPlayer && !bShotAnim &&
(!(bWasBurning && bCrispified) || bFrustrated) ) (!(bWasBurning && bCrispified) || bFrustrated) )
StartChargingFP(InstigatedBy); StartChargingFP(InstigatedBy);
} }