Merge pull request #11 from GenZmeY/skins

Apply weapon skins for replaced DLCs

.github/workflows/mega-linter.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: MegaLinter
         id: ml
-        uses: oxsecurity/megalinter@v6
+        uses: oxsecurity/megalinter@v7
         env:
           VALIDATE_ALL_CODEBASE: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -68,5 +68,5 @@ jobs:
         with:
           branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
           commit_message: "[MegaLinter] Apply linters fixes"
-          commit_user_name: megalinter-bot
-          commit_user_email: nicolas.vuillamy@ox.security
+          commit_user_name: "github-actions"
+          commit_user_email: "github-actions[bot]@users.noreply.github.com"

CTI/Classes/CTI.uc

@@ -1,7 +1,7 @@
 class CTI extends Info
 	config(CTI);
 
-const LatestVersion = 3;
+const LatestVersion = 4;
 
 const CfgRemoveItems     = class'RemoveItems';
 const CfgAddItems        = class'AddItems';
@@ -22,10 +22,12 @@ var private config E_LogLevel LogLevel;
 var private config String     UnlockDLC;
 var private config bool       bPreloadContent;
 var private config bool       bOfficialWeaponsList;
+var private config bool       bDisableItemLimitCheck;
 
-var private KFGameInfo KFGI;
+var private KFGameInfo            KFGI;
 var private KFGameReplicationInfo KFGRI;
 
+var private Array<class<KFWeaponDefinition> > WeapDefs;
 var private Array<class<KFWeaponDefinition> > RemoveItems;
 var private Array<class<KFWeaponDefinition> > AddItems;
 
@@ -33,7 +35,18 @@ var private Array<CTI_RepInfo> RepInfos;
 
 var private bool ReadyToSync;
 
-var private Array<S_PreloadContent> PreloadContent;
+// To bypass "Booleans may not be out parameters" error
+struct BoolWrapper
+{
+	var bool Value;
+
+	structdefaultproperties
+	{
+		Value = false
+	}
+};
+
+var private BoolWrapper DLCSkinUpdateRequired;
 
 public simulated function bool SafeDestroy()
 {
@@ -95,6 +108,8 @@ private function PreInit()
 			bOfficialWeaponsList = false;
 
 		case 2:
+		case 3:
+			bDisableItemLimitCheck = false;
 
 		case MaxInt:
 			`Log_Info("Config updated to version" @ LatestVersion);
@@ -129,7 +144,7 @@ private function PreInit()
 
 	if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
 	{
-		`Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)");
+		`Log_Warn("Wrong 'UnlockDLC' value (" $ UnlockDLC $ "), return to default value (False)");
 		UnlockDLC = "False";
 		SaveConfig();
 	}
@@ -172,10 +187,11 @@ private function PostInit()
 		return;
 	}
 
-	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel))
+	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel))
 	{
 		`Log_Info("DLC unlocked");
 	}
+	`Log_Debug("DLCSkinUpdateRequired:" @ String(DLCSkinUpdateRequired.Value));
 
 	if (bPreloadContent)
 	{
@@ -189,34 +205,35 @@ private function PostInit()
 		CfgRemoveItems.default.bAll,
 		CfgRemoveItems.default.bHRG,
 		CfgRemoveItems.default.bDLC,
+		bDisableItemLimitCheck,
 		LogLevel);
 
+	WeapDefs = Trader.static.GetTraderWeapDefs(KFGRI, LogLevel);
+
 	ReadyToSync = true;
 
 	foreach RepInfos(RepInfo)
 	{
 		if (RepInfo.PendingSync)
 		{
-			RepInfo.ServerSync();
+			RepInfo.Replicate(WeapDefs);
 		}
 	}
 }
 
-private function Preload(Array<class<KFWeaponDefinition> > Content)
+private function Preload(const out Array<class<KFWeaponDefinition> > Content)
 {
-	local Array<class<KFWeapon> > OfficialWeapons;
+	local Array<S_PreloadContent> PreloadContent;
 	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)
+			if (SPC.KFWC.GetPackageName() == 'CTI' || SPC.KFWC.GetPackageName() == 'KFGameContent')
 			{
 				`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
 				continue;
