Merge pull request #3 from GenZmeY/v1136

Update v1136 (unlock new DLC weapons)

.gitignore

@@ -0,0 +1,2 @@
+*.psd
+/ignore

CTI/Classes/AddItems.uc

@@ -29,24 +29,37 @@ 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'));
+		ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-		if (ItemClass == None)
+		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_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,17 +1,27 @@
 class CTI extends Info
 	config(CTI);
 
-const LatestVersion = 1;
+const LatestVersion = 3;
 
 const CfgRemoveItems     = class'RemoveItems';
 const CfgAddItems        = class'AddItems';
-const Helper         = class'Helper';
+const CfgOfficialWeapons = class'OfficialWeapons';
+const Trader             = class'Trader';
+const Unlocker           = class'Unlocker';
+
+struct S_PreloadContent
+{
+	var class<KFWeaponDefinition> KFWD;
+	var class<KFWeapon>           KFWC;
+	var KFWeapon                  KFW;
+	var KFW_Access                KFWA;
+};
 
 var private config int        Version;
 var private config E_LogLevel LogLevel;
+var private config String     UnlockDLC;
 var private config bool       bPreloadContent;
-var private config bool       bForcePreloadContent;
+var private config bool       bOfficialWeaponsList;
-var private config bool       UnlockDLC;
 
 var private KFGameInfo KFGI;
 var private KFGameReplicationInfo KFGRI;
@@ -23,16 +33,18 @@ var private Array<CTI_RepInfo> RepInfos;
 
 var private bool ReadyToSync;
 
+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);
 	
@@ -50,7 +62,7 @@ public event PreBeginPlay()
 
 public event PostBeginPlay()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (bPendingDelete || bDeleteMe) return;
 	
@@ -61,14 +73,13 @@ public event PostBeginPlay()
 
 private function PreInit()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (Version == `NO_CONFIG)
 	{
 		LogLevel = LL_Info;
 		bPreloadContent = true;
-		bForcePreloadContent = true;
+		UnlockDLC = "False";
-		UnlockDLC = false;
 		SaveConfig();
 	}
 	
@@ -80,6 +91,11 @@ private function PreInit()
 		case `NO_CONFIG:
 			`Log_Info("Config created");
 			
+		case 1:
+			bOfficialWeaponsList = false;
+			
+		case 2:
+			
 		case MaxInt:
 			`Log_Info("Config updated to version" @ LatestVersion);
 			break;
@@ -95,6 +111,8 @@ private function PreInit()
 			break;
 	}
 	
+	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
+
 	if (LatestVersion != Version)
 	{
 		Version = LatestVersion;
@@ -109,15 +127,22 @@ 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);
 }
 
 private function PostInit()
 {
-	local CTI_RepInfo RepLink;
+	local CTI_RepInfo RepInfo;
 	
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (WorldInfo == None || WorldInfo.Game == None)
 	{
@@ -133,42 +158,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 DLC unlock");
-				}
-				
-				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 DLC unlock");
-				}
-				
-				KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
-				`Log_Info("DLC unlocked");
-			}
-		}
-	}
-	
 	if (KFGI.GameReplicationInfo == None)
 	{
 		SetTimer(1.0f, false, nameof(PostInit));
@@ -183,87 +172,148 @@ 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)
 	{
-		Helper.static.PreloadContent(AddItems);
+		Preload(AddItems);
 	}
 	
+	Trader.static.ModifyTrader(
+		KFGRI,
+		RemoveItems,
+		AddItems,
+		CfgRemoveItems.default.bAll,
+		CfgRemoveItems.default.bHRG,
+		CfgRemoveItems.default.bDLC,
+		LogLevel);
+	
 	ReadyToSync = true;
 	
-	foreach RepInfos(RepLink)
+	foreach RepInfos(RepInfo)
 	{
-		if (RepLink.PendingSync)
+		if (RepInfo.PendingSync)
 		{
-			RepLink.ServerSync();
+			RepInfo.ServerSync();
 		}
 	}
 }
 
+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)
+			{
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
+				continue;
+			}
+			
+			SPC.KFWA = new (SPC.KFW) class'KFW_Access';
+			if (SPC.KFWA == None)
+			{
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
+				continue;
+			}
+			
+			PreloadContent.AddItem(SPC);
+		}
+	}
+	
+	foreach PreloadContent(SPC)
+	{
+		SPC.KFWA.KFW_StartLoadWeaponContent();
+	}
+	
+	`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
+}
+
 public function NotifyLogin(Controller C)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
