From 54a46e2c372c7e0c680f4a587970fec8544801b6 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Sun, 10 Jan 2021 06:27:50 +0300 Subject: [PATCH] refactor: DLC weapons for free - unlocks all dlc, including future ones; - "bDLCWeaponsForFree" deprecated. --- ServerExt/Classes/DLCWeapDef_Blunderbuss.uc | 7 --- ServerExt/Classes/DLCWeapDef_ChainBat.uc | 7 --- ServerExt/Classes/DLCWeapDef_ChiappaRhino.uc | 7 --- .../Classes/DLCWeapDef_ChiappaRhinoDual.uc | 7 --- ServerExt/Classes/DLCWeapDef_CompoundBow.uc | 7 --- ServerExt/Classes/DLCWeapDef_FreezeThrower.uc | 7 --- ServerExt/Classes/DLCWeapDef_G18.uc | 7 --- ServerExt/Classes/DLCWeapDef_IonThruster.uc | 7 --- ServerExt/Classes/DLCWeapDef_LazerCutter.uc | 7 --- .../Classes/DLCWeapDef_Mine_Reconstructor.uc | 7 --- ServerExt/Classes/DLCWeapDef_Minigun.uc | 7 --- ServerExt/Classes/DLCWeapDef_MosinNagant.uc | 8 --- .../Classes/DLCWeapDef_Pistol_DualG18.uc | 7 --- ServerExt/Classes/DLCWeapDef_Pistol_G18C.uc | 7 --- .../DLCWeapDef_Rifle_FrostShotgunAxe.uc | 7 --- ServerExt/Classes/ExtTraderContainer_Store.uc | 15 +++++ ServerExtMut/Classes/ServerExtMut.uc | 56 +------------------ 17 files changed, 17 insertions(+), 160 deletions(-) delete mode 100644 ServerExt/Classes/DLCWeapDef_Blunderbuss.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_ChainBat.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_ChiappaRhino.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_ChiappaRhinoDual.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_CompoundBow.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_FreezeThrower.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_G18.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_IonThruster.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_LazerCutter.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_Minigun.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_MosinNagant.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_Pistol_DualG18.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_Pistol_G18C.uc delete mode 100644 ServerExt/Classes/DLCWeapDef_Rifle_FrostShotgunAxe.uc diff --git a/ServerExt/Classes/DLCWeapDef_Blunderbuss.uc b/ServerExt/Classes/DLCWeapDef_Blunderbuss.uc deleted file mode 100644 index 7535a56..0000000 --- a/ServerExt/Classes/DLCWeapDef_Blunderbuss.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_Blunderbuss extends KFWeapDef_Blunderbuss - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_ChainBat.uc b/ServerExt/Classes/DLCWeapDef_ChainBat.uc deleted file mode 100644 index 120f7e2..0000000 --- a/ServerExt/Classes/DLCWeapDef_ChainBat.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_ChainBat extends KFWeapDef_ChainBat - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_ChiappaRhino.uc b/ServerExt/Classes/DLCWeapDef_ChiappaRhino.uc deleted file mode 100644 index 4d92566..0000000 --- a/ServerExt/Classes/DLCWeapDef_ChiappaRhino.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_ChiappaRhino extends KFWeapDef_ChiappaRhino - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_ChiappaRhinoDual.uc b/ServerExt/Classes/DLCWeapDef_ChiappaRhinoDual.uc deleted file mode 100644 index 447217c..0000000 --- a/ServerExt/Classes/DLCWeapDef_ChiappaRhinoDual.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_ChiappaRhinoDual extends KFWeapDef_ChiappaRhinoDual - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_CompoundBow.uc b/ServerExt/Classes/DLCWeapDef_CompoundBow.uc deleted file mode 100644 index 77619fc..0000000 --- a/ServerExt/Classes/DLCWeapDef_CompoundBow.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_CompoundBow extends KFWeapDef_CompoundBow - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_FreezeThrower.uc b/ServerExt/Classes/DLCWeapDef_FreezeThrower.uc deleted file mode 100644 index 648569b..0000000 --- a/ServerExt/Classes/DLCWeapDef_FreezeThrower.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_FreezeThrower extends KFWeapDef_FreezeThrower - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_G18.uc b/ServerExt/Classes/DLCWeapDef_G18.uc deleted file mode 100644 index 404edc2..0000000 --- a/ServerExt/Classes/DLCWeapDef_G18.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_G18 extends KFWeapDef_G18 - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_IonThruster.uc b/ServerExt/Classes/DLCWeapDef_IonThruster.uc deleted file mode 100644 index 9b8321d..0000000 --- a/ServerExt/Classes/DLCWeapDef_IonThruster.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_IonThruster extends KFWeapDef_IonThruster - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_LazerCutter.uc b/ServerExt/Classes/DLCWeapDef_LazerCutter.uc deleted file mode 100644 index d3ca435..0000000 --- a/ServerExt/Classes/DLCWeapDef_LazerCutter.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_LazerCutter extends KFWeapDef_LazerCutter - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc b/ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc deleted file mode 100644 index 2bfd752..0000000 --- a/ServerExt/Classes/DLCWeapDef_Mine_Reconstructor.uc +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 0ce4c52..0000000 --- a/ServerExt/Classes/DLCWeapDef_Minigun.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_Minigun extends KFWeapDef_Minigun - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_MosinNagant.uc b/ServerExt/Classes/DLCWeapDef_MosinNagant.uc deleted file mode 100644 index fe00c54..0000000 --- a/ServerExt/Classes/DLCWeapDef_MosinNagant.uc +++ /dev/null @@ -1,8 +0,0 @@ -class DLCWeapDef_MosinNagant extends KFWeapDef_MosinNagant - abstract; - -DefaultProperties -{ - WeaponClassPath="KFGameContent.KFWeap_Rifle_MosinNagant" - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_Pistol_DualG18.uc b/ServerExt/Classes/DLCWeapDef_Pistol_DualG18.uc deleted file mode 100644 index ca641ae..0000000 --- a/ServerExt/Classes/DLCWeapDef_Pistol_DualG18.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_Pistol_DualG18 extends KFWeapDef_Pistol_DualG18 - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_Pistol_G18C.uc b/ServerExt/Classes/DLCWeapDef_Pistol_G18C.uc deleted file mode 100644 index 89abd62..0000000 --- a/ServerExt/Classes/DLCWeapDef_Pistol_G18C.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_Pistol_G18C extends KFWeapDef_Pistol_G18C - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} \ No newline at end of file diff --git a/ServerExt/Classes/DLCWeapDef_Rifle_FrostShotgunAxe.uc b/ServerExt/Classes/DLCWeapDef_Rifle_FrostShotgunAxe.uc deleted file mode 100644 index b86eae3..0000000 --- a/ServerExt/Classes/DLCWeapDef_Rifle_FrostShotgunAxe.uc +++ /dev/null @@ -1,7 +0,0 @@ -class DLCWeapDef_Rifle_FrostShotgunAxe extends KFWeapDef_Rifle_FrostShotgunAxe - abstract; - -DefaultProperties -{ - SharedUnlockId=SCU_None -} diff --git a/ServerExt/Classes/ExtTraderContainer_Store.uc b/ServerExt/Classes/ExtTraderContainer_Store.uc index af3ff4e..6674776 100644 --- a/ServerExt/Classes/ExtTraderContainer_Store.uc +++ b/ServerExt/Classes/ExtTraderContainer_Store.uc @@ -1,5 +1,20 @@ class ExtTraderContainer_Store extends KFGFxTraderContainer_Store; +/** returns true if this item should not be displayed */ +function bool IsItemFiltered(STraderItem Item, optional bool bDebug) +{ + if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.ClassName)) + return true; + if ( KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.DualClassName) ) + return true; + if (!KFPC.GetPurchaseHelper().IsSellable(Item)) + return true; + if ( Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted( Item.WeaponDef.default.PlatformRestriction ) ) + return true; + + return false; +} + function RefreshWeaponListByPerk(byte FilterIndex, const out array ItemList) { local int i, SlotIndex; diff --git a/ServerExtMut/Classes/ServerExtMut.uc b/ServerExtMut/Classes/ServerExtMut.uc index 51db0b1..72e4a69 100644 --- a/ServerExtMut/Classes/ServerExtMut.uc +++ b/ServerExtMut/Classes/ServerExtMut.uc @@ -59,7 +59,6 @@ var ExtSpawnPointHelper SpawnPointer; var bool bRespawnCheck,bSpecialSpawn,bGameHasEnded,bIsPostGame; var config bool bKillMessages,bDamageMessages,bEnableMapVote,bNoAdminCommands,bNoWebAdmin,bNoBoomstickJumping,bDumpXMLStats,bRagdollFromFall,bRagdollFromMomentum,bRagdollFromBackhit,bAddCountryTags; var config bool bServerPerksMode; -var config bool bDLCWeaponsForFree; var config bool bDontUseOriginalWeaponry; var config bool bAllowStandartPistolUpgrade; var config bool bDisableCustomTrader; @@ -176,7 +175,6 @@ function PostBeginPlay() if (SettingsInit < 13) { - bDLCWeaponsForFree = True; bAllowStandartPistolUpgrade = True; bDisableCustomTrader = False; } @@ -310,14 +308,11 @@ function EditTraiderItems() { local int i; local KFGFxObject_TraderItems Trad; - // local FCustomTraderItem CI; - // local STraderItem SI; - // var config bool bDLCWeaponsForFree; - // var config bool bDontUseOriginalWeaponry; + if (!bDontUseOriginalWeaponry) { Trad = KFGameReplicationInfo(WorldInfo.GRI).TraderItems; - // Remove dual 9mm, 9mm, medpistol and DLC weapons + // Remove dual 9mm, 9mm, medpistol for (i=0;i