From cbbdc4166aaff2ac1f06823094bfd527604f3c64 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Thu, 3 Sep 2020 14:09:09 +0300 Subject: [PATCH] v1103 --- ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc | 7 +++++++ ServerExt/Classes/DLCWeapDef_Minigun.uc | 7 +++++++ ServerExt/Classes/ExtPerkManager.uc | 2 +- ServerExt/Classes/Ext_PerkBase.uc | 2 +- ServerExt/Classes/Ext_PerkFieldMedic.uc | 2 +- ServerExtMut/Classes/ServerExtMut.uc | 6 +++++- 6 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc create mode 100644 ServerExt/Classes/DLCWeapDef_Minigun.uc diff --git a/ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc b/ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc new file mode 100644 index 0000000..2bfd752 --- /dev/null +++ b/ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc @@ -0,0 +1,7 @@ +class DLCWeapDef_Mine_Reconstructor extends KFWeapDef_Mine_Reconstructor + abstract; + +DefaultProperties +{ + SharedUnlockId=SCU_None +} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_Minigun.uc b/ServerExt/Classes/DLCWeapDef_Minigun.uc new file mode 100644 index 0000000..0ce4c52 --- /dev/null +++ b/ServerExt/Classes/DLCWeapDef_Minigun.uc @@ -0,0 +1,7 @@ +class DLCWeapDef_Minigun extends KFWeapDef_Minigun + abstract; + +DefaultProperties +{ + SharedUnlockId=SCU_None +} \ No newline at end of file diff --git a/ServerExt/Classes/ExtPerkManager.uc b/ServerExt/Classes/ExtPerkManager.uc index b3e2671..acf365d 100644 --- a/ServerExt/Classes/ExtPerkManager.uc +++ b/ServerExt/Classes/ExtPerkManager.uc @@ -563,7 +563,7 @@ function bool CanNotBeGrabbed() { return (CurrentPerk!=None ? !CurrentPerk.bCanBeGrabbed : false); } -simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out byte MagazineCapacity, optional array< Class > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) +simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out int MagazineCapacity, optional array< Class > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) { if( CurrentPerk!=None ) CurrentPerk.ModifyMagSizeAndNumber(KFW,MagazineCapacity,WeaponPerkClass,bSecondary,WeaponClassname); diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc index 5bd679f..d3b7845 100644 --- a/ServerExt/Classes/Ext_PerkBase.uc +++ b/ServerExt/Classes/Ext_PerkBase.uc @@ -1271,7 +1271,7 @@ function bool ModifyHealAmount( out float HealAmount ) HealAmount*=Modifiers[9]; return false; } -simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out byte MagazineCapacity, optional array< Class > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) +simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out int MagazineCapacity, optional array< Class > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) { if( MagazineCapacity>2 && (KFW==None ? WeaponPerkClass.Find(BasePerk)>=0 : IsWeaponOnPerk(KFW)) ) // Skip boomstick for this. MagazineCapacity = Min(MagazineCapacity*Modifiers[10],255); diff --git a/ServerExt/Classes/Ext_PerkFieldMedic.uc b/ServerExt/Classes/Ext_PerkFieldMedic.uc index 048caf8..4765e2b 100644 --- a/ServerExt/Classes/Ext_PerkFieldMedic.uc +++ b/ServerExt/Classes/Ext_PerkFieldMedic.uc @@ -26,7 +26,7 @@ simulated function ModifyDamageGiven( out int InDamage, optional Actor DamageCau Super.ModifyDamageGiven(InDamage, DamageCauser, MyKFPM, DamageInstigator, DamageType, HitZoneIdx); } -simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out byte MagazineCapacity, optional array< Class > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) +simulated function ModifyMagSizeAndNumber( KFWeapon KFW, out int MagazineCapacity, optional array< Class > WeaponPerkClass, optional bool bSecondary=false, optional name WeaponClassname ) { if( MagazineCapacity>2 && (KFW==None ? WeaponPerkClass.Find(BasePerk)>=0 : IsWeaponOnPerk(KFW)) ) // Skip boomstick for this. MagazineCapacity = Min(MagazineCapacity*Modifiers[10], bSecondary ? 150 : 255); diff --git a/ServerExtMut/Classes/ServerExtMut.uc b/ServerExtMut/Classes/ServerExtMut.uc index 51d1fcc..c3e7591 100644 --- a/ServerExtMut/Classes/ServerExtMut.uc +++ b/ServerExtMut/Classes/ServerExtMut.uc @@ -341,7 +341,9 @@ function EditTraiderItems() || string(Trad.SaleItems[i].ClassName) ~= "KFWeap_Rifle_MosinNagant" || string(Trad.SaleItems[i].ClassName) ~= "KFWeap_AssaultRifle_LazerCutter" || 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; } @@ -380,6 +382,8 @@ function EditTraiderItems() AddCIToTrader("ServerExt.DLCWeapDef_LazerCutter"); AddCIToTrader("ServerExt.DLCWeapDef_Pistol_DualG18"); AddCIToTrader("ServerExt.DLCWeapDef_Pistol_G18C"); + AddCIToTrader("ServerExt.DLCWeapDef_Mine_Reconstructor"); + AddCIToTrader("ServerExt.DLCWeapDef_Minigun"); } // Add custom items from WebAdmin