From 0656855070e04c4d94ffe8b38c7d650898a1301b Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Aug 2021 07:25:27 -0700 Subject: [PATCH 1/3] test --- ServerExt/Classes/ExtPerkManager.uc | 5 +++++ ServerExt/Classes/Ext_PerkBase.uc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ServerExt/Classes/ExtPerkManager.uc b/ServerExt/Classes/ExtPerkManager.uc index 8b62849..34eb2fd 100644 --- a/ServerExt/Classes/ExtPerkManager.uc +++ b/ServerExt/Classes/ExtPerkManager.uc @@ -516,6 +516,11 @@ simulated function ModifyRecoil(out float CurrentRecoilModifier, KFWeapon 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) { if (CurrentPerk!=None) diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index ac1807d..43d3637 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -1293,6 +1293,11 @@ simulated function float GetReloadRateScale(KFWeapon KFW) return (IsWeaponOnPerk(KFW) ? Modifiers[5] : 1.f); } +simulated function float GetCameraViewShakeModifier(KFWeapon KFW) +{ +return Modifiers[2]; +} + function ModifyHealth(out int InHealth) { InHealth *= Modifiers[6]; From bae438531cfa61ef5dc67ee7f993490616e327b9 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 02:03:16 +0300 Subject: [PATCH 2/3] Style --- ServerExt/Classes/Ext_PerkBase.uc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index 43d3637..fb63809 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -1295,7 +1295,7 @@ simulated function float GetReloadRateScale(KFWeapon KFW) simulated function float GetCameraViewShakeModifier(KFWeapon KFW) { -return Modifiers[2]; + return Modifiers[2]; } function ModifyHealth(out int InHealth) @@ -1580,4 +1580,4 @@ defaultproperties EnemyDistDraw.Add(700) EnemyDistDraw.Add(1000) EnemyDistDraw.Add(1600) -} \ No newline at end of file +} From 59e99903d3db88901793455c6f8a0693b026a5f7 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 02:04:28 +0300 Subject: [PATCH 3/3] Style --- ServerExt/Classes/ExtPerkManager.uc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ServerExt/Classes/ExtPerkManager.uc b/ServerExt/Classes/ExtPerkManager.uc index 34eb2fd..8260def 100644 --- a/ServerExt/Classes/ExtPerkManager.uc +++ b/ServerExt/Classes/ExtPerkManager.uc @@ -518,7 +518,7 @@ simulated function ModifyRecoil(out float CurrentRecoilModifier, KFWeapon KFW) simulated function float GetCameraViewShakeModifier(KFWeapon KFW) { - return (CurrentPerk!=None ? CurrentPerk.GetCameraViewShakeModifier( KFW) : 1.f); + return (CurrentPerk!=None ? CurrentPerk.GetCameraViewShakeModifier(KFW) : 1.f); } simulated function ModifySpread(out float InSpread) @@ -924,4 +924,4 @@ defaultproperties BumpMomentum=1.f BumpDamageAmount=450 BumpDamageType=class'KFDT_SWATBatteringRam' -} \ No newline at end of file +}