-	CreateRepLink(C);
+	if (!CreateRepInfo(C))
+	{
+		`Log_Error("Can't create RepInfo for:" @ C);
+	}
 }
 
 public function NotifyLogout(Controller C)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
-	DestroyRepLink(C);
+	DestroyRepInfo(C);
 }
 
-public function bool CreateRepLink(Controller C)
+public function bool CreateRepInfo(Controller C)
 {
-	local CTI_RepInfo RepLink;
+	local CTI_RepInfo RepInfo;
 	
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (C == None) return false;
 	
-	RepLink = Spawn(class'CTI_RepInfo', C);
+	RepInfo = Spawn(class'CTI_RepInfo', C);
 	
-	if (RepLink == None) return false;
+	if (RepInfo == None) return false;
 	
-	RepLink.PrepareSync(
+	RepInfo.PrepareSync(
 		Self,
 		LogLevel,
 		RemoveItems,
 		AddItems,
 		CfgRemoveItems.default.bAll,
-		bPreloadContent,
+		CfgRemoveItems.default.bHRG,
-		bForcePreloadContent);
+		CfgRemoveItems.default.bDLC);
 	
-	RepInfos.AddItem(RepLink);
+	RepInfos.AddItem(RepInfo);
 	
 	if (ReadyToSync)
 	{
-		RepLink.ServerSync();
+		RepInfo.ServerSync();
 	}
 	else
 	{
-		RepLink.PendingSync = true;
+		RepInfo.PendingSync = true;
 	}
 	
 	return true;
 }
 
-public function bool DestroyRepLink(Controller C)
+public function bool DestroyRepInfo(Controller C)
 {
-	local CTI_RepInfo RepLink;
+	local CTI_RepInfo RepInfo;
 	
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	if (C == None) return false;
 	
-	foreach RepInfos(RepLink)
+	foreach RepInfos(RepInfo)
 	{
-		if (RepLink.Owner == C)
+		if (RepInfo.Owner == C)
 		{
-			RepLink.SafeDestroy();
+			RepInfos.RemoveItem(RepInfo);
-			RepInfos.RemoveItem(RepLink);
+			RepInfo.SafeDestroy();
 			return true;
 		}
 	}

CTI/Classes/CTIMut.uc

@@ -15,19 +15,17 @@ public event PreBeginPlay()
 	
 	foreach WorldInfo.DynamicActors(class'CTI', CTI)
 	{
-		`Log_Base("Found 'CTI'");
 		break;
 	}
 	
 	if (CTI == None)
 	{
-		`Log_Base("Spawn 'CTI'");
 		CTI = WorldInfo.Spawn(class'CTI');
 	}
 	
 	if (CTI == None)
 	{
-		`Log_Base("Can't Spawn 'CTI', Destroy...");
+		`Log_Base("FATAL: Can't Spawn 'CTI'");
 		SafeDestroy();
 	}
 }
@@ -44,16 +42,16 @@ public function AddMutator(Mutator Mut)
 
 public function NotifyLogin(Controller C)
 {
-	Super.NotifyLogin(C);
-	
 	CTI.NotifyLogin(C);
+	
+	Super.NotifyLogin(C);
 }
 
 public function NotifyLogout(Controller C)
 {
-	Super.NotifyLogout(C);
-	
 	CTI.NotifyLogout(C);
+	
+	Super.NotifyLogout(C);
 }
 
 DefaultProperties

CTI/Classes/CTI_LocalMessage.uc

@@ -0,0 +1,73 @@
+class CTI_LocalMessage extends Object
+	abstract;
+
+var const             String SyncItemsDefault;
+var private localized String SyncItems;
+
+var const             String SyncFinishedDefault;
+var private localized String SyncFinished;
+
+var const             String WaitingGRIDefault;
+var private localized String WaitingGRI;
+
+var const             String IncompatibleGRIDefault;
+var private localized String IncompatibleGRI;
+
+var const             String DisconnectDefault;
+var private localized String Disconnect;
+
+var const             String SecondsShortDefault;
+var private localized String SecondsShort;
+
+enum E_CTI_LocalMessageType
+{
+	CTI_SyncItems,
+	CTI_SyncFinished,
+	CTI_WaitingGRI,
+	CTI_IncompatibleGRI,
+	CTI_Disconnect,
+	CTI_SecondsShort
+};
+
+public static function String GetLocalizedString(
+	E_LogLevel LogLevel,
+	E_CTI_LocalMessageType LMT,
+	optional String String1,
+	optional String String2,
+	optional String String3)
+{
+	`Log_TraceStatic();
+	
+	switch (LMT)
+	{
+		case CTI_SyncItems:
+			return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
+			
+		case CTI_SyncFinished:
+			return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
+		
+		case CTI_WaitingGRI:
+			return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
+		
+		case CTI_IncompatibleGRI:
+			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
+		
+		case CTI_Disconnect:
+			return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
+		
+		case CTI_SecondsShort:
+			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
+	}
+	
+	return "";
+}
+
+defaultproperties
+{
+	SyncItemsDefault       = "Sync items:"
+	SyncFinishedDefault    = "Sync finished."
+	WaitingGRIDefault      = "Waiting GRI..."
+	IncompatibleGRIDefault = "Incompatible GRI:"
+	DisconnectDefault      = "Disconnect..."
+	SecondsShortDefault    = "s"
+}

