Merge pull request #11 from GenZmeY/skins

Apply weapon skins for replaced DLCs

.editorconfig

@@ -0,0 +1,33 @@
+root = true
+
+# Global
+[*]
+indent_style = unset
+indent_size = 4
+tab_width = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = unset
+
+# Unreal Engine 3 / Source
+[*.uc]
+indent_style = tab
+
+[*.{uci,upkg}]
+
+# Unreal Engine 3 / i18n
+[*.{chn,cht,cze,dan,deu,dut,esl,esn,fra,frc,hun,int,ita,jpn,kor,pol,por,ptb,rus,tur,ukr}]
+charset = utf-16le
+
+# Other
+[*.md]
+indent_style = space
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.{txt,cfg,conf}]
+indent_style = tab

.github/workflows/mega-linter.yml

@@ -0,0 +1,72 @@
+---
+name: MegaLinter
+
+permissions: read-all
+
+on:
+  push:
+  pull_request:
+    branches: [master]
+
+env:
+  APPLY_FIXES: none
+  APPLY_FIXES_EVENT: pull_request
+  APPLY_FIXES_MODE: commit
+  DISABLE: SPELL
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: MegaLinter
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+
+      - name: MegaLinter
+        id: ml
+        uses: oxsecurity/megalinter@v7
+        env:
+          VALIDATE_ALL_CODEBASE: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Archive production artifacts
+        if: ${{ success() }} || ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: MegaLinter reports
+          path: |
+            megalinter-reports
+            mega-linter.log
+
+      - name: Create Pull Request with applied fixes
+        id: cpr
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          commit-message: "[MegaLinter] Apply linters automatic fixes"
+          title: "[MegaLinter] Apply linters automatic fixes"
+          labels: bot
+      - name: Create PR output
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+      - name: Prepare commit
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        run: sudo chown -Rc $UID .git/
+      - name: Commit and push applied linter fixes
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
+          commit_message: "[MegaLinter] Apply linters fixes"
+          commit_user_name: "github-actions"
+          commit_user_email: "github-actions[bot]@users.noreply.github.com"

CTI/Classes/AddItems.uc

@@ -1,79 +1,79 @@
-class AddItems extends Object
+class AddItems extends Object
-	dependson(CTI)
+	dependson(CTI)
-	config(CTI);
+	config(CTI);
-
+
-var private config Array<String> Item;
+var private config Array<String> Item;
-
+
-public static function InitConfig(int Version, int LatestVersion)
+public static function InitConfig(int Version, int LatestVersion)
-{
+{
-	switch (Version)
+	switch (Version)
-	{
+	{
-		case `NO_CONFIG:
+		case `NO_CONFIG:
-			ApplyDefault();
+			ApplyDefault();
-			
+
-		default: break;
+		default: break;
-	}
+	}
-	
+
-	if (LatestVersion != Version)
+	if (LatestVersion != Version)
-	{
+	{
-		StaticSaveConfig();
+		StaticSaveConfig();
-	}
+	}
-}
+}
-
+
-private static function ApplyDefault()
+private static function ApplyDefault()
-{
+{
-	default.Item.Length = 0;
+	default.Item.Length = 0;
-	default.Item.AddItem("SomePackage.SomeWeapon");
+	default.Item.AddItem("SomePackage.SomeWeapon");
-}
+}
-
+
-public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
+public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
-{
+{
-	local Array<class<KFWeaponDefinition> > ItemList;
+	local Array<class<KFWeaponDefinition> > ItemList;
-	local class<KFWeaponDefinition> ItemWeapDef;
+	local class<KFWeaponDefinition> ItemWeapDef;
-	local class<KFWeapon> ItemWeapon;
+	local class<KFWeapon> ItemWeapon;
-	local String ItemRaw;
+	local String ItemRaw;
-	local int    Line;
+	local int    Line;
-	
+
-	`Log_Info("Load Items to add:");
+	`Log_Info("Load Items to add:");
-	foreach default.Item(ItemRaw, Line)
+	foreach default.Item(ItemRaw, Line)
-	{
+	{
-		ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+		ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-		if (ItemWeapDef == None)
+		if (ItemWeapDef == None)
-		{
+		{
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
-			continue;
+			continue;
-		}
+		}
-		
+
-		ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
+		ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
-		if (ItemWeapon == None)
+		if (ItemWeapon == None)
-		{
+		{
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
-			continue;
+			continue;
-		}
+		}
-		
+
-		if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
+		if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
-		{
+		{
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
-			continue;
+			continue;
-		}
+		}
-		
+
-		ItemList.AddItem(ItemWeapDef);
+		ItemList.AddItem(ItemWeapDef);
-		`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
+		`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
-	}
+	}
-	
+
-	if (ItemList.Length == default.Item.Length)
+	if (ItemList.Length == default.Item.Length)
-	{
+	{
-		`Log_Info("Items to add list loaded successfully (" $ default.Item.Length @ "entries)");
+		`Log_Info("Items to add list loaded successfully (" $ default.Item.Length @ "entries)");
-	}
+	}
-	else
+	else
-	{
+	{
-		`Log_Info("Items to add list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
+		`Log_Info("Items to add list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
-	}
+	}
-	
+
-	return ItemList;
+	return ItemList;
-}
+}
-
+
-defaultproperties
+defaultproperties
-{
+{
-
+
-}
+}

CTI/Classes/CTI.uc

@@ -1,316 +1,337 @@
-class CTI extends Info
+class CTI extends Info
-	config(CTI);
+	config(CTI);
-
+
-const LatestVersion = 2;
+const LatestVersion = 4;
-
+
-const CfgRemoveItems     = class'RemoveItems';
+const CfgRemoveItems     = class'RemoveItems';
-const CfgAddItems        = class'AddItems';
+const CfgAddItems        = class'AddItems';
-const CfgOfficialWeapons = class'OfficialWeapons';
+const CfgOfficialWeapons = class'OfficialWeapons';
-const Trader             = class'Trader';
+const Trader             = class'Trader';
-const Unlocker           = class'Unlocker';
+const Unlocker           = class'Unlocker';
-
+
-struct S_PreloadContent
+struct S_PreloadContent
-{
+{
-	var class<KFWeaponDefinition> KFWD;
+	var class<KFWeaponDefinition> KFWD;
-	var class<KFWeapon>           KFWC;
+	var class<KFWeapon>           KFWC;
-	var KFWeapon                  KFW;
+	var KFWeapon                  KFW;
-	var KFW_Access                KFWA;
+	var KFW_Access                KFWA;
-};
+};
-
+
-var private config int        Version;
+var private config int        Version;
-var private config E_LogLevel LogLevel;
+var private config E_LogLevel LogLevel;
-var private config String     UnlockDLC;
+var private config String     UnlockDLC;
-var private config bool       bPreloadContent;
+var private config bool       bPreloadContent;
-var private config bool       bOfficialWeaponsList;
+var private config bool       bOfficialWeaponsList;
-
+var private config bool       bDisableItemLimitCheck;
-var private KFGameInfo KFGI;
+
-var private KFGameReplicationInfo KFGRI;
+var private KFGameInfo            KFGI;
-
+var private KFGameReplicationInfo KFGRI;
-var private Array<class<KFWeaponDefinition> > RemoveItems;
+
-var private Array<class<KFWeaponDefinition> > AddItems;
+var private Array<class<KFWeaponDefinition> > WeapDefs;
-
+var private Array<class<KFWeaponDefinition> > RemoveItems;
-var private Array<CTI_RepInfo> RepInfos;
+var private Array<class<KFWeaponDefinition> > AddItems;
-
+
-var private bool ReadyToSync;
+var private Array<CTI_RepInfo> RepInfos;
-
+
-var private Array<S_PreloadContent> PreloadContent;
+var private bool ReadyToSync;
-
+
-public simulated function bool SafeDestroy()
+// To bypass "Booleans may not be out parameters" error
-{
+struct BoolWrapper
-	`Log_Trace();
+{
-	
+	var bool Value;
-	return (bPendingDelete || bDeleteMe || Destroy());
+
-}
+	structdefaultproperties
-
+	{
-public event PreBeginPlay()
+		Value = false
-{
+	}
-	`Log_Trace();
+};
-	
+
-	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
+var private BoolWrapper DLCSkinUpdateRequired;
-	
+
-	if (WorldInfo.NetMode == NM_Client)
+public simulated function bool SafeDestroy()
-	{
+{
-		`Log_Fatal("NetMode == NM_Client, Destroy...");
+	`Log_Trace();
-		SafeDestroy();
+
-		return;
+	return (bPendingDelete || bDeleteMe || Destroy());
-	}
+}
-	
+
-	Super.PreBeginPlay();
+public event PreBeginPlay()
-	
+{
-	PreInit();
+	`Log_Trace();
-}
+
-
+	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
-public event PostBeginPlay()
+
-{
+	if (WorldInfo.NetMode == NM_Client)
-	`Log_Trace();
+	{
-	
+		`Log_Fatal("NetMode == NM_Client, Destroy...");
-	if (bPendingDelete || bDeleteMe) return;
+		SafeDestroy();
-	
+		return;
-	Super.PostBeginPlay();
+	}
-	
+
-	PostInit();
+	Super.PreBeginPlay();
-}
+
-
+	PreInit();
-private function PreInit()
+}
-{
+
-	`Log_Trace();
+public event PostBeginPlay()
-	
+{
-	if (Version == `NO_CONFIG)
+	`Log_Trace();
-	{
+
-		LogLevel = LL_Info;
+	if (bPendingDelete || bDeleteMe) return;
-		bPreloadContent = true;
+
-		UnlockDLC = "False";
+	Super.PostBeginPlay();
-		SaveConfig();
+
-	}
+	PostInit();
-	
+}
-	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
+
-	CfgAddItems.static.InitConfig(Version, LatestVersion);
+private function PreInit()
-	
+{
-	switch (Version)
+	`Log_Trace();
-	{
+
-		case `NO_CONFIG:
+	if (Version == `NO_CONFIG)
-			`Log_Info("Config created");
+	{
-			
+		LogLevel = LL_Info;
-		case 1:
+		bPreloadContent = true;
-			bOfficialWeaponsList = false;
+		UnlockDLC = "False";
-			
+		SaveConfig();
-		case MaxInt:
+	}
-			`Log_Info("Config updated to version" @ LatestVersion);
+
-			break;
+	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
-			
+	CfgAddItems.static.InitConfig(Version, LatestVersion);
-		case LatestVersion:
+
-			`Log_Info("Config is up-to-date");
+	switch (Version)
-			break;
+	{
-			
+		case `NO_CONFIG:
-		default:
+			`Log_Info("Config created");
-			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
+
-			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
+		case 1:
-			`Log_Warn("The config version will be changed to" @ LatestVersion);
+			bOfficialWeaponsList = false;
-			break;
+
-	}
+		case 2:
-	
+		case 3:
-	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
+			bDisableItemLimitCheck = false;
-
+
-	if (LatestVersion != Version)
+		case MaxInt:
-	{
+			`Log_Info("Config updated to version" @ LatestVersion);
-		Version = LatestVersion;
+			break;
-		SaveConfig();
+
-	}
+		case LatestVersion:
-
+			`Log_Info("Config is up-to-date");
-	if (LogLevel == LL_WrongLevel)
+			break;
-	{
+
-		LogLevel = LL_Info;
+		default:
-		`Log_Warn("Wrong 'LogLevel', return to default value");
+			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
-		SaveConfig();
+			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
-	}
+			`Log_Warn("The config version will be changed to" @ LatestVersion);
-	`Log_Base("LogLevel:" @ LogLevel);
+			break;
-	
+	}
-	if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
+
-	{
+	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
-		`Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)");
+
-		UnlockDLC = "False";
+	if (LatestVersion != Version)
-		SaveConfig();
+	{
-	}
+		Version = LatestVersion;
-	
+		SaveConfig();
-	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
+	}
-	AddItems    = CfgAddItems.static.Load(LogLevel);
+
-}
+	if (LogLevel == LL_WrongLevel)
-
+	{
-private function PostInit()
+		LogLevel = LL_Info;
-{
+		`Log_Warn("Wrong 'LogLevel', return to default value");
-	local CTI_RepInfo RepInfo;
+		SaveConfig();
-	
+	}
-	`Log_Trace();
+	`Log_Base("LogLevel:" @ LogLevel);
-	
+
-	if (WorldInfo == None || WorldInfo.Game == None)
+	if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
-	{
+	{
-		SetTimer(1.0f, false, nameof(PostInit));
+		`Log_Warn("Wrong 'UnlockDLC' value (" $ UnlockDLC $ "), return to default value (False)");
-		return;
+		UnlockDLC = "False";
-	}
+		SaveConfig();
-	
+	}
-	KFGI = KFGameInfo(WorldInfo.Game);
+
-	if (KFGI == None)
+	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
-	{
+	AddItems    = CfgAddItems.static.Load(LogLevel);
-		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
+}
-		SafeDestroy();
+
-		return;
+private function PostInit()
-	}
+{
-	
+	local CTI_RepInfo RepInfo;
-	if (KFGI.GameReplicationInfo == None)
+
-	{
+	`Log_Trace();
-		SetTimer(1.0f, false, nameof(PostInit));
+
-		return;
+	if (WorldInfo == None || WorldInfo.Game == None)
-	}
+	{
-	
+		SetTimer(1.0f, false, nameof(PostInit));
-	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
+		return;
-	if (KFGRI == None)
+	}
-	{
+
-		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
+	KFGI = KFGameInfo(WorldInfo.Game);
-		SafeDestroy();
+	if (KFGI == None)
-		return;
+	{
-	}
+		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
-	
+		SafeDestroy();
-	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel))
+		return;
-	{
+	}
-		`Log_Info("DLC unlocked");
+
-	}
+	if (KFGI.GameReplicationInfo == None)
-	
+	{
-	if (bPreloadContent)
+		SetTimer(1.0f, false, nameof(PostInit));
-	{
+		return;
-		Preload(AddItems);
+	}
-	}
+
-	
+	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
-	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll, LogLevel);
+	if (KFGRI == None)
-	
+	{
-	ReadyToSync = true;
+		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
-	
+		SafeDestroy();
-	foreach RepInfos(RepInfo)
+		return;
-	{
+	}
-		if (RepInfo.PendingSync)
+
-		{
+	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel))
-			RepInfo.ServerSync();
+	{
-		}
+		`Log_Info("DLC unlocked");
-	}
+	}
-}
+	`Log_Debug("DLCSkinUpdateRequired:" @ String(DLCSkinUpdateRequired.Value));
-
+
-private function Preload(Array<class<KFWeaponDefinition> > Content)
+	if (bPreloadContent)
-{
+	{
-	local Array<class<KFWeapon> > OfficialWeapons;
+		Preload(AddItems);
-	local S_PreloadContent SPC;
+	}
-	
+
-	`Log_Trace();
+	Trader.static.ModifyTrader(
-	
+		KFGRI,
-	OfficialWeapons = Trader.static.GetTraderWeapons();
+		RemoveItems,
-	
+		AddItems,
-	foreach Content(SPC.KFWD)
+		CfgRemoveItems.default.bAll,
-	{
+		CfgRemoveItems.default.bHRG,
-		SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
+		CfgRemoveItems.default.bDLC,
-		if (SPC.KFWC != None)
+		bDisableItemLimitCheck,
-		{
+		LogLevel);
-			if (OfficialWeapons.Find(SPC.KFWC) != INDEX_NONE)
+
-			{
+	WeapDefs = Trader.static.GetTraderWeapDefs(KFGRI, LogLevel);
-				`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
+
-				continue;
+	ReadyToSync = true;
-			}
+
-		
+	foreach RepInfos(RepInfo)
-			SPC.KFW = KFGI.Spawn(SPC.KFWC);
+	{
-			if (SPC.KFW == None)
+		if (RepInfo.PendingSync)
-			{
+		{
-				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
+			RepInfo.Replicate(WeapDefs);
-				continue;
+		}
-			}
+	}
-			
+}
-			SPC.KFWA = new (SPC.KFW) class'KFW_Access';
+
-			if (SPC.KFWA == None)
+private function Preload(const out Array<class<KFWeaponDefinition> > Content)
-			{
+{
-				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
+	local Array<S_PreloadContent> PreloadContent;
-				continue;
+	local S_PreloadContent SPC;
-			}
+
-			
+	`Log_Trace();
-			PreloadContent.AddItem(SPC);
+
-		}
+	foreach Content(SPC.KFWD)
-	}
+	{
-	
+		SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
-	foreach PreloadContent(SPC)
+		if (SPC.KFWC != None)
-	{
+		{
-		SPC.KFWA.KFW_StartLoadWeaponContent();
+			if (SPC.KFWC.GetPackageName() == 'CTI' || SPC.KFWC.GetPackageName() == 'KFGameContent')
-	}
+			{
-	
+				`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
-	`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
+				continue;
-}
+			}
-
+
-public function NotifyLogin(Controller C)
+			SPC.KFW = KFGI.Spawn(SPC.KFWC);
-{
+			if (SPC.KFW == None)
-	`Log_Trace();
+			{
-
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
-	if (!CreateRepInfo(C))
+				continue;
-	{
+			}
-		`Log_Error("Can't create RepInfo for:" @ C);
+
-	}
+			SPC.KFWA = new (SPC.KFW) class'KFW_Access';
-}
+			if (SPC.KFWA == None)
-
+			{
-public function NotifyLogout(Controller C)
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
-{
+				continue;
-	`Log_Trace();
+			}
-
+
-	DestroyRepInfo(C);
+			PreloadContent.AddItem(SPC);
-}
+		}
-
+	}
-public function bool CreateRepInfo(Controller C)
+
-{
+	foreach PreloadContent(SPC)
-	local CTI_RepInfo RepInfo;
+	{
-	
+		SPC.KFWA.KFW_StartLoadWeaponContent();
-	`Log_Trace();
+	}
-	
+
-	if (C == None) return false;
+	`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
-	
+}
-	RepInfo = Spawn(class'CTI_RepInfo', C);
+
-	
+public function NotifyLogin(Controller C)
-	if (RepInfo == None) return false;
+{
-	
+	`Log_Trace();
-	RepInfo.PrepareSync(
+
-		Self,
+	if (!CreateRepInfo(C))
-		LogLevel,
+	{
-		RemoveItems,
+		`Log_Error("Can't create RepInfo for:" @ C);
-		AddItems,
+	}
-		CfgRemoveItems.default.bAll);
+}
-	
+
-	RepInfos.AddItem(RepInfo);
+public function NotifyLogout(Controller C)
-	
+{
-	if (ReadyToSync)
+	`Log_Trace();
-	{
+
-		RepInfo.ServerSync();
+	DestroyRepInfo(C);
-	}
+}
-	else
+
-	{
+public function bool CreateRepInfo(Controller C)
-		RepInfo.PendingSync = true;
+{
-	}
+	local CTI_RepInfo RepInfo;
-	
+
-	return true;
+	`Log_Trace();
-}
+
-
+	if (C == None || KFPlayerController(C) == None) return false;
-public function bool DestroyRepInfo(Controller C)
+
-{
+	RepInfo = Spawn(class'CTI_RepInfo', C);
-	local CTI_RepInfo RepInfo;
+
-	
+	if (RepInfo == None) return false;
-	`Log_Trace();
+
-	
+	RepInfo.PrepareSync(Self, KFPlayerController(C), LogLevel, DLCSkinUpdateRequired.Value);
-	if (C == None) return false;
+
-	
+	RepInfos.AddItem(RepInfo);
-	foreach RepInfos(RepInfo)
+
-	{
+	if (ReadyToSync)
-		if (RepInfo.Owner == C)
+	{
-		{
+		RepInfo.Replicate(WeapDefs);
-			RepInfos.RemoveItem(RepInfo);
+	}
-			RepInfo.SafeDestroy();
+	else
-			return true;
+	{
-		}
+		RepInfo.PendingSync = true;
-	}
+	}
-	
+
-	return false;
+	return true;
-}
+}
-
+
-DefaultProperties
+public function bool DestroyRepInfo(Controller C)
-{
+{
-	ReadyToSync = false
+	local CTI_RepInfo RepInfo;
+
+	`Log_Trace();
+
+	if (C == None) return false;
+
+	foreach RepInfos(RepInfo)
+	{
+		if (RepInfo.Owner == C)
+		{
+			RepInfos.RemoveItem(RepInfo);
+			RepInfo.SafeDestroy();
+			return true;
+		}
+	}
+
+	return false;
+}
+
+DefaultProperties
+{
+	ReadyToSync = false
 }

CTI/Classes/CTI.upkg

@@ -1,4 +1,4 @@
-[Flags]
+[Flags]
-AllowDownload=True
+AllowDownload=True
-ClientOptional=False
+ClientOptional=False
-ServerSideOnly=False
+ServerSideOnly=False

CTI/Classes/CTIMut.uc

@@ -1,60 +1,60 @@
-class CTIMut extends KFMutator;
+class CTIMut extends KFMutator;
-	
+
-var private CTI CTI;
+var private CTI CTI;
-
+
-public simulated function bool SafeDestroy()
+public simulated function bool SafeDestroy()
-{
+{
-	return (bPendingDelete || bDeleteMe || Destroy());
+	return (bPendingDelete || bDeleteMe || Destroy());
-}
+}
-
+
-public event PreBeginPlay()
+public event PreBeginPlay()
-{
+{
-	Super.PreBeginPlay();
+	Super.PreBeginPlay();
-	
+
-	if (WorldInfo.NetMode == NM_Client) return;
+	if (WorldInfo.NetMode == NM_Client) return;
-	
+
-	foreach WorldInfo.DynamicActors(class'CTI', CTI)
+	foreach WorldInfo.DynamicActors(class'CTI', CTI)
-	{
+	{
-		break;
+		break;
-	}
+	}
-	
+
-	if (CTI == None)
+	if (CTI == None)
-	{
+	{
-		CTI = WorldInfo.Spawn(class'CTI');
+		CTI = WorldInfo.Spawn(class'CTI');
-	}
+	}
-	
+
-	if (CTI == None)
+	if (CTI == None)
-	{
+	{
-		`Log_Base("FATAL: Can't Spawn 'CTI'");
+		`Log_Base("FATAL: Can't Spawn 'CTI'");
-		SafeDestroy();
+		SafeDestroy();
-	}
+	}
-}
+}
-
+
-public function AddMutator(Mutator Mut)
+public function AddMutator(Mutator Mut)
-{
+{
-	if (Mut == Self) return;
+	if (Mut == Self) return;
-	
+
-	if (Mut.Class == Class)
+	if (Mut.Class == Class)
-		Mut.Destroy();
+		CTIMut(Mut).SafeDestroy();
-	else
+	else
-		Super.AddMutator(Mut);
+		Super.AddMutator(Mut);
-}
+}
-
+
-public function NotifyLogin(Controller C)
+public function NotifyLogin(Controller C)
-{
+{
-	CTI.NotifyLogin(C);
+	CTI.NotifyLogin(C);
-	
+
-	Super.NotifyLogin(C);
+	Super.NotifyLogin(C);
-}
+}
-
+
-public function NotifyLogout(Controller C)
+public function NotifyLogout(Controller C)
-{
+{
-	CTI.NotifyLogout(C);
+	CTI.NotifyLogout(C);
-	
+
-	Super.NotifyLogout(C);
+	Super.NotifyLogout(C);
-}
+}
-
+
-DefaultProperties
+DefaultProperties
-{
+{
-
+	GroupNames.Add("TraderItems")
 }

CTI/Classes/CTI_GFxMenu_Trader.uc

@@ -1,8 +1,8 @@
-class CTI_GFxMenu_Trader extends KFGFxMenu_Trader
+class CTI_GFxMenu_Trader extends KFGFxMenu_Trader
-	dependsOn(CTI_GFxTraderContainer_Store);
+	dependsOn(CTI_GFxTraderContainer_Store);
-
+
-defaultproperties
+defaultproperties
-{
+{
-	SubWidgetBindings.Remove((WidgetName="shopContainer",WidgetClass=class'KFGFxTraderContainer_Store'))
+	SubWidgetBindings.Remove((WidgetName="shopContainer",WidgetClass=class'KFGFxTraderContainer_Store'))
-	SubWidgetBindings.Add((WidgetName="shopContainer",WidgetClass=class'CTI_GFxTraderContainer_Store'))
+	SubWidgetBindings.Add((WidgetName="shopContainer",WidgetClass=class'CTI_GFxTraderContainer_Store'))
-}
+}

CTI/Classes/CTI_GFxMoviePlayer_Manager.uc

@@ -1,8 +1,8 @@
-class CTI_GFxMoviePlayer_Manager extends KFGFxMoviePlayer_Manager
+class CTI_GFxMoviePlayer_Manager extends KFGFxMoviePlayer_Manager
-	dependsOn(CTI_GFxMenu_Trader);
+	dependsOn(CTI_GFxMenu_Trader);
-
+
-defaultproperties
+defaultproperties
-{
+{
-	WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
+	WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
-	WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
+	WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
-}
+}

CTI/Classes/CTI_GFxMoviePlayer_Manager_Versus.uc

@@ -1,8 +1,8 @@
-class CTI_GFxMoviePlayer_Manager_Versus extends KFGFxMoviePlayer_Manager_Versus
+class CTI_GFxMoviePlayer_Manager_Versus extends KFGFxMoviePlayer_Manager_Versus
-	dependsOn(CTI_GFxMenu_Trader);
+	dependsOn(CTI_GFxMenu_Trader);
-
+
-defaultproperties
+defaultproperties
-{
+{
-	WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
+	WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
-	WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
+	WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
-}
+}

CTI/Classes/CTI_GFxTraderContainer_Store.uc

@@ -1,20 +1,20 @@
-class CTI_GFxTraderContainer_Store extends KFGFxTraderContainer_Store;
+class CTI_GFxTraderContainer_Store extends KFGFxTraderContainer_Store;
-
+
-function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
+function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
-{
+{
-	if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.ClassName))
+	if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.ClassName))
-		return true;
+		return true;
-	if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.DualClassName))
+	if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.DualClassName))
-		return true;
+		return true;
-	if (!KFPC.GetPurchaseHelper().IsSellable(Item))
+	if (!KFPC.GetPurchaseHelper().IsSellable(Item))
-		return true;
+		return true;
-	if (Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted(Item.WeaponDef.default.PlatformRestriction))
+	if (Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted(Item.WeaponDef.default.PlatformRestriction))
-		return true;
+		return true;
-
+
-   	return false;
+	return false;
-}
+}
-
+
-defaultproperties
+defaultproperties
-{
+{
-	
+
-}
+}

CTI/Classes/CTI_LocalMessage.uc

@@ -1,73 +1,73 @@
-class CTI_LocalMessage extends Object
+class CTI_LocalMessage extends Object
-	abstract;
+	abstract;
-
+
-var const             String SyncItemsDefault;
+var const             String SyncItemsDefault;
-var private localized String SyncItems;
+var private localized String SyncItems;
-
+
-var const             String SyncFinishedDefault;
+var const             String WaitingGRIDefault;
-var private localized String SyncFinished;
+var private localized String WaitingGRI;
-
+
-var const             String WaitingGRIDefault;
+var const             String IncompatibleGRIDefault;
-var private localized String WaitingGRI;
+var private localized String IncompatibleGRI;
-
+
-var const             String IncompatibleGRIDefault;
+var const             String IncompatibleGRIWarningDefault;
-var private localized String IncompatibleGRI;
+var private localized String IncompatibleGRIWarning;
-
+
-var const             String DisconnectDefault;
+var const             String SecondsShortDefault;
-var private localized String Disconnect;
+var private localized String SecondsShort;
-
+
-var const             String SecondsShortDefault;
+var const             String PleaseWaitDefault;
-var private localized String SecondsShort;
+var private localized String PleaseWait;
-
+
-enum E_CTI_LocalMessageType
+enum E_CTI_LocalMessageType
-{
+{
-	CTI_SyncItems,
+	CTI_SyncItems,
-	CTI_SyncFinished,
+	CTI_WaitingGRI,
-	CTI_WaitingGRI,
+	CTI_IncompatibleGRI,
-	CTI_IncompatibleGRI,
+	CTI_IncompatibleGRIWarning,
-	CTI_Disconnect,
+	CTI_SecondsShort,
-	CTI_SecondsShort
+	CTI_PleaseWait
-};
+};
-
+
-public static function String GetLocalizedString(
+public static function String GetLocalizedString(
-	E_LogLevel LogLevel,
+	E_LogLevel LogLevel,
-	E_CTI_LocalMessageType LMT,
+	E_CTI_LocalMessageType LMT,
-	optional String String1,
+	optional String String1,
-	optional String String2,
+	optional String String2,
-	optional String String3)
+	optional String String3)
-{
+{
-	`Log_TraceStatic();
+	`Log_TraceStatic();
-	
+
-	switch (LMT)
+	switch (LMT)
-	{
+	{
-		case CTI_SyncItems:
+		case CTI_SyncItems:
-			return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
+			return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
-			
+
-		case CTI_SyncFinished:
+		case CTI_WaitingGRI:
-			return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
+			return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
-		
+
-		case CTI_WaitingGRI:
+		case CTI_IncompatibleGRI:
-			return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
+			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault) @ String1;
-		
+
-		case CTI_IncompatibleGRI:
+		case CTI_IncompatibleGRIWarning:
-			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
+			return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
-		
+
-		case CTI_Disconnect:
+		case CTI_SecondsShort:
-			return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
+			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
-		
+
-		case CTI_SecondsShort:
+		case CTI_PleaseWait:
-			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
+			return (default.PleaseWait != "" ? default.PleaseWait : default.PleaseWaitDefault);
-	}
+	}
-	
+
-	return "";
+	return "";
-}
+}
-
+
-defaultproperties
+defaultproperties
-{
+{
-	SyncItemsDefault       = "Sync items:"
+	SyncItemsDefault              = "Sync items:"
-	SyncFinishedDefault    = "Sync finished."
+	WaitingGRIDefault             = "Waiting GRI..."
-	WaitingGRIDefault      = "Waiting GRI..."
+	IncompatibleGRIDefault        = "Incompatible GRI:"
-	IncompatibleGRIDefault = "Incompatible GRI:"
+	IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
-	DisconnectDefault      = "Disconnect..."
+	SecondsShortDefault           = "s"
-	SecondsShortDefault    = "s"
+	PleaseWaitDefault             = "Please wait"
 }

CTI/Classes/CTI_RepInfo.uc

@@ -1,292 +1,401 @@
-class CTI_RepInfo extends ReplicationInfo;
+class CTI_RepInfo extends ReplicationInfo
-
+	dependson(WeaponReplacements);
-const Trader       = class'Trader';
+
-const LocalMessage = class'CTI_LocalMessage';
+const CAPACITY = 64; // max: 128
-
+
-var public  bool PendingSync;
+const Trader       = class'Trader';
-
+const LocalMessage = class'CTI_LocalMessage';
-var private CTI CTI;
+const Replacements = class'WeaponReplacements';
-var private E_LogLevel LogLevel;
+
-var private Array<class<KFWeaponDefinition> > RemoveItems;
+struct ReplicationStruct
-var private Array<class<KFWeaponDefinition> > AddItems;
+{
-var private bool ReplaceMode;
+	var int Size;
-var private bool PreloadContent;
+	var int Transfered;
-
+
-var private int  Recieved;
+	var class<KFWeaponDefinition> Items[CAPACITY];
-var private int  SyncSize;
+	var int Length;
-
+};
-var private KFPlayerController      KFPC;
+
-var private KFGFxWidget_PartyInGame PartyInGameWidget;
+var public  bool PendingSync;
-var private GFxObject               Notification;
+
-
+var private CTI CTI;
-var private String NotificationHeaderText;
+var private E_LogLevel LogLevel;
-var private String NotificationLeftText;
+
-var private String NotificationRightText;
+var private KFPlayerController      KFPC;
-var private int    NotificationPercent;
+var private KFPlayerReplicationInfo KFPRI;
-
+var private KFGFxWidget_PartyInGame PartyInGameWidget;
-var private int    WaitingGRI;
+var private GFxObject               Notification;
-
+
-replication
+var private String NotificationHeaderText;
-{
+var private String NotificationLeftText;
-	if (bNetInitial && Role == ROLE_Authority)
+var private String NotificationRightText;
-		LogLevel, ReplaceMode, SyncSize;
+var private int    NotificationPercent;
-}
+
-
+var private int    WaitingGRI;
-public simulated function bool SafeDestroy()
+var private int    WaitingGRILimit;
-{
+
-	`Log_Trace();
+var private ReplicationStruct                 RepData;
-
+var private Array<class<KFWeaponDefinition> > RepArray;
-	return (bPendingDelete || bDeleteMe || Destroy());
+
-}
+var private bool SkinUpdateRequired;
-
+
-public function PrepareSync(
+replication
-	CTI _CTI,
+{
-	E_LogLevel _LogLevel,
+	if (bNetInitial && Role == ROLE_Authority)
-	Array<class<KFWeaponDefinition> > _RemoveItems,
+		LogLevel, SkinUpdateRequired;
-	Array<class<KFWeaponDefinition> > _AddItems,
+}
-	bool _ReplaceMode)
+
-{
+public simulated function bool SafeDestroy()
-	`Log_Trace();
+{
-	
+	`Log_Trace();
-	CTI                 = _CTI;
+
-	LogLevel            = _LogLevel;
+	return (bPendingDelete || bDeleteMe || Destroy());
-	RemoveItems         = _RemoveItems;
+}
-	AddItems            = _AddItems;
+
-	ReplaceMode         = _ReplaceMode;
+public function Replicate(const out Array<class<KFWeaponDefinition> > WeapDefs)
-	SyncSize            = RemoveItems.Length + AddItems.Length;
+{
-}
+	`Log_Trace();
-
+
-private simulated function KFPlayerController GetKFPC()
+	RepArray = WeapDefs;
-{
+	RepData.Size = RepArray.Length;
-	`Log_Trace();
+
-	
+	if (WorldInfo.NetMode == NM_StandAlone)
-	if (KFPC != None) return KFPC;
+	{
-	
+		Progress(RepArray.Length, RepArray.Length);
-	KFPC = KFPlayerController(Owner);
+		return;
-	
+	}
-	if (KFPC == None && ROLE < ROLE_Authority)
+
-	{
+	Sync();
-		KFPC = KFPlayerController(GetALocalPlayerController());
+}
-	}
+
-	
+private reliable server function Sync()
-	return KFPC;
+{
-}
+	local int  LocalIndex;
-
+	local int  GlobalIndex;
-private simulated function SetPartyInGameWidget()
+
-{
+	`Log_Trace();
-	`Log_Trace();
+
-	
+	LocalIndex = 0;
-	if (GetKFPC() == None) return;
+	GlobalIndex = RepData.Transfered;
-	
+
-	if (KFPC.MyGFxManager == None) return;
+	while (LocalIndex < CAPACITY && GlobalIndex < RepData.Size)
-	if (KFPC.MyGFxManager.PartyWidget == None) return;
+	{
-	
+		RepData.Items[LocalIndex++] = RepArray[GlobalIndex++];
-	PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
+	}
-	Notification = PartyInGameWidget.Notification;
+
-}
+	if (RepData.Transfered == GlobalIndex) return; // Finished
-
+
-private simulated function bool CheckPartyInGameWidget()
+	RepData.Transfered = GlobalIndex;
-{
+	RepData.Length = LocalIndex;
-	`Log_Trace();
+
-	
+	Send(RepData);
-	if (PartyInGameWidget == None)
+
-	{
+	Progress(RepData.Transfered, RepData.Size);
-		SetPartyInGameWidget();
+}
-	}
+
-	
+private reliable client function Send(ReplicationStruct RD)
-	return (PartyInGameWidget != None);
+{
-}
+	local int LocalIndex;
-
+
-private simulated function HideReadyButton()
+	`Log_Trace();
-{
+
-	`Log_Trace();
+	for (LocalIndex = 0; LocalIndex < RD.Length; LocalIndex++)
-	
+	{
-	if (CheckPartyInGameWidget())
+		RepArray.AddItem(RD.Items[LocalIndex]);
-	{
+	}
-		PartyInGameWidget.SetReadyButtonVisibility(false);
+
-	}
+	Progress(RD.Transfered, RD.Size);
-}
+
-
+	Sync();
-private simulated function ShowReadyButton()
+}
-{
+
-	`Log_Trace();
+public function PrepareSync(CTI _CTI, KFPlayerController _KFPC, E_LogLevel _LogLevel, bool _SkinUpdateRequired)
-	
+{
-	if (CheckPartyInGameWidget())
+	`Log_Trace();
-	{
+
-		Notification.SetVisible(false);
+	CTI                = _CTI;
-		PartyInGameWidget.SetReadyButtonVisibility(true);
+	KFPC               = _KFPC;
-		PartyInGameWidget.UpdateReadyButtonText();
+	LogLevel           = _LogLevel;
-		PartyInGameWidget.UpdateReadyButtonVisibility();
+	SkinUpdateRequired = _SkinUpdateRequired;
-	}
+}
-}
+
-
+private simulated function Progress(int Value, int Size)
-private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
+{
-{
+	`Log_Trace();
-	`Log_Trace();
+
-	
+	`Log_Debug("Replicated:" @ Value @ "/" @ Size);
-	if (CheckPartyInGameWidget() && Notification != None)
+
-	{
+	if (ROLE < ROLE_Authority)
-		Notification.SetString("itemName", Title);
+	{
-		Notification.SetFloat("percent", Percent);
+		NotifyProgress(Value, Size);
-		Notification.SetInt("queue", 0);
+		if (Value >= Size) Finished();
-		Notification.SetString("downLoading", Left);
+	}
-		Notification.SetString("remaining", Right);
+}
-		Notification.SetObject("notificationInfo", Notification);
+
-		Notification.SetVisible(true);
+private simulated function Finished()
-	}
+{
-}
+	local KFGameReplicationInfo KFGRI;
-
+
-private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
+	`Log_Trace();
-{
+
-	`Log_Trace();
+	if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
-
+	{
-	if (WeapDef == None)
+		`Log_Debug("Finished: Waiting GRI" @ WaitingGRI);
-	{
+		NotifyWaitingGRI();
-		`Log_Fatal("WeapDef is:" @ WeapDef);
+		SetTimer(1.0f, false, nameof(Finished));
-		Cleanup();
+		return;
-		ConsoleCommand("Disconnect");
+	}
-		SafeDestroy();
+
-		return;
+	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
-	}
+	if (KFGRI != None)
-	
+	{
-	if (!IsTimerActive(nameof(KeepNotification)))
+		`Log_Debug("Finished: Trader.static.OverwriteTraderItems");
-	{
+		Trader.static.OverwriteTraderItems(KFGRI, RepArray, LogLevel);
-		SetTimer(0.1f, true, nameof(KeepNotification));
+		`Log_Info("Trader items successfully synchronized!");
-	}
+	}
-	
+	else
-	if (Remove)
+	{
-	{
+		`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
-		RemoveItems.AddItem(WeapDef);
+		NotifyIncompatibleGRI();
-	}
+	}
-	else
+
-	{
+	ShowReadyButton();
-		AddItems.AddItem(WeapDef);
+
-	}
+	if (SkinUpdateRequired)
-	
+	{
-	Recieved = RemoveItems.Length + AddItems.Length;
+		SetTimer(1.0f, true, nameof(UpdateSkinsDLC));
-	
+	}
-	NotificationHeaderText  = (Remove ? "-" : "+") @ WeapDef.static.GetItemName();
+	else
-	NotificationLeftText    = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
+	{
-	NotificationRightText   = Recieved @ "/" @ SyncSize;
+		ClientCleanup();
-	if (SyncSize != 0)
+	}
-	{
+}
-		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
+
-	}
+private simulated function UpdateSkinsDLC()
-	
+{
-	`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
+	local SWeapReplace WeapReplace;
-	
+
-	ServerSync();
+	`Log_Debug("Wait for spawn");
-}
+	if (GetKFPRI() != None && KFPRI.bHasSpawnedIn)
-
+	{
-private simulated function KeepNotification()
+		foreach Replacements.default.DLC(WeapReplace)
-{
+		{
-	HideReadyButton();
+			if (WeapReplace.WeapParent.default.SkinItemId > 0 && WeapReplace.Weap.default.SkinItemId != WeapReplace.WeapParent.default.SkinItemId)
-	UpdateNotification(
+			{
-		NotificationHeaderText,
+				`Log_Debug("Update skin for:" @ String(WeapReplace.WeapDef) @ "SkinId:" @ WeapReplace.WeapParent.default.SkinItemId);
-		NotificationLeftText,
+				class'KFWeaponSkinList'.static.SaveWeaponSkin(WeapReplace.WeapDef, WeapReplace.WeapParent.default.SkinItemId);
-		NotificationRightText,
+			}
-		NotificationPercent);
+		}
-}
+
-
+		ClearTimer(nameof(UpdateSkinsDLC));
-private simulated reliable client function ClientSyncFinished()
+		ClientCleanup();
-{
+	}
-	local KFGameReplicationInfo KFGRI;
+}
-
+
-	`Log_Trace();
+private simulated function KFPlayerController GetKFPC()
-	
+{
-	NotificationLeftText  = "";
+	`Log_Trace();
-	NotificationRightText = "";
+
-	NotificationPercent   = 0;
+	if (KFPC != None) return KFPC;
-	
+
-	if (WorldInfo.GRI == None)
+	KFPC = KFPlayerController(Owner);
-	{
+
-		`Log_Debug("ClientSyncFinished: Waiting GRI");
+	if (KFPC == None && ROLE < ROLE_Authority)
-		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
+	{
-		NotificationLeftText   = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
+		KFPC = KFPlayerController(GetALocalPlayerController());
-		NotificationRightText  = "";
+	}
-		SetTimer(1.0f, false, nameof(ClientSyncFinished));
+
-		return;
+	return KFPC;
-	}
+}
-	
+
-	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
+private simulated function KFPlayerReplicationInfo GetKFPRI()
-	if (KFGRI == None)
+{
-	{
+	`Log_Trace();
-		`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
+
-		ClearTimer(nameof(KeepNotification));
+	if (KFPRI != None) return KFPRI;
-		UpdateNotification(
+
-			LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI),
+	if (GetKFPC() == None) return None;
-			LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0);
+
-		Cleanup();
+	KFPRI = KFPlayerReplicationInfo(KFPC.PlayerReplicationInfo);
-		ConsoleCommand("Disconnect");
+
-		SafeDestroy();
+	return KFPRI;
-		return;
+}
-	}
+
-	
+public reliable client function WriteToChatLocalized(
-	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished);
+	E_CTI_LocalMessageType LMT,
-	NotificationLeftText   = "";
+	optional String HexColor,
-	NotificationRightText  = "";
+	optional String String1,
-	NotificationPercent    = 0;
+	optional String String2,
-
+	optional String String3)
-	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, LogLevel);
+{
-	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
+	`Log_Trace();
-
+
-	ClearTimer(nameof(KeepNotification)); 
+	WriteToChat(LocalMessage.static.GetLocalizedString(LogLevel, LMT, String1, String2, String3), HexColor);
-	ShowReadyButton();
+}
-	
+
-	Cleanup();
+public reliable client function WriteToChat(String Message, optional String HexColor)
-	
+{
-	SafeDestroy();
+	local KFGFxHudWrapper HUD;
-}
+
-
+	`Log_Trace();
-private reliable server function Cleanup()
+
-{
+	if (GetKFPC() == None) return;
-	`Log_Trace();
+
-	
+	if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
-	`Log_Debug("Cleanup");
+	{
-	if (!CTI.DestroyRepInfo(Controller(Owner)))
+		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
-	{
+		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
-		`Log_Debug("Cleanup (forced)");
+	}
-		SafeDestroy();
+
-	}
+	HUD = KFGFxHudWrapper(KFPC.myHUD);
-}
+	if (HUD != None && HUD.HUDMovie != None && HUD.HUDMovie.HudChatBox != None)
-
+	{
-public reliable server function ServerSync()
+		HUD.HUDMovie.HudChatBox.AddChatMessage(Message, HexColor);
-{
+	}
-	`Log_Trace();
+}
-	
+
-	PendingSync = false;
+private simulated function SetPartyInGameWidget()
-	
+{
-	if (bPendingDelete || bDeleteMe) return;
+	`Log_Trace();
-	
+
-	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
+	if (GetKFPC() == None) return;
-	{
+
-		`Log_Debug("ServerSync: Finished");
+	if (KFPC.MyGFxManager == None) return;
-		ClientSyncFinished();
+	if (KFPC.MyGFxManager.PartyWidget == None) return;
-	}
+
-	else
+	PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
-	{
+	Notification = PartyInGameWidget.Notification;
-		if (Recieved < RemoveItems.Length)
+}
-		{
+
-			`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
+private simulated function bool CheckPartyInGameWidget()
-			ClientSync(RemoveItems[Recieved++], true);
+{
-		}
+	`Log_Trace();
-		else
+
-		{
+	if (PartyInGameWidget == None)
-			`Log_Debug("ServerSync[+]:" @ (Recieved + 1) @ "/" @ SyncSize @ AddItems[Recieved - RemoveItems.Length]);
+	{
-			ClientSync(AddItems[Recieved++ - RemoveItems.Length], false);
+		SetPartyInGameWidget();
-		}
+	}
-	}
+
-}
+	return (PartyInGameWidget != None);
-
+}
-defaultproperties
+
-{
+private simulated function HideReadyButton()
-	bAlwaysRelevant               = false
+{
-	bOnlyRelevantToOwner          = true
+	`Log_Trace();
-	bSkipActorPropertyReplication = false
+
-	
+	if (CheckPartyInGameWidget())
-	PendingSync = false
+	{
-	Recieved    = 0
+		PartyInGameWidget.SetReadyButtonVisibility(false);
-	
+	}
-	NotificationPercent    = 0
+}
-	WaitingGRI             = 0
+
-}
+private simulated function ShowReadyButton()
+{
+	`Log_Trace();
+
+	ClearTimer(nameof(KeepNotification));
+
+	if (CheckPartyInGameWidget())
+	{
+		Notification.SetVisible(false);
+		PartyInGameWidget.SetReadyButtonVisibility(true);
+		PartyInGameWidget.UpdateReadyButtonText();
+		PartyInGameWidget.UpdateReadyButtonVisibility();
+	}
+}
+
+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", Left);
+		Notification.SetString("remaining", Right);
+		Notification.SetObject("notificationInfo", Notification);
+		Notification.SetVisible(true);
+	}
+}
+
+private simulated function KeepNotification()
+{
+	HideReadyButton();
+	UpdateNotification(
+		NotificationHeaderText,
+		NotificationLeftText,
+		NotificationRightText,
+		NotificationPercent);
+}
+
+private simulated function ClientCleanup()
+{
+	ServerCleanup();
+	SafeDestroy();
+}
+
+private reliable server function ServerCleanup()
+{
+	`Log_Trace();
+
+	`Log_Debug("Cleanup");
+	if (!CTI.DestroyRepInfo(GetKFPC()))
+	{
+		`Log_Debug("Cleanup (forced)");
+		SafeDestroy();
+	}
+}
+
+private simulated function NotifyWaitingGRI()
+{
+	if (!IsTimerActive(nameof(KeepNotification)))
+	{
+		SetTimer(0.1f, true, nameof(KeepNotification));
+	}
+
+	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)))
+	{
+		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
+{
+	bAlwaysRelevant               = false
+	bOnlyRelevantToOwner          = true
+	bSkipActorPropertyReplication = false
+
+	PendingSync = false
+
+	NotificationPercent    = 0
+	WaitingGRI             = 0
+	WaitingGRILimit        = 30
+}

CTI/Classes/CTI_WeapDef_AutoTurret.uc

@@ -1,7 +1,13 @@
-class CTI_WeapDef_AutoTurret extends KFWeapDef_AutoTurret
+class CTI_WeapDef_AutoTurret extends KFWeapDef_AutoTurret
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_AutoTurret'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_BladedPistol extends KFWeapDef_BladedPistol
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_BladedPistol'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Blunderbuss extends KFWeapDef_Blunderbuss
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Blunderbuss'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_ChainBat extends KFWeapDef_ChainBat
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_ChainBat'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_ChiappaRhino extends KFWeapDef_ChiappaRhino
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_ChiappaRhino'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_ChiappaRhinoDual extends KFWeapDef_ChiappaRhinoDual
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_ChiappaRhinoDual'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_CompoundBow extends KFWeapDef_CompoundBow
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_CompoundBow'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Doshinegun extends KFWeapDef_Doshinegun
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Doshinegun'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_DualBladed extends KFWeapDef_DualBladed
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_DualBladed'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_FAMAS extends KFWeapDef_FAMAS
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_FAMAS'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_G18 extends KFWeapDef_G18
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_G18'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_G36C extends KFWeapDef_G36C
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_G36C'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_GravityImploder extends KFWeapDef_GravityImploder
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_GravityImploder'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_GravityImploder"
 }

CTI/Classes/CTI_WeapDef_HVStormCannon.uc

@@ -0,0 +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
+	WeaponClassPath = "CTI.CTI_Weap_HVStormCannon"
+}

CTI/Classes/CTI_WeapDef_IonThruster.uc

@@ -1,7 +1,13 @@
-class CTI_WeapDef_IonThruster extends KFWeapDef_IonThruster
+class CTI_WeapDef_IonThruster extends KFWeapDef_IonThruster
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_IonThruster'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Mine_Reconstructor extends KFWeapDef_Mine_Reconstructor
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Mine_Reconstructor'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Minigun extends KFWeapDef_Minigun
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Minigun'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_MosinNagant extends KFWeapDef_MosinNagant
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_MosinNagant'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_ParasiteImplanter extends KFWeapDef_ParasiteImplanter
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_ParasiteImplanter'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Pistol_DualG18 extends KFWeapDef_Pistol_DualG18
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Pistol_DualG18'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Pistol_G18C extends KFWeapDef_Pistol_G18C
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Pistol_G18C'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Rifle_FrostShotgunAxe extends KFWeapDef_Rifle_FrostShotgunAxe
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Rifle_FrostShotgunAxe'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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
+class CTI_WeapDef_Scythe extends KFWeapDef_Scythe
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Scythe'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Edged_Scythe"
 }

CTI/Classes/CTI_WeapDef_Shotgun_S12.uc

@@ -0,0 +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
+	WeaponClassPath = "CTI.CTI_Weap_Shotgun_S12"
+}

CTI/Classes/CTI_WeapDef_ShrinkRayGun.uc

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

CTI/Classes/CTI_WeapDef_ZedMKIII.uc

@@ -0,0 +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
+	WeaponClassPath = "CTI.CTI_Weap_ZedMKIII"
+}

CTI/Classes/CTI_WeapDef_Zweihander.uc

@@ -1,7 +1,13 @@
-class CTI_WeapDef_Zweihander extends KFWeapDef_Zweihander
+class CTI_WeapDef_Zweihander extends KFWeapDef_Zweihander
-	abstract;
+	abstract;
-
+
-defaultproperties
+static function String GetItemLocalization(String KeyName)
-{
+{
-	SharedUnlockId = SCU_None
+	return class'KFGame.KFWeapDef_Zweihander'.static.GetItemLocalization(KeyName);
+}
+
+defaultproperties
+{
+	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/KFW_Access.uc

@@ -8,5 +8,5 @@ public function KFW_StartLoadWeaponContent()
 
 defaultproperties
 {
-	
+
 }

CTI/Classes/OfficialWeapons.uc

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

CTI/Classes/RemoveItems.uc

@@ -1,88 +1,105 @@
-class RemoveItems extends Object
+class RemoveItems extends Object
-	dependson(CTI)
+	dependson(CTI)
-	config(CTI);
+	config(CTI);
-
+
-var public  config bool bAll;
+var public  config bool bAll;
-var private config Array<String> Item;
+var public  config bool bHRG;
-
+var public  config bool bDLC;
-public static function InitConfig(int Version, int LatestVersion)
+var private config Array<String> Item;
-{
+
-	switch (Version)
+public static function InitConfig(int Version, int LatestVersion)
-	{
+{
-		case `NO_CONFIG:
+	switch (Version)
-			ApplyDefault();
+	{
-			
+		case `NO_CONFIG:
-		default: break;
+			ApplyDefault();
-	}
+
-	
+		case 2:
-	if (LatestVersion != Version)
+			default.bHRG = false;
-	{
+			default.bDLC = false;
-		StaticSaveConfig();
+
-	}
+		default: break;
-}
+	}
-
+
-private static function ApplyDefault()
+	if (LatestVersion != Version)
-{
+	{
-	default.bAll = false;
+		StaticSaveConfig();
-	default.Item.Length = 0;
+	}
-	default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
+}
-}
+
-
+private static function ApplyDefault()
-public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
+{
-{
+	default.bAll = false;
-	local Array<class<KFWeaponDefinition> > ItemList;
+	default.bHRG = false;
-	local class<KFWeaponDefinition> ItemWeapDef;
+	default.bDLC = false;
-	local class<KFWeapon> ItemWeapon;
+	default.Item.Length = 0;
-	local String ItemRaw;
+	default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
-	local int    Line;
+}
-	
+
-	`Log_Info("Load items to remove:");
+public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
-	if (default.bAll)
+{
-	{
+	local Array<class<KFWeaponDefinition> > ItemList;
-		`Log_Info("Remove all default items");
+	local class<KFWeaponDefinition> ItemWeapDef;
-	}
+	local class<KFWeapon> ItemWeapon;
-	else
+	local String ItemRaw;
-	{
+	local int    Line;
-		foreach default.Item(ItemRaw, Line)
+
-		{
+	`Log_Info("Load items to remove:");
-			ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+	if (default.bAll)
-			if (ItemWeapDef == None)
+	{
-			{
+		`Log_Info("Remove all default items");
-				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
+	}
-				continue;
+	else
-			}
+	{
-			
+		if (default.bHRG)
-			ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
+		{
-			if (ItemWeapon == None)
+			`Log_Info("Remove all HRG items");
-			{
+		}
-				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
+		if (default.bDLC)
-				continue;
+		{
-			}
+			`Log_Info("Remove all DLC items");
-			
+		}
-			if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
+
-			{
+		foreach default.Item(ItemRaw, Line)
-				`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
+		{
-				continue;
+			ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-			}
+			if (ItemWeapDef == None)
-			
+			{
-			ItemList.AddItem(ItemWeapDef);
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
-			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
+				continue;
-		}
+			}
-		
+
-		if (ItemList.Length == default.Item.Length)
+			ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
-		{
+			if (ItemWeapon == None)
-			`Log_Info("Items to remove list loaded successfully (" $ ItemList.Length @ "entries)");
+			{
-		}
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
-		else
+				continue;
-		{
+			}
-			`Log_Info("Items to remove list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
+
-		}
+			if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
-	}
+			{
-	
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
-	return ItemList;
+				continue;
-}
+			}
-
+
-defaultproperties
+			ItemList.AddItem(ItemWeapDef);
-{
+			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
-
+		}
-}
+
+		if (ItemList.Length == default.Item.Length)
+		{
+			`Log_Info("Items to remove list loaded successfully (" $ ItemList.Length @ "entries)");
+		}
+		else
+		{
+			`Log_Info("Items to remove list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
+		}
+	}
+
+	return ItemList;
+}
+
+defaultproperties
+{
+
+}

CTI/Classes/Trader.uc

@@ -1,161 +1,200 @@
-class Trader extends Object
+class Trader extends Object
-	abstract;
+	abstract;
-
+
-private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
+// Bug:
-{
+// The wrong weapon is purchased if the index is greater than 256 😡
-	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
+// Some greedy guy saved 3 bytes for no reason again
-}
+const ITEMS_LIMIT = 256;
-
+
-public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
+private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
-{
+{
-	local String TraderItemsPath;
+	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
-	
+}
-	if (KFGRI == None)
+
-	{
+public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
-		TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
+{
-	}
+	local String TraderItemsPath;
-	else
+
-	{
+	if (KFGRI == None)
-		TraderItemsPath = KFGRI.TraderItemsPath;
+	{
-	}
+		TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
-	
+	}
-	return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
+	else
-}
+	{
-
+		TraderItemsPath = KFGRI.TraderItemsPath;
-public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+	}
-{
+
-	local Array<class<KFWeaponDefinition> > KFWeapDefs;
+	return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
-	local KFGFxObject_TraderItems TraderItems;
+}
-	local STraderItem Item;
+
-	
+public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
+{
-	
+	local Array<class<KFWeaponDefinition> > KFWeapDefs;
-	foreach TraderItems.SaleItems(Item)
+	local KFGFxObject_TraderItems TraderItems;
-	{
+	local STraderItem Item;
-		if (Item.WeaponDef != None)
+
-		{
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
-			KFWeapDefs.AddItem(Item.WeaponDef);
+
-		}
+	foreach TraderItems.SaleItems(Item)
-	}
+	{
-	
+		if (Item.WeaponDef != None)
-	return KFWeapDefs;
+		{
-}
+			KFWeapDefs.AddItem(Item.WeaponDef);
-
+		}
-public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+	}
-{
+
-	local Array<class<KFWeapon> > KFWeapons;
+	return KFWeapDefs;
-	local class<KFWeapon> KFWeapon;
+}
-	local KFGFxObject_TraderItems TraderItems;
+
-	local STraderItem Item;
+public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
-	
+{
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	local Array<class<KFWeapon> > KFWeapons;
-	
+	local class<KFWeapon> KFWeapon;
-	foreach TraderItems.SaleItems(Item)
+	local KFGFxObject_TraderItems TraderItems;
-	{
+	local STraderItem Item;
-		if (Item.WeaponDef != None)
+
-		{
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
-			KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
+
-			if (KFWeapon != None)
+	foreach TraderItems.SaleItems(Item)
-			{
+	{
-				KFWeapons.AddItem(KFWeapon);
+		if (Item.WeaponDef != None)
-			}
+		{
-		}
+			KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
-	}
+			if (KFWeapon != None)
-	
+			{
-	return KFWeapons;
+				KFWeapons.AddItem(KFWeapon);
-}
+			}
-
+		}
-public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KFGameReplicationInfo KFGRI, E_LogLevel LogLevel)
+	}
-{
+
-	local KFGFxObject_TraderItems TraderItems;
+	return KFWeapons;
-	local STraderItem Item;
+}
-	local Array<class<KFWeaponDefinition> > WeapDefs;
+
-	
+public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KFGameReplicationInfo KFGRI, E_LogLevel LogLevel)
-	`Log_TraceStatic();
+{
-	
+	local KFGFxObject_TraderItems TraderItems;
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	local STraderItem Item;
-	
+	local Array<class<KFWeaponDefinition> > WeapDefs;
-	foreach TraderItems.SaleItems(Item)
+
-	{
+	`Log_TraceStatic();
-		if (Item.WeaponDef != None && Item.WeaponDef.default.SharedUnlockId != SCU_None)
+
-		{
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
-			WeapDefs.AddItem(Item.WeaponDef);
+
-		}
+	foreach TraderItems.SaleItems(Item)
-	}
+	{
-	
+		if (Item.WeaponDef != None && Item.WeaponDef.default.SharedUnlockId != SCU_None)
-	return WeapDefs;
+		{
-}
+			WeapDefs.AddItem(Item.WeaponDef);
-
+		}
-public static simulated function ModifyTrader(
+	}
-	KFGameReplicationInfo KFGRI,
+
-	Array<class<KFWeaponDefinition> > RemoveItems,
+	return WeapDefs;
-	Array<class<KFWeaponDefinition> > AddItems,
+}
-	bool ReplaceMode,
+
-	E_LogLevel LogLevel)
+public static simulated function ModifyTrader(
-{
+	KFGameReplicationInfo KFGRI,
-	local KFGFxObject_TraderItems TraderItems;
+	const out Array<class<KFWeaponDefinition> > RemoveItems,
-	local STraderItem Item;
+	const out Array<class<KFWeaponDefinition> > AddItems,
-	local class<KFWeaponDefinition> WeapDef;
+	bool ReplaceMode,
-	local Array<class<KFWeaponDefinition> > WeapDefs;
+	bool RemoveHRG,
-	local int Index;
+	bool RemoveDLC,
-	local int MaxItemID;
+	bool bDisableItemLimitCheck,
-	
+	E_LogLevel LogLevel)
-	`Log_TraceStatic();
+{
-	
+	local KFGFxObject_TraderItems TraderItems;
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	local STraderItem Item;
-	
+	local Array<class<KFWeaponDefinition> > WeapDefs;
-	if (!ReplaceMode)
+	local int Index;
-	{
+
-		foreach TraderItems.SaleItems(Item)
+	`Log_TraceStatic();
-		{
+
-			if (Item.WeaponDef != None
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
-			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
+
-			&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
+	if (!ReplaceMode)
-			{
+	{
-				WeapDefs.AddItem(Item.WeaponDef);
+		foreach TraderItems.SaleItems(Item)
-			}
+		{
-		}
+			if (Item.WeaponDef != None
-	}
+			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
-	
+			&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
-	for (Index = 0; Index < AddItems.Length; ++Index)
+			&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None))
-	{
+			&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
-		WeapDefs.AddItem(AddItems[Index]);
+			{
-	}
+				WeapDefs.AddItem(Item.WeaponDef);
-	
+			}
-	WeapDefs.Sort(ByPrice);
+		}
-	
+	}
-	TraderItems.SaleItems.Length = 0;
+
-	MaxItemID = 0;
+	for (Index = 0; Index < AddItems.Length; ++Index)
-	foreach WeapDefs(WeapDef)
+	{
-	{
+		WeapDefs.AddItem(AddItems[Index]);
-		Item.WeaponDef = WeapDef;
+	}
-		Item.ItemID = ++MaxItemID;
+
-		TraderItems.SaleItems.AddItem(Item);
+	WeapDefs.Sort(ByPrice);
-	}
+
-
+	if (!bDisableItemLimitCheck && WeapDefs.Length > ITEMS_LIMIT)
-	TraderItems.SetItemsInfo(TraderItems.SaleItems);
+	{
-	
+		`Log_Warn("The total number of items has reached the limit (" $ ITEMS_LIMIT $ ")," @ (WeapDefs.Length - ITEMS_LIMIT) @ "items will not be added.");
-	KFGRI.TraderItems = TraderItems;
+		`Log_Warn("Excluded items:");
-}
+		for (Index = ITEMS_LIMIT; Index < WeapDefs.Length; ++Index)
-
+		{
-private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
+			`Log_Warn("[" $ Index + 1 $ "]" @ String(WeapDefs[Index]));
-{
+		}
-	local class<KFWeaponDefinition> WeapDef;
+		WeapDefs.Length = ITEMS_LIMIT;
-	
+	}
-	`Log_TraceStatic();
+
-	
+	OverwriteTraderItems(KFGRI, WeapDefs, LogLevel);
-	foreach WeapDefs(WeapDef)
+}
-	{
+
-		if (WeapDef.default.WeaponClassPath == WeaponClassPath)
+public static simulated function OverwriteTraderItems(
-		{
+	KFGameReplicationInfo KFGRI,
-			return false;
+	const out Array<class<KFWeaponDefinition> > WeapDefs,
-		}
+	E_LogLevel LogLevel)
-	}
+{
-	
+	local KFGFxObject_TraderItems TraderItems;
-	return true;
+	local STraderItem Item;
-}
+	local class<KFWeaponDefinition> WeapDef;
-
+	local int MaxItemID;
-defaultproperties
+
-{
+	`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++;
+		TraderItems.SaleItems.AddItem(Item);
+		`Log_Debug("[" $ MaxItemID $ "]" @ String(WeapDef));
+	}
+
+	TraderItems.SetItemsInfo(TraderItems.SaleItems);
+
+	KFGRI.TraderItems = TraderItems;
+}
+
+private static function bool WeaponClassIsUnique(String WeaponClassPath, const out 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

@@ -1,197 +1,188 @@
-class Unlocker extends Object
+class Unlocker extends Object
-	abstract;
+	dependson(WeaponReplacements)
-
+	abstract;
-// TODO:
+
-// replace shopContainer (KFGFxTraderContainer_Store)
+// TODO:
-// without replacing KFGFxMoviePlayer_Manager
+// replace shopContainer (KFGFxTraderContainer_Store)
-// but how? 🤔
+// without replacing KFGFxMoviePlayer_Manager
-
+// but how? 🤔
-const Trader = class'Trader';
+
-
+const Trader       = class'Trader';
-var private const Array<class<KFWeaponDefinition> > WeapDefDLCReplacements;
+const Replacements = class'WeaponReplacements';
-
+
-public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
+public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
-{
+{
-	`Log_TraceStatic();
+	`Log_TraceStatic();
-	
+
-	switch (Locs(UnlockType))
+	switch (Locs(UnlockType))
-	{
+	{
-		case "true":
+		case "true":
-		case "false":
+		case "false":
-		case "auto":
+		case "auto":
-		case "replaceweapons":
+		case "replaceweapons":
-		case "replacefilter":
+		case "replacefilter":
-			return true;
+			return true;
-	}
+	}
-	
+
-	return false;
+	return false;
-}
+}
-
+
-public static function bool UnlockDLC(
+public static function bool UnlockDLC(
-	KFGameInfo KFGI,
+	KFGameInfo KFGI,
-	KFGameReplicationInfo KFGRI,
+	KFGameReplicationInfo KFGRI,
-	String UnlockType,
+	String UnlockType,
-	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
-	out Array<class<KFWeaponDefinition> > AddItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
-	E_LogLevel LogLevel)
+	out BoolWrapper DLCSkinUpdateRequired,
-{
+	E_LogLevel LogLevel)
-	`Log_TraceStatic();
+{
-	
+	`Log_TraceStatic();
-	switch (Locs(UnlockType))
+
-	{
+	switch (Locs(UnlockType))
-		case "true":
+	{
-		case "auto":
+		case "true":
-			return Auto(KFGI, KFGRI, RemoveItems, AddItems, LogLevel);
+		case "auto":
-
+			return Auto(KFGI, KFGRI, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel);
-		case "replaceweapons":
+
-			return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
+		case "replaceweapons":
-			
+			DLCSkinUpdateRequired.Value = true;
-		case "replacefilter":
+			return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
-			return ReplaceFilter(KFGI, LogLevel);
+
-			
+		case "replacefilter":
-		case "false":
+			DLCSkinUpdateRequired.Value = false;
-		default:
+			return ReplaceFilter(KFGI, LogLevel);
-			return false;
+
-	}
+		case "false":
-}
+		default:
-
+			return false;
-private static function bool Auto(
+	}
-	KFGameInfo KFGI,
+}
-	KFGameReplicationInfo KFGRI,
+
-	out Array<class<KFWeaponDefinition> > RemoveItems,
+private static function bool Auto(
-	out Array<class<KFWeaponDefinition> > AddItems,
+	KFGameInfo KFGI,
-	E_LogLevel LogLevel)
+	KFGameReplicationInfo KFGRI,
-{
+	out Array<class<KFWeaponDefinition> > RemoveItems,
-	local bool CustomGFxManager;
+	out Array<class<KFWeaponDefinition> > AddItems,
-	
+	out BoolWrapper DLCSkinUpdateRequired,
-	`Log_TraceStatic();
+	E_LogLevel LogLevel)
-	
+{
-	if (KFGI == None) return false;
+	local bool CustomGFxManager;
-	
+
-	if (KFGameInfo_VersusSurvival(KFGI) != None)
+	`Log_TraceStatic();
-	{
+
-		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
+	if (KFGI == None) return false;
-	}
+
-	else
+	if (KFGameInfo_VersusSurvival(KFGI) != None)
-	{
+	{
-		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
-	}
+	}
-
+	else
-	if (CustomGFxManager)
+	{
-	{
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
-		return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
+	}
-	}
+
-	else
+	if (CustomGFxManager)
-	{
+	{
-		return ReplaceFilter(KFGI, LogLevel);
+		DLCSkinUpdateRequired.Value = true;
-	}
+		return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
-}
+	}
-
+	else
-private static function bool ReplaceWeapons(
+	{
-	KFGameReplicationInfo KFGRI,
+		DLCSkinUpdateRequired.Value = false;
-	out Array<class<KFWeaponDefinition> > RemoveItems,
+		return ReplaceFilter(KFGI, LogLevel);
-	out Array<class<KFWeaponDefinition> > AddItems,
+	}
-	E_LogLevel LogLevel)
+}
-{
+
-	local Array<class<KFWeaponDefinition> > WeapDefsDLCs;
+private static function bool ReplaceWeapons(
-	local class<KFWeaponDefinition> WeapDefDLC;
+	KFGameReplicationInfo KFGRI,
-	local class<KFWeaponDefinition> WeapDefReplacement;
+	out Array<class<KFWeaponDefinition> > RemoveItems,
-	local bool Unlock, PartialUnlock;
+	out Array<class<KFWeaponDefinition> > AddItems,
-	
+	E_LogLevel LogLevel)
-	`Log_TraceStatic();
+{
-	
+	local Array<class<KFWeaponDefinition> > WeapDefsDLCs;
-	Unlock = false;
+	local class<KFWeaponDefinition> WeapDefDLC;
-	PartialUnlock = false;
+	local class<KFWeaponDefinition> WeapDefReplacement;
-	
+	local bool Unlock, PartialUnlock;
-	WeapDefsDLCs = Trader.static.GetTraderWeapDefsDLC(KFGRI, LogLevel);
+
-	
+	`Log_TraceStatic();
-	foreach WeapDefsDLCs(WeapDefDLC)
+
-	{
+	`Log_Debug("Unlock by replace weapons");
-		WeapDefReplacement = PickReplacementWeapDefDLC(WeapDefDLC, LogLevel);
+
-		if (WeapDefReplacement != None)
+	Unlock = false;
-		{
+	PartialUnlock = false;
-			Unlock = true;
+
-			if (AddItems.Find(WeapDefReplacement) == INDEX_NONE)
+	WeapDefsDLCs = Trader.static.GetTraderWeapDefsDLC(KFGRI, LogLevel);
-			{
+
-				AddItems.AddItem(WeapDefReplacement);
+	foreach WeapDefsDLCs(WeapDefDLC)
-			}
+	{
-			`Log_Debug(WeapDefDLC @ "replaced by" @ WeapDefReplacement);
+		WeapDefReplacement = PickReplacementWeapDefDLC(WeapDefDLC, LogLevel);
-		}
+		if (WeapDefReplacement != None)
-		else
+		{
-		{
+			Unlock = true;
-			PartialUnlock = true;
+			if (AddItems.Find(WeapDefReplacement) == INDEX_NONE)
-			`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
+			{
-		}
+				AddItems.AddItem(WeapDefReplacement);
-	}
+			}
-	
+			`Log_Debug(WeapDefDLC @ "replaced by" @ WeapDefReplacement);
-	if (PartialUnlock)
+		}
-	{
+		else
-		`Log_Warn("Some DLCs are not unlocked. Try to set 'UnlockDLC=ReplaceFilter' or ask the author to update the mod");
+		{
-	}
+			PartialUnlock = true;
-	
+			`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
-	return Unlock;
+		}
-}
+
-
+		if (RemoveItems.Find(WeapDefDLC) == INDEX_NONE)
-private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
+		{
-{
+			RemoveItems.AddItem(WeapDefDLC);
-	local class<KFWeaponDefinition> WeapDef;
+		}
-	
+	}
-	`Log_TraceStatic();
+
-	
+	if (PartialUnlock)
-	foreach default.WeapDefDLCReplacements(WeapDef)
+	{
-	{
+		`Log_Warn("Some DLCs are not unlocked. Try to set 'UnlockDLC=ReplaceFilter' or ask the author to update the mod");
-		if (ClassIsChildOf(WeapDef, WeapDefDLC))
+	}
-		{
+
-			return WeapDef;
+	return Unlock;
-		}
+}
-	}
+
-	
+private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
-	return None;
+{
-}
+	local SWeapReplace WeapReplace;
-
+
-private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
+	`Log_TraceStatic();
-{
+
-	`Log_TraceStatic();
+	foreach Replacements.default.DLC(WeapReplace)
-	
+	{
-	if (KFGI == None) return false;
+		if (ClassIsChildOf(WeapReplace.WeapDef, WeapDefDLC))
-	
+		{
-	if (KFGameInfo_VersusSurvival(KFGI) != None)
+			return WeapReplace.WeapDef;
-	{
+		}
-		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
+	}
-	}
+
-	else
+	return None;
-	{
+}
-		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
+
-	}
+private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
-	
+{
-	return true;
+	`Log_TraceStatic();
-}
+
-
+	`Log_Debug("Unlock by replace filter");
-defaultproperties
+
-{
+	if (KFGI == None) return false;
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_AutoTurret')
+
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol')
+	if (KFGameInfo_VersusSurvival(KFGI) != None)
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss')
+	{
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat')
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino')
+	}
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual')
+	else
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow')
+	{
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun')
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed')
+	}
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS')
+
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18')
+	return true;
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C')
+}
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder')
+
-	WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster')
+defaultproperties
-	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_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'
+	)})
+}

CTI/Classes/_Logger.uc

@@ -1,20 +1,20 @@
-class _Logger extends Object
+class _Logger extends Object
-	abstract;
+	abstract;
-
+
-enum E_LogLevel
+enum E_LogLevel
-{
+{
-	LL_WrongLevel,
+	LL_WrongLevel,
-	LL_None,
+	LL_None,
-	LL_Fatal,
+	LL_Fatal,
-	LL_Error,
+	LL_Error,
-	LL_Warning,
+	LL_Warning,
-	LL_Info,
+	LL_Info,
-	LL_Debug,
+	LL_Debug,
-	LL_Trace,
+	LL_Trace,
-	LL_All
+	LL_All
-};
+};
-
+
-defaultproperties
+defaultproperties
-{
+{
-	
+
-}
+}

CTI/Constants.uci

@@ -1,2 +1,2 @@
-// Constants
+// Constants
-`define NO_CONFIG 0
+`define NO_CONFIG 0

CTI/Globals.uci

@@ -1,3 +1,3 @@
-// Imports
+// Imports
-`include(Logger.uci)
+`include(Logger.uci)
-`include(Constants.uci)
+`include(Constants.uci)

CTI/Logger.uci

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

PublicationContent/description.txt

@@ -15,7 +15,7 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
 [h1]Usage (single player)[/h1]
 [olist]
 [*]Subscribe to this mutator;
-[*]Start KF2; 
+[*]Start KF2;
 [*]Open console (~) and input:
 [b]open KF-BioticsLab?Mutator=CTI.CTIMut[/b]
 (replace the map and add the parameters you need)
@@ -65,13 +65,15 @@ Unfortunately I can't do anything about it because it's a game problem (not muta
 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.
+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:
-[b]Item=""[/b]
+[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]

README.md

@@ -3,24 +3,24 @@
 [![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 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)
+[![MegaLinter](https://github.com/GenZmeY/KF2-CustomTraderInventory/actions/workflows/mega-linter.yml/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-CustomTraderInventory/actions/workflows/mega-linter.yml)
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory)](https://github.com/GenZmeY/KF2-CustomTraderInventory/tags)
 [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory)](LICENSE)
 
-# Description
+## Description
 Add/Remove Items in the Trader's Inventory  
 
-# Features
+## Features
 - remove/add items to trader;
 - can preload weapon models (no lags when buying weapons);
 - unlock DLC weapons;
 - correct items sorting (by price);
 - don't have to worry about adding new guns after each Tripware update.
 
-# Usage & Setup
+## Usage & Setup
 [See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
 
-# Build
+## Build
 **Note:** If you want to build/test/brew/publish a mutator without git-bash and/or scripts, follow [these instructions](https://tripwireinteractive.atlassian.net/wiki/spaces/KF2SW/pages/26247172/KF2+Code+Modding+How-to) instead of what is described here.
 1. Install [Killing Floor 2](https://store.steampowered.com/app/232090/Killing_Floor_2/), Killing Floor 2 - SDK and [git for windows](https://git-scm.com/download/win);
 2. open git-bash and go to any folder where you want to store sources:  
@@ -34,16 +34,9 @@ Add/Remove Items in the Trader's Inventory
 5. The compiled files will be here:  
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
 
-# Testing
+## Bug reports
-Open git-bash in the source folder and run command:  
-`./tools/builder -t`  
-(or `./tools/builder -ct` if you haven't compiled the mutator yet)  
-
-A local single-user test will be launched with parameters from `builder.cfg` (edit this file if you want to test mutator with different parameters).
-
-# Bug reports
 If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-CustomTraderInventory/issues) and check if there is a description of your bug. If not, create a new issue.  
 Describe what the bug looks like and how reproduce it.  
 
-# License
+## License
-[GNU GPLv3](LICENSE)  
+[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)

builder.cfg

@@ -7,7 +7,7 @@ StripSource="True"
 
 # Mutators to be compiled
 # Specify them with a space as a separator,
-# Mutators will be compiled in the specified order 
+# Mutators will be compiled in the specified order
 PackageBuildOrder="CTI"
 
 
@@ -16,7 +16,7 @@ PackageBuildOrder="CTI"
 # 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 
+# The order doesn't matter
 PackagePeelzBrew=""
 
 
@@ -24,7 +24,7 @@ PackagePeelzBrew=""
 
 # Mutators that will be uploaded to the workshop
 # Specify them with a space as a separator,
-# The order doesn't matter 
+# The order doesn't matter
 PackageUpload="CTI"