From 33ce2f5ef577193d3cd4b06465ffae1dea8b3999 Mon Sep 17 00:00:00 2001 From: Shtoyan Date: Sun, 19 Mar 2023 21:53:44 +0400 Subject: [PATCH] Revert "FP one hit kill fix" This reverts commit b8045655f1253acc30eed7dc4d98fdf98c4794f6. --- sources/Zeds/Nice/NiceZombieFleshPound.uc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sources/Zeds/Nice/NiceZombieFleshPound.uc b/sources/Zeds/Nice/NiceZombieFleshPound.uc index 539ce75..1a7ea05 100644 --- a/sources/Zeds/Nice/NiceZombieFleshPound.uc +++ b/sources/Zeds/Nice/NiceZombieFleshPound.uc @@ -132,8 +132,7 @@ function TakeDamageClient(int Damage, Pawn InstigatedBy, Vector Hitlocation, Vec PostNetReceive(); Super.TakeDamageClient(Damage, instigatedBy, hitLocation, momentum, damageType, headshotLevel, lockonTime); TwoSecondDamageTotal += OldHealth - Health; - // fixed their one hit kill ability when you spam attack during hit animation - if( !bDecapitated && TwoSecondDamageTotal > RageDamageThreshold && !bChargingPlayer && !bShotAnim && + if( !bDecapitated && TwoSecondDamageTotal > RageDamageThreshold && !bChargingPlayer && (!(bWasBurning && bCrispified) || bFrustrated) ) StartChargingFP(InstigatedBy); }