From 754262c61d9e3327585620582c06908f576b4503 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Aug 2021 10:14:37 -0700 Subject: [PATCH 1/4] make knockdown stat stumble enemies in addition --- ServerExt/Classes/Ext_PerkBase.uc | 5 +++++ ServerExt/Classes/Ext_PerkSWAT.uc | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index ac1807d..c331e11 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -1313,6 +1313,11 @@ function float GetStunPowerModifier(optional class DamageType, optio return Modifiers[7]; } +function float GetStumblePowerModifier( optional KFPawn KFP, optional class DamageType, optional out float CooldownModifier, optional byte BodyPart ) +{ + return Modifiers[7]; +} + simulated function ModifyMeleeAttackSpeed(out float InDuration); function AddDefaultInventory(KFPawn P) diff --git a/ServerExt/Classes/Ext_PerkSWAT.uc b/ServerExt/Classes/Ext_PerkSWAT.uc index 13cf38b..dfee293 100644 --- a/ServerExt/Classes/Ext_PerkSWAT.uc +++ b/ServerExt/Classes/Ext_PerkSWAT.uc @@ -28,6 +28,16 @@ simulated function float GetZedTimeModifier(KFWeapon W) return 0.f; } +function float GetStumblePowerModifier( optional KFPawn KFP, optional class DamageType, optional out float CooldownModifier, optional byte BodyPart ) +{ + if( bRapidAssault) + { + return 2.f*Modifiers[7]; + } + + return Modifiers[7]; +} + defaultproperties { PerkIcon=Texture2D'UI_PerkIcons_TEX.UI_PerkIcon_SWAT' From e3df8317735962d53a0089fbbca0bdef5affad99 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Aug 2021 10:23:39 -0700 Subject: [PATCH 2/4] fix perkmanager tieing stumblepower to stunpower --- ServerExt/Classes/ExtPerkManager.uc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ServerExt/Classes/ExtPerkManager.uc b/ServerExt/Classes/ExtPerkManager.uc index 8b62849..5515707 100644 --- a/ServerExt/Classes/ExtPerkManager.uc +++ b/ServerExt/Classes/ExtPerkManager.uc @@ -557,7 +557,7 @@ function float GetKnockdownPowerModifier(optional class DamageType, function float GetStumblePowerModifier(optional KFPawn KFP, optional class DamageType, optional out float CooldownModifier, optional byte BodyPart) { - return (CurrentPerk!=None ? CurrentPerk.GetKnockdownPowerModifier() : 1.f); + return (CurrentPerk!=None ? CurrentPerk.GetStumblePowerModifier() : 1.f); } function float GetStunPowerModifier(optional class DamageType, optional byte HitZoneIdx) From 1c12cc55a7e1a090a80ca0d821cd4532939c4eab Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 02:25:27 +0300 Subject: [PATCH 3/4] Code 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 c331e11..5aa6da2 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -1315,7 +1315,7 @@ function float GetStunPowerModifier(optional class DamageType, optio function float GetStumblePowerModifier( optional KFPawn KFP, optional class DamageType, optional out float CooldownModifier, optional byte BodyPart ) { - return Modifiers[7]; + return Modifiers[7]; } simulated function ModifyMeleeAttackSpeed(out float InDuration); @@ -1580,4 +1580,4 @@ defaultproperties EnemyDistDraw.Add(700) EnemyDistDraw.Add(1000) EnemyDistDraw.Add(1600) -} \ No newline at end of file +} From 683b1e9d93968aa888f375eec31a6ced9e2a8dce Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 02:26:47 +0300 Subject: [PATCH 4/4] Code style --- ServerExt/Classes/Ext_PerkSWAT.uc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ServerExt/Classes/Ext_PerkSWAT.uc b/ServerExt/Classes/Ext_PerkSWAT.uc index dfee293..dd38f35 100644 --- a/ServerExt/Classes/Ext_PerkSWAT.uc +++ b/ServerExt/Classes/Ext_PerkSWAT.uc @@ -30,12 +30,12 @@ simulated function float GetZedTimeModifier(KFWeapon W) function float GetStumblePowerModifier( optional KFPawn KFP, optional class DamageType, optional out float CooldownModifier, optional byte BodyPart ) { - if( bRapidAssault) - { - return 2.f*Modifiers[7]; - } + if (bRapidAssault) + { + return 2.f * Modifiers[7]; + } - return Modifiers[7]; + return Modifiers[7]; } defaultproperties @@ -61,4 +61,4 @@ defaultproperties MoveSpeedMods(0)=1.3 MoveSpeedMods(1)=1.5 MoveSpeedMods(2)=2 -} \ No newline at end of file +}