v1.4.0

- added WeaponClass check at config loading stage;
- added DLC unlock without replacing KFGFxMoviePlayer_Manager;
- redesigned UnlockDLC - now it is flexibly configured;
- updated logger and some messages in the log;
- added parameter bOfficialWeaponsList allowing you;
  to have an up-to-date list of all official weapons in the config;
- optimized weapon preload: official weapon models are skipped now.

CTI/Classes/AddItems.uc

@@ -29,23 +29,36 @@ private static function ApplyDefault()
 public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
 {
 	local Array<class<KFWeaponDefinition> > ItemList;
-	local class<KFWeaponDefinition> ItemClass;
+	local class<KFWeaponDefinition> ItemWeapDef;
+	local class<KFWeapon> ItemWeapon;
 	local String ItemRaw;
 	local int    Line;
 	
 	`Log_Info("Load Items to add:");
 	foreach default.Item(ItemRaw, Line)
 	{
-		ItemClass = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-		if (ItemClass == None)
+		ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+		if (ItemWeapDef == None)
 		{
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load Item class:" @ ItemRaw);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
+			continue;
 		}
-		else
+		
+		ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
+		if (ItemWeapon == None)
 		{
-			ItemList.AddItem(ItemClass);
-			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
+			continue;
 		}
+		
+		if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
+		{
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
+			continue;
+		}
+		
+		ItemList.AddItem(ItemWeapDef);
+		`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
 	}
 	
 	if (ItemList.Length == default.Item.Length)

CTI/Classes/CTI.uc

@@ -1,11 +1,13 @@
 class CTI extends Info
 	config(CTI);
 
-const LatestVersion = 1;
+const LatestVersion = 2;
 
-const CfgRemoveItems = class'RemoveItems';
-const CfgAddItems    = class'AddItems';
-const Helper         = class'Helper';
+const CfgRemoveItems     = class'RemoveItems';
+const CfgAddItems        = class'AddItems';
+const CfgOfficialWeapons = class'OfficialWeapons';
+const Trader             = class'Trader';
+const Unlocker           = class'Unlocker';
 
 struct S_PreloadContent
 {
@@ -17,8 +19,9 @@ struct S_PreloadContent
 
 var private config int        Version;
 var private config E_LogLevel LogLevel;
-var private config bool       UnlockDLC;
+var private config String     UnlockDLC;
 var private config bool       bPreloadContent;
+var private config bool       bOfficialWeaponsList;
 
 var private KFGameInfo KFGI;
 var private KFGameReplicationInfo KFGRI;
@@ -34,14 +37,14 @@ var private Array<S_PreloadContent> PreloadContent;
 
 public simulated function bool SafeDestroy()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
 
 public event PreBeginPlay()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
 	
@@ -59,7 +62,7 @@ public event PreBeginPlay()
 
 public event PostBeginPlay()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (bPendingDelete || bDeleteMe) return;
 	
@@ -70,13 +73,13 @@ public event PostBeginPlay()
 
 private function PreInit()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (Version == `NO_CONFIG)
 	{
 		LogLevel = LL_Info;
 		bPreloadContent = true;
-		UnlockDLC = false;
+		UnlockDLC = "False";
 		SaveConfig();
 	}
 	
@@ -88,8 +91,11 @@ private function PreInit()
 		case `NO_CONFIG:
 			`Log_Info("Config created");
 			
+		case 1:
+			bOfficialWeaponsList = false;
+			
 		case MaxInt:
-			`Log_Info("Config updated to version"@LatestVersion);
+			`Log_Info("Config updated to version" @ LatestVersion);
 			break;
 			
 		case LatestVersion:
@@ -102,6 +108,8 @@ private function PreInit()
 			`Log_Warn("The config version will be changed to" @ LatestVersion);
 			break;
 	}
+	
+	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
 
 	if (LatestVersion != Version)
 	{
@@ -117,6 +125,13 @@ private function PreInit()
 	}
 	`Log_Base("LogLevel:" @ LogLevel);
 	
+	if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
+	{
+		`Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)");
+		UnlockDLC = "False";
+		SaveConfig();
+	}
+	
 	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
 	AddItems    = CfgAddItems.static.Load(LogLevel);
 }
