KillingFloor2/KF2-Server-Extension
KillingFloor2/KF2-Server-Extension
1
0
Fork 0
Code Releases 5 Activity

Merge branch 'master' into weaponswitch

Browse Source
This commit is contained in:
GenZmeY 2021-08-24 04:48:08 +03:00 committed by GitHub
commit 637e3675a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ServerExt/Classes/ExtPerkManager.uc
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)
@ -557,7 +562,7 @@ function float GetKnockdownPowerModifier(optional class<DamageType> DamageType,
function float GetStumblePowerModifier(optional KFPawn KFP, optional class<KFDamageType> DamageType, optional out float CooldownModifier, optional byte BodyPart) function float GetStumblePowerModifier(optional KFPawn KFP, optional class<KFDamageType> 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> DamageType, optional byte HitZoneIdx) function float GetStunPowerModifier(optional class<DamageType> DamageType, optional byte HitZoneIdx)
@ -894,8 +899,13 @@ simulated function float GetPenetrationModifier(byte Level, class<KFDamageType>
return (Ext_PerkSupport(CurrentPerk)!=None ? Ext_PerkSupport(CurrentPerk).GetPenetrationModifier(Level, DamageType, bForce) : 0.f); 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);
}
// SwitchSpeed // SwitchSpeed
simulated function ModifyWeaponSwitchTime( out float ModifiedSwitchTime ) simulated function ModifyWeaponSwitchTime(out float ModifiedSwitc)
{ {
if (CurrentPerk != None) if (CurrentPerk != None)
CurrentPerk.ModifyWeaponSwitchTime(ModifiedSwitchTime); CurrentPerk.ModifyWeaponSwitchTime(ModifiedSwitchTime);

15
ServerExt/Classes/Ext_PerkBase.uc
View File

@ -1300,6 +1300,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];
@ -1320,6 +1325,11 @@ function float GetStunPowerModifier(optional class<DamageType> DamageType, optio
return Modifiers[7]; return Modifiers[7];
} }
function float GetStumblePowerModifier( optional KFPawn KFP, optional class<KFDamageType> DamageType, optional out float CooldownModifier, optional byte BodyPart )
{
return Modifiers[7];
}
simulated function ModifyMeleeAttackSpeed(out float InDuration); simulated function ModifyMeleeAttackSpeed(out float InDuration);
function AddDefaultInventory(KFPawn P) function AddDefaultInventory(KFPawn P)
@ -1487,6 +1497,11 @@ simulated function float GetZedTimeExtensions(byte Level)
return 1.f; return 1.f;
} }
simulated function float GetTightChokeModifier()
{
return Modifiers[3];
}
defaultproperties defaultproperties
{ {
CurrentConfigVer=15 CurrentConfigVer=15

10
ServerExt/Classes/Ext_PerkSWAT.uc
View File

@ -28,6 +28,16 @@ simulated function float GetZedTimeModifier(KFWeapon W)
return 0.f; return 0.f;
} }
function float GetStumblePowerModifier( optional KFPawn KFP, optional class<KFDamageType> DamageType, optional out float CooldownModifier, optional byte BodyPart )
{
if (bRapidAssault)
{
return 2.f * Modifiers[7];
}
return Modifiers[7];
}
defaultproperties defaultproperties
{ {
PerkIcon=Texture2D'UI_PerkIcons_TEX.UI_PerkIcon_SWAT' PerkIcon=Texture2D'UI_PerkIcons_TEX.UI_PerkIcon_SWAT'

6
ServerExt/Classes/Ext_TraitWPGuns.uc
View File

@ -2,8 +2,8 @@ Class Ext_TraitWPGuns extends Ext_TraitWeapons;
defaultproperties defaultproperties
{ {
LevelEffects(0)=(LoadoutClasses=(class'KFWeap_Pistol_Colt1911')) LevelEffects(0)=(LoadoutClasses=(class'KFWeap_Pistol_DualColt1911'))
LevelEffects(1)=(LoadoutClasses=(class'KFWeap_Pistol_Deagle')) LevelEffects(1)=(LoadoutClasses=(class'KFWeap_Pistol_DualDeagle'))
LevelEffects(2)=(LoadoutClasses=(class'KFWeap_Revolver_SW500')) LevelEffects(2)=(LoadoutClasses=(class'KFWeap_Revolver_DualSW500'))
LevelEffects(3)=(LoadoutClasses=(class'KFWeap_Pistol_DualColt1911',class'KFWeap_Pistol_DualDeagle',class'KFWeap_Revolver_DualSW500')) LevelEffects(3)=(LoadoutClasses=(class'KFWeap_Pistol_DualColt1911',class'KFWeap_Pistol_DualDeagle',class'KFWeap_Revolver_DualSW500'))
} }