CTI/Classes/CTI_RepInfo.uc

@@ -1,6 +1,7 @@
 class CTI_RepInfo extends ReplicationInfo;
 
-const Helper = class'Helper';
+const Trader       = class'Trader';
+const LocalMessage = class'CTI_LocalMessage';
 
 var public  bool PendingSync;
 
@@ -9,24 +10,33 @@ var private E_LogLevel LogLevel;
 var private Array<class<KFWeaponDefinition> > RemoveItems;
 var private Array<class<KFWeaponDefinition> > AddItems;
 var private bool ReplaceMode;
+var private bool RemoveHRG;
+var private bool RemoveDLC;
 var private bool PreloadContent;
-var private bool ForcePreloadContent;
 
 var private int  Recieved;
 var private int  SyncSize;
 
+var private KFPlayerController      KFPC;
 var private KFGFxWidget_PartyInGame PartyInGameWidget;
 var private GFxObject               Notification;
 
+var private String NotificationHeaderText;
+var private String NotificationLeftText;
+var private String NotificationRightText;
+var private int    NotificationPercent;
+
+var private int    WaitingGRI;
+
 replication
 {
 	if (bNetInitial && Role == ROLE_Authority)
-		LogLevel, ReplaceMode, PreloadContent, ForcePreloadContent, SyncSize;
+		LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
 }
 
 public simulated function bool SafeDestroy()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
@@ -37,41 +47,43 @@ public function PrepareSync(
 	Array<class<KFWeaponDefinition> > _RemoveItems,
 	Array<class<KFWeaponDefinition> > _AddItems,
 	bool _ReplaceMode,
-	bool _PreloadContent,
+	bool _RemoveHRG,
-	bool _ForcePreloadContent)
+	bool _RemoveDLC)
 {
+	`Log_Trace();
+	
 	CTI                 = _CTI;
 	LogLevel            = _LogLevel;
 	RemoveItems         = _RemoveItems;
 	AddItems            = _AddItems;
 	ReplaceMode         = _ReplaceMode;
-	PreloadContent      = _PreloadContent;
+	RemoveHRG           = _RemoveHRG;
-	ForcePreloadContent = _ForcePreloadContent;
+	RemoveDLC           = _RemoveDLC;
 	SyncSize            = RemoveItems.Length + AddItems.Length;
 }
 
-private simulated function PlayerController GetPlayerController()
+private simulated function KFPlayerController GetKFPC()
 {
-	local PlayerController PC;
+	`Log_Trace();
 	
-	PC = PlayerController(Owner);
+	if (KFPC != None) return KFPC;
 	
-	if (PC == None && ROLE < ROLE_Authority)
+	KFPC = KFPlayerController(Owner);
+	
+	if (KFPC == None && ROLE < ROLE_Authority)
 	{
-		PC = GetALocalPlayerController();
+		KFPC = KFPlayerController(GetALocalPlayerController());
 	}
 	
-	return PC;
+	return KFPC;
 }
 
 private simulated function SetPartyInGameWidget()
 {
-	local KFPlayerController KFPC;
+	`Log_Trace();
 	
-	`Log_Trace(`Location);
+	if (GetKFPC() == None) return;
 	
-	KFPC = KFPlayerController(GetPlayerController());
-	if (KFPC == None) return;
 	if (KFPC.MyGFxManager == None) return;
 	if (KFPC.MyGFxManager.PartyWidget == None) return;
 	
@@ -81,6 +93,8 @@ private simulated function SetPartyInGameWidget()
 
 private simulated function bool CheckPartyInGameWidget()
 {
+	`Log_Trace();
+	
 	if (PartyInGameWidget == None)
 	{
 		SetPartyInGameWidget();
@@ -91,6 +105,8 @@ private simulated function bool CheckPartyInGameWidget()
 
 private simulated function HideReadyButton()
 {
+	`Log_Trace();
+	
 	if (CheckPartyInGameWidget())
 	{
 		PartyInGameWidget.SetReadyButtonVisibility(false);
@@ -99,6 +115,8 @@ private simulated function HideReadyButton()
 
 private simulated function ShowReadyButton()
 {
+	`Log_Trace();
+	
 	if (CheckPartyInGameWidget())
 	{
 		Notification.SetVisible(false);
@@ -108,15 +126,17 @@ private simulated function ShowReadyButton()
 	}
 }
 
-private reliable client function UpdateNotification(String Title, String Downloading, String Remainig, int Percent)
+private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
 {
+	`Log_Trace();
+	
 	if (CheckPartyInGameWidget() && Notification != None)
 	{
 		Notification.SetString("itemName", Title);
 		Notification.SetFloat("percent", Percent);
 		Notification.SetInt("queue", 0);
-		Notification.SetString("downLoading", Downloading);
+		Notification.SetString("downLoading", Left);
-		Notification.SetString("remaining", Remainig);
+		Notification.SetString("remaining", Right);
 		Notification.SetObject("notificationInfo", Notification);
 		Notification.SetVisible(true);
 	}
@@ -124,16 +144,21 @@ private reliable client function UpdateNotification(String Title, String Downloa
 
 private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 
 	if (WeapDef == None)
 	{
 		`Log_Fatal("WeapDef is:" @ WeapDef);
+		Cleanup();
+		ConsoleCommand("Disconnect");
 		SafeDestroy();
 		return;
 	}
 	
-	HideReadyButton();
+	if (!IsTimerActive(nameof(KeepNotification)))
+	{
+		SetTimer(0.1f, true, nameof(KeepNotification));
+	}
 	
 	if (Remove)
 	{
@@ -142,53 +167,98 @@ private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, o
 	else
 	{
 		AddItems.AddItem(WeapDef);
-		if (PreloadContent)
-		{
-			Helper.static.PreloadWeapon(WeapDef);
-		}
 	}
 	
 	Recieved = RemoveItems.Length + AddItems.Length;
 	
-	UpdateNotification(
+	NotificationHeaderText  = (Remove ? "-" : "+") @ WeapDef.static.GetItemName();
-		"Sync items, please wait...",
+	NotificationLeftText    = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
-		Remove ? "-" : "+" @ Repl(String(WeapDef), "KFWeapDef_", ""),
+	NotificationRightText   = Recieved @ "/" @ SyncSize;
-		Recieved @ "/" @ SyncSize,
+	if (SyncSize != 0)
-		(float(Recieved) / float(SyncSize)) * 100);
+	{
+		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
+	}
+	
+	`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
 	
 	ServerSync();
 }
 
-private simulated reliable client function SyncFinished()
+private simulated function KeepNotification()
+{
+	HideReadyButton();
+	UpdateNotification(
+		NotificationHeaderText,
+		NotificationLeftText,
+		NotificationRightText,
+		NotificationPercent);
+}
+
+private simulated reliable client function ClientSyncFinished()
 {
 	local KFGameReplicationInfo KFGRI;
 
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
-	if (WorldInfo == None || WorldInfo.GRI == None)
+	NotificationLeftText  = "";
+	NotificationRightText = "";
+	NotificationPercent   = 0;
+	
+	if (WorldInfo.GRI == None)
 	{
-		SetTimer(1.0f, false, nameof(SyncFinished));
+		`Log_Debug("ClientSyncFinished: Waiting GRI");
+		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
+		NotificationLeftText   = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
+		NotificationRightText  = "";
+		SetTimer(1.0f, false, nameof(ClientSyncFinished));
 		return;
 	}
 	
 	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
 	if (KFGRI == None)
 	{
-		`Log_Fatal("Incompatible Replication info:" @ WorldInfo.GRI);
+		`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
+		ClearTimer(nameof(KeepNotification));
+		UpdateNotification(
+			LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI),
+			LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0);
+		Cleanup();
+		ConsoleCommand("Disconnect");
 		SafeDestroy();
 		return;
 	}
 	
-	Helper.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode);
+	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished);
+	NotificationLeftText   = "";
+	NotificationRightText  = "";
+	NotificationPercent    = 0;
 
+	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
+	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
+
+	ClearTimer(nameof(KeepNotification)); 
 	ShowReadyButton();
 	
+	Cleanup();
+	
 	SafeDestroy();
 }
 
+private reliable server function Cleanup()
+{
+	`Log_Trace();
+	
+	`Log_Debug("Cleanup");
+	if (!CTI.DestroyRepInfo(Controller(Owner)))
+	{
+		`Log_Debug("Cleanup (forced)");
+		SafeDestroy();
+	}
+}
+
 public reliable server function ServerSync()
 {
-	`Log_Trace(`Location);
+	`Log_Trace();
 	
 	PendingSync = false;
 	
@@ -196,119 +266,24 @@ public reliable server function ServerSync()
 	
 	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
 	{
-		if (ForcePreloadContent)
+		`Log_Debug("ServerSync: Finished");
-		{
+		ClientSyncFinished();
-			PreloadContentWorkaround();
-		}
-		
-		SyncFinished();
-		
-		if (!CTI.DestroyRepLink(Controller(Owner)))
-		{
-			SafeDestroy();
-		}
 	}
 	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);
 		}
 	}
 }
 
-private function PreloadContentWorkaround()
-{
-	local PlayerController PC;
-	local Pawn P;
-	local KFInventoryManager KFIM;
-	local class<Weapon> CW;
-	local Weapon W;
-	local int Index;
-	local DroppedPickup DP;
-	local float Time;
-	
-	`Log_Trace(`Location);
-
-	HideReadyButton();
-	PC = GetPlayerController();
-	
-	if (PC == None)
-	{
-		SetTimer(0.1f, false, nameof(PreloadContentWorkaround));
-		return;
-	}
-	
-	P = PC.Pawn;
-	if (P == None)
-	{
-		SetTimer(0.1f, false, nameof(PreloadContentWorkaround));
-		return;
-	}
-	
-	KFIM = KFInventoryManager(P.InvManager);
-	if (KFIM == None)
-	{
-		SetTimer(0.1f, false, nameof(PreloadContentWorkaround));
-		return;
-	}
-
-	KFIM.bInfiniteWeight = true;
-	Time = WorldInfo.TimeSeconds - 1.0f;
-
-	for (Index = 0; Index < AddItems.Length; Index++)
-	{
-		HideReadyButton();
-		UpdateNotification(
-			"Game isn't frozen, Don't panic",
-			"Preload content:",
-			Index @ "/" @ AddItems.Length,
-			(float(Index) / float(AddItems.Length)) * 100);
-		
-		CW = class<Weapon> (DynamicLoadObject(AddItems[Index].default.WeaponClassPath, class'Class'));
-		if (CW != None && Weapon(P.FindInventoryType(CW)) == None)
-		{
-			P.CreateInventory(CW);
-		}
-	}
-	
-	HideReadyButton();
-	UpdateNotification("Cleanup", "", "", 0);
-			
-	foreach KFIM.InventoryActors(class'Weapon', W)
-	{
-		if (W != None)
-		{
-			KFIM.PendingWeapon = W;
-			KFIM.ChangedWeapon();
-			if (W.CanThrow())
-			{
-				P.TossInventory(W);
-				W.Destroy();
-			}
-		}
-	}
-	
-	HideReadyButton();
-	UpdateNotification("Cleanup", "", "", 0);
-	
-	foreach WorldInfo.DynamicActors(class'DroppedPickup', DP)
-	{
-		if (DP.Instigator == P && DP.CreationTime > Time)
-		{
-			DP.Destroy();
-		}
-	}
-	
-	KFIM.bInfiniteWeight = false;
-	
-	`Log_Info("Force Preload Finished (" $ PC.PlayerReplicationInfo.PlayerName $ ")");
-}
-
 defaultproperties
 {
 	bAlwaysRelevant               = false
@@ -317,4 +292,7 @@ defaultproperties
 	
 	PendingSync = false
 	Recieved    = 0
+	
+	NotificationPercent    = 0
+	WaitingGRI             = 0
 }

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_G36C.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_G36C extends KFWeapDef_G36C
+	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_HVStormCannon.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_HVStormCannon extends KFWeapDef_HVStormCannon
+	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_Scythe.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_Scythe extends KFWeapDef_Scythe
+	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_ZedMKIII.uc

@@ -0,0 +1,7 @@
+class CTI_WeapDef_ZedMKIII extends KFWeapDef_ZedMKIII
+	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,83 +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;
-}
-
-public static simulated function PreloadContent(Array<class<KFWeaponDefinition> > WeapDefs)
-{
-	local class<KFWeaponDefinition> WeapDef;
-	
-	foreach WeapDefs(WeapDef)
-	{
-		PreloadWeapon(WeapDef);
-	}
-}
-
-public static simulated function PreloadWeapon(class<KFWeaponDefinition> WeapDef)
-{
-	local class<KFWeapon> KFW;
-	
-	KFW = class<KFWeapon> (DynamicLoadObject(WeapDef.default.WeaponClassPath, class'Class'));
-	if (KFW != None)
-	{
-		// This doesn't seem to have any effect right now,
-		// so we're forced to use a workaround: CTI_RepInfo.PreloadContentWorkaround()
-		// But I still leave it for the future
-		// in the hope that someday we can preload weapon models using this function
-		class'KFWeapon'.static.TriggerAsyncContentLoad(KFW);
-	}
-}
-
-defaultproperties
-{
-	
-}

CTI/Classes/KFW_Access.uc

@@ -0,0 +1,12 @@
+class KFW_Access extends Object
+	within KFWeapon;
+
+public function KFW_StartLoadWeaponContent()
+{
+	StartLoadWeaponContent();
+}
+
+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

@@ -3,6 +3,8 @@ class RemoveItems extends Object
 	config(CTI);
 
 var public  config bool bAll;
+var public  config bool bHRG;
+var public  config bool bDLC;
 var private config Array<String> Item;
 
 public static function InitConfig(int Version, int LatestVersion)
@@ -12,6 +14,10 @@ public static function InitConfig(int Version, int LatestVersion)
 		case `NO_CONFIG:
 			ApplyDefault();
 			
+		case 2:
+			default.bHRG = false;
+			default.bDLC = false;
+			
 		default: break;
 	}
 	
@@ -24,6 +30,8 @@ public static function InitConfig(int Version, int LatestVersion)
 private static function ApplyDefault()
 {
 	default.bAll = false;
+	default.bHRG = false;
+	default.bDLC = false;
 	default.Item.Length = 0;
 	default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
 }
@@ -31,7 +39,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;
 	
@@ -42,23 +51,44 @@ public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLeve
 	}
 	else
 	{
+		if (default.bHRG)
+		{
+			`Log_Info("Remove all HRG items");
+		}
+		if (default.bDLC)
+		{
+			`Log_Info("Remove all DLC items");
+		}
+		
 		foreach default.Item(ItemRaw, Line)
 		{
-			ItemClass = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+			ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-			if (ItemClass == None)
+			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_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,165 @@
+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,
+	bool RemoveHRG,
+	bool RemoveDLC,
+	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
+			&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
+			&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_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,199 @@
+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.Add(class'CTI_WeapDef_AutoTurret')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_HVStormCannon')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Mine_Reconstructor')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Minigun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_MosinNagant')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ParasiteImplanter')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_DualG18')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_G18C')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Rifle_FrostShotgunAxe')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Scythe')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ShrinkRayGun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ZedMKIII')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander')
+}

CTI/Classes/_Logger.uc

@@ -4,6 +4,7 @@ class _Logger extends Object
 enum E_LogLevel
 {
 	LL_WrongLevel,
+	LL_None,
 	LL_Fatal,
 	LL_Error,
 	LL_Warning,

CTI/Logger.uci

@@ -1,6 +1,8 @@
 // Logger
 `define Log_Tag 'CTI'
 
+`define LocationStatic        "`{ClassName}::" $ GetFuncName()
+
 `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)
@@ -8,4 +10,6 @@
 `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_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

@@ -1,51 +1,84 @@
+[img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory[/img] [img]https://img.shields.io/steam/downloads/2830826239[/img] [img]https://img.shields.io/steam/favorites/2830826239[/img] [img]https://img.shields.io/steam/update-date/2830826239[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2830826239][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory[/img][/url]
+
 [h1]Features[/h1]
-- remove and/or add items;
+[list]
-- unlock DLC weapons;
+[*]remove/add items to trader;
-- correct items sorting (by price);
+[*]can preload weapon models (no lags when someone buys weapons);
-- can preload content (no lags during trader time);
+[*]unlock DLC weapons;
-- don't have to worry about adding new guns after each Tripware update.
+[*]correct items sorting (by price);
+[*]don't have to worry about adding new guns after each KF2 update.
+[/list]
 
 [h1]Whitelisted?[/h1]
-No. This mod is not whitelisted and will unrank your server. Any XP gained will not be saved.
+No. This mod is not whitelisted and will de-rank your server. Any XP gained will not be saved.
 
 [h1]Usage (single player)[/h1]
-1. Subscribe to this mutator;
+[olist]
-2. Start KF2; 
+[*]Subscribe to this mutator;
-3. Open console (`) and input:
+[*]Start KF2; 
+[*]Open console (~) and input:
 [b]open KF-BioticsLab?Mutator=CTI.CTIMut[/b]
 (replace the map and add the parameters you need)
-4. <Enter>.
+[*]<Enter>.
-
+[/olist]
 [h1]Usage (server)[/h1]
 [b]Note:[/b] [i]If you don't understand what is written here, read the article [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server (KF2 wiki)[/u][/url] before following these instructions.[/i]
-
+[olist]
-1. Open your [b]PCServer-KFEngine.ini[/b] / [b]LinuxServer-KFEngine.ini[/b];
+[*]Open your [b]PCServer-KFEngine.ini[/b] / [b]LinuxServer-KFEngine.ini[/b];
-2. Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
+[*]Find the [b][IpDrv.TcpNetDriver][/b] section and make sure that there is a line (add if not):
+[b]DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload[/b]
+❗️ If there are several [b]DownloadManagers=[/b] then the line above should be the first ❗️
+[*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
 [b]ServerSubscribedWorkshopItems=2830826239[/b]
-3. Start the server and wait while the mutator is downloading;
+[*]Start the server and wait while the mutator is downloading;
-4. Add mutator to server start parameters: [b]?Mutator=CTI.CTIMut[/b] and restart the server.
+[*]Add mutator to server start parameters: [b]?Mutator=CTI.CTIMut[/b] and restart the server.
+[/olist]
 
-[h1]Note[/h1]
+[h1]Important setup information[/h1]
+The config should be created on first start, but now the game contains a bug that initializes the config values ​​randomly if they are not explicitly set. Thus, the config may have incorrect values ​​or not be created at all.
+So if you are using this mutator for the first time, I highly recommend doing the following:
+[olist]
+[*]Create (modify) [b]KFCTI.ini[/b] manually. Put the following content there:
+[b][CTI.CTI]
+Version=0[/b]
+[*]Start the game/server with CTI to generate the contents of the config.
+[*]Close the game/server.
+[/olist]
+[b]Right now this is the only way to correctly create the default config.[/b]
+Unfortunately I can't do anything about it because it's a game problem (not mutator). I hope TWI fixes this someday.
+
+[h1]Setup (KFCTI.ini)[/h1]
+[list]
+[*]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:
+[list]
+[*][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.
+[/list]
+
+[*]Use [b][CTI.RemoveItems][/b] to remove items from the trader inventory.
+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).
+[*]Set [b]bHRG=True[/b] to remove HRG items.
+[*]Set [b]bDLC=True[/b] to remove DLC items.
+
+[*]Use [b][CTI.AddItems][/b] to add items to the trader inventory.
+example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
+[/list]
+
+❗️ Note that if you need an empty list anywhere (for example, you don't want to delete some of the traders's weapons), leave at least one line there:
+[b]Item=""[/b]
+This is necessary to explicitly initialize the list (because of the bug I wrote about above) to avoid initialization with random values.
+
+[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).
 
-[h1]Setup (KFCTI.ini)[/h1]
-Config will be created at the first start.
-
-Set [b]UnlockDLC=True[/b] to allow all players to buy DLC weapons.
-
-Set [b]bForcePreloadContent=True[/b] to preload weapon models and have no lags during trader time.
-
-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).
-
-Use [b][CTI.AddItems][/b] to add items to the trader inventory.
-For example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
-
-[h1]Example config(s)[/h1]
-🔗 [url=https://steamcommunity.com/workshop/filedetails/discussion/2830826239/3409804177172972154/]Reinforcement Weapon Pack[/url]
-🔗 [url=https://steamcommunity.com/workshop/filedetails/discussion/2830826239/3409804177173363434/]Warface Arsenal[/url]
-
 [h1]Sources[/h1]
-[url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] (GNU GPLv3)
+[url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]

README.md

@@ -1,7 +1,7 @@
 # Custom Trader Inventory
 
 [![Steam Workshop](https://img.shields.io/static/v1?message=workshop&logo=steam&labelColor=gray&color=blue&logoColor=white&label=steam%20)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
-[![Steam Subscriptions](https://img.shields.io/steam/subscriptions/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
+[![Steam Downloads](https://img.shields.io/steam/downloads/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
 [![Steam Favorites](https://img.shields.io/steam/favorites/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
 [![Steam Update Date](https://img.shields.io/steam/update-date/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory)](https://github.com/GenZmeY/KF2-CustomTraderInventory/tags)
@@ -11,10 +11,10 @@
 Add/Remove Items in the Trader's Inventory  
 
 # Features
-- remove and/or add items;
+- remove/add items to trader;
+- can preload weapon models (no lags when buying weapons);
 - unlock DLC weapons;
 - correct items sorting (by price);
-- can preload content (no lags during trader time);
 - don't have to worry about adding new guns after each Tripware update.
 
 # Usage & Setup

builder.cfg

@@ -11,6 +11,15 @@ StripSource="True"
 PackageBuildOrder="CTI"
 
 
+### Brew parameters ###
+
+# Packages you want to brew using @peelz's patched KFEditor.
+# Useful for cases where regular brew doesn't put *.upk inside the package.
+# Specify them with a space as a separator,
+# The order doesn't matter 
+PackagePeelzBrew=""
+
+
 ### Steam Workshop upload parameters ###
 
 # Mutators that will be uploaded to the workshop
@@ -30,7 +39,7 @@ Map="KF-Nuked"
 # Endless:        KFGameContent.KFGameInfo_Endless
 # Objective:      KFGameContent.KFGameInfo_Objective
 # Versus:         KFGameContent.KFGameInfo_VersusSurvival
-Game="KFGameContent.KFGameInfo_Endless"
+Game="KFGameContent.KFGameInfo_Survival"
 
 # Difficulty:
 # Normal:         0