@@ -125,7 +140,7 @@ private function PostInit()
 {
 	local CTI_RepInfo RepInfo;
 	
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (WorldInfo == None || WorldInfo.Game == None)
 	{
@@ -141,42 +156,6 @@ private function PostInit()
 		return;
 	}
 	
-	// TODO:
-	// replace shopContainer (KFGFxTraderContainer_Store)
-	// without replacing KFGFxMoviePlayer_Manager
-	// but how? 🤔
-	if (UnlockDLC)
-	{
-		if (KFGameInfo_VersusSurvival(KFGI) != None)
-		{
-			if (KFGI.KFGFxManagerClass != class'CTI_GFxMoviePlayer_Manager_Versus')
-			{
-				if (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass)
-				{
-					`Log_Warn("Found custom 'KFGFxManagerClass' (" $ KFGI.KFGFxManagerClass $ "), there may be compatibility issues");
-					`Log_Warn("If you notice problems, try disabling UnlockDLC");
-				}
-				
-				KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
-				`Log_Info("DLC unlocked");
-			}
-		}
-		else
-		{
-			if (KFGI.KFGFxManagerClass != class'CTI_GFxMoviePlayer_Manager')
-			{
-				if (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass)
-				{
-					`Log_Warn("Found custom 'KFGFxManagerClass' (" $ KFGI.KFGFxManagerClass $ "), there may be compatibility issues");
-					`Log_Warn("If you notice problems, try disabling UnlockDLC");
-				}
-				
-				KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
-				`Log_Info("DLC unlocked");
-			}
-		}
-	}
-	
 	if (KFGI.GameReplicationInfo == None)
 	{
 		SetTimer(1.0f, false, nameof(PostInit));
@@ -191,13 +170,18 @@ private function PostInit()
 		return;
 	}
 	
-	Helper.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll);
+	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel))
+	{
+		`Log_Info("DLC unlocked");
+	}
 	
 	if (bPreloadContent)
 	{
 		Preload(AddItems);
 	}
 	
+	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll, LogLevel);
+	
 	ReadyToSync = true;
 	
 	foreach RepInfos(RepInfo)
@@ -211,13 +195,24 @@ private function PostInit()
 
 private function Preload(Array<class<KFWeaponDefinition> > Content)
 {
+	local Array<class<KFWeapon> > OfficialWeapons;
 	local S_PreloadContent SPC;
 	
+	`Log_Trace();
+	
+	OfficialWeapons = Trader.static.GetTraderWeapons();
+	
 	foreach Content(SPC.KFWD)
 	{
 		SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
 		if (SPC.KFWC != None)
 		{
+			if (OfficialWeapons.Find(SPC.KFWC) != INDEX_NONE)
+			{
+				`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
+				continue;
+			}
+		
 			SPC.KFW = KFGI.Spawn(SPC.KFWC);
 			if (SPC.KFW == None)
 			{
@@ -240,18 +235,20 @@ private function Preload(Array<class<KFWeaponDefinition> > Content)
 	{
 		SPC.KFWA.KFW_StartLoadWeaponContent();
 	}
+	
+	`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
 }
 
 public function NotifyLogin(Controller C)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
 	CreateRepInfo(C);
 }
 
 public function NotifyLogout(Controller C)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
 	DestroyRepInfo(C);
 }
@@ -260,7 +257,7 @@ public function bool CreateRepInfo(Controller C)
 {
 	local CTI_RepInfo RepInfo;
 	
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (C == None) return false;
 	
@@ -293,7 +290,7 @@ public function bool DestroyRepInfo(Controller C)
 {
 	local CTI_RepInfo RepInfo;
 	
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (C == None) return false;
 	

CTI/Classes/CTI_RepInfo.uc

@@ -1,6 +1,6 @@
 class CTI_RepInfo extends ReplicationInfo;
 
-const Helper = class'Helper';
+const Trader = class'Trader';
 
 var public  bool PendingSync;
 
@@ -33,7 +33,7 @@ replication
 
 public simulated function bool SafeDestroy()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
@@ -45,7 +45,7 @@ public function PrepareSync(
 	Array<class<KFWeaponDefinition> > _AddItems,
 	bool _ReplaceMode)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	CTI                 = _CTI;
 	LogLevel            = _LogLevel;
@@ -57,7 +57,7 @@ public function PrepareSync(
 
 private simulated function KFPlayerController GetKFPC()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (KFPC != None) return KFPC;
 	
@@ -73,7 +73,7 @@ private simulated function KFPlayerController GetKFPC()
 
 private simulated function SetPartyInGameWidget()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (GetKFPC() == None) return;
 	
@@ -86,7 +86,7 @@ private simulated function SetPartyInGameWidget()
 
 private simulated function bool CheckPartyInGameWidget()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (PartyInGameWidget == None)
 	{
@@ -98,7 +98,7 @@ private simulated function bool CheckPartyInGameWidget()
 
 private simulated function HideReadyButton()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (CheckPartyInGameWidget())
 	{
@@ -108,7 +108,7 @@ private simulated function HideReadyButton()
 
 private simulated function ShowReadyButton()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (CheckPartyInGameWidget())
 	{
@@ -121,7 +121,7 @@ private simulated function ShowReadyButton()
 
 private simulated function UpdateNotification(String Title, String Downloading, String Remainig, int Percent)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (CheckPartyInGameWidget() && Notification != None)
 	{
@@ -137,7 +137,7 @@ private simulated function UpdateNotification(String Title, String Downloading,
 
 private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
 	if (WeapDef == None)
 	{
@@ -164,14 +164,14 @@ private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, o
 	
 	Recieved = RemoveItems.Length + AddItems.Length;
 	
-	NotificationLeftText    = Remove ? "-" : "+" @ Repl(String(WeapDef), "KFWeapDef_", "");
-	NotificationRightText   = Recieved @ "/" @ SyncSize;
+	NotificationLeftText    = WeapDef.static.GetItemName();
+	NotificationRightText   = Recieved @ "/" @ SyncSize @ "(" $ (Remove ? "remove" : "add") $ ")";
 	if (SyncSize != 0)
 	{
 		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
 	}
 	
-	`Log_Debug("ClientSync:" @ NotificationLeftText @ NotificationRightText);
+	`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
 	
 	ServerSync();
 }
@@ -190,13 +190,18 @@ private simulated reliable client function ClientSyncFinished()
 {
 	local KFGameReplicationInfo KFGRI;
 
-	`Log_Trace(`Location);
+	`Log_Trace();
+	
+	NotificationLeftText  = "";
+	NotificationRightText = "";
+	NotificationPercent   = 0;
 	
 	if (WorldInfo.GRI == None)
 	{
 		`Log_Debug("ClientSyncFinished: Waiting GRI");
 		NotificationHeaderText = "Waiting for GameReplicationInfo...";
 		NotificationLeftText   = String(++WaitingGRI) $ "s";
+		NotificationRightText  = "";
 		SetTimer(1.0f, false, nameof(ClientSyncFinished));
 		return;
 	}
@@ -207,16 +212,21 @@ private simulated reliable client function ClientSyncFinished()
 		`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
 		ClearTimer(nameof(KeepNotification));
 		UpdateNotification(
-			"Error: Incompatible Replication info:" @ String(WorldInfo.GRI),
+			"Incompatible GRI:" @ String(WorldInfo.GRI),
 			"Disconnect...", "", 0);
 		Cleanup();
 		ConsoleCommand("Disconnect");
 		SafeDestroy();
 		return;
 	}
+	
+	NotificationHeaderText = "Sync finished";
+	NotificationLeftText   = "";
+	NotificationRightText  = "";
+	NotificationPercent    = 0;
 
-	Helper.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode);
-	`Log_Debug("ClientSyncFinished: Helper.static.ModifyTrader");
+	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, LogLevel);
+	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
 
 	ClearTimer(nameof(KeepNotification)); 
 	ShowReadyButton();
@@ -228,7 +238,7 @@ private simulated reliable client function ClientSyncFinished()
 
 private reliable server function Cleanup()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	`Log_Debug("Cleanup");
 	if (!CTI.DestroyRepInfo(Controller(Owner)))
@@ -240,26 +250,27 @@ private reliable server function Cleanup()
 
 public reliable server function ServerSync()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	PendingSync = false;
 	
 	if (bPendingDelete || bDeleteMe) return;
 	
-	`Log_Debug("ServerSync:" @ Recieved @ "/" @ SyncSize);
 	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
 	{
-		`Log_Debug("ServerSync: SyncFinished");
+		`Log_Debug("ServerSync: Finished");
 		ClientSyncFinished();
 	}
 	else
 	{
 		if (Recieved < RemoveItems.Length)
 		{
+			`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
 			ClientSync(RemoveItems[Recieved++], true);
 		}
 		else
 		{
+			`Log_Debug("ServerSync[+]:" @ (Recieved + 1) @ "/" @ SyncSize @ AddItems[Recieved - RemoveItems.Length]);
 			ClientSync(AddItems[Recieved++ - RemoveItems.Length], false);
 		}
 	}

CTI/Classes/CTI_WeapDef_AutoTurret.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_AutoTurret extends KFWeapDef_AutoTurret
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_BladedPistol.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_BladedPistol extends KFWeapDef_BladedPistol
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_Blunderbuss.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_Blunderbuss extends KFWeapDef_Blunderbuss
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_ChainBat.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_ChainBat extends KFWeapDef_ChainBat
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_ChiappaRhino.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_ChiappaRhino extends KFWeapDef_ChiappaRhino
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_ChiappaRhinoDual.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_ChiappaRhinoDual extends KFWeapDef_ChiappaRhinoDual
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_CompoundBow.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_CompoundBow extends KFWeapDef_CompoundBow
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_Doshinegun.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_Doshinegun extends KFWeapDef_Doshinegun
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_DualBladed.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_DualBladed extends KFWeapDef_DualBladed
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_FAMAS.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_FAMAS extends KFWeapDef_FAMAS
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_G18.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_G18 extends KFWeapDef_G18
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_GravityImploder.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_GravityImploder extends KFWeapDef_GravityImploder
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_IonThruster.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_IonThruster extends KFWeapDef_IonThruster
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_Mine_Reconstructor.uc

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

CTI/Classes/CTI_WeapDef_Minigun.uc

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

CTI/Classes/CTI_WeapDef_MosinNagant.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_MosinNagant extends KFWeapDef_MosinNagant
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_ParasiteImplanter.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_ParasiteImplanter extends KFWeapDef_ParasiteImplanter
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_Pistol_DualG18.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_Pistol_DualG18 extends KFWeapDef_Pistol_DualG18
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_Pistol_G18C.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_Pistol_G18C extends KFWeapDef_Pistol_G18C
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_Rifle_FrostShotgunAxe.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_Rifle_FrostShotgunAxe extends KFWeapDef_Rifle_FrostShotgunAxe
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_ShrinkRayGun.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_ShrinkRayGun extends KFWeapDef_ShrinkRayGun
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_ThermiteBore.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_ThermiteBore extends KFWeapDef_ThermiteBore
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/CTI_WeapDef_Zweihander.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_Zweihander extends KFWeapDef_Zweihander
+	abstract;
+
+defaultproperties
+{
+	SharedUnlockId = SCU_None
+}

CTI/Classes/Helper.uc

@@ -1,58 +0,0 @@
-class Helper extends Object;
-
-private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
-{
-	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
-}
-
-public static simulated function ModifyTrader(
-	KFGameReplicationInfo KFGRI,
-	Array<class<KFWeaponDefinition> > RemoveItems,
-	Array<class<KFWeaponDefinition> > AddItems,
-	bool ReplaceMode)
-{
-	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
-	local class<KFWeaponDefinition> WeapDef;
-	local Array<class<KFWeaponDefinition> > WeapDefs;
-	local int Index;
-	local int MaxItemID;
-	
-	if (KFGRI == None) return;
-	
-	TraderItems = KFGFxObject_TraderItems(DynamicLoadObject(KFGRI.TraderItemsPath, class'KFGFxObject_TraderItems'));
-	
-	if (!ReplaceMode)
-	{
-		foreach TraderItems.SaleItems(Item)
-		{
-			if (Item.WeaponDef != None && RemoveItems.Find(Item.WeaponDef) == INDEX_NONE)
-			{
-				WeapDefs.AddItem(Item.WeaponDef);
-			}
-		}
-	}
-	
-	for (Index = 0; Index < AddItems.Length; Index++)
-		WeapDefs.AddItem(AddItems[Index]);
-	
-	WeapDefs.Sort(ByPrice);
-	
-	TraderItems.SaleItems.Length = 0;
-	MaxItemID = 0;
-	foreach WeapDefs(WeapDef)
-	{
-		Item.WeaponDef = WeapDef;
-		Item.ItemID = ++MaxItemID;
-		TraderItems.SaleItems.AddItem(Item);
-	}
-
-	TraderItems.SetItemsInfo(TraderItems.SaleItems);
-	
-	KFGRI.TraderItems = TraderItems;
-}
-
-defaultproperties
-{
-	
-}

CTI/Classes/OfficialWeapons.uc

@@ -0,0 +1,43 @@
+class OfficialWeapons extends Object
+	config(CTI);
+
+const Trader = class'Trader';
+const DefaultComment = "Auto-generated list of official weapons for your convenience, copy-paste ready";
+
+var private config String Comment;
+var private config Array<String> Item;
+
+private delegate int ByName(String A, String B)
+{
+	return A > B ? -1 : 0;
+}
+
+public static function Update(bool Enabled)
+{
+	local Array<class<KFWeaponDefinition> > KFWeapDefs;
+	local class<KFWeaponDefinition> KFWeapDef;
+	
+	if (!Enabled) return;
+
+	KFWeapDefs = Trader.static.GetTraderWeapDefs();
+	
+	if (default.Item.Length != KFWeapDefs.Length || default.Comment != DefaultComment)
+	{
+		default.Comment = DefaultComment;
+		default.Item.Length = 0;
+		
+		foreach KFWeapDefs(KFWeapDef)
+		{
+			default.Item.AddItem(KFWeapDef.GetPackageName() $ "." $ KFWeapDef);
+		}
+		
+		default.Item.Sort(ByName);
+		
+		StaticSaveConfig();
+	}
+}
+
+defaultproperties
+{
+
+}

CTI/Classes/RemoveItems.uc

@@ -31,7 +31,8 @@ private static function ApplyDefault()
 public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
 {
 	local Array<class<KFWeaponDefinition> > ItemList;
-	local class<KFWeaponDefinition> ItemClass;
+	local class<KFWeaponDefinition> ItemWeapDef;
+	local class<KFWeapon> ItemWeapon;
 	local String ItemRaw;
 	local int    Line;
 	
@@ -44,21 +45,33 @@ public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLeve
 	{
 		foreach default.Item(ItemRaw, Line)
 		{
-			ItemClass = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-			if (ItemClass == None)
+			ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+			if (ItemWeapDef == None)
 			{
-				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load item class:" @ ItemRaw);
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
+				continue;
 			}
-			else
+			
+			ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
+			if (ItemWeapon == None)
 			{
-				ItemList.AddItem(ItemClass);
-				`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
+				continue;
 			}
+			
+			if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
+			{
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
+				continue;
+			}
+			
+			ItemList.AddItem(ItemWeapDef);
+			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
 		}
 		
 		if (ItemList.Length == default.Item.Length)
 		{
-			`Log_Info("Items to remove list loaded successfully (" $ default.Item.Length @ "entries)");
+			`Log_Info("Items to remove list loaded successfully (" $ ItemList.Length @ "entries)");
 		}
 		else
 		{

CTI/Classes/Trader.uc

@@ -0,0 +1,161 @@
+class Trader extends Object
+	abstract;
+
+private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
+{
+	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
+}
+
+public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
+{
+	local String TraderItemsPath;
+	
+	if (KFGRI == None)
+	{
+		TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
+	}
+	else
+	{
+		TraderItemsPath = KFGRI.TraderItemsPath;
+	}
+	
+	return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
+}
+
+public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+{
+	local Array<class<KFWeaponDefinition> > KFWeapDefs;
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	foreach TraderItems.SaleItems(Item)
+	{
+		if (Item.WeaponDef != None)
+		{
+			KFWeapDefs.AddItem(Item.WeaponDef);
+		}
+	}
+	
+	return KFWeapDefs;
+}
+
+public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+{
+	local Array<class<KFWeapon> > KFWeapons;
+	local class<KFWeapon> KFWeapon;
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	foreach TraderItems.SaleItems(Item)
+	{
+		if (Item.WeaponDef != None)
+		{
+			KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
+			if (KFWeapon != None)
+			{
+				KFWeapons.AddItem(KFWeapon);
+			}
+		}
+	}
+	
+	return KFWeapons;
+}
+
+public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KFGameReplicationInfo KFGRI, E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local Array<class<KFWeaponDefinition> > WeapDefs;
+	
+	`Log_TraceStatic();
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	foreach TraderItems.SaleItems(Item)
+	{
+		if (Item.WeaponDef != None && Item.WeaponDef.default.SharedUnlockId != SCU_None)
+		{
+			WeapDefs.AddItem(Item.WeaponDef);
+		}
+	}
+	
+	return WeapDefs;
+}
+
+public static simulated function ModifyTrader(
+	KFGameReplicationInfo KFGRI,
+	Array<class<KFWeaponDefinition> > RemoveItems,
+	Array<class<KFWeaponDefinition> > AddItems,
+	bool ReplaceMode,
+	E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local class<KFWeaponDefinition> WeapDef;
+	local Array<class<KFWeaponDefinition> > WeapDefs;
+	local int Index;
+	local int MaxItemID;
+	
+	`Log_TraceStatic();
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	if (!ReplaceMode)
+	{
+		foreach TraderItems.SaleItems(Item)
+		{
+			if (Item.WeaponDef != None
+			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
+			&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
+			{
+				WeapDefs.AddItem(Item.WeaponDef);
+			}
+		}
+	}
+	
+	for (Index = 0; Index < AddItems.Length; ++Index)
+	{
+		WeapDefs.AddItem(AddItems[Index]);
+	}
+	
+	WeapDefs.Sort(ByPrice);
+	
+	TraderItems.SaleItems.Length = 0;
+	MaxItemID = 0;
+	foreach WeapDefs(WeapDef)
+	{
+		Item.WeaponDef = WeapDef;
+		Item.ItemID = ++MaxItemID;
+		TraderItems.SaleItems.AddItem(Item);
+	}
+
+	TraderItems.SetItemsInfo(TraderItems.SaleItems);
+	
+	KFGRI.TraderItems = TraderItems;
+}
+
+private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
+{
+	local class<KFWeaponDefinition> WeapDef;
+	
+	`Log_TraceStatic();
+	
+	foreach WeapDefs(WeapDef)
+	{
+		if (WeapDef.default.WeaponClassPath == WeaponClassPath)
+		{
+			return false;
+		}
+	}
+	
+	return true;
+}
+
+defaultproperties
+{
+	
+}

CTI/Classes/Unlocker.uc

@@ -0,0 +1,195 @@
+class Unlocker extends Object
+	abstract;
+
+// TODO:
+// replace shopContainer (KFGFxTraderContainer_Store)
+// without replacing KFGFxMoviePlayer_Manager
+// but how? 🤔
+
+const Trader = class'Trader';
+
+var private const Array<class<KFWeaponDefinition> > WeapDefDLCReplacements;
+
+public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
+{
+	`Log_TraceStatic();
+	
+	switch (Locs(UnlockType))
+	{
+		case "true":
+		case "false":
+		case "auto":
+		case "replaceweapons":
+		case "replacefilter":
+			return true;
+	}
+	
+	return false;
+}
+
+public static function bool UnlockDLC(
+	KFGameInfo KFGI,
+	KFGameReplicationInfo KFGRI,
+	String UnlockType,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
+	E_LogLevel LogLevel)
+{
+	`Log_TraceStatic();
+	
+	switch (Locs(UnlockType))
+	{
+		case "true":
+		case "auto":
+			return Auto(KFGI, KFGRI, RemoveItems, AddItems, LogLevel);
+
+		case "replaceweapons":
+			return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
+			
+		case "replacefilter":
+			return ReplaceFilter(KFGI, LogLevel);
+			
+		case "false":
+		default:
+			return false;
+	}
+}
+
+private static function bool Auto(
+	KFGameInfo KFGI,
+	KFGameReplicationInfo KFGRI,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
+	E_LogLevel LogLevel)
+{
+	local bool CustomGFxManager;
+	
+	`Log_TraceStatic();
+	
+	if (KFGI == None) return false;
+	
+	if (KFGameInfo_VersusSurvival(KFGI) != None)
+	{
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
+	}
+	else
+	{
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
+	}
+
+	if (CustomGFxManager)
+	{
+		return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
+	}
+	else
+	{
+		return ReplaceFilter(KFGI, LogLevel);
+	}
+}
+
+private static function bool ReplaceWeapons(
+	KFGameReplicationInfo KFGRI,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
+	E_LogLevel LogLevel)
+{
+	local Array<class<KFWeaponDefinition> > WeapDefsDLCs;
+	local class<KFWeaponDefinition> WeapDefDLC;
+	local class<KFWeaponDefinition> WeapDefReplacement;
+	local bool Unlock, PartialUnlock;
+	
+	`Log_TraceStatic();
+	
+	Unlock = false;
+	PartialUnlock = false;
+	
+	WeapDefsDLCs = Trader.static.GetTraderWeapDefsDLC(KFGRI, LogLevel);
+	
+	foreach WeapDefsDLCs(WeapDefDLC)
+	{
+		WeapDefReplacement = PickReplacementWeapDefDLC(WeapDefDLC, LogLevel);
+		if (WeapDefReplacement != None)
+		{
+			Unlock = true;
+			if (AddItems.Find(WeapDefReplacement) == INDEX_NONE)
+			{
+				AddItems.AddItem(WeapDefReplacement);
+			}
+			`Log_Debug(WeapDefDLC @ "replaced by" @ WeapDefReplacement);
+		}
+		else
+		{
+			PartialUnlock = true;
+			`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
+		}
+	}
+	
+	if (PartialUnlock)
+	{
+		`Log_Warn("Some DLCs are not unlocked. Try to set 'UnlockDLC=ReplaceFilter' or ask the author to update the mod");
+	}
+	
+	return Unlock;
+}
+
+private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
+{
+	local class<KFWeaponDefinition> WeapDef;
+	
+	`Log_TraceStatic();
+	
+	foreach default.WeapDefDLCReplacements(WeapDef)
+	{
+		if (ClassIsChildOf(WeapDef, WeapDefDLC))
+		{
+			return WeapDef;
+		}
+	}
+	
+	return None;
+}
+
+private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
+{
+	`Log_TraceStatic();
+	
+	if (KFGI == None) return false;
+	
+	if (KFGameInfo_VersusSurvival(KFGI) != None)
+	{
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
+	}
+	else
+	{
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
+	}
+	
+	return true;
+}
+
+defaultproperties
+{
+	WeapDefDLCReplacements(0)  = class'CTI_WeapDef_AutoTurret'
+	WeapDefDLCReplacements(1)  = class'CTI_WeapDef_BladedPistol'
+	WeapDefDLCReplacements(2)  = class'CTI_WeapDef_Blunderbuss'
+	WeapDefDLCReplacements(3)  = class'CTI_WeapDef_ChainBat'
+	WeapDefDLCReplacements(4)  = class'CTI_WeapDef_ChiappaRhino'
+	WeapDefDLCReplacements(5)  = class'CTI_WeapDef_ChiappaRhinoDual'
+	WeapDefDLCReplacements(6)  = class'CTI_WeapDef_CompoundBow'
+	WeapDefDLCReplacements(7)  = class'CTI_WeapDef_Doshinegun'
+	WeapDefDLCReplacements(8)  = class'CTI_WeapDef_DualBladed'
+	WeapDefDLCReplacements(9)  = class'CTI_WeapDef_FAMAS'
+	WeapDefDLCReplacements(10) = class'CTI_WeapDef_G18'
+	WeapDefDLCReplacements(11) = class'CTI_WeapDef_GravityImploder'
+	WeapDefDLCReplacements(12) = class'CTI_WeapDef_IonThruster'
+	WeapDefDLCReplacements(13) = class'CTI_WeapDef_Mine_Reconstructor'
+	WeapDefDLCReplacements(14) = class'CTI_WeapDef_Minigun'
+	WeapDefDLCReplacements(15) = class'CTI_WeapDef_MosinNagant'
+	WeapDefDLCReplacements(16) = class'CTI_WeapDef_ParasiteImplanter'
+	WeapDefDLCReplacements(17) = class'CTI_WeapDef_Pistol_DualG18'
+	WeapDefDLCReplacements(18) = class'CTI_WeapDef_Pistol_G18C'
+	WeapDefDLCReplacements(19) = class'CTI_WeapDef_Rifle_FrostShotgunAxe'
+	WeapDefDLCReplacements(20) = class'CTI_WeapDef_ShrinkRayGun'
+	WeapDefDLCReplacements(21) = class'CTI_WeapDef_ThermiteBore'
+	WeapDefDLCReplacements(22) = class'CTI_WeapDef_Zweihander'
+}

CTI/Logger.uci

@@ -1,11 +1,15 @@
 // Logger
 `define Log_Tag 'CTI'
 
-`define Log_Base(msg, cond) `log(`msg `if(`cond), `cond`{endif},            `Log_Tag)
+`define LocationStatic        "`{ClassName}::" $ GetFuncName()
 
-`define Log_Fatal(msg)      `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `Log_Tag)
-`define Log_Error(msg)      `log("ERROR:" @ `msg, (LogLevel >= LL_Error),   `Log_Tag)
-`define Log_Warn(msg)       `log("WARN:"  @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
-`define Log_Info(msg)       `log("INFO:"  @ `msg, (LogLevel >= LL_Info),    `Log_Tag)
-`define Log_Debug(msg)      `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug),   `Log_Tag)
-`define Log_Trace(msg)      `log("TRACE:" @ `msg, (LogLevel >= LL_Trace),   `Log_Tag)
+`define Log_Base(msg, cond)  `log(`msg `if(`cond), `cond`{endif},            `Log_Tag)
+
+`define Log_Fatal(msg)       `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `Log_Tag)
+`define Log_Error(msg)       `log("ERROR:" @ `msg, (LogLevel >= LL_Error),   `Log_Tag)
+`define Log_Warn(msg)        `log("WARN:"  @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
+`define Log_Info(msg)        `log("INFO:"  @ `msg, (LogLevel >= LL_Info),    `Log_Tag)
+`define Log_Debug(msg)       `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug),   `Log_Tag)
+
+`define Log_Trace(msg)       `log("TRACE:" @ `Location       `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
+`define Log_TraceStatic(msg) `log("TRACE:" @ `LocationStatic `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)

PublicationContent/description.txt

@@ -37,8 +37,13 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
 [h1]Setup (KFCTI.ini)[/h1]
 Config will be created at the first start.
 [list]
-[*]Set [b]UnlockDLC=True[/b] to allow all players to buy DLC weapons.
 [*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags during the game.
+[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste).
+[*]Set [b]UnlockDLC[/b] to customize DLC weapon unlocks. Here are the possible values:
+[b]False[/b] - disable DLC unlock.
+[b]ReplaceFilter[/b] - changes the trader filter allowing you to buy original DLC weapons without restrictions, unlocks future DLCs as well (no need to update this mutator). However, it replaces the [b]KFGFxMoviePlayer_Manager[/b] class so it may not be compatible with mods that also replace it.
+[b]ReplaceWeapons[/b] - replaces DLC weapons with their unlocked variants. Compatible with any mods, but may require a CTI update after the release of new DLC weapons.
+[b]True[/b] or [b]Auto[/b] - selects the most appropriate option automatically. Recommend putting CTIMut last in the mutator load queue if you use this.
 [*]Use [b][CTI.RemoveItems][/b] to remove items from the trader inventory.
 For example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
 [*]Set [b]bAll=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
@@ -50,10 +55,6 @@ For example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamco
 [h1]Notes[/h1]
 📌 Mutator does not contain custom weapons. You must have the required weapon packs in your subscriptions to be able to add them to the trader.
 📌 If you are using this mutator to add weapons, you should [b]not[/b] use mutators from weapon packs (just having them in subscriptions is enough).
-📌 Unlike [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2193261170]DLC Weapon Unlocker[/url], a different method is used here.
-[url=https://steamcommunity.com/sharedfiles/filedetails/?id=2193261170]DLC Weapon Unlocker[/url] creates clones of DLC weapons and adds them to the trader. This allows you not to replace any classes in the game, so Hunter mutator has better compatibility with other mutators, however you need to update DWU every time kf2 update comes out with new guns.
-CTI unlocks DLC weapons differently - it changes the trader filter allowing you to buy original DLC weapons without restrictions. You don't need to update the mutator when new kf2 updates are released - unlocking will work with future weapons as well. However, when you set UnlockDLC=True CTI replaces the [b]KFGFxMoviePlayer_Manager[/b] class, so CTI may not be compatible with mods that replaces this class too. If you notice any compatibility issues, try turning off UnlockDLC.
-You can use this built-in method or add weapons from [url=https://steamcommunity.com/workshop/filedetails/discussion/2193261170/3046108212603783998]DLC Weapon Unlocker[/url] - choose what suits you best.
 
 [h1]Sources[/h1]
 [url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]