Merge pull request #32 from secretagentjr/test

Incorporate Camera View Shake Reduction Into Recoil Reduction
This commit is contained in:
GenZmeY 2021-08-24 02:04:56 +03:00 committed by GitHub
commit febf439541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View File

@ -516,6 +516,11 @@ simulated function ModifyRecoil(out float CurrentRecoilModifier, KFWeapon KFW)
CurrentPerk.ModifyRecoil(CurrentRecoilModifier,KFW); CurrentPerk.ModifyRecoil(CurrentRecoilModifier,KFW);
} }
simulated function float GetCameraViewShakeModifier(KFWeapon KFW)
{
return (CurrentPerk!=None ? CurrentPerk.GetCameraViewShakeModifier(KFW) : 1.f);
}
simulated function ModifySpread(out float InSpread) simulated function ModifySpread(out float InSpread)
{ {
if (CurrentPerk!=None) if (CurrentPerk!=None)
@ -924,4 +929,4 @@ defaultproperties
BumpMomentum=1.f BumpMomentum=1.f
BumpDamageAmount=450 BumpDamageAmount=450
BumpDamageType=class'KFDT_SWATBatteringRam' BumpDamageType=class'KFDT_SWATBatteringRam'
} }

View File

@ -1293,6 +1293,11 @@ simulated function float GetReloadRateScale(KFWeapon KFW)
return (IsWeaponOnPerk(KFW) ? Modifiers[5] : 1.f); return (IsWeaponOnPerk(KFW) ? Modifiers[5] : 1.f);
} }
simulated function float GetCameraViewShakeModifier(KFWeapon KFW)
{
return Modifiers[2];
}
function ModifyHealth(out int InHealth) function ModifyHealth(out int InHealth)
{ {
InHealth *= Modifiers[6]; InHealth *= Modifiers[6];
@ -1580,4 +1585,4 @@ defaultproperties
EnemyDistDraw.Add(700) EnemyDistDraw.Add(700)
EnemyDistDraw.Add(1000) EnemyDistDraw.Add(1000)
EnemyDistDraw.Add(1600) EnemyDistDraw.Add(1600)
} }