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

Merge branch 'v1103'

Browse Source
This commit is contained in:
GenZmeY 2020-09-29 18:46:44 +03:00
commit 18d8768c00
6 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc Normal file
View File

@ -0,0 +1,7 @@
class DLCWeapDef_Mine_Reconstructor extends KFWeapDef_Mine_Reconstructor
abstract;
DefaultProperties
{
SharedUnlockId=SCU_None
}

7
ServerExt/Classes/DLCWeapDef_Minigun.uc Normal file
View File

@ -0,0 +1,7 @@
class DLCWeapDef_Minigun extends KFWeapDef_Minigun
abstract;
DefaultProperties
{
SharedUnlockId=SCU_None
}

2
ServerExt/Classes/ExtPerkManager.uc
View File

@ -563,7 +563,7 @@ function bool CanNotBeGrabbed()
{ {
return (CurrentPerk!=None ? !CurrentPerk.bCanBeGrabbed : false); return (CurrentPerk!=None ? !CurrentPerk.bCanBeGrabbed : false);
} }
simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out byte MagazineCapacity, optional array< Class<KFPerk> > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out int MagazineCapacity, optional array< Class<KFPerk> > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname )
{ {
if( CurrentPerk!=None ) if( CurrentPerk!=None )
CurrentPerk.ModifyMagSizeAndNumber(KFW,MagazineCapacity,WeaponPerkClass,bSecondary,WeaponClassname); CurrentPerk.ModifyMagSizeAndNumber(KFW,MagazineCapacity,WeaponPerkClass,bSecondary,WeaponClassname);

2
ServerExt/Classes/Ext_PerkBase.uc
View File

@ -1321,7 +1321,7 @@ function bool ModifyHealAmount( out float HealAmount )
HealAmount*=Modifiers[9]; HealAmount*=Modifiers[9];
return false; return false;
} }
simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out byte MagazineCapacity, optional array< Class<KFPerk> > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out int MagazineCapacity, optional array< Class<KFPerk> > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname )
{ {
if( MagazineCapacity>2 && (KFW==None ? WeaponPerkClass.Find(BasePerk)>=0 : IsWeaponOnPerk(KFW)) ) // Skip boomstick for this. if( MagazineCapacity>2 && (KFW==None ? WeaponPerkClass.Find(BasePerk)>=0 : IsWeaponOnPerk(KFW)) ) // Skip boomstick for this.
MagazineCapacity = Min(MagazineCapacity*Modifiers[10],255); MagazineCapacity = Min(MagazineCapacity*Modifiers[10],255);

2
ServerExt/Classes/Ext_PerkFieldMedic.uc
View File

@ -26,7 +26,7 @@ simulated function ModifyDamageGiven( out int InDamage, optional Actor DamageCau
Super.ModifyDamageGiven(InDamage, DamageCauser, MyKFPM, DamageInstigator, DamageType, HitZoneIdx); Super.ModifyDamageGiven(InDamage, DamageCauser, MyKFPM, DamageInstigator, DamageType, HitZoneIdx);
} }
simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out byte MagazineCapacity, optional array< Class<KFPerk> > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out int MagazineCapacity, optional array< Class<KFPerk> > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname )
{ {
if( MagazineCapacity>2 && (KFW==None ? WeaponPerkClass.Find(BasePerk)>=0 : IsWeaponOnPerk(KFW)) ) // Skip boomstick for this. if( MagazineCapacity>2 && (KFW==None ? WeaponPerkClass.Find(BasePerk)>=0 : IsWeaponOnPerk(KFW)) ) // Skip boomstick for this.
MagazineCapacity = Min(MagazineCapacity*Modifiers[10], bSecondary ? 150 : 255); MagazineCapacity = Min(MagazineCapacity*Modifiers[10], bSecondary ? 150 : 255);

6
ServerExtMut/Classes/ServerExtMut.uc
View File

@ -341,7 +341,9 @@ function EditTraiderItems()
|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Rifle_MosinNagant" || string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Rifle_MosinNagant"
|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_AssaultRifle_LazerCutter" || string(Trad.SaleItems[i].ClassName) ~= "KFWeap_AssaultRifle_LazerCutter"
|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_SMG_G18" || string(Trad.SaleItems[i].ClassName) ~= "KFWeap_SMG_G18"
|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Pistol_DualG18") || string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Pistol_DualG18"
|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Mine_Reconstructor"
|| string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Minigun")
{ {
continue; continue;
} }
@ -380,6 +382,8 @@ function EditTraiderItems()
AddCIToTrader("ServerExt.DLCWeapDef_LazerCutter"); AddCIToTrader("ServerExt.DLCWeapDef_LazerCutter");
AddCIToTrader("ServerExt.DLCWeapDef_Pistol_DualG18"); AddCIToTrader("ServerExt.DLCWeapDef_Pistol_DualG18");
AddCIToTrader("ServerExt.DLCWeapDef_Pistol_G18C"); AddCIToTrader("ServerExt.DLCWeapDef_Pistol_G18C");
AddCIToTrader("ServerExt.DLCWeapDef_Mine_Reconstructor");
AddCIToTrader("ServerExt.DLCWeapDef_Minigun");
} }
// Add custom items from WebAdmin // Add custom items from WebAdmin