@@ -271,26 +288,19 @@ public function bool CreateRepInfo(Controller C)
 
 	`Log_Trace();
 
-	if (C == None) return false;
+	if (C == None || KFPlayerController(C) == None) return false;
 
 	RepInfo = Spawn(class'CTI_RepInfo', C);
 
 	if (RepInfo == None) return false;
 
-	RepInfo.PrepareSync(
-		Self,
-		LogLevel,
-		RemoveItems,
-		AddItems,
-		CfgRemoveItems.default.bAll,
-		CfgRemoveItems.default.bHRG,
-		CfgRemoveItems.default.bDLC);
+	RepInfo.PrepareSync(Self, KFPlayerController(C), LogLevel, DLCSkinUpdateRequired.Value);
 
 	RepInfos.AddItem(RepInfo);
 
 	if (ReadyToSync)
 	{
-		RepInfo.ServerSync();
+		RepInfo.Replicate(WeapDefs);
 	}
 	else
 	{

CTI/Classes/CTI_LocalMessage.uc

@@ -16,13 +16,17 @@ var private localized String IncompatibleGRIWarning;
 var const             String SecondsShortDefault;
 var private localized String SecondsShort;
 
+var const             String PleaseWaitDefault;
+var private localized String PleaseWait;
+
 enum E_CTI_LocalMessageType
 {
 	CTI_SyncItems,
 	CTI_WaitingGRI,
 	CTI_IncompatibleGRI,
 	CTI_IncompatibleGRIWarning,
-	CTI_SecondsShort
+	CTI_SecondsShort,
+	CTI_PleaseWait
 };
 
 public static function String GetLocalizedString(
@@ -50,6 +54,9 @@ public static function String GetLocalizedString(
 
 		case CTI_SecondsShort:
 			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
+
+		case CTI_PleaseWait:
+			return (default.PleaseWait != "" ? default.PleaseWait : default.PleaseWaitDefault);
 	}
 
 	return "";
@@ -62,4 +69,5 @@ defaultproperties
 	IncompatibleGRIDefault        = "Incompatible GRI:"
 	IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
 	SecondsShortDefault           = "s"
+	PleaseWaitDefault             = "Please wait"
 }

CTI/Classes/CTI_RepInfo.uc

@@ -1,23 +1,28 @@
-class CTI_RepInfo extends ReplicationInfo;
+class CTI_RepInfo extends ReplicationInfo
+	dependson(WeaponReplacements);
+
+const CAPACITY = 64; // max: 128
 
 const Trader       = class'Trader';
 const LocalMessage = class'CTI_LocalMessage';
+const Replacements = class'WeaponReplacements';
+
+struct ReplicationStruct
+{
+	var int Size;
+	var int Transfered;
+
+	var class<KFWeaponDefinition> Items[CAPACITY];
+	var int Length;
+};
 
 var public  bool PendingSync;
 
 var private CTI CTI;
 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 int  Recieved;
-var private int  SyncSize;
 
 var private KFPlayerController      KFPC;
+var private KFPlayerReplicationInfo KFPRI;
 var private KFGFxWidget_PartyInGame PartyInGameWidget;
 var private GFxObject               Notification;
 
@@ -29,10 +34,15 @@ var private int    NotificationPercent;
 var private int    WaitingGRI;
 var private int    WaitingGRILimit;
 
+var private ReplicationStruct                 RepData;
+var private Array<class<KFWeaponDefinition> > RepArray;
+
+var private bool SkinUpdateRequired;
+
 replication
 {
 	if (bNetInitial && Role == ROLE_Authority)
-		LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
+		LogLevel, SkinUpdateRequired;
 }
 
 public simulated function bool SafeDestroy()
@@ -42,25 +52,144 @@ public simulated function bool SafeDestroy()
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
 
-public function PrepareSync(
-	CTI _CTI,
-	E_LogLevel _LogLevel,
-	Array<class<KFWeaponDefinition> > _RemoveItems,
-	Array<class<KFWeaponDefinition> > _AddItems,
-	bool _ReplaceMode,
-	bool _RemoveHRG,
-	bool _RemoveDLC)
+public function Replicate(const out Array<class<KFWeaponDefinition> > WeapDefs)
 {
 	`Log_Trace();
 
-	CTI                 = _CTI;
-	LogLevel            = _LogLevel;
-	RemoveItems         = _RemoveItems;
-	AddItems            = _AddItems;
-	ReplaceMode         = _ReplaceMode;
-	RemoveHRG           = _RemoveHRG;
-	RemoveDLC           = _RemoveDLC;
-	SyncSize            = RemoveItems.Length + AddItems.Length;
+	RepArray = WeapDefs;
+	RepData.Size = RepArray.Length;
+
+	if (WorldInfo.NetMode == NM_StandAlone)
+	{
+		Progress(RepArray.Length, RepArray.Length);
+		return;
+	}
+
+	Sync();
+}
+
+private reliable server function Sync()
+{
+	local int  LocalIndex;
+	local int  GlobalIndex;
+
+	`Log_Trace();
+
+	LocalIndex = 0;
+	GlobalIndex = RepData.Transfered;
+
+	while (LocalIndex < CAPACITY && GlobalIndex < RepData.Size)
+	{
+		RepData.Items[LocalIndex++] = RepArray[GlobalIndex++];
+	}
+
+	if (RepData.Transfered == GlobalIndex) return; // Finished
+
+	RepData.Transfered = GlobalIndex;
+	RepData.Length = LocalIndex;
+
+	Send(RepData);
+
+	Progress(RepData.Transfered, RepData.Size);
+}
+
+private reliable client function Send(ReplicationStruct RD)
+{
+	local int LocalIndex;
+
+	`Log_Trace();
+
+	for (LocalIndex = 0; LocalIndex < RD.Length; LocalIndex++)
+	{
+		RepArray.AddItem(RD.Items[LocalIndex]);
+	}
+
+	Progress(RD.Transfered, RD.Size);
+
+	Sync();
+}
+
+public function PrepareSync(CTI _CTI, KFPlayerController _KFPC, E_LogLevel _LogLevel, bool _SkinUpdateRequired)
+{
+	`Log_Trace();
+
+	CTI                = _CTI;
+	KFPC               = _KFPC;
+	LogLevel           = _LogLevel;
+	SkinUpdateRequired = _SkinUpdateRequired;
+}
+
+private simulated function Progress(int Value, int Size)
+{
+	`Log_Trace();
+
+	`Log_Debug("Replicated:" @ Value @ "/" @ Size);
+
+	if (ROLE < ROLE_Authority)
+	{
+		NotifyProgress(Value, Size);
+		if (Value >= Size) Finished();
+	}
+}
+
+private simulated function Finished()
+{
+	local KFGameReplicationInfo KFGRI;
+
+	`Log_Trace();
+
+	if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
+	{
+		`Log_Debug("Finished: Waiting GRI" @ WaitingGRI);
+		NotifyWaitingGRI();
+		SetTimer(1.0f, false, nameof(Finished));
+		return;
+	}
+
+	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
+	if (KFGRI != None)
+	{
+		`Log_Debug("Finished: Trader.static.OverwriteTraderItems");
+		Trader.static.OverwriteTraderItems(KFGRI, RepArray, LogLevel);
+		`Log_Info("Trader items successfully synchronized!");
+	}
+	else
+	{
+		`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
+		NotifyIncompatibleGRI();
+	}
+
+	ShowReadyButton();
+
+	if (SkinUpdateRequired)
+	{
+		SetTimer(1.0f, true, nameof(UpdateSkinsDLC));
+	}
+	else
+	{
+		ClientCleanup();
+	}
+}
+
+private simulated function UpdateSkinsDLC()
+{
+	local SWeapReplace WeapReplace;
+
+	`Log_Debug("Wait for spawn");
+	if (GetKFPRI() != None && KFPRI.bHasSpawnedIn)
+	{
+		foreach Replacements.default.DLC(WeapReplace)
+		{
+			if (WeapReplace.WeapParent.default.SkinItemId > 0 && WeapReplace.Weap.default.SkinItemId != WeapReplace.WeapParent.default.SkinItemId)
+			{
+				`Log_Debug("Update skin for:" @ String(WeapReplace.WeapDef) @ "SkinId:" @ WeapReplace.WeapParent.default.SkinItemId);
+				class'KFWeaponSkinList'.static.SaveWeaponSkin(WeapReplace.WeapDef, WeapReplace.WeapParent.default.SkinItemId);
+			}
+		}
+
+		ClearTimer(nameof(UpdateSkinsDLC));
+		ClientCleanup();
+	}
 }
 
 private simulated function KFPlayerController GetKFPC()
@@ -79,6 +208,19 @@ private simulated function KFPlayerController GetKFPC()
 	return KFPC;
 }
 
+private simulated function KFPlayerReplicationInfo GetKFPRI()
+{
+	`Log_Trace();
+
+	if (KFPRI != None) return KFPRI;
+
+	if (GetKFPC() == None) return None;
+
+	KFPRI = KFPlayerReplicationInfo(KFPC.PlayerReplicationInfo);
+
+	return KFPRI;
+}
+
 public reliable client function WriteToChatLocalized(
 	E_CTI_LocalMessageType LMT,
 	optional String HexColor,
@@ -151,6 +293,8 @@ private simulated function ShowReadyButton()
 {
 	`Log_Trace();
 
+	ClearTimer(nameof(KeepNotification));
+
 	if (CheckPartyInGameWidget())
 	{
 		Notification.SetVisible(false);
@@ -176,48 +320,6 @@ private simulated function UpdateNotification(String Title, String Left, String
 	}
 }
 
-private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
-{
-	`Log_Trace();
-
-	if (WeapDef == None)
-	{
-		`Log_Fatal("WeapDef is:" @ WeapDef);
-		Cleanup();
-		ConsoleCommand("Disconnect");
-		SafeDestroy();
-		return;
-	}
-
-	if (!IsTimerActive(nameof(KeepNotification)))
-	{
-		SetTimer(0.1f, true, nameof(KeepNotification));
-	}
-
-	if (Remove)
-	{
-		RemoveItems.AddItem(WeapDef);
-	}
-	else
-	{
-		AddItems.AddItem(WeapDef);
-	}
-
-	Recieved = RemoveItems.Length + AddItems.Length;
-
-	NotificationHeaderText  = (Remove ? "-" : "+") @ WeapDef.static.GetItemName();
-	NotificationLeftText    = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
-	NotificationRightText   = Recieved @ "/" @ SyncSize;
-	if (SyncSize != 0)
-	{
-		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
-	}
-
-	`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
-
-	ServerSync();
-}
-
 private simulated function KeepNotification()
 {
 	HideReadyButton();
@@ -228,91 +330,61 @@ private simulated function KeepNotification()
 		NotificationPercent);
 }
 
-private simulated reliable client function ClientSyncFinished()
+private simulated function ClientCleanup()
 {
-	local KFGameReplicationInfo KFGRI;
-
-	`Log_Trace();
-
-	if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
-	{
-		`Log_Debug("ClientSyncFinished: Waiting GRI" @ WaitingGRI);
-		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
-		NotificationLeftText   = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
-		NotificationRightText  = "";
-		NotificationPercent    = 0;
-		SetTimer(1.0f, false, nameof(ClientSyncFinished));
-		return;
-	}
-
-	NotificationHeaderText = "";
-	NotificationLeftText   = "";
-	NotificationRightText  = "";
-	NotificationPercent    = 0;
-
-	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
-	if (KFGRI != None)
-	{
-		`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
-		Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
-	}
-	else
-	{
-		`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
-		WriteToChatLocalized(
-			CTI_IncompatibleGRI,
-			class'KFLocalMessage'.default.InteractionColor,
-			WorldInfo.GRI == None ? "None" : String(WorldInfo.GRI.class));
-		WriteToChatLocalized(
-			CTI_IncompatibleGRIWarning,
-			class'KFLocalMessage'.default.InteractionColor);
-	}
-
-	ClearTimer(nameof(KeepNotification));
-	ShowReadyButton();
-
-	Cleanup();
+	ServerCleanup();
 	SafeDestroy();
 }
 
-private reliable server function Cleanup()
+private reliable server function ServerCleanup()
 {
 	`Log_Trace();
 
 	`Log_Debug("Cleanup");
-	if (!CTI.DestroyRepInfo(Controller(Owner)))
+	if (!CTI.DestroyRepInfo(GetKFPC()))
 	{
 		`Log_Debug("Cleanup (forced)");
 		SafeDestroy();
 	}
 }
 
-public reliable server function ServerSync()
+private simulated function NotifyWaitingGRI()
 {
-	`Log_Trace();
-
-	PendingSync = false;
-
-	if (bPendingDelete || bDeleteMe) return;
-
-	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
+	if (!IsTimerActive(nameof(KeepNotification)))
 	{
-		`Log_Debug("ServerSync: Finished");
-		ClientSyncFinished();
+		SetTimer(0.1f, true, nameof(KeepNotification));
 	}
-	else
+
+	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
+	NotificationLeftText   = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
+	NotificationRightText  = LocalMessage.static.GetLocalizedString(LogLevel, CTI_PleaseWait);
+	NotificationPercent    = 0;
+	KeepNotification();
+}
+
+private simulated function NotifyProgress(int Value, int Size)
+{
+	if (!IsTimerActive(nameof(KeepNotification)))
 	{
-		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);
-		}
+		SetTimer(0.1f, true, nameof(KeepNotification));
 	}
+
+	NotificationHeaderText  = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
+	NotificationLeftText    = Value @ "/" @ Size;
+	NotificationRightText   = LocalMessage.static.GetLocalizedString(LogLevel, CTI_PleaseWait);
+	NotificationPercent     = (float(Value) / float(Size)) * 100;
+	KeepNotification();
+}
+
+private simulated function NotifyIncompatibleGRI()
+{
+	WriteToChatLocalized(
+		CTI_IncompatibleGRI,
+		class'KFLocalMessage'.default.InteractionColor,
+		String(WorldInfo.GRI.class));
+	WriteToChatLocalized(
+		CTI_IncompatibleGRIWarning,
+		class'KFLocalMessage'.default.InteractionColor);
 }
 
 defaultproperties
@@ -322,9 +394,8 @@ defaultproperties
 	bSkipActorPropertyReplication = false
 
 	PendingSync = false
-	Recieved    = 0
 
 	NotificationPercent    = 0
 	WaitingGRI             = 0
-	WaitingGRILimit        = 15
+	WaitingGRILimit        = 30
 }

CTI/Classes/CTI_WeapDef_AutoTurret.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_AutoTurret extends KFWeapDef_AutoTurret
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_AutoTurret'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AutoTurret"
 }

CTI/Classes/CTI_WeapDef_BladedPistol.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_BladedPistol extends KFWeapDef_BladedPistol
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_BladedPistol'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_Bladed"
 }

CTI/Classes/CTI_WeapDef_Blunderbuss.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Blunderbuss extends KFWeapDef_Blunderbuss
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Blunderbuss'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_Blunderbuss"
 }

CTI/Classes/CTI_WeapDef_ChainBat.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_ChainBat extends KFWeapDef_ChainBat
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_ChainBat'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Blunt_ChainBat"
 }

CTI/Classes/CTI_WeapDef_ChiappaRhino.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_ChiappaRhino extends KFWeapDef_ChiappaRhino
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_ChiappaRhino'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_ChiappaRhino"
 }

CTI/Classes/CTI_WeapDef_ChiappaRhinoDual.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_ChiappaRhinoDual extends KFWeapDef_ChiappaRhinoDual
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_ChiappaRhinoDual'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_ChiappaRhinoDual"
 }

CTI/Classes/CTI_WeapDef_CompoundBow.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_CompoundBow extends KFWeapDef_CompoundBow
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_CompoundBow'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Bow_CompoundBow"
 }

CTI/Classes/CTI_WeapDef_Doshinegun.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Doshinegun extends KFWeapDef_Doshinegun
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Doshinegun'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AssaultRifle_Doshinegun"
 }

CTI/Classes/CTI_WeapDef_DualBladed.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_DualBladed extends KFWeapDef_DualBladed
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_DualBladed'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_DualBladed"
 }

CTI/Classes/CTI_WeapDef_FAMAS.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_FAMAS extends KFWeapDef_FAMAS
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_FAMAS'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AssaultRifle_FAMAS"
 }

CTI/Classes/CTI_WeapDef_G18.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_G18 extends KFWeapDef_G18
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_G18'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_SMG_G18"
 }

CTI/Classes/CTI_WeapDef_G36C.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_G36C extends KFWeapDef_G36C
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_G36C'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AssaultRifle_G36C"
 }

CTI/Classes/CTI_WeapDef_GravityImploder.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_GravityImploder extends KFWeapDef_GravityImploder
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_GravityImploder'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_GravityImploder"
 }

CTI/Classes/CTI_WeapDef_HVStormCannon.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_HVStormCannon extends KFWeapDef_HVStormCannon
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_HVStormCannon'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_HVStormCannon"
 }

CTI/Classes/CTI_WeapDef_IonThruster.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_IonThruster extends KFWeapDef_IonThruster
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_IonThruster'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Edged_IonThruster"
 }

CTI/Classes/CTI_WeapDef_Mine_Reconstructor.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Mine_Reconstructor extends KFWeapDef_Mine_Reconstructor
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Mine_Reconstructor'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Mine_Reconstructor"
 }

CTI/Classes/CTI_WeapDef_Minigun.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Minigun extends KFWeapDef_Minigun
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Minigun'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Minigun"
 }

CTI/Classes/CTI_WeapDef_MosinNagant.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_MosinNagant extends KFWeapDef_MosinNagant
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_MosinNagant'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Rifle_MosinNagant"
 }

CTI/Classes/CTI_WeapDef_ParasiteImplanter.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_ParasiteImplanter extends KFWeapDef_ParasiteImplanter
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_ParasiteImplanter'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Rifle_ParasiteImplanter"
 }

CTI/Classes/CTI_WeapDef_Pistol_DualG18.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Pistol_DualG18 extends KFWeapDef_Pistol_DualG18
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Pistol_DualG18'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_DualG18"
 }

CTI/Classes/CTI_WeapDef_Pistol_G18C.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Pistol_G18C extends KFWeapDef_Pistol_G18C
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Pistol_G18C'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_G18C"
 }

CTI/Classes/CTI_WeapDef_Rifle_FrostShotgunAxe.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Rifle_FrostShotgunAxe extends KFWeapDef_Rifle_FrostShotgunAxe
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Rifle_FrostShotgunAxe'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Rifle_FrostShotgunAxe"
 }

CTI/Classes/CTI_WeapDef_Scythe.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Scythe extends KFWeapDef_Scythe
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Scythe'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Edged_Scythe"
 }

CTI/Classes/CTI_WeapDef_Shotgun_S12.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Shotgun_S12 extends KFWeapDef_Shotgun_S12
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Shotgun_S12'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Shotgun_S12"
 }

CTI/Classes/CTI_WeapDef_ShrinkRayGun.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_ShrinkRayGun extends KFWeapDef_ShrinkRayGun
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_ShrinkRayGun'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_ShrinkRayGun"
 }

CTI/Classes/CTI_WeapDef_ThermiteBore.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_ThermiteBore extends KFWeapDef_ThermiteBore
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_ThermiteBore'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_RocketLauncher_ThermiteBore"
 }

CTI/Classes/CTI_WeapDef_ZedMKIII.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_ZedMKIII extends KFWeapDef_ZedMKIII
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_ZedMKIII'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_ZedMKIII"
 }

CTI/Classes/CTI_WeapDef_Zweihander.uc

@@ -1,7 +1,13 @@
 class CTI_WeapDef_Zweihander extends KFWeapDef_Zweihander
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	return class'KFGame.KFWeapDef_Zweihander'.static.GetItemLocalization(KeyName);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Edged_Zweihander"
 }

CTI/Classes/CTI_Weap_AssaultRifle_Doshinegun.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_AssaultRifle_Doshinegun extends KFWeap_AssaultRifle_Doshinegun;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_AssaultRifle_FAMAS.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_AssaultRifle_FAMAS extends KFWeap_AssaultRifle_FAMAS;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_AssaultRifle_G36C.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_AssaultRifle_G36C extends KFWeap_AssaultRifle_G36C;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_AutoTurret.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_AutoTurret extends KFWeap_AutoTurret;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Blunt_ChainBat.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Blunt_ChainBat extends KFWeap_Blunt_ChainBat;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Bow_CompoundBow.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Bow_CompoundBow extends KFWeap_Bow_CompoundBow;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Edged_IonThruster.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Edged_IonThruster extends KFWeap_Edged_IonThruster;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Edged_Scythe.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Edged_Scythe extends KFWeap_Edged_Scythe;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Edged_Zweihander.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Edged_Zweihander extends KFWeap_Edged_Zweihander;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_GravityImploder.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_GravityImploder extends KFWeap_GravityImploder;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_HVStormCannon.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_HVStormCannon extends KFWeap_HVStormCannon;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Mine_Reconstructor.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Mine_Reconstructor extends KFWeap_Mine_Reconstructor;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Minigun.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Minigun extends KFWeap_Minigun;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Pistol_Bladed.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Pistol_Bladed extends KFWeap_Pistol_Bladed;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Pistol_Blunderbuss.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Pistol_Blunderbuss extends KFWeap_Pistol_Blunderbuss;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Pistol_ChiappaRhino.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Pistol_ChiappaRhino extends KFWeap_Pistol_ChiappaRhino;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Pistol_ChiappaRhinoDual.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Pistol_ChiappaRhinoDual extends KFWeap_Pistol_ChiappaRhinoDual;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Pistol_DualBladed.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Pistol_DualBladed extends KFWeap_Pistol_DualBladed;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Pistol_DualG18.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Pistol_DualG18 extends KFWeap_Pistol_DualG18;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Pistol_G18C.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Pistol_G18C extends KFWeap_Pistol_G18C;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Rifle_FrostShotgunAxe.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Rifle_FrostShotgunAxe extends KFWeap_Rifle_FrostShotgunAxe;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Rifle_MosinNagant.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Rifle_MosinNagant extends KFWeap_Rifle_MosinNagant;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Rifle_ParasiteImplanter.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Rifle_ParasiteImplanter extends KFWeap_Rifle_ParasiteImplanter;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_RocketLauncher_ThermiteBore.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_RocketLauncher_ThermiteBore extends KFWeap_RocketLauncher_ThermiteBore;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_SMG_G18.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_SMG_G18 extends KFWeap_SMG_G18;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_Shotgun_S12.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_Shotgun_S12 extends KFWeap_Shotgun_S12;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_ShrinkRayGun.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_ShrinkRayGun extends KFWeap_ShrinkRayGun;
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI_Weap_ZedMKIII.uc

@@ -0,0 +1,6 @@
+class CTI_Weap_ZedMKIII extends KFWeap_ZedMKIII;
+
+defaultproperties
+{
+
+}

CTI/Classes/Trader.uc

@@ -1,6 +1,11 @@
 class Trader extends Object
 	abstract;
 
+// Bug:
+// The wrong weapon is purchased if the index is greater than 256 😡
+// Some greedy guy saved 3 bytes for no reason again
+const ITEMS_LIMIT = 256;
+
 private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
 {
 	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
@@ -22,7 +27,7 @@ public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameRep
 	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)
+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;
@@ -41,7 +46,7 @@ public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optio
 	return KFWeapDefs;
 }
 
-public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+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;
@@ -88,19 +93,18 @@ public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KF
 
 public static simulated function ModifyTrader(
 	KFGameReplicationInfo KFGRI,
-	Array<class<KFWeaponDefinition> > RemoveItems,
-	Array<class<KFWeaponDefinition> > AddItems,
+	const out Array<class<KFWeaponDefinition> > RemoveItems,
+	const out Array<class<KFWeaponDefinition> > AddItems,
 	bool ReplaceMode,
 	bool RemoveHRG,
 	bool RemoveDLC,
+	bool bDisableItemLimitCheck,
 	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();
 
@@ -128,13 +132,44 @@ public static simulated function ModifyTrader(
 
 	WeapDefs.Sort(ByPrice);
 
+	if (!bDisableItemLimitCheck && WeapDefs.Length > ITEMS_LIMIT)
+	{
+		`Log_Warn("The total number of items has reached the limit (" $ ITEMS_LIMIT $ ")," @ (WeapDefs.Length - ITEMS_LIMIT) @ "items will not be added.");
+		`Log_Warn("Excluded items:");
+		for (Index = ITEMS_LIMIT; Index < WeapDefs.Length; ++Index)
+		{
+			`Log_Warn("[" $ Index + 1 $ "]" @ String(WeapDefs[Index]));
+		}
+		WeapDefs.Length = ITEMS_LIMIT;
+	}
+
+	OverwriteTraderItems(KFGRI, WeapDefs, LogLevel);
+}
+
+public static simulated function OverwriteTraderItems(
+	KFGameReplicationInfo KFGRI,
+	const out Array<class<KFWeaponDefinition> > WeapDefs,
+	E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local class<KFWeaponDefinition> WeapDef;
+	local int MaxItemID;
+
+	`Log_TraceStatic();
+
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+
 	TraderItems.SaleItems.Length = 0;
 	MaxItemID = 0;
+
+	`Log_Debug("Trader Items:");
 	foreach WeapDefs(WeapDef)
 	{
 		Item.WeaponDef = WeapDef;
-		Item.ItemID = ++MaxItemID;
+		Item.ItemID = MaxItemID++;
 		TraderItems.SaleItems.AddItem(Item);
+		`Log_Debug("[" $ MaxItemID $ "]" @ String(WeapDef));
 	}
 
 	TraderItems.SetItemsInfo(TraderItems.SaleItems);
@@ -142,7 +177,7 @@ public static simulated function ModifyTrader(
 	KFGRI.TraderItems = TraderItems;
 }
 
-private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
+private static function bool WeaponClassIsUnique(String WeaponClassPath, const out Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
 {
 	local class<KFWeaponDefinition> WeapDef;
 

CTI/Classes/Unlocker.uc

@@ -1,4 +1,5 @@
 class Unlocker extends Object
+	dependson(WeaponReplacements)
 	abstract;
 
 // TODO:
@@ -6,9 +7,8 @@ class Unlocker extends Object
 // without replacing KFGFxMoviePlayer_Manager
 // but how? 🤔
 
-const Trader = class'Trader';
-
-var private const Array<class<KFWeaponDefinition> > WeapDefDLCReplacements;
+const Trader       = class'Trader';
+const Replacements = class'WeaponReplacements';
 
 public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
 {
@@ -33,6 +33,7 @@ public static function bool UnlockDLC(
 	String UnlockType,
 	out Array<class<KFWeaponDefinition> > RemoveItems,
 	out Array<class<KFWeaponDefinition> > AddItems,
+	out BoolWrapper DLCSkinUpdateRequired,
 	E_LogLevel LogLevel)
 {
 	`Log_TraceStatic();
@@ -41,12 +42,14 @@ public static function bool UnlockDLC(
 	{
 		case "true":
 		case "auto":
-			return Auto(KFGI, KFGRI, RemoveItems, AddItems, LogLevel);
+			return Auto(KFGI, KFGRI, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel);
 
 		case "replaceweapons":
+			DLCSkinUpdateRequired.Value = true;
 			return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
 
 		case "replacefilter":
+			DLCSkinUpdateRequired.Value = false;
 			return ReplaceFilter(KFGI, LogLevel);
 
 		case "false":
@@ -60,6 +63,7 @@ private static function bool Auto(
 	KFGameReplicationInfo KFGRI,
 	out Array<class<KFWeaponDefinition> > RemoveItems,
 	out Array<class<KFWeaponDefinition> > AddItems,
+	out BoolWrapper DLCSkinUpdateRequired,
 	E_LogLevel LogLevel)
 {
 	local bool CustomGFxManager;
@@ -79,10 +83,12 @@ private static function bool Auto(
 
 	if (CustomGFxManager)
 	{
+		DLCSkinUpdateRequired.Value = true;
 		return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
 	}
 	else
 	{
+		DLCSkinUpdateRequired.Value = false;
 		return ReplaceFilter(KFGI, LogLevel);
 	}
 }
@@ -100,6 +106,8 @@ private static function bool ReplaceWeapons(
 
 	`Log_TraceStatic();
 
+	`Log_Debug("Unlock by replace weapons");
+
 	Unlock = false;
 	PartialUnlock = false;
 
@@ -122,6 +130,11 @@ private static function bool ReplaceWeapons(
 			PartialUnlock = true;
 			`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
 		}
+
+		if (RemoveItems.Find(WeapDefDLC) == INDEX_NONE)
+		{
+			RemoveItems.AddItem(WeapDefDLC);
+		}
 	}
 
 	if (PartialUnlock)
@@ -134,15 +147,15 @@ private static function bool ReplaceWeapons(
 
 private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
 {
-	local class<KFWeaponDefinition> WeapDef;
+	local SWeapReplace WeapReplace;
 
 	`Log_TraceStatic();
 
-	foreach default.WeapDefDLCReplacements(WeapDef)
+	foreach Replacements.default.DLC(WeapReplace)
 	{
-		if (ClassIsChildOf(WeapDef, WeapDefDLC))
+		if (ClassIsChildOf(WeapReplace.WeapDef, WeapDefDLC))
 		{
-			return WeapDef;
+			return WeapReplace.WeapDef;
 		}
 	}
 
@@ -153,6 +166,8 @@ private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
 {
 	`Log_TraceStatic();
 
+	`Log_Debug("Unlock by replace filter");
+
 	if (KFGI == None) return false;
 
 	if (KFGameInfo_VersusSurvival(KFGI) != None)
@@ -169,32 +184,5 @@ private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
 
 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_Shotgun_S12')
-	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/WeaponReplacements.uc

@@ -0,0 +1,183 @@
+class WeaponReplacements extends Object;
+
+struct SWeapReplace
+{
+	var const class<KFWeaponDefinition> WeapDef;
+	var const class<KFWeaponDefinition> WeapDefParent;
+	var const class<KFWeapon>           Weap;
+	var const class<KFWeapon>           WeapParent;
+};
+
+var public const Array<SWeapReplace> DLC;
+
+defaultproperties
+{
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_AutoTurret',
+		WeapDefParent=class'KFWeapDef_AutoTurret',
+		Weap=class'CTI_Weap_AutoTurret',
+		WeapParent=class'KFWeap_AutoTurret'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_BladedPistol',
+		WeapDefParent=class'KFWeapDef_BladedPistol',
+		Weap=class'CTI_Weap_Pistol_Bladed',
+		WeapParent=class'KFWeap_Pistol_Bladed'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Blunderbuss',
+		WeapDefParent=class'KFWeapDef_Blunderbuss',
+		Weap=class'CTI_Weap_Pistol_Blunderbuss',
+		WeapParent=class'KFWeap_Pistol_Blunderbuss'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_ChainBat',
+		WeapDefParent=class'KFWeapDef_ChainBat',
+		Weap=class'CTI_Weap_Blunt_ChainBat',
+		WeapParent=class'KFWeap_Blunt_ChainBat'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_ChiappaRhino',
+		WeapDefParent=class'KFWeapDef_ChiappaRhino',
+		Weap=class'CTI_Weap_Pistol_ChiappaRhino',
+		WeapParent=class'KFWeap_Pistol_ChiappaRhino'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_ChiappaRhinoDual',
+		WeapDefParent=class'KFWeapDef_ChiappaRhinoDual',
+		Weap=class'CTI_Weap_Pistol_ChiappaRhinoDual',
+		WeapParent=class'KFWeap_Pistol_ChiappaRhinoDual'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_CompoundBow',
+		WeapDefParent=class'KFWeapDef_CompoundBow',
+		Weap=class'CTI_Weap_Bow_CompoundBow',
+		WeapParent=class'KFWeap_Bow_CompoundBow'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Doshinegun',
+		WeapDefParent=class'KFWeapDef_Doshinegun',
+		Weap=class'CTI_Weap_AssaultRifle_Doshinegun',
+		WeapParent=class'KFWeap_AssaultRifle_Doshinegun'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_DualBladed',
+		WeapDefParent=class'KFWeapDef_DualBladed',
+		Weap=class'CTI_Weap_Pistol_DualBladed',
+		WeapParent=class'KFWeap_Pistol_DualBladed'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_FAMAS',
+		WeapDefParent=class'KFWeapDef_FAMAS',
+		Weap=class'CTI_Weap_AssaultRifle_FAMAS',
+		WeapParent=class'KFWeap_AssaultRifle_FAMAS'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_G18',
+		WeapDefParent=class'KFWeapDef_G18',
+		Weap=class'CTI_Weap_SMG_G18',
+		WeapParent=class'KFWeap_SMG_G18'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_G36C',
+		WeapDefParent=class'KFWeapDef_G36C',
+		Weap=class'CTI_Weap_AssaultRifle_G36C',
+		WeapParent=class'KFWeap_AssaultRifle_G36C'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_GravityImploder',
+		WeapDefParent=class'KFWeapDef_GravityImploder',
+		Weap=class'CTI_Weap_GravityImploder',
+		WeapParent=class'KFWeap_GravityImploder'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_HVStormCannon',
+		WeapDefParent=class'KFWeapDef_HVStormCannon',
+		Weap=class'CTI_Weap_HVStormCannon',
+		WeapParent=class'KFWeap_HVStormCannon'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_IonThruster',
+		WeapDefParent=class'KFWeapDef_IonThruster',
+		Weap=class'CTI_Weap_Edged_IonThruster',
+		WeapParent=class'KFWeap_Edged_IonThruster'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Mine_Reconstructor',
+		WeapDefParent=class'KFWeapDef_Mine_Reconstructor',
+		Weap=class'CTI_Weap_Mine_Reconstructor',
+		WeapParent=class'KFWeap_Mine_Reconstructor'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Minigun',
+		WeapDefParent=class'KFWeapDef_Minigun',
+		Weap=class'CTI_Weap_Minigun',
+		WeapParent=class'KFWeap_Minigun'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_MosinNagant',
+		WeapDefParent=class'KFWeapDef_MosinNagant',
+		Weap=class'CTI_Weap_Rifle_MosinNagant',
+		WeapParent=class'KFWeap_Rifle_MosinNagant'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_ParasiteImplanter',
+		WeapDefParent=class'KFWeapDef_ParasiteImplanter',
+		Weap=class'CTI_Weap_Rifle_ParasiteImplanter',
+		WeapParent=class'KFWeap_Rifle_ParasiteImplanter'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Pistol_DualG18',
+		WeapDefParent=class'KFWeapDef_Pistol_DualG18',
+		Weap=class'CTI_Weap_Pistol_DualG18',
+		WeapParent=class'KFWeap_Pistol_DualG18'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Pistol_G18C',
+		WeapDefParent=class'KFWeapDef_Pistol_G18C',
+		Weap=class'CTI_Weap_Pistol_G18C',
+		WeapParent=class'KFWeap_Pistol_G18C'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Rifle_FrostShotgunAxe',
+		WeapDefParent=class'KFWeapDef_Rifle_FrostShotgunAxe',
+		Weap=class'CTI_Weap_Rifle_FrostShotgunAxe',
+		WeapParent=class'KFWeap_Rifle_FrostShotgunAxe'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Scythe',
+		WeapDefParent=class'KFWeapDef_Scythe',
+		Weap=class'CTI_Weap_Edged_Scythe',
+		WeapParent=class'KFWeap_Edged_Scythe'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Shotgun_S12',
+		WeapDefParent=class'KFWeapDef_Shotgun_S12',
+		Weap=class'CTI_Weap_Shotgun_S12',
+		WeapParent=class'KFWeap_Shotgun_S12'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_ShrinkRayGun',
+		WeapDefParent=class'KFWeapDef_ShrinkRayGun',
+		Weap=class'CTI_Weap_ShrinkRayGun',
+		WeapParent=class'KFWeap_ShrinkRayGun'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_ThermiteBore',
+		WeapDefParent=class'KFWeapDef_ThermiteBore',
+		Weap=class'CTI_Weap_RocketLauncher_ThermiteBore',
+		WeapParent=class'KFWeap_RocketLauncher_ThermiteBore'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_ZedMKIII',
+		WeapDefParent=class'KFWeapDef_ZedMKIII',
+		Weap=class'CTI_Weap_ZedMKIII',
+		WeapParent=class'KFWeap_ZedMKIII'
+	)})
+	DLC.Add({(
+		WeapDef=class'CTI_WeapDef_Zweihander',
+		WeapDefParent=class'KFWeapDef_Zweihander',
+		Weap=class'CTI_Weap_Edged_Zweihander',
+		WeapParent=class'KFWeap_Edged_Zweihander'
+	)})
+}

PublicationContent/description.txt

@@ -69,7 +69,7 @@ example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
 [*]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.
+example: [b]Item=WeaponPackExt.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: