From d750a2a6d0539b073c806f156bc7ac9fd0a63c41 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Aug 2021 10:53:27 -0700 Subject: [PATCH 1/4] weaponswitch speed --- Localization/INT/ServerExt.int | Bin 56232 -> 56312 bytes ServerExt/Classes/ExtPerkManager.uc | 8 ++++++++ ServerExt/Classes/Ext_PerkBase.uc | 12 ++++++++++++ 3 files changed, 20 insertions(+) diff --git a/Localization/INT/ServerExt.int b/Localization/INT/ServerExt.int index 48e24e721c0d8a61f246157452687ce5c6322d28..ebae82379ec35c8a3ef77bf9c15adfc7454925eb 100644 GIT binary patch delta 64 zcmZ3no%zRh<_#B)OfERWp&86j&XCDa!jR06!C=dv#1PJq%8v?7$DqJ~Bs=;4 MKKacTj@%Ff0I!l1!T return (Ext_PerkSupport(CurrentPerk)!=None ? Ext_PerkSupport(CurrentPerk).GetPenetrationModifier(Level, DamageType, bForce) : 0.f); } +// SwitchSpeed +simulated function ModifyWeaponSwitchTime( out float ModifiedSwitchTime ) +{ + if( CurrentPerk!=None ) + CurrentPerk.ModifyWeaponSwitchTime(ModifiedSwitchTime); +} + + // Other function ApplySkillsToPawn() { diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index ac1807d..9b82088 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -109,6 +109,7 @@ var localized string StatFireDmg; var localized string StatAllDmg; var localized string StatHeadDamage; var localized string StatHealRecharge; +var localized string StatSwitch; reliable client simulated function string UIName(FDefPerkStat DefPerkStat) { @@ -135,6 +136,7 @@ reliable client simulated function string UIName(FDefPerkStat DefPerkStat) case name("AllDmg"): return StatAllDmg; case name("HeadDamage"): return StatHeadDamage; case name("HealRecharge"): return StatHealRecharge; + case name("Switch"): return StatSwitch; } return ""; } @@ -1237,6 +1239,9 @@ simulated function float ApplyEffect(name Type, float Value, float Progress) case 'HealRecharge': Modifiers[20] = 1.f / (1.f+Value*Progress); break; + case 'Switch': + Modifiers[21] = 1.f / (1.f+Value*Progress); + break; } return (Value*Progress); } @@ -1467,6 +1472,11 @@ simulated function float GetIronSightSpeedModifier(KFWeapon KFW) return 1.f; } +simulated function ModifyWeaponSwitchTime( out float ModifiedSwitchTime ) +{ + ModifiedSwitchTime *= Modifiers[21]; +} + function OnWaveEnded(); function NotifyZedTimeStarted(); @@ -1548,6 +1558,7 @@ defaultproperties DefPerkStats(18)=(MaxValue=500,CostPerValue=1,StatType="AllDmg",Progress=0.25) DefPerkStats(19)=(MaxValue=500,CostPerValue=1,StatType="HeadDamage",Progress=1,bHiddenConfig=true) DefPerkStats(20)=(MaxValue=200,CostPerValue=1,StatType="HealRecharge",Progress=0.5,bHiddenConfig=true) + DefPerkStats(21)=(MaxValue=100,CostPerValue=1,StatType="Switch",Progress=1) Modifiers.Add(1.f) Modifiers.Add(1.f) @@ -1570,6 +1581,7 @@ defaultproperties Modifiers.Add(1.f) Modifiers.Add(0.f) Modifiers.Add(1.f) + Modifiers.Add(1.f) EnemyDistDraw.Add(500) EnemyDistDraw.Add(700) From d7064608c2383d8654a38b6c4abb3a992cfa65ee Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 03:18:38 +0300 Subject: [PATCH 2/4] Code style --- ServerExt/Classes/ExtPerkManager.uc | 5 ++--- ServerExt/Classes/Ext_PerkBase.uc | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ServerExt/Classes/ExtPerkManager.uc b/ServerExt/Classes/ExtPerkManager.uc index 4cef230..b2230e1 100644 --- a/ServerExt/Classes/ExtPerkManager.uc +++ b/ServerExt/Classes/ExtPerkManager.uc @@ -897,11 +897,10 @@ simulated function float GetPenetrationModifier(byte Level, class // SwitchSpeed simulated function ModifyWeaponSwitchTime( out float ModifiedSwitchTime ) { - if( CurrentPerk!=None ) - CurrentPerk.ModifyWeaponSwitchTime(ModifiedSwitchTime); + if (CurrentPerk != None) + CurrentPerk.ModifyWeaponSwitchTime(ModifiedSwitchTime); } - // Other function ApplySkillsToPawn() { diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index 9b82088..7a5bec9 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -1472,9 +1472,9 @@ simulated function float GetIronSightSpeedModifier(KFWeapon KFW) return 1.f; } -simulated function ModifyWeaponSwitchTime( out float ModifiedSwitchTime ) +simulated function ModifyWeaponSwitchTime(out float ModifiedSwitchTime) { - ModifiedSwitchTime *= Modifiers[21]; + ModifiedSwitchTime *= Modifiers[21]; } function OnWaveEnded(); From 80d0c0cc0ade57178369e780946caf5b40673301 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 03:29:06 +0300 Subject: [PATCH 3/4] Update localization files (cht, jpn, rus) --- Localization/CHT/ServerExt.CHT | Bin 38374 -> 38428 bytes Localization/JPN/ServerExt.jpn | Bin 41160 -> 41220 bytes Localization/RUS/ServerExt.rus | Bin 57052 -> 57136 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Localization/CHT/ServerExt.CHT b/Localization/CHT/ServerExt.CHT index 354e93c537b0605711931df11314ff11ccf94aaf..d66b345343dc09d03be0f7a025f0d11c53fc88bd 100644 GIT binary patch delta 43 zcmaF1nrY4&rVV`clLP8FB!U^r88R747?K$>7;G7o7}Byc!q|guCvW~y_f8A|Jh2YI delta 18 acmbQUhUwXArVV`clQS53HV4$75d#2A_y>mo diff --git a/Localization/JPN/ServerExt.jpn b/Localization/JPN/ServerExt.jpn index 3ba629dbf45bcfef5e321ba383db21ad27b56e1d..ad323954be53413d908fbceedcf06d85f4375991 100644 GIT binary patch delta 48 zcmX?ckg4Sm(}o*;lM}i)WP=&X88R747?K$>7;G7o7}Byc!txB*gSrgyV8kG^EXS}H Df$$HF delta 14 Wcmdn6kNM7C<_$W>H#Z#LAPxXI5(jbs From d8a19104dcf1c81a96ded666f07d47687d1ee7db Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Tue, 24 Aug 2021 04:06:29 +0300 Subject: [PATCH 4/4] Add WeaponSwitch stat to KFServerExt.ini --- ServerExt/Classes/Ext_PerkBase.uc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index 7a5bec9..6310792 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -712,6 +712,8 @@ static function UpdateConfigs(int OldVer) AddStatsCfg(18); // Add all damage. else if (OldVer<=13) AddStatsCfg(19); // Add HeadDamage and HealRecharge + else if (OldVer<=14) + AddStatsCfg(21); // Add WeaponSwitch if (OldVer<=5) { // Add prestige @@ -1487,7 +1489,7 @@ simulated function float GetZedTimeExtensions(byte Level) defaultproperties { - CurrentConfigVer=14 + CurrentConfigVer=15 bOnlyRelevantToOwner=true bCanBeGrabbed=true NetUpdateFrequency=1