From 0656855070e04c4d94ffe8b38c7d650898a1301b Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Aug 2021 07:25:27 -0700 Subject: [PATCH 1/9] 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 b550ba56e755f4bdfca4219219f149826401d512 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Aug 2021 09:56:06 -0700 Subject: [PATCH 2/9] Fix Spread not working on shotguns --- 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..01ff623 100644 --- a/ServerExt/Classes/ExtPerkManager.uc +++ b/ServerExt/Classes/ExtPerkManager.uc @@ -894,6 +894,11 @@ simulated function float GetPenetrationModifier(byte Level, class return (Ext_PerkSupport(CurrentPerk)!=None ? Ext_PerkSupport(CurrentPerk).GetPenetrationModifier(Level, DamageType, bForce) : 0.f); } +simulated function float GetTightChokeModifier() +{ + return (CurrentPerk!=None ? CurrentPerk.GetTightChokeModifier() : 1.f); +} + // Other function ApplySkillsToPawn() { diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index ac1807d..5e87f82 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -1475,6 +1475,11 @@ simulated function float GetZedTimeExtensions(byte Level) return 1.f; } +simulated function float GetTightChokeModifier() +{ + return Modifiers[3]; +} + defaultproperties { CurrentConfigVer=14 From 754262c61d9e3327585620582c06908f576b4503 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Aug 2021 10:14:37 -0700 Subject: [PATCH 3/9] 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 4/9] 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 c33116b97cf48d71aa611e3fd86b94d0b9344edb Mon Sep 17 00:00:00 2001 From: nateku2 Date: Mon, 23 Aug 2021 06:05:31 -0400 Subject: [PATCH 5/9] Update Ext_TraitWPGuns.uc It never made sense to me that, It only gave you a single pistol considering gunslinger dual wields most of the time. --- ServerExt/Classes/Ext_TraitWPGuns.uc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ServerExt/Classes/Ext_TraitWPGuns.uc b/ServerExt/Classes/Ext_TraitWPGuns.uc index 1a40076..d6c5a51 100644 --- a/ServerExt/Classes/Ext_TraitWPGuns.uc +++ b/ServerExt/Classes/Ext_TraitWPGuns.uc @@ -2,8 +2,8 @@ Class Ext_TraitWPGuns extends Ext_TraitWeapons; defaultproperties { - LevelEffects(0)=(LoadoutClasses=(class'KFWeap_Pistol_Colt1911')) - LevelEffects(1)=(LoadoutClasses=(class'KFWeap_Pistol_Deagle')) - LevelEffects(2)=(LoadoutClasses=(class'KFWeap_Revolver_SW500')) + LevelEffects(0)=(LoadoutClasses=(class'KFWeap_Pistol_DualColt1911')) + LevelEffects(1)=(LoadoutClasses=(class'KFWeap_Pistol_DualDeagle')) + LevelEffects(2)=(LoadoutClasses=(class'KFWeap_Revolver_DualSW500')) LevelEffects(3)=(LoadoutClasses=(class'KFWeap_Pistol_DualColt1911',class'KFWeap_Pistol_DualDeagle',class'KFWeap_Revolver_DualSW500')) -} \ No newline at end of file +} From bae438531cfa61ef5dc67ee7f993490616e327b9 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 02:03:16 +0300 Subject: [PATCH 6/9] 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 7/9] 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 +} From 1c12cc55a7e1a090a80ca0d821cd4532939c4eab Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 02:25:27 +0300 Subject: [PATCH 8/9] 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 9/9] 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 +}