.editorconfig

@@ -1,33 +0,0 @@
-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

@@ -1,114 +0,0 @@
----
-name: MegaLinter
-
-permissions: read-all
-
-on:
-  push:
-  pull_request:
-    branches:
-      - master
-
-env:
-  APPLY_FIXES: none
-  APPLY_FIXES_EVENT: pull_request
-  APPLY_FIXES_MODE: commit
-  FILTER_REGEX_EXCLUDE: (mega-linter.yml)
-  DISABLE: SPELL
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  megalinter:
-    name: MegaLinter
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-        with:
-          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-
-      - name: MegaLinter
-        uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
-        id: ml
-        env:
-          VALIDATE_ALL_CODEBASE: true
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Archive production artifacts
-        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
-        if: success() || failure()
-        with:
-          name: MegaLinter reports
-          path: |
-            megalinter-reports
-            mega-linter.log
-
-      - name: Set APPLY_FIXES_IF var
-        run: |
-          printf 'APPLY_FIXES_IF=%s\n' "${{
-            steps.ml.outputs.has_updated_sources == 1 &&
-            (
-              env.APPLY_FIXES_EVENT == 'all' ||
-              env.APPLY_FIXES_EVENT == github.event_name
-            ) &&
-            (
-              github.event_name == 'push' ||
-              github.event.pull_request.head.repo.full_name == github.repository
-            )
-          }}" >> "${GITHUB_ENV}"
-
-      - name: Set APPLY_FIXES_IF_* vars
-        run: |
-          printf 'APPLY_FIXES_IF_PR=%s\n' "${{
-            env.APPLY_FIXES_IF == 'true' &&
-            env.APPLY_FIXES_MODE == 'pull_request'
-          }}" >> "${GITHUB_ENV}"
-          printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
-            env.APPLY_FIXES_IF == 'true' &&
-            env.APPLY_FIXES_MODE == 'commit' &&
-            (!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
-          }}" >> "${GITHUB_ENV}"
-
-      - name: Create Pull Request with applied fixes
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
-        id: cpr
-        if: env.APPLY_FIXES_IF_PR == 'true'
-        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: env.APPLY_FIXES_IF_PR == 'true'
-        run: |
-          echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
-          echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
-
-      - name: Prepare commit
-        if: env.APPLY_FIXES_IF_COMMIT == 'true'
-        run: sudo chown -Rc $UID .git/
-
-      - name: Commit and push applied linter fixes
-        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
-        if: env.APPLY_FIXES_IF_COMMIT == 'true'
-        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
-	dependson(CTI)
-	config(CTI);
-
-var private config Array<String> Item;
-
-public static function InitConfig(int Version, int LatestVersion)
-{
-	switch (Version)
-	{
-		case `NO_CONFIG:
-			ApplyDefault();
-
-		default: break;
-	}
-
-	if (LatestVersion != Version)
-	{
-		StaticSaveConfig();
-	}
-}
-
-private static function ApplyDefault()
-{
-	default.Item.Length = 0;
-	default.Item.AddItem("SomePackage.SomeWeapon");
-}
-
-public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
-{
-	local Array<class<KFWeaponDefinition> > ItemList;
-	local class<KFWeaponDefinition> ItemWeapDef;
-	local class<KFWeapon> ItemWeapon;
-	local String ItemRaw;
-	local int    Line;
-
-	`Log_Info("Load Items to add:");
-	foreach default.Item(ItemRaw, Line)
-	{
-		ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-		if (ItemWeapDef == None)
-		{
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
-			continue;
-		}
-
-		ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
-		if (ItemWeapon == None)
-		{
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
-			continue;
-		}
-
-		if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
-		{
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
-			continue;
-		}
-
-		ItemList.AddItem(ItemWeapDef);
-		`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
-	}
-
-	if (ItemList.Length == default.Item.Length)
-	{
-		`Log_Info("Items to add list loaded successfully (" $ default.Item.Length @ "entries)");
-	}
-	else
-	{
-		`Log_Info("Items to add list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
-	}
-
-	return ItemList;
-}
-
-defaultproperties
-{
-
-}
+class AddItems extends Object
+	dependson(CTI)
+	config(CTI);
+
+var private config Array<String> Item;
+
+public static function InitConfig(int Version, int LatestVersion)
+{
+	switch (Version)
+	{
+		case `NO_CONFIG:
+			ApplyDefault();
+			
+		default: break;
+	}
+	
+	if (LatestVersion != Version)
+	{
+		StaticSaveConfig();
+	}
+}
+
+private static function ApplyDefault()
+{
+	default.Item.Length = 0;
+	default.Item.AddItem("SomePackage.SomeWeapon");
+}
+
+public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
+{
+	local Array<class<KFWeaponDefinition> > ItemList;
+	local class<KFWeaponDefinition> ItemWeapDef;
+	local class<KFWeapon> ItemWeapon;
+	local String ItemRaw;
+	local int    Line;
+	
+	`Log_Info("Load Items to add:");
+	foreach default.Item(ItemRaw, Line)
+	{
+		ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+		if (ItemWeapDef == None)
+		{
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
+			continue;
+		}
+		
+		ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
+		if (ItemWeapon == None)
+		{
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
+			continue;
+		}
+		
+		if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
+		{
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
+			continue;
+		}
+		
+		ItemList.AddItem(ItemWeapDef);
+		`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
+	}
+	
+	if (ItemList.Length == default.Item.Length)
+	{
+		`Log_Info("Items to add list loaded successfully (" $ default.Item.Length @ "entries)");
+	}
+	else
+	{
+		`Log_Info("Items to add list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
+	}
+	
+	return ItemList;
+}
+
+defaultproperties
+{
+
+}

CTI/Classes/CTI.uc

@@ -1,391 +1,316 @@
-class CTI extends Info
-	config(CTI);
-
-const LatestVersion = 5;
-
-const CfgRemoveItems     = class'RemoveItems';
-const CfgAddItems        = class'AddItems';
-const CfgOfficialWeapons = class'OfficialWeapons';
-const Trader             = class'Trader';
-const Unlocker           = class'Unlocker';
-
-struct S_PreloadContent
-{
-	var class<KFWeaponDefinition> KFWD;
-	var class<KFWeapon>           KFWC;
-	var KFWeapon                  KFW;
-	var KFW_Access                KFWA;
-};
-
-var private config int        Version;
-var private config E_LogLevel LogLevel;
-var private config String     UnlockDLC;
-var private config bool       bPreloadContent;
-var private config bool       bOfficialWeaponsList;
-var private config bool       bDisableItemLimitCheck;
-var private config bool       bApplyPatch;
-
-var private KFGameInfo            KFGI;
-var private KFGameReplicationInfo KFGRI;
-
-var private Array<class<KFWeaponDefinition> > WeapDefs;
-var private Array<class<KFWeaponDefinition> > RemoveItems;
-var private Array<class<KFWeaponDefinition> > AddItems;
-
-var private Array<CTI_RepInfo> RepInfos;
-
-var private bool ReadyToSync;
-
-// To bypass "Booleans may not be out parameters" error
-struct BoolWrapper
-{
-	var bool Value;
-
-	structdefaultproperties
-	{
-		Value = false
-	}
-};
-
-var private BoolWrapper DLCSkinUpdateRequired;
-
-public simulated function bool SafeDestroy()
-{
-	`Log_Trace();
-
-	return (bPendingDelete || bDeleteMe || Destroy());
-}
-
-public event PreBeginPlay()
-{
-	`Log_Trace();
-
-	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
-
-	if (WorldInfo.NetMode == NM_Client)
-	{
-		`Log_Fatal("NetMode == NM_Client, Destroy...");
-		SafeDestroy();
-		return;
-	}
-
-	Super.PreBeginPlay();
-
-	PreInit();
-}
-
-public event PostBeginPlay()
-{
-	`Log_Trace();
-
-	if (bPendingDelete || bDeleteMe) return;
-
-	Super.PostBeginPlay();
-
-	PostInit();
-}
-
-private function PreInit()
-{
-	`Log_Trace();
-
-	if (Version == `NO_CONFIG)
-	{
-		LogLevel = LL_Info;
-		bPreloadContent = true;
-		UnlockDLC = "False";
-		SaveConfig();
-	}
-
-	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
-	CfgAddItems.static.InitConfig(Version, LatestVersion);
-
-	switch (Version)
-	{
-		case `NO_CONFIG:
-			`Log_Info("Config created");
-
-		case 1:
-			bOfficialWeaponsList = false;
-
-		case 2:
-		case 3:
-			bDisableItemLimitCheck = false;
-
-		case 4:
-			bApplyPatch = false;
-
-		case MaxInt:
-			`Log_Info("Config updated to version" @ LatestVersion);
-			break;
-
-		case LatestVersion:
-			`Log_Info("Config is up-to-date");
-			break;
-
-		default:
-			`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);
-			`Log_Warn("The config version will be changed to" @ LatestVersion);
-			break;
-	}
-
-	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
-
-	if (LatestVersion != Version)
-	{
-		Version = LatestVersion;
-		SaveConfig();
-	}
-
-	if (LogLevel == LL_WrongLevel)
-	{
-		LogLevel = LL_Info;
-		`Log_Warn("Wrong 'LogLevel', return to default value");
-		SaveConfig();
-	}
-	`Log_Base("LogLevel:" @ LogLevel);
-
-	if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
-	{
-		`Log_Warn("Wrong 'UnlockDLC' value (" $ UnlockDLC $ "), return to default value (False)");
-		UnlockDLC = "False";
-		SaveConfig();
-	}
-
-	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
-	AddItems    = CfgAddItems.static.Load(LogLevel);
-}
-
-private function PostInit()
-{
-	local CTI_RepInfo RepInfo;
-
-	`Log_Trace();
-
-	if (WorldInfo == None || WorldInfo.Game == None)
-	{
-		SetTimer(1.0f, false, nameof(PostInit));
-		return;
-	}
-
-	KFGI = KFGameInfo(WorldInfo.Game);
-	if (KFGI == None)
-	{
-		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
-		SafeDestroy();
-		return;
-	}
-
-	if (KFGI.GameReplicationInfo == None)
-	{
-		SetTimer(1.0f, false, nameof(PostInit));
-		return;
-	}
-
-	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
-	if (KFGRI == None)
-	{
-		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
-		SafeDestroy();
-		return;
-	}
-
-	WeapDefs = Trader.static.GenerateWeapDefList(
-		KFGRI,
-		RemoveItems,
-		AddItems,
-		CfgRemoveItems.default.bAll,
-		CfgRemoveItems.default.bHRG,
-		CfgRemoveItems.default.bDLC,
-		bDisableItemLimitCheck,
-		LogLevel);
-
-	RemoveItems.Length = 0;
-	AddItems.Length = 0;
-
-	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, WeapDefs, DLCSkinUpdateRequired, LogLevel))
-	{
-		`Log_Info("DLC unlocked");
-	}
-	`Log_Debug("DLCSkinUpdateRequired:" @ String(DLCSkinUpdateRequired.Value));
-
-	if (bApplyPatch)
-	{
-		ServerPatch();
-	}
-
-	Trader.static.OverwriteTraderItems(KFGRI, WeapDefs, bApplyPatch, LogLevel);
-
-	`Log_Info("Trader items:" @ WeapDefs.Length);
-
-	if (bPreloadContent)
-	{
-		Preload(WeapDefs);
-	}
-
-	ReadyToSync = true;
-
-	foreach RepInfos(RepInfo)
-	{
-		if (RepInfo.PendingSync)
-		{
-			RepInfo.PrepareSync(Self, LogLevel, KFGI.KFGFxManagerClass, DLCSkinUpdateRequired.Value, bApplyPatch);
-			RepInfo.Replicate(WeapDefs);
-		}
-	}
-}
-
-private function ServerPatch()
-{
-	local class<KFAutoPurchaseHelper> AutoPurchaseHelper;
-	local class<KFInventoryManager> InventoryManager;
-
-	if (KFGI.KFGFxManagerClass.GetPackageName() != 'CTI')
-	{
-		if (Unlocker.static.CustomGFxManager(KFGI))
-		{
-			`Log_Warn("Custom KFGFxMoviePlayer_Manager detected:" @ String(KFGI.KFGFxManagerClass) $ ". There may be compatibility issues.");
-		}
-
-		if (KFGameInfo_VersusSurvival(KFGI) != None)
-		{
-			KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
-		}
-		else
-		{
-			KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
-		}
-	}
-
-	if (KFGRI.TraderItems.class != class'KFGFxObject_TraderItems')
-	{
-		`Log_Warn("Custom TraderItems detected:" @ String(KFGRI.TraderItems.class) $ ". There may be compatibility issues.");
-	}
-
-	AutoPurchaseHelper = class<KFPlayerController>(KFGI.PlayerControllerClass).default.PurchaseHelperClass;
-	if (AutoPurchaseHelper != class'KFPlayerController'.default.PurchaseHelperClass)
-	{
-		`Log_Warn("Custom PurchaseHelper detected:" @ String(AutoPurchaseHelper) $ ". There may be compatibility issues.");
-	}
-
-	InventoryManager = class<KFInventoryManager>(KFGI.DefaultPawnClass.default.InventoryManagerClass);
-	if (InventoryManager != class'KFPawn'.default.InventoryManagerClass)
-	{
-		`Log_Warn("Custom InventoryManager detected:" @ String(InventoryManager) $ ". There may be compatibility issues.");
-	}
-}
-
-private function Preload(const out Array<class<KFWeaponDefinition> > Content)
-{
-	local Array<S_PreloadContent> PreloadContent;
-	local S_PreloadContent SPC;
-
-	`Log_Trace();
-
-	foreach Content(SPC.KFWD)
-	{
-		SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
-		if (SPC.KFWC != None)
-		{
-			if (SPC.KFWC.GetPackageName() == 'CTI' || SPC.KFWC.GetPackageName() == 'KFGameContent')
-			{
-				`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
-				continue;
-			}
-
-			SPC.KFW = KFGI.Spawn(SPC.KFWC);
-			if (SPC.KFW == None)
-			{
-				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
-				continue;
-			}
-
-			SPC.KFWA = new (SPC.KFW) class'KFW_Access';
-			if (SPC.KFWA == None)
-			{
-				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
-				continue;
-			}
-
-			PreloadContent.AddItem(SPC);
-		}
-	}
-
-	foreach PreloadContent(SPC)
-	{
-		SPC.KFWA.KFW_StartLoadWeaponContent();
-	}
-
-	`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
-}
-
-public function NotifyLogin(Controller C)
-{
-	`Log_Trace();
-
-	if (!CreateRepInfo(C))
-	{
-		`Log_Error("Can't create RepInfo for:" @ C);
-	}
-}
-
-public function NotifyLogout(Controller C)
-{
-	`Log_Trace();
-
-	DestroyRepInfo(C);
-}
-
-public function bool CreateRepInfo(Controller C)
-{
-	local CTI_RepInfo RepInfo;
-
-	`Log_Trace();
-
-	if (C == None || KFPlayerController(C) == None) return false;
-
-	RepInfo = Spawn(class'CTI_RepInfo', C);
-
-	if (RepInfo == None) return false;
-
-	RepInfos.AddItem(RepInfo);
-
-	if (ReadyToSync)
-	{
-		RepInfo.PrepareSync(Self, LogLevel, KFGI.KFGFxManagerClass, DLCSkinUpdateRequired.Value, bApplyPatch);
-		RepInfo.Replicate(WeapDefs);
-	}
-	else
-	{
-		RepInfo.PendingSync = true;
-	}
-
-	return true;
-}
-
-public function bool DestroyRepInfo(Controller C)
-{
-	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
-}
+class CTI extends Info
+	config(CTI);
+
+const LatestVersion = 2;
+
+const CfgRemoveItems     = class'RemoveItems';
+const CfgAddItems        = class'AddItems';
+const CfgOfficialWeapons = class'OfficialWeapons';
+const Trader             = class'Trader';
+const Unlocker           = class'Unlocker';
+
+struct S_PreloadContent
+{
+	var class<KFWeaponDefinition> KFWD;
+	var class<KFWeapon>           KFWC;
+	var KFWeapon                  KFW;
+	var KFW_Access                KFWA;
+};
+
+var private config int        Version;
+var private config E_LogLevel LogLevel;
+var private config String     UnlockDLC;
+var private config bool       bPreloadContent;
+var private config bool       bOfficialWeaponsList;
+
+var private KFGameInfo KFGI;
+var private KFGameReplicationInfo KFGRI;
+
+var private Array<class<KFWeaponDefinition> > RemoveItems;
+var private Array<class<KFWeaponDefinition> > AddItems;
+
+var private Array<CTI_RepInfo> RepInfos;
+
+var private bool ReadyToSync;
+
+var private Array<S_PreloadContent> PreloadContent;
+
+public simulated function bool SafeDestroy()
+{
+	`Log_Trace();
+	
+	return (bPendingDelete || bDeleteMe || Destroy());
+}
+
+public event PreBeginPlay()
+{
+	`Log_Trace();
+	
+	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
+	
+	if (WorldInfo.NetMode == NM_Client)
+	{
+		`Log_Fatal("NetMode == NM_Client, Destroy...");
+		SafeDestroy();
+		return;
+	}
+	
+	Super.PreBeginPlay();
+	
+	PreInit();
+}
+
+public event PostBeginPlay()
+{
+	`Log_Trace();
+	
+	if (bPendingDelete || bDeleteMe) return;
+	
+	Super.PostBeginPlay();
+	
+	PostInit();
+}
+
+private function PreInit()
+{
+	`Log_Trace();
+	
+	if (Version == `NO_CONFIG)
+	{
+		LogLevel = LL_Info;
+		bPreloadContent = true;
+		UnlockDLC = "False";
+		SaveConfig();
+	}
+	
+	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
+	CfgAddItems.static.InitConfig(Version, LatestVersion);
+	
+	switch (Version)
+	{
+		case `NO_CONFIG:
+			`Log_Info("Config created");
+			
+		case 1:
+			bOfficialWeaponsList = false;
+			
+		case MaxInt:
+			`Log_Info("Config updated to version" @ LatestVersion);
+			break;
+			
+		case LatestVersion:
+			`Log_Info("Config is up-to-date");
+			break;
+			
+		default:
+			`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);
+			`Log_Warn("The config version will be changed to" @ LatestVersion);
+			break;
+	}
+	
+	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
+
+	if (LatestVersion != Version)
+	{
+		Version = LatestVersion;
+		SaveConfig();
+	}
+
+	if (LogLevel == LL_WrongLevel)
+	{
+		LogLevel = LL_Info;
+		`Log_Warn("Wrong 'LogLevel', return to default value");
+		SaveConfig();
+	}
+	`Log_Base("LogLevel:" @ LogLevel);
+	
+	if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
+	{
+		`Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)");
+		UnlockDLC = "False";
+		SaveConfig();
+	}
+	
+	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
+	AddItems    = CfgAddItems.static.Load(LogLevel);
+}
+
+private function PostInit()
+{
+	local CTI_RepInfo RepInfo;
+	
+	`Log_Trace();
+	
+	if (WorldInfo == None || WorldInfo.Game == None)
+	{
+		SetTimer(1.0f, false, nameof(PostInit));
+		return;
+	}
+	
+	KFGI = KFGameInfo(WorldInfo.Game);
+	if (KFGI == None)
+	{
+		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
+		SafeDestroy();
+		return;
+	}
+	
+	if (KFGI.GameReplicationInfo == None)
+	{
+		SetTimer(1.0f, false, nameof(PostInit));
+		return;
+	}
+	
+	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
+	if (KFGRI == None)
+	{
+		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
+		SafeDestroy();
+		return;
+	}
+	
+	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel))
+	{
+		`Log_Info("DLC unlocked");
+	}
+	
+	if (bPreloadContent)
+	{
+		Preload(AddItems);
+	}
+	
+	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll, LogLevel);
+	
+	ReadyToSync = true;
+	
+	foreach RepInfos(RepInfo)
+	{
+		if (RepInfo.PendingSync)
+		{
+			RepInfo.ServerSync();
+		}
+	}
+}
+
+private function Preload(Array<class<KFWeaponDefinition> > Content)
+{
+	local Array<class<KFWeapon> > OfficialWeapons;
+	local S_PreloadContent SPC;
+	
+	`Log_Trace();
+	
+	OfficialWeapons = Trader.static.GetTraderWeapons();
+	
+	foreach Content(SPC.KFWD)
+	{
+		SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
+		if (SPC.KFWC != None)
+		{
+			if (OfficialWeapons.Find(SPC.KFWC) != INDEX_NONE)
+			{
+				`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
+				continue;
+			}
+		
+			SPC.KFW = KFGI.Spawn(SPC.KFWC);
+			if (SPC.KFW == None)
+			{
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
+				continue;
+			}
+			
+			SPC.KFWA = new (SPC.KFW) class'KFW_Access';
+			if (SPC.KFWA == None)
+			{
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
+				continue;
+			}
+			
+			PreloadContent.AddItem(SPC);
+		}
+	}
+	
+	foreach PreloadContent(SPC)
+	{
+		SPC.KFWA.KFW_StartLoadWeaponContent();
+	}
+	
+	`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
+}
+
+public function NotifyLogin(Controller C)
+{
+	`Log_Trace();
+
+	if (!CreateRepInfo(C))
+	{
+		`Log_Error("Can't create RepInfo for:" @ C);
+	}
+}
+
+public function NotifyLogout(Controller C)
+{
+	`Log_Trace();
+
+	DestroyRepInfo(C);
+}
+
+public function bool CreateRepInfo(Controller C)
+{
+	local CTI_RepInfo RepInfo;
+	
+	`Log_Trace();
+	
+	if (C == None) return false;
+	
+	RepInfo = Spawn(class'CTI_RepInfo', C);
+	
+	if (RepInfo == None) return false;
+	
+	RepInfo.PrepareSync(
+		Self,
+		LogLevel,
+		RemoveItems,
+		AddItems,
+		CfgRemoveItems.default.bAll);
+	
+	RepInfos.AddItem(RepInfo);
+	
+	if (ReadyToSync)
+	{
+		RepInfo.ServerSync();
+	}
+	else
+	{
+		RepInfo.PendingSync = true;
+	}
+	
+	return true;
+}
+
+public function bool DestroyRepInfo(Controller C)
+{
+	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]
-AllowDownload=True
-ClientOptional=False
-ServerSideOnly=False
+[Flags]
+AllowDownload=True
+ClientOptional=False
+ServerSideOnly=False

CTI/Classes/CTIMut.uc

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

CTI/Classes/CTI_AutoPurchaseHelper.uc

@@ -1,289 +0,0 @@
-class CTI_AutoPurchaseHelper extends KFAutoPurchaseHelper;
-
-var private CTI_GFxObject_TraderItems CTI_TraderItems;
-var private CTI_InventoryManager CTI_IM;
-
-private function CTI_GFxObject_TraderItems GetCTI_TraderItems()
-{
-	if (CTI_TraderItems == None)
-	{
-		if (TraderItems == None)
-		{
-			GetTraderItems();
-		}
-
-		if (TraderItems != None)
-		{
-			CTI_TraderItems = CTI_GFxObject_TraderItems(TraderItems);
-		}
-	}
-
-	return CTI_TraderItems;
-}
-
-private function CTI_InventoryManager GetCTI_IM()
-{
-	if (CTI_IM != Pawn.InvManager)
-	{
-		`Log_Base("Update InvManager:" @ String(CTI_IM) @ "<-" @ String(Pawn.InvManager));
-		CTI_IM = CTI_InventoryManager(Pawn.InvManager);
-	}
-
-	return CTI_IM;
-}
-
-public function Initialize(optional bool bInitializeOwned = true)
-{
-	Super.Initialize(bInitializeOwned);
-	GetCTI_IM();
-	GetCTI_TraderItems();
-}
-
-public function bool UpgradeWeapon(int OwnedItemIndex)
-{
-	local int ItemIndex;
-	local STraderItem DefaultItemInfo;
-	local SItemInformation ItemInfo;
-	local int Test1, Test2;
-
-	ItemInfo = OwnedItemList[OwnedItemIndex];
-	DefaultItemInfo = ItemInfo.DefaultItem;
-
-	if (ItemInfo.bIsSecondaryAmmo || !CanUpgrade(DefaultItemInfo, Test1, Test2, true))
-	{
-		return false;
-	}
-
-	if (GetCTI_IM() == None) return false;
-
-	CTI_GetItemIndicesFromArche(ItemIndex, DefaultItemInfo.ClassName);
-	CTI_IM.CTI_BuyUpgrade(ItemIndex, ItemInfo.ItemUpgradeLevel);
-	OwnedItemList[OwnedItemIndex].SellPrice = GetAdjustedSellPriceFor(DefaultItemInfo);
-
-	if (MyGfxManager != None && MyGfxManager.TraderMenu != None)
-	{
-		MyGfxManager.TraderMenu.OwnedItemList = OwnedItemList;
-	}
-
-	return true;
-}
-
-public function BoughtAmmo(float AmountPurchased, int Price, EItemType ItemType, optional name ClassName, optional bool bIsSecondaryAmmo)
-{
-	local int ItemIndex;
-	AddDosh(-Price);
-
-	if (ItemType == EIT_Weapon)
-	{
-		CTI_GetItemIndicesFromArche(ItemIndex, ClassName);
-	}
-
-	if (GetCTI_IM() == None) return;
-
-	CTI_IM.CTI_BuyAmmo(AmountPurchased, ItemType, ItemIndex, bIsSecondaryAmmo);
-}
-
-private function float AmmoCostScale()
-{
-	local KFGameReplicationInfo KFGRI;
-	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
-	return KFGRI == None? 1.0f : KFGRI.GameAmmoCostScale;
-}
-
-public function int AddWeaponToOwnedItemList(STraderItem DefaultItem, optional bool bDoNotBuy, optional int OverrideItemUpgradeLevel = INDEX_NONE)
-{
-	local SItemInformation WeaponInfo;
-	local int ItemIndex, AddedWeaponIndex, OwnedSingleIdx, SingleDualAmmoDiff;
-	local bool bAddingDual;
-
-	WeaponInfo.MagazineCapacity = DefaultItem.MagazineCapacity;
-	CurrentPerk.ModifyMagSizeAndNumber(None, WeaponInfo.MagazineCapacity, DefaultItem.AssociatedPerkClasses,, DefaultItem.ClassName);
-
-	WeaponInfo.MaxSpareAmmo = DefaultItem.MaxSpareAmmo;
-	CurrentPerk.ModifyMaxSpareAmmoAmount(none, WeaponInfo.MaxSpareAmmo, DefaultItem);
-	WeaponInfo.MaxSpareAmmo += WeaponInfo.MagazineCapacity;
-
-	WeaponInfo.SpareAmmoCount = DefaultItem.InitialSpareMags * DefaultItem.MagazineCapacity;
-	CurrentPerk.ModifySpareAmmoAmount(none, WeaponInfo.SpareAmmoCount, DefaultItem);
-	WeaponInfo.SpareAmmoCount += WeaponInfo.MagazineCapacity;
-
-	bAddingDual = DefaultItem.SingleClassName != '';
-	if (bAddingDual)
-	{
-		for (OwnedSingleIdx = 0; OwnedSingleIdx < OwnedItemList.Length; ++OwnedSingleIdx)
-		{
-			if (OwnedItemList[OwnedSingleIdx].DefaultItem.ClassName != DefaultItem.SingleClassName) continue;
-
-			SingleDualAmmoDiff = OwnedItemList[OwnedSingleIdx].SpareAmmoCount - WeaponInfo.SpareAmmoCount;
-			SingleDualAmmoDiff = Max(0, SingleDualAmmoDiff);
-
-			if (WeaponInfo.SpareAmmoCount > OwnedItemList[OwnedSingleIdx].SpareAmmoCount)
-			{
-				OwnedItemList[OwnedSingleIdx].SpareAmmoCount = WeaponInfo.SpareAmmoCount;
-			}
-			else
-			{
-				WeaponInfo.SpareAmmoCount = Min(OwnedItemList[OwnedSingleIdx].SpareAmmoCount, WeaponInfo.MaxSpareAmmo);
-			}
-
-			WeaponInfo.ItemUpgradeLevel = OwnedItemList[OwnedSingleIdx].ItemUpgradeLevel;
-			break;
-		}
-	}
-
-	CurrentPerk.MaximizeSpareAmmoAmount(DefaultItem.AssociatedPerkClasses, WeaponInfo.SpareAmmoCount, DefaultItem.MaxSpareAmmo + DefaultItem.MagazineCapacity);
-
-	WeaponInfo.SecondaryAmmoCount = DefaultItem.InitialSecondaryAmmo;
-	CurrentPerk.ModifyMagSizeAndNumber(None, WeaponInfo.MagazineCapacity, DefaultItem.AssociatedPerkClasses, true, DefaultItem.ClassName);
-	CurrentPerk.ModifySpareAmmoAmount(None, WeaponInfo.SecondaryAmmoCount, DefaultItem, true);
-
-	WeaponInfo.MaxSecondaryAmmo = DefaultItem.MaxSecondaryAmmo;
-	CurrentPerk.ModifyMaxSpareAmmoAmount(None, WeaponInfo.MaxSecondaryAmmo, DefaultItem, true);
-
-	WeaponInfo.AmmoPricePerMagazine = AmmoCostScale() * DefaultItem.WeaponDef.default.AmmoPricePerMag;
-	WeaponInfo.SellPrice = GetAdjustedSellPriceFor(DefaultItem);
-
-	WeaponInfo.DefaultItem = DefaultItem;
-
-	if (OverrideItemUpgradeLevel > INDEX_NONE)
-	{
-		WeaponInfo.ItemUpgradeLevel = OverrideItemUpgradeLevel;
-	}
-
-	AddedWeaponIndex = AddItemByPriority(WeaponInfo);
-
-	if (GetCTI_IM() == None) return AddedWeaponIndex;
-
-	CTI_GetItemIndicesFromArche(ItemIndex, DefaultItem.ClassName);
-
-	if (!bDoNotBuy)
-	{
-		CTI_IM.CTI_ServerBuyWeapon(ItemIndex, WeaponInfo.ItemUpgradeLevel);
-	}
-	else
-	{
-		CTI_IM.CTI_ServerAddTransactionItem(ItemIndex, WeaponInfo.ItemUpgradeLevel);
-		AddBlocks(CTI_IM.GetWeaponBlocks(DefaultItem, WeaponInfo.ItemUpgradeLevel));
-	}
-
-	if (bAddingDual)
-	{
-		CTI_AddTransactionAmmo(ItemIndex, SingleDualAmmoDiff, false);
-		RemoveWeaponFromOwnedItemList(, DefaultItem.SingleClassName, true);
-	}
-
-	return AddedWeaponIndex;
-}
-
-public function RemoveWeaponFromOwnedItemList(optional int OwnedListIdx = INDEX_NONE, optional name ClassName, optional bool bDoNotSell)
-{
-	local SItemInformation ItemInfo;
-	local int ItemIndex;
-	local int SingleOwnedIndex;
-
-	if (OwnedListIdx == INDEX_NONE && ClassName != '')
-	{
-		for (OwnedListIdx = 0; OwnedListIdx < OwnedItemList.length; ++OwnedListIdx)
-		{
-			if (OwnedItemList[OwnedListIdx].DefaultItem.ClassName == ClassName) break;
-		}
-	}
-
-	if (OwnedListIdx >= OwnedItemList.length) return;
-
-	ItemInfo = OwnedItemList[OwnedListIdx];
-
-	if (GetCTI_IM() == None) return;
-
-	if (!bDoNotSell)
-	{
-		CTI_GetItemIndicesFromArche(ItemIndex, ItemInfo.DefaultItem.ClassName);
-		CTI_IM.CTI_ServerSellWeapon(ItemIndex);
-	}
-	else
-	{
-		AddBlocks(-CTI_IM.GetDisplayedBlocksRequiredFor(ItemInfo.DefaultItem));
-		CTI_GetItemIndicesFromArche(ItemIndex, ItemInfo.DefaultItem.ClassName);
-		CTI_IM.CTI_ServerRemoveTransactionItem(ItemIndex);
-	}
-
-	if (OwnedItemList[OwnedListIdx].bIsSecondaryAmmo)
-	{
-		OwnedItemList.Remove(OwnedListIdx, 1);
-		if (OwnedListIdx - 1 >= 0)
-		{
-			OwnedItemList.Remove(OwnedListIdx - 1, 1);
-		}
-	}
-	else if (OwnedItemList[OwnedListIdx].DefaultItem.WeaponDef.static.UsesSecondaryAmmo())
-	{
-		if (OwnedListIdx + 1 < OwnedItemList.Length)
-		{
-			OwnedItemList.Remove(OwnedListIdx + 1, 1);
-			OwnedItemList.Remove(OwnedListIdx, 1);
-		}
-	}
-	else
-	{
-		OwnedItemList.Remove(OwnedListIdx, 1);
-	}
-
-	if (ItemInfo.DefaultItem.SingleClassName == 'KFWeap_Pistol_9mm' || ItemInfo.DefaultItem.SingleClassName == 'KFWeap_HRG_93R')
-	{
-		if (CTI_GetItemIndicesFromArche(ItemIndex, ItemInfo.DefaultItem.SingleClassName))
-		{
-			SingleOwnedIndex = AddWeaponToOwnedItemList(CTI_TraderItems.AllItems[ItemIndex], true, ItemInfo.ItemUpgradeLevel);
-
-			CTI_AddTransactionAmmo(ItemIndex, ItemInfo.SpareAmmoCount - (ItemInfo.MaxSpareAmmo / 2.0) + ((ItemInfo.MaxSpareAmmo / 2.0) - OwnedItemList[SingleOwnedIndex].SpareAmmoCount), false);
-			OwnedItemList[SingleOwnedIndex].SpareAmmoCount = ItemInfo.SpareAmmoCount;
-		}
-	}
-
-	if (MyGfxManager != None && MyGfxManager.TraderMenu != None)
-	{
-		MyGfxManager.TraderMenu.OwnedItemList = OwnedItemList;
-	}
-}
-
-public function SetWeaponInformation(KFWeapon KFW)
-{
-	local int i;
-
-	if (GetCTI_TraderItems() == None)
-	{
-		Super.SetWeaponInformation(KFW);
-		return;
-	}
-
-	for (i = 0; i < CTI_TraderItems.AllItems.Length; i++)
-	{
-		if (KFW.Class.name == CTI_TraderItems.AllItems[i].ClassName)
-		{
-			SetWeaponInfo(KFW, CTI_TraderItems.AllItems[i]);
-			return;
-		}
-	}
-}
-
-// native private final function AddTransactionAmmo( byte ItemIndex, int Amount, bool bSecondaryAmmo );
-private function CTI_AddTransactionAmmo(int ItemIndex, int Amount, bool bSecondaryAmmo); // TODO: impl
-
-private function bool CTI_GetItemIndicesFromArche(out int ItemIndex, name WeaponClassName)
-{
-	local int Index;
-
-	if (GetCTI_TraderItems() == None) return false;
-
-	Index = CTI_TraderItems.AllItems.Find('ClassName', WeaponClassName);
-
-	if (Index == INDEX_NONE) return false;
-
-	ItemIndex = Index;
-
-	return true;
-}
-
-defaultproperties
-{
-
-}

CTI/Classes/CTI_GFxMenu_Trader.uc

@@ -1,217 +1,8 @@
-class CTI_GFxMenu_Trader extends KFGFxMenu_Trader
-	dependsOn(CTI_GFxTraderContainer_Store);
-
-var private int SelectedItemIndexInt;
-
-private function UpdateByteSelectedIndex()
-{
-	SelectedItemIndex = Clamp(SelectedItemIndexInt, 0, 255);
-}
-
-public function SetTraderItemDetails(int ItemIndex)
-{
-	local STraderItem SelectedItem;
-	local bool bCanAfford, bCanBuyItem, bCanCarry;
-	SelectedList = TL_Shop;
-
-	if (ItemDetails == None || ShopContainer == None) return;
-
-	if (MyKFPC.GetPurchaseHelper().TraderItems.SaleItems.length >= 0 && ItemIndex < MyKFPC.GetPurchaseHelper().TraderItems.SaleItems.length)
-	{
-		SelectedItemIndexInt = ItemIndex;
-		SelectedItem = MyKFPC.GetPurchaseHelper().TraderItems.SaleItems[ItemIndex];
-
-		bCanAfford = MyKFPC.GetPurchaseHelper().GetCanAfford(MyKFPC.GetPurchaseHelper().GetAdjustedBuyPriceFor(SelectedItem));
-		bCanCarry = MyKFPC.GetPurchaseHelper().CanCarry(SelectedItem);
-
-		bCanBuyItem = bCanAfford && bCanCarry;
-
-		PurchaseError(!bCanAfford, !bCanCarry);
-
-		ItemDetails.SetShopItemDetails(SelectedItem, MyKFPC.GetPurchaseHelper().GetAdjustedBuyPriceFor(SelectedItem), bCanCarry, bCanBuyItem);
-		bCanBuyOrSellItem = bCanBuyItem;
-	}
-	else
-	{
-		ItemDetails.SetVisible(false);
-	}
-
-	UpdateByteSelectedIndex();
-}
-
-public function SetPlayerItemDetails(int ItemIndex)
-{
-	local STraderItem SelectedItem;
-
-	SelectedList = TL_Player;
-	if (ItemDetails == None || ItemIndex >= OwnedItemList.length) return;
-
-	bGenericItemSelected = false;
-	SelectedItemIndexInt = ItemIndex;
-	SelectedItem = OwnedItemList[ItemIndex].DefaultItem;
-	ItemDetails.SetPlayerItemDetails(SelectedItem, OwnedItemList[ItemIndex].SellPrice, OwnedItemList[ItemIndex].ItemUpgradeLevel);
-	bCanBuyOrSellItem = MyKFPC.GetPurchaseHelper().IsSellable(SelectedItem);
-	PurchaseError(false, false);
-
-	UpdateByteSelectedIndex();
-}
-
-public function SetNewSelectedIndex(int ListLength)
-{
-	if (SelectedItemIndexInt >= ListLength)
-	{
-		if (SelectedItemIndexInt != 0)
-		{
-			SelectedItemIndexInt--;
-		}
-	}
-
-	UpdateByteSelectedIndex();
-}
-
-public function RefreshItemComponents(optional bool bInitOwnedItems = false)
-{
-	if (PlayerInventoryContainer == None || PlayerInfoContainer == None) return;
-
-	if (bInitOwnedItems)
-	{
-		MyKFPC.GetPurchaseHelper().InitializeOwnedItemList();
-	}
-	OwnedItemList = MyKFPC.GetPurchaseHelper().OwnedItemList;
-	PlayerInventoryContainer.RefreshPlayerInventory();
-	RefreshShopItemList(CurrentTab, CurrentFilterIndex);
-	GameInfoContainer.UpdateGameInfo();
-	GameInfoContainer.SetDosh(MyKFPC.GetPurchaseHelper().TotalDosh);
-	GameInfoContainer.SetCurrentWeight(MyKFPC.GetPurchaseHelper().TotalBlocks, MyKFPC.GetPurchaseHelper().MaxBlocks);
-
-	if (SelectedList == TL_Shop)
-	{
-		SetTraderItemDetails(SelectedItemIndexInt);
-	}
-	else if (bGenericItemSelected)
-	{
-		SetGenericItemDetails(LastDefaultItemInfo, LastItemInfo);
-	}
-	else
-	{
-		SetPlayerItemDetails(SelectedItemIndexInt);
-	}
-}
-
-public function RefreshShopItemList(TabIndices TabIndex, byte FilterIndex)
-{
-	if (ShopContainer == None || FilterContainer == None) return;
-
-	switch (TabIndex)
-	{
-		case (TI_Perks):
-			ShopContainer.RefreshWeaponListByPerk(FilterIndex, MyKFPC.GetPurchaseHelper().TraderItems.SaleItems);
-			FilterContainer.SetPerkFilterData(FilterIndex);
-		break;
-		case (TI_Type):
-			ShopContainer.RefreshItemsByType(FilterIndex, MyKFPC.GetPurchaseHelper().TraderItems.SaleItems);
-			FilterContainer.SetTypeFilterData(FilterIndex);
-		break;
-		case (TI_Favorites):
-			ShopContainer.RefreshFavoriteItems(MyKFPC.GetPurchaseHelper().TraderItems.SaleItems);
-			FilterContainer.ClearFilters();
-		break;
-		case (TI_All):
-			ShopContainer.RefreshAllItems(MyKFPC.GetPurchaseHelper().TraderItems.SaleItems);
-			FilterContainer.ClearFilters();
-		break;
-	}
-
-	FilterContainer.SetInt("selectedTab", TabIndex);
-	FilterContainer.SetInt("selectedFilter", FilterIndex);
-
-	if (SelectedList == TL_Shop)
-	{
-		if (SelectedItemIndexInt >= MyKFPC.GetPurchaseHelper().TraderItems.SaleItems.length)
-		{
-			SelectedItemIndexInt = MyKFPC.GetPurchaseHelper().TraderItems.SaleItems.length - 1;
-		}
-
-		SetTraderItemDetails(SelectedItemIndexInt);
-		ShopContainer.SetSelectedIndex(SelectedItemIndexInt);
-	}
-}
-
-public function Callback_BuyOrSellItem()
-{
-	local STraderItem ShopItem;
-	local SItemInformation ItemInfo;
-
-	if (bCanBuyOrSellItem)
-	{
-		if (SelectedList == TL_Shop)
-		{
-			ShopItem = MyKFPC.GetPurchaseHelper().TraderItems.SaleItems[SelectedItemIndexInt];
-
-			MyKFPC.GetPurchaseHelper().PurchaseWeapon(ShopItem);
-			SetNewSelectedIndex(MyKFPC.GetPurchaseHelper().TraderItems.SaleItems.length);
-			SetTraderItemDetails(SelectedItemIndexInt);
-			ShopContainer.ActionScriptVoid("itemBought");
-		}
-		else
-		{
-			ItemInfo = OwnedItemList[SelectedItemIndexInt];
-			MyKFPC.GetPurchaseHelper().SellWeapon(ItemInfo, SelectedItemIndexInt);
-
-			SetNewSelectedIndex(OwnedItemList.length);
-			SetPlayerItemDetails(SelectedItemIndexInt);
-			PlayerInventoryContainer.ActionScriptVoid("itemSold");
-		}
-	}
-	else if (SelectedList == TL_Shop)
-	{
-		ShopItem = MyKFPC.GetPurchaseHelper().TraderItems.SaleItems[SelectedItemIndexInt];
-
-		MyKFPC.PlayTraderSelectItemDialog(!MyKFPC.GetPurchaseHelper().GetCanAfford(MyKFPC.GetPurchaseHelper().GetAdjustedBuyPriceFor(ShopItem)), !MyKFPC.GetPurchaseHelper().CanCarry(ShopItem));
-	}
-	RefreshItemComponents();
-}
-
-public function Callback_FavoriteItem()
-{
-	if (SelectedList == TL_Shop)
-	{
-		ToggleFavorite(MyKFPC.GetPurchaseHelper().TraderItems.SaleItems[SelectedItemIndexInt].ClassName);
-		if (CurrentTab == TI_Favorites)
-		{
-			SetNewSelectedIndex(MyKFPC.GetPurchaseHelper().TraderItems.SaleItems.length);
-		}
-		SetTraderItemDetails(SelectedItemIndexInt);
-	}
-	else
-	{
-		ToggleFavorite(OwnedItemList[SelectedItemIndexInt].DefaultItem.ClassName);
-		SetPlayerItemDetails(SelectedItemIndexInt);
-	}
-	RefreshItemComponents();
-}
-
-public function Callback_UpgradeItem()
-{
-	local SItemInformation ItemInfo;
-	local KFAutoPurchaseHelper PurchaseHelper;
-
-	if (SelectedList != TL_Player) return;
-
-	PurchaseHelper = MyKFPC.GetPurchaseHelper();
-	if (PurchaseHelper.UpgradeWeapon(SelectedItemIndexInt))
-	{
-		ItemInfo = PurchaseHelper.OwnedItemList[SelectedItemIndexInt];
-		PurchaseHelper.OwnedItemList[SelectedItemIndexInt].ItemUpgradeLevel++;
-		PurchaseHelper.OwnedItemList[SelectedItemIndexInt].SellPrice =
-			PurchaseHelper.GetAdjustedSellPriceFor(ItemInfo.DefaultItem);
-		RefreshItemComponents();
-		ShopContainer.ActionScriptVoid("itemBought");
-		class'KFMusicStingerHelper'.static.PlayWeaponUpgradeStinger(MyKFPC);
-	}
-}
-
-defaultproperties
-{
-
-}
+class CTI_GFxMenu_Trader extends KFGFxMenu_Trader
+	dependsOn(CTI_GFxTraderContainer_Store);
+
+defaultproperties
+{
+	SubWidgetBindings.Remove((WidgetName="shopContainer",WidgetClass=class'KFGFxTraderContainer_Store'))
+	SubWidgetBindings.Add((WidgetName="shopContainer",WidgetClass=class'CTI_GFxTraderContainer_Store'))
+}

CTI/Classes/CTI_GFxMenu_Trader_DLC.uc

@@ -1,8 +0,0 @@
-class CTI_GFxMenu_Trader_DLC extends CTI_GFxMenu_Trader
-	dependsOn(CTI_GFxTraderContainer_Store);
-
-defaultproperties
-{
-	SubWidgetBindings.Remove((WidgetName="shopContainer",WidgetClass=class'KFGFxTraderContainer_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
-	dependsOn(CTI_GFxMenu_Trader);
-
-defaultproperties
-{
-	WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
-	WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
-}
+class CTI_GFxMoviePlayer_Manager extends KFGFxMoviePlayer_Manager
+	dependsOn(CTI_GFxMenu_Trader);
+
+defaultproperties
+{
+	WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
+	WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
+}

CTI/Classes/CTI_GFxMoviePlayer_Manager_DLC.uc

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

CTI/Classes/CTI_GFxMoviePlayer_Manager_Versus.uc

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

CTI/Classes/CTI_GFxMoviePlayer_Manager_Versus_DLC.uc

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

CTI/Classes/CTI_GFxObject_TraderItems.uc

@@ -1,21 +0,0 @@
-class CTI_GFxObject_TraderItems extends KFGFxObject_TraderItems;
-
-var() Array<STraderItem> AllItems;
-
-public function bool CTI_GetItemIndicesFromArche(out int ItemIndex, name WeaponClassName)
-{
-	local int Index;
-
-	Index = AllItems.Find('ClassName', WeaponClassName);
-
-	if (Index == INDEX_NONE) return false;
-
-	ItemIndex = Index;
-
-	return true;
-}
-
-DefaultProperties
-{
-
-}

CTI/Classes/CTI_GFxTraderContainer_Store.uc

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

CTI/Classes/CTI_InventoryManager.uc

@@ -1,505 +0,0 @@
-class CTI_InventoryManager extends KFInventoryManager;
-
-var private CTI_RepInfo RepInfo;
-
-public function Initialize(CTI_RepInfo _RepInfo)
-{
-	RepInfo = _RepInfo;
-}
-
-public function OwnerDied()
-{
-	RepInfo.SetTimer(1.0f, false, nameof(RepInfo.InitInventoryManager));
-	Super.OwnerDied();
-}
-
-// simulated function final BuyAmmo( float AmountPurchased, EItemType ItemType, optional byte ItemIndex, optional bool bSecondaryAmmo )
-public simulated function CTI_BuyAmmo(float AmountPurchased, EItemType ItemType, optional int ItemIndex, optional bool bSecondaryAmmo)
-{
-	local STraderItem WeaponItem;
-	local KFWeapon KFW;
-	local int MagAmmoCount;
-
-	switch (ItemType)
-	{
-		case EIT_Weapon:
-			MagAmmoCount = INDEX_NONE;
-			if (CTI_GetTraderItemFromWeaponLists(WeaponItem, ItemIndex) && GetWeaponFromClass(KFW, WeaponItem.ClassName))
-			{
-				MagAmmoCount = bSecondaryAmmo ? KFW.AmmoCount[1] : KFW.AmmoCount[0];
-			}
-			CTI_ServerBuyAmmo(int(AmountPurchased), MagAmmoCount, ItemIndex, bSecondaryAmmo);
-		break;
-
-		case EIT_Armor:   CTI_ServerBuyArmor(AmountPurchased);        break;
-		case EIT_Grenade: CTI_ServerBuyGrenade(int(AmountPurchased)); break;
-	}
-}
-
-// reliable server final private function ServerBuyAmmo(int AmountPurchased, byte ClientAmmoCount, byte ItemIndex, bool bSecondaryAmmo)
-private reliable server function CTI_ServerBuyAmmo(int AmountPurchased, int ClientAmmoCount, int ItemIndex, bool bSecondaryAmmo)
-{
-	local STraderItem WeaponItem;
-	local KFWeapon KFW;
-	local int ClientMaxMagCapacity;
-
-	if (Role != ROLE_Authority || !bServerTraderMenuOpen)              return;
-	if (!CTI_GetTraderItemFromWeaponLists(WeaponItem, ItemIndex))      return;
-	if (!CTI_ProcessAmmoDosh(WeaponItem, AmountPurchased, bSecondaryAmmo)) return;
-
-	if (!GetWeaponFromClass(KFW, WeaponItem.ClassName))
-	{
-		CTI_ServerAddTransactionAmmo(AmountPurchased, ItemIndex, bSecondaryAmmo);
-		return;
-	}
-
-	if (bSecondaryAmmo)
-	{
-		KFW.AddSecondaryAmmo(AmountPurchased);
-	}
-	else
-	{
-		if (ClientAmmoCount != INDEX_NONE)
-		{
-			ClientMaxMagCapacity = KFW.default.MagazineCapacity[0];
-			if (KFW.GetPerk() != None)
-			{
-				KFW.GetPerk().ModifyMagSizeAndNumber(KFW, ClientMaxMagCapacity);
-			}
-			KFW.AmmoCount[0] = Clamp(ClientAmmoCount, 0, ClientMaxMagCapacity);
-		}
-
-		KFW.AddAmmo(AmountPurchased);
-	}
-}
-
-// reliable server final private event ServerAddTransactionAmmo( int AmountAdded, byte ItemIndex, bool bSecondaryAmmo )
-private reliable server event CTI_ServerAddTransactionAmmo(int AmountAdded, int ItemIndex, bool bSecondaryAmmo)
-{
-	local STraderItem WeaponItem;
-	local int TransactionIndex;
-
-	if (!bServerTraderMenuOpen) return;
-	if (!CTI_GetTraderItemFromWeaponLists(WeaponItem, ItemIndex)) return;
-
-	TransactionIndex = GetTransactionItemIndex(WeaponItem.ClassName);
-	if (TransactionIndex == INDEX_NONE) return;
-
-	TransactionItems[TransactionIndex].AddedAmmo[byte(bSecondaryAmmo)] += AmountAdded;
-}
-
-// simulated function final BuyUpgrade(byte ItemIndex, int CurrentUpgradeLevel)
-public simulated function CTI_BuyUpgrade(int ItemIndex, int CurrentUpgradeLevel)
-{
-	local STraderItem WeaponItem;
-	local KFPlayerController KFPC;
-
-	KFPC = KFPlayerController(Instigator.Owner);
-
-	if (!CTI_GetTraderItemFromWeaponLists(WeaponItem, ItemIndex)) return;
-
-	KFPC.GetPurchaseHelper().AddDosh(-WeaponItem.WeaponDef.static.GetUpgradePrice(CurrentUpgradeLevel)); //client tracking
-	KFPC.GetPurchaseHelper().AddBlocks(-GetDisplayedBlocksRequiredFor(WeaponItem));//remove the old weight
-	KFPC.GetPurchaseHelper().AddBlocks(GetDisplayedBlocksRequiredFor(WeaponItem, CurrentUpgradeLevel + 1)); //add the new
-	CTI_ServerBuyUpgrade(ItemIndex, CurrentUpgradeLevel);
-}
-
-// reliable server final private function ServerBuyUpgrade(byte ItemIndex, int CurrentUpgradeLevel)
-private reliable server function CTI_ServerBuyUpgrade(int ItemIndex, int CurrentUpgradeLevel)
-{
-	local STraderItem WeaponItem;
-	local KFWeapon KFW;
-	local int NewUpgradeLevel;
-
-	if (Role != ROLE_Authority || !bServerTraderMenuOpen)         return;
-	if (!CTI_GetTraderItemFromWeaponLists(WeaponItem, ItemIndex)) return;
-	if (!CTI_ProcessUpgradeDosh(WeaponItem, CurrentUpgradeLevel)) return;
-
-	NewUpgradeLevel = CurrentUpgradeLevel + 1;
-
-	if (GetWeaponFromClass(KFW, WeaponItem.ClassName))
-	{
-		if (KFW == None) return;
-
-		KFW.SetWeaponUpgradeLevel(NewUpgradeLevel);
-		if (CurrentUpgradeLevel > 0)
-		{
-			AddCurrentCarryBlocks(-KFW.GetUpgradeStatAdd(EWUS_Weight, CurrentUpgradeLevel));
-		}
-
-		AddCurrentCarryBlocks(KFW.GetUpgradeStatAdd(EWUS_Weight, NewUpgradeLevel));
-	}
-	else
-	{
-		CTI_ServerAddTransactionUpgrade(ItemIndex, NewUpgradeLevel);
-	}
-
-}
-
-// reliable server final function ServerBuyWeapon( byte ItemIndex, optional byte WeaponUpgrade )
-public reliable server function CTI_ServerBuyWeapon(int ItemIndex, optional int WeaponUpgrade )
-{
-	local STraderItem PurchasedItem;
-	local int BlocksRequired;
-
-	if (Role != ROLE_Authority || !bServerTraderMenuOpen)            return;
-	if (!CTI_GetTraderItemFromWeaponLists(PurchasedItem, ItemIndex)) return;
-
-	BlocksRequired = GetWeaponBlocks(PurchasedItem, WeaponUpgrade);
-
-	if (CurrentCarryBlocks > CurrentCarryBlocks + BlocksRequired) return;
-	if (!CTI_ProcessWeaponDosh(PurchasedItem))                        return;
-
-	CTI_AddTransactionItem(PurchasedItem, WeaponUpgrade);
-}
-
-// final function AddTransactionItem( const out STraderItem ItemToAdd, optional byte WeaponUpgrade )
-public function CTI_AddTransactionItem(const out STraderItem ItemToAdd, optional int WeaponUpgrade)
-{
-	local TransactionItem NewTransactionItem;
-
-	if (Role < ROLE_Authority || !bServerTraderMenuOpen) return;
-
-	NewTransactionItem.ClassName = ItemToAdd.ClassName;
-	NewTransactionItem.DLOString = ItemToAdd.WeaponDef.default.WeaponClassPath;
-	NewTransactionItem.AddedAmmo[0] = 0;
-	NewTransactionItem.AddedAmmo[1] = 0;
-	NewTransactionItem.WeaponUpgradeLevel = WeaponUpgrade;
-
-	TransactionItems.AddItem(NewTransactionItem);
-
-	AddCurrentCarryBlocks(GetWeaponBlocks(ItemToAdd, WeaponUpgrade));
-}
-
-// reliable server final function ServerAddTransactionItem( byte ItemIndex, optional byte WeaponUpgrade)
-public reliable server function CTI_ServerAddTransactionItem(int ItemIndex, optional int WeaponUpgrade)
-{
-	local STraderItem PurchasedItem;
-
-	if (Role != ROLE_Authority || !bServerTraderMenuOpen) return;
-
-	if (CTI_GetTraderItemFromWeaponLists(PurchasedItem, ItemIndex))
-	{
-		CTI_AddTransactionItem(PurchasedItem, WeaponUpgrade);
-	}
-}
-
-// final function RemoveTransactionItem( const out STraderItem ItemToRemove )
-final function CTI_RemoveTransactionItem(const out STraderItem ItemToRemove)
-{
-	local int Index;
-
-	if (Role < ROLE_Authority || !bServerTraderMenuOpen) return;
-
-	Index = GetTransactionItemIndex( ItemToRemove.ClassName );
-
-	if (Index == INDEX_NONE) return;
-
-	AddCurrentCarryBlocks(-GetDisplayedBlocksRequiredFor(ItemToRemove, TransactionItems[Index].WeaponUpgradeLevel));
-	TransactionItems.Remove(Index, 1);
-}
-
-// reliable server final function ServerRemoveTransactionItem( int ItemIndex )
-public reliable server final function CTI_ServerRemoveTransactionItem(int ItemIndex)
-{
-	local STraderItem ItemToRemove;
-	local KFWeapon InvWeap;
-
-	if (!bServerTraderMenuOpen) return;
-	if (!CTI_GetTraderItemFromWeaponLists(ItemToRemove, ItemIndex)) return;
-
-	CTI_RemoveTransactionItem(ItemToRemove);
-
-	if (!GetWeaponFromClass(InvWeap, ItemToRemove.ClassName)) return;
-
-	RemoveFromInventory(InvWeap);
-}
-
-// reliable server final function ServerSellWeapon( byte ItemIndex )
-public reliable server function CTI_ServerSellWeapon(int ItemIndex)
-{
-	local STraderItem SoldItem;
-	local int SellPrice, TransactionIndex;
-	local KFWeapon KFW;
-	local KFPlayerReplicationInfo KFPRI;
-
-	if (Role != ROLE_Authority || !bServerTraderMenuOpen) return;
-
-	KFPRI = KFPlayerReplicationInfo(Instigator.PlayerReplicationInfo);
-
-	if (KFPRI == None) return;
-
-	if (!CTI_GetTraderItemFromWeaponLists(SoldItem, ItemIndex)) return;
-
-	if (GetWeaponFromClass(KFW, SoldItem.ClassName))
-	{
-		SellPrice = GetAdjustedSellPriceFor(SoldItem);
-		KFPRI.AddDosh(SellPrice);
-		ServerRemoveFromInventory(KFW);
-		KFW.Destroy();
-	}
-	else
-	{
-		TransactionIndex = GetTransactionItemIndex(SoldItem.ClassName);
-
-		if (TransactionIndex == INDEX_NONE) return;
-
-		SellPrice = GetAdjustedSellPriceFor(SoldItem);
-		KFPRI.AddDosh(SellPrice);
-		CTI_RemoveTransactionItem(SoldItem);
-	}
-}
-
-// private final simulated function bool GetTraderItemFromWeaponLists(out STraderItem TraderItem, byte ItemIndex )
-private simulated function bool CTI_GetTraderItemFromWeaponLists(out STraderItem TraderItem, int ItemIndex)
-{
-	local CTI_GFxObject_TraderItems TraderItems;
-
-	if (WorldInfo.GRI == None) return false;
-
-	TraderItems = CTI_GFxObject_TraderItems(KFGameReplicationInfo(WorldInfo.GRI).TraderItems);
-
-	if (TraderItems == None) return false;
-
-	if (ItemIndex < TraderItems.AllItems.Length)
-	{
-		TraderItem = TraderItems.AllItems[ItemIndex];
-		return true;
-	}
-
-	return false;
-}
-
-// private final function bool ProcessWeaponDosh(out STraderItem PurchasedItem)
-private function bool CTI_ProcessWeaponDosh(out STraderItem PurchasedItem)
-{
-	local int BuyPrice;
-	local KFPlayerReplicationInfo KFPRI;
-
-	KFPRI = KFPlayerReplicationInfo(Instigator.PlayerReplicationInfo);
-	if (KFPRI == None) return false;
-
-	BuyPrice = GetAdjustedBuyPriceFor(PurchasedItem);
-
-	if (KFPRI.Score - BuyPrice >= 0)
-	{
-		KFPRI.AddDosh(-BuyPrice);
-		return true;
-	}
-
-	return false;
-}
-
-private function float AmmoCostScale()
-{
-	local KFGameReplicationInfo KFGRI;
-	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
-	return KFGRI == None ? 1.0f : KFGRI.GameAmmoCostScale;
-}
-
-// private final function bool ProcessAmmoDosh(out STraderItem PurchasedItem, int AdditionalAmmo, optional bool bSecondaryAmmo)
-private function bool CTI_ProcessAmmoDosh(out STraderItem PurchasedItem, int AdditionalAmmo, optional bool bSecondaryAmmo)
-{
-	local int BuyPrice;
-	local float PricePerMag, MagSize;
-	local KFPlayerReplicationInfo KFPRI;
-
-	KFPRI = KFPlayerReplicationInfo(Instigator.PlayerReplicationInfo);
-	if (KFPRI == None) return false;
-
-	if (bSecondaryAmmo)
-	{
-		PricePerMag = AmmoCostScale() * PurchasedItem.WeaponDef.default.SecondaryAmmoMagPrice;
-		MagSize = PurchasedItem.WeaponDef.default.SecondaryAmmoMagSize;
-		BuyPrice = FCeil((PricePerMag / MagSize) * float(AdditionalAmmo));
-	}
-	else
-	{
-		PricePerMag = AmmoCostScale() * PurchasedItem.WeaponDef.default.AmmoPricePerMag;
-		MagSize = PurchasedItem.MagazineCapacity;
-		BuyPrice = FCeil((PricePerMag / MagSize) * float(AdditionalAmmo));
-	}
-
-	if (KFPRI.Score - BuyPrice >= 0)
-	{
-		KFPRI.AddDosh(-BuyPrice);
-		return true;
-	}
-
-	return false;
-}
-
-// private final function bool ProcessUpgradeDosh(const out STraderItem PurchasedItem, int NewUpgradeLevel)
-private function bool CTI_ProcessUpgradeDosh(const out STraderItem PurchasedItem, int NewUpgradeLevel)
-{
-	local int BuyPrice;
-	local KFPlayerController KFPC;
-	local KFPlayerReplicationInfo KFPRI;
-
-	KFPC = KFPlayerController(Instigator.Owner);
-	KFPRI = KFPlayerReplicationInfo(Instigator.PlayerReplicationInfo);
-
-	if (KFPC == None || KFPRI == none) return false;
-
-	BuyPrice = PurchasedItem.WeaponDef.static.GetUpgradePrice(NewUpgradeLevel);
-	if (BuyPrice <= KFPRI.Score)
-	{
-		KFPRI.AddDosh(-BuyPrice);
-		return true;
-	}
-
-	return false;
-}
-
-// private final function bool ProcessGrenadeDosh(int AmountPurchased)
-private function bool CTI_ProcessGrenadeDosh(int AmountPurchased)
-{
-	local int BuyPrice;
-	local KFGFxObject_TraderItems TraderItems;
-	local KFPlayerController KFPC;
-	local KFPlayerReplicationInfo KFPRI;
-
-	KFPC = KFPlayerController(Instigator.Owner);
-	KFPRI = KFPlayerReplicationInfo(Instigator.PlayerReplicationInfo);
-	if (KFPC == None || KFPRI == None) return false;
-
-	TraderItems = KFGameReplicationInfo(WorldInfo.GRI).TraderItems;
-	BuyPrice = TraderItems.GrenadePrice * AmountPurchased;
-	if (BuyPrice <= KFPRI.Score)
-	{
-		KFPRI.AddDosh(-BuyPrice);
-		return true;
-	}
-
-	return false;
-}
-
-// reliable server final private function ServerBuyArmor( float PercentPurchased )
-private reliable server function CTI_ServerBuyArmor(float PercentPurchased)
-{
-	local KFPawn_Human KFP;
-	local int AmountPurchased;
-	local float MaxArmor;
-
-	KFP = KFPawn_Human(Instigator);
-	if (Role != ROLE_Authority || KFP == none || !bServerTraderMenuOpen) return;
-	if (!CTI_ProcessArmorDosh(PercentPurchased)) return;
-
-	MaxArmor = KFP.GetMaxArmor();
-	AmountPurchased = FCeil(MaxArmor * (PercentPurchased / 100.0));
-
-	KFP.AddArmor(AmountPurchased);
-}
-
-// private final function bool ProcessArmorDosh(float PercentPurchased)
-private function bool CTI_ProcessArmorDosh(float PercentPurchased)
-{
-	local int BuyPrice;
-	local KFGFxObject_TraderItems TraderItems;
-	local KFPlayerController KFPC;
-	local KFPerk CurrentPerk;
-	local int ArmorPricePerPercent;
-	local KFPlayerReplicationInfo KFPRI;
-
-	KFPRI = KFPlayerReplicationInfo(Instigator.PlayerReplicationInfo);
-	if (KFPRI == None) return false;
-
-	TraderItems = KFGameReplicationInfo(WorldInfo.GRI).TraderItems;
-	ArmorPricePerPercent = TraderItems.ArmorPrice;
-
-	KFPC = KFPlayerController(Instigator.Owner);
-	if (KFPC != None)
-	{
-		CurrentPerk = KFPC.GetPerk();
-		if (CurrentPerk != None)
-		{
-			ArmorPricePerPercent *= CurrentPerk.GetArmorDiscountMod();
-		}
-	}
-
-	BuyPrice = FCeil(ArmorPricePerPercent * PercentPurchased);
-	if (BuyPrice <= KFPRI.Score)
-	{
-		KFPRI.AddDosh(-BuyPrice);
-		return true;
-	}
-
-	return false;
-}
-
-// reliable server final private event ServerAddTransactionUpgrade(int ItemIndex, int NewUpgradeLevel)
-private reliable server event CTI_ServerAddTransactionUpgrade(int ItemIndex, int NewUpgradeLevel)
-{
-	if (bServerTraderMenuOpen)
-	{
-		CTI_AddTransactionUpgrade(ItemIndex, NewUpgradeLevel);
-	}
-}
-
-// final function AddTransactionUpgrade(int ItemIndex, int NewUpgradeLevel)
-private function CTI_AddTransactionUpgrade(int ItemIndex, int NewUpgradeLevel)
-{
-	local STraderItem WeaponItem;
-	local int TransactionIndex;
-
-	if (Role < ROLE_Authority || !bServerTraderMenuOpen) return;
-
-	if (CTI_GetTraderItemFromWeaponLists(WeaponItem, ItemIndex))
-	{
-		TransactionIndex = GetTransactionItemIndex(WeaponItem.ClassName);
-		if (TransactionIndex == INDEX_NONE) return;
-
-		TransactionItems[TransactionIndex].WeaponUpgradeLevel = NewUpgradeLevel;
-		TransactionItems[TransactionIndex].AddedWeight = WeaponItem.WeaponUpgradeWeight[NewUpgradeLevel];
-		if (NewUpgradeLevel > 0)
-		{
-			AddCurrentCarryBlocks(-WeaponItem.WeaponUpgradeWeight[NewUpgradeLevel-1]);
-		}
-		AddCurrentCarryBlocks(WeaponItem.WeaponUpgradeWeight[NewUpgradeLevel]);
-	}
-}
-
-// reliable server final private function ServerBuyGrenade( int AmountPurchased )
-private reliable server function CTI_ServerBuyGrenade(int AmountPurchased)
-{
-	if (Role != ROLE_Authority || !bServerTraderMenuOpen) return;
-
-	if (CTI_ProcessGrenadeDosh(AmountPurchased))
-	{
-		AddGrenades(AmountPurchased);
-	}
-}
-
-public simulated function int GetWeaponBlocks(const out STraderItem ShopItem, optional int OverrideLevelValue = INDEX_NONE)
-{
-	local int ItemUpgradeLevel;
-	local KFPlayerController KFPC;
-	local Inventory InventoryItem;
-
-	if (ShopItem.SingleClassName != '' && OverrideLevelValue == INDEX_NONE && ClassNameIsInInventory(ShopItem.SingleClassName, InventoryItem))
-	{
-		ItemUpgradeLevel = KFWeapon(InventoryItem).CurrentWeaponUpgradeIndex;
-	}
-	else
-	{
-		if (OverrideLevelValue != INDEX_NONE)
-		{
-			ItemUpgradeLevel = OverrideLevelValue;
-		}
-		else
-		{
-			KFPC = KFPlayerController(Instigator.Owner);
-			if (KFPC != None)
-			{
-				ItemUpgradeLevel = KFPC.GetPurchaseHelper().GetItemUpgradeLevelByClassName(ShopItem.ClassName);
-			}
-		}
-	}
-
-	return ShopItem.BlocksRequired + (ItemUpgradeLevel > INDEX_NONE ? ShopItem.WeaponUpgradeWeight[ItemUpgradeLevel] : 0);
-}
-
-defaultproperties
-{
-
-}

CTI/Classes/CTI_LocalMessage.uc

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

CTI/Classes/CTI_RepInfo.uc

@@ -1,591 +1,292 @@
-class CTI_RepInfo extends ReplicationInfo
-	dependson(WeaponReplacements);
-
-const CAPACITY = 64; // max: 128
-
-const Trader             = class'Trader';
-const LocalMessage       = class'CTI_LocalMessage';
-const Replacements       = class'WeaponReplacements';
-const PurchaseHelper     = class'CTI_AutoPurchaseHelper';
-const InventoryManager   = class'CTI_InventoryManager';
-
-struct ReplicationStruct
-{
-	var int Size;
-	var int Transfered;
-
-	var class<KFWeaponDefinition> Items[CAPACITY];
-	var int Length;
-};
-
-var public  bool PendingSync;
-
-var private CTI CTI;
-var private E_LogLevel LogLevel;
-
-var private class<KFGFxMoviePlayer_Manager> FrontEndClass;
-
-var private GameReplicationInfo     GRI;
-var private KFPlayerController      KFPC;
-var private KFPlayerReplicationInfo KFPRI;
-var private KFGFxWidget_PartyInGame PartyInGameWidget;
-var private GFxObject               Notification;
-
-var private String NotificationHeaderText;
-var private String NotificationLeftText;
-var private String NotificationRightText;
-var private int    NotificationPercent;
-
-var private int    WaitingGRI;
-var private int    WaitingGRIThreshold;
-var private int    WaitingGRILimit;
-
-var private ReplicationStruct                 RepData;
-var private Array<class<KFWeaponDefinition> > RepArray;
-
-var private bool SkinUpdateRequired;
-var private bool PatchRequired;
-
-var private bool ClientReady, ServerReady;
-
-replication
-{
-	if (bNetInitial && Role == ROLE_Authority)
-		LogLevel, SkinUpdateRequired, PatchRequired, FrontEndClass;
-}
-
-public simulated function bool SafeDestroy()
-{
-	`Log_Trace();
-
-	return (bPendingDelete || bDeleteMe || Destroy());
-}
-
-public function PrepareSync(
-	CTI _CTI, E_LogLevel _LogLevel,
-	class<KFGFxMoviePlayer_Manager> _FrontEndClass,
-	bool _SkinUpdateRequired, bool _PatchRequired)
-{
-	`Log_Trace();
-
-	CTI                      = _CTI;
-	LogLevel                 = _LogLevel;
-	FrontEndClass            = _FrontEndClass;
-	SkinUpdateRequired       = _SkinUpdateRequired;
-	PatchRequired            = _PatchRequired;
-}
-
-private reliable client function ClientSetFrontEnd()
-{
-	if (FrontEndClass == None || GetKFPRI() == None)
-	{
-		`Log_Debug("Wait for frontend");
-		SetTimer(1.0f, false, nameof(ClientSetFrontEnd));
-		return;
-	}
-
-	if (KFPC.MyGFxManager != None && KFPC.MyGFxManager.class == FrontEndClass)
-	{
-		`Log_Debug("MyGFxManager is ok:" @ String(KFPC.MyGFxManager.class));
-		return;
-	}
-
-	KFPC.MyGFxManager.CloseMenus(true);
-	KFPC.MyGFxManager = None;
-
-	KFPC.ClientSetFrontEnd(FrontEndClass, KFPRI.bOnlySpectator);
-
-	`Log_Debug(String(FrontEndClass) @ "initialized.");
-}
-
-public function Replicate(const out Array<class<KFWeaponDefinition> > WeapDefs)
-{
-	`Log_Trace();
-
-	ServerReady = !PatchRequired;
-
-	ClientSetFrontEnd();
-
-	if (PatchRequired)
-	{
-		if (GetKFPC() != None)
-		{
-			KFPC.PurchaseHelperClass = PurchaseHelper;
-			KFPC.PurchaseHelper = None;
-		}
-
-		InitInventoryManager();
-	}
-
-	RepArray = WeapDefs;
-	RepData.Size = RepArray.Length;
-
-	if (WorldInfo.NetMode != NM_StandAlone)
-	{
-		Sync();
-	}
-	else
-	{
-		Finished();
-	}
-}
-
-private reliable server function Sync()
-{
-	local int  LocalIndex;
-	local int  GlobalIndex;
-
-	`Log_Trace();
-
-	LocalIndex = 0;
-	GlobalIndex = RepData.Transfered;
-
-	while (LocalIndex < CAPACITY && GlobalIndex < RepData.Size)
-	{
-		RepData.Items[LocalIndex++] = RepArray[GlobalIndex++];
-	}
-
-	if (RepData.Transfered == GlobalIndex) return; // Finished
-
-	RepData.Transfered = GlobalIndex;
-	RepData.Length = LocalIndex;
-
-	Send(RepData);
-
-	Progress(RepData.Transfered, RepData.Size);
-}
-
-private reliable client function Send(ReplicationStruct RD)
-{
-	local int LocalIndex;
-
-	`Log_Trace();
-
-	for (LocalIndex = 0; LocalIndex < RD.Length; LocalIndex++)
-	{
-		RepArray.AddItem(RD.Items[LocalIndex]);
-	}
-
-	Progress(RD.Transfered, RD.Size);
-
-	Sync();
-}
-
-private simulated function Progress(int Value, int Size)
-{
-	`Log_Trace();
-
-	`Log_Debug("Replicated:" @ Value @ "/" @ Size);
-
-	if (ROLE < ROLE_Authority)
-	{
-		NotifyProgress(Value, Size);
-		if (Value >= Size) Finished();
-	}
-}
-
-private simulated function Finished()
-{
-	local KFGameReplicationInfo KFGRI;
-
-	`Log_Trace();
-
-	if ((GetGRI(WaitingGRI > WaitingGRIThreshold) == None) && WaitingGRI++ < WaitingGRILimit)
-	{
-		`Log_Debug("Finished: Waiting GRI" @ WaitingGRI);
-		NotifyWaitingGRI();
-		SetTimer(1.0f, false, nameof(Finished));
-		return;
-	}
-
-	if (PatchRequired && GetKFPC() != None)
-	{
-		KFPC.PurchaseHelperClass = PurchaseHelper;
-		KFPC.PurchaseHelper = None;
-	}
-
-	KFGRI = KFGameReplicationInfo(GRI);
-	if (KFGRI != None)
-	{
-		`Log_Debug("Finished: Trader.static.OverwriteTraderItems");
-		if (WorldInfo.NetMode != NM_StandAlone)
-		{
-			Trader.static.OverwriteTraderItems(KFGRI, RepArray, PatchRequired, LogLevel);
-		}
-		`Log_Info("Trader items successfully synchronized!");
-	}
-	else
-	{
-		`Log_Error("Incompatible Game Replication info:" @ String(GRI));
-		if (GRI == None)
-		{
-			NotifyNoneGRI();
-		}
-		else
-		{
-			NotifyIncompatibleGRI();
-		}
-	}
-
-	ShowReadyButton();
-
-	if (SkinUpdateRequired)
-	{
-		SkinUpdate();
-	}
-	else
-	{
-		ClientFinished();
-	}
-}
-
-private simulated function SkinUpdate()
-{
-	local SWeapReplace WeapReplace;
-
-	if (GetKFPRI() == None || !KFPRI.bHasSpawnedIn)
-	{
-		`Log_Debug("Wait for spawn (SkinUpdate)");
-		SetTimer(1.0f, false, nameof(SkinUpdate));
-		return;
-	}
-
-	foreach Replacements.default.DLC(WeapReplace)
-	{
-		// sometimes "WeapReplace.Weap.default.SkinItemId" can give values greater than zero while actually being zero
-		// this is the same bug that prevents creating the correct default config
-		// so for now let’s shorten the check a little so that the skinId of the WeapReplace is guaranteed to be correct
-		// but if this bug is ever fixed, then it’s worth replacing the check with this one:
-		// if (WeapReplace.WeapParent.default.SkinItemId > 0 && WeapReplace.Weap.default.SkinItemId != WeapReplace.WeapParent.default.SkinItemId)
-		// to reduce the number of meaningless disk writes
-		if (WeapReplace.WeapParent.default.SkinItemId > 0)
-		{
-			`Log_Debug("Update skin for:" @ String(WeapReplace.WeapDef) @ "SkinId:" @ WeapReplace.WeapParent.default.SkinItemId);
-			class'KFWeaponSkinList'.static.SaveWeaponSkin(WeapReplace.WeapDef, WeapReplace.WeapParent.default.SkinItemId);
-		}
-	}
-
-	ClearTimer(nameof(SkinUpdate));
-	ClientFinished();
-}
-
-private simulated function GameReplicationInfo GetGRI(optional bool ForcedSearch = false)
-{
-	`Log_Trace();
-
-	if (GRI == None)
-	{
-		GRI = WorldInfo.GRI;
-	}
-
-	if (GRI == None && ForcedSearch)
-	{
-		foreach WorldInfo.DynamicActors(class'GameReplicationInfo', GRI) break;
-	}
-
-	if (WorldInfo.GRI == None && GRI != None)
-	{
-		`Log_Warn("Force initialization of WorldInfo.GRI" @ String(GRI));
-		WorldInfo.GRI = GRI;
-	}
-
-	return GRI;
-}
-
-private simulated function KFPlayerController GetKFPC()
-{
-	`Log_Trace();
-
-	if (KFPC != None) return KFPC;
-
-	KFPC = KFPlayerController(Owner);
-
-	if (KFPC == None && ROLE < ROLE_Authority)
-	{
-		KFPC = KFPlayerController(GetALocalPlayerController());
-	}
-
-	return KFPC;
-}
-
-private simulated function KFPlayerReplicationInfo GetKFPRI()
-{
-	`Log_Trace();
-
-	if (KFPRI != None) return KFPRI;
-
-	if (GetKFPC() == None) return None;
-
-	KFPRI = KFPlayerReplicationInfo(KFPC.PlayerReplicationInfo);
-
-	return KFPRI;
-}
-
-public reliable client function WriteToChatLocalized(
-	E_CTI_LocalMessageType LMT,
-	optional String HexColor,
-	optional String String1,
-	optional String String2,
-	optional String String3)
-{
-	`Log_Trace();
-
-	WriteToChat(LocalMessage.static.GetLocalizedString(LogLevel, LMT, String1, String2, String3), HexColor);
-}
-
-public reliable client function WriteToChat(String Message, optional String HexColor)
-{
-	local KFGFxHudWrapper HUD;
-
-	`Log_Trace();
-
-	if (GetKFPC() == None) return;
-
-	if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
-	{
-		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
-		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
-	}
-
-	HUD = KFGFxHudWrapper(KFPC.myHUD);
-	if (HUD != None && HUD.HUDMovie != None && HUD.HUDMovie.HudChatBox != None)
-	{
-		HUD.HUDMovie.HudChatBox.AddChatMessage(Message, HexColor);
-	}
-}
-
-private simulated function SetPartyInGameWidget()
-{
-	`Log_Trace();
-
-	if (GetKFPC() == None) return;
-
-	if (KFPC.MyGFxManager == None) return;
-	if (KFPC.MyGFxManager.PartyWidget == None) return;
-
-	PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
-	Notification = PartyInGameWidget.Notification;
-}
-
-private simulated function bool CheckPartyInGameWidget()
-{
-	`Log_Trace();
-
-	if (PartyInGameWidget == None)
-	{
-		SetPartyInGameWidget();
-	}
-
-	return (PartyInGameWidget != None);
-}
-
-private simulated function HideReadyButton()
-{
-	`Log_Trace();
-
-	if (CheckPartyInGameWidget())
-	{
-		PartyInGameWidget.SetReadyButtonVisibility(false);
-	}
-}
-
-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 reliable server function ClientFinished()
-{
-	ClientReady = true;
-	if (ClientReady && ServerReady) Cleanup();
-}
-
-private function ServerFinished()
-{
-	ServerReady = true;
-	if (ClientReady && ServerReady) Cleanup();
-}
-
-private reliable server function Cleanup()
-{
-	`Log_Trace();
-
-	if (PatchRequired)
-	{
-		`Log_Debug("Skip cleanup to keep CTI_RepInfo alive");
-		return;
-	}
-
-	`Log_Debug("Cleanup" @ GetKFPC() @ GetKFPRI() == None? "" : GetKFPRI().PlayerName);
-	if (!CTI.DestroyRepInfo(GetKFPC()))
-	{
-		`Log_Debug("Cleanup (forced)");
-		SafeDestroy();
-	}
-}
-
-public function InitInventoryManager()
-{
-	local InventoryManager PrevInventoryManger;
-	local InventoryManager NextInventoryManger;
-
-	local KFInventoryManager PrevKFInventoryManger;
-	local KFInventoryManager NextKFInventoryManger;
-
-	local Inventory Item;
-
-	`Log_Trace();
-
-	if (GetKFPRI() == None || !KFPRI.bHasSpawnedIn || KFPC.Pawn == None)
-	{
-		`Log_Debug("Wait for spawn (InventoryManager)");
-		SetTimer(1.0f, false, nameof(InitInventoryManager));
-		return;
-	}
-
-	PrevInventoryManger = KFPC.Pawn.InvManager;
-
-	KFPC.Pawn.InventoryManagerClass = InventoryManager;
-	NextInventoryManger = Spawn(KFPC.Pawn.InventoryManagerClass, KFPC.Pawn);
-	CTI_InventoryManager(NextInventoryManger).Initialize(Self);
-
-	if (NextInventoryManger == None)
-	{
-		`Log_Error("Can't spawn" @ String(KFPC.Pawn.InventoryManagerClass));
-		ServerFinished();
-		return;
-	}
-
-	KFPC.Pawn.InvManager = NextInventoryManger;
-	KFPC.Pawn.InvManager.SetupFor(KFPC.Pawn);
-
-	if (PrevInventoryManger == None)
-	{
-		KFPC.Pawn.AddDefaultInventory();
-	}
-	else
-	{
-		for (Item = PrevInventoryManger.InventoryChain; Item != None; Item = PrevInventoryManger.InventoryChain)
-		{
-			PrevInventoryManger.RemoveFromInventory(Item);
-			NextInventoryManger.AddInventory(Item);
-		}
-	}
-
-	PrevKFInventoryManger = KFInventoryManager(PrevInventoryManger);
-	NextKFInventoryManger = KFInventoryManager(NextInventoryManger);
-
-	if (PrevKFInventoryManger != None && NextKFInventoryManger != None)
-	{
-		NextKFInventoryManger.GrenadeCount = PrevKFInventoryManger.GrenadeCount;
-	}
-
-	PrevKFInventoryManger.InventoryChain = None;
-	PrevKFInventoryManger.Destroy();
-
-	`Log_Debug("InventoryManager initialized");
-
-	ServerFinished();
-}
-
-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(GRI.class));
-	WriteToChatLocalized(
-		CTI_IncompatibleGRIWarning,
-		class'KFLocalMessage'.default.InteractionColor);
-}
-
-private simulated function NotifyNoneGRI()
-{
-	WriteToChatLocalized(
-		CTI_NoneGRI,
-		class'KFLocalMessage'.default.InteractionColor);
-	WriteToChatLocalized(
-		CTI_NoneGRIWarning,
-		class'KFLocalMessage'.default.InteractionColor);
-}
-
-defaultproperties
-{
-	bAlwaysRelevant               = false
-	bOnlyRelevantToOwner          = true
-	bSkipActorPropertyReplication = false
-
-	PendingSync = false
-
-	NotificationPercent    = 0
-	WaitingGRI             = 0
-	WaitingGRIThreshold    = 15
-	WaitingGRILimit        = 30
-
-	ClientReady = false
-	ServerReady = false
-}
+class CTI_RepInfo extends ReplicationInfo;
+
+const Trader       = class'Trader';
+const LocalMessage = class'CTI_LocalMessage';
+
+var public  bool PendingSync;
+
+var private CTI CTI;
+var private E_LogLevel LogLevel;
+var private Array<class<KFWeaponDefinition> > RemoveItems;
+var private Array<class<KFWeaponDefinition> > AddItems;
+var private bool ReplaceMode;
+var private bool PreloadContent;
+
+var private int  Recieved;
+var private int  SyncSize;
+
+var private KFPlayerController      KFPC;
+var private KFGFxWidget_PartyInGame PartyInGameWidget;
+var private GFxObject               Notification;
+
+var private String NotificationHeaderText;
+var private String NotificationLeftText;
+var private String NotificationRightText;
+var private int    NotificationPercent;
+
+var private int    WaitingGRI;
+
+replication
+{
+	if (bNetInitial && Role == ROLE_Authority)
+		LogLevel, ReplaceMode, SyncSize;
+}
+
+public simulated function bool SafeDestroy()
+{
+	`Log_Trace();
+
+	return (bPendingDelete || bDeleteMe || Destroy());
+}
+
+public function PrepareSync(
+	CTI _CTI,
+	E_LogLevel _LogLevel,
+	Array<class<KFWeaponDefinition> > _RemoveItems,
+	Array<class<KFWeaponDefinition> > _AddItems,
+	bool _ReplaceMode)
+{
+	`Log_Trace();
+	
+	CTI                 = _CTI;
+	LogLevel            = _LogLevel;
+	RemoveItems         = _RemoveItems;
+	AddItems            = _AddItems;
+	ReplaceMode         = _ReplaceMode;
+	SyncSize            = RemoveItems.Length + AddItems.Length;
+}
+
+private simulated function KFPlayerController GetKFPC()
+{
+	`Log_Trace();
+	
+	if (KFPC != None) return KFPC;
+	
+	KFPC = KFPlayerController(Owner);
+	
+	if (KFPC == None && ROLE < ROLE_Authority)
+	{
+		KFPC = KFPlayerController(GetALocalPlayerController());
+	}
+	
+	return KFPC;
+}
+
+private simulated function SetPartyInGameWidget()
+{
+	`Log_Trace();
+	
+	if (GetKFPC() == None) return;
+	
+	if (KFPC.MyGFxManager == None) return;
+	if (KFPC.MyGFxManager.PartyWidget == None) return;
+	
+	PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
+	Notification = PartyInGameWidget.Notification;
+}
+
+private simulated function bool CheckPartyInGameWidget()
+{
+	`Log_Trace();
+	
+	if (PartyInGameWidget == None)
+	{
+		SetPartyInGameWidget();
+	}
+	
+	return (PartyInGameWidget != None);
+}
+
+private simulated function HideReadyButton()
+{
+	`Log_Trace();
+	
+	if (CheckPartyInGameWidget())
+	{
+		PartyInGameWidget.SetReadyButtonVisibility(false);
+	}
+}
+
+private simulated function ShowReadyButton()
+{
+	`Log_Trace();
+	
+	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 reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
+{
+	`Log_Trace();
+
+	if (WeapDef == None)
+	{
+		`Log_Fatal("WeapDef is:" @ WeapDef);
+		Cleanup();
+		ConsoleCommand("Disconnect");
+		SafeDestroy();
+		return;
+	}
+	
+	if (!IsTimerActive(nameof(KeepNotification)))
+	{
+		SetTimer(0.1f, true, nameof(KeepNotification));
+	}
+	
+	if (Remove)
+	{
+		RemoveItems.AddItem(WeapDef);
+	}
+	else
+	{
+		AddItems.AddItem(WeapDef);
+	}
+	
+	Recieved = RemoveItems.Length + AddItems.Length;
+	
+	NotificationHeaderText  = (Remove ? "-" : "+") @ WeapDef.static.GetItemName();
+	NotificationLeftText    = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
+	NotificationRightText   = Recieved @ "/" @ SyncSize;
+	if (SyncSize != 0)
+	{
+		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
+	}
+	
+	`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
+	
+	ServerSync();
+}
+
+private simulated function KeepNotification()
+{
+	HideReadyButton();
+	UpdateNotification(
+		NotificationHeaderText,
+		NotificationLeftText,
+		NotificationRightText,
+		NotificationPercent);
+}
+
+private simulated reliable client function ClientSyncFinished()
+{
+	local KFGameReplicationInfo KFGRI;
+
+	`Log_Trace();
+	
+	NotificationLeftText  = "";
+	NotificationRightText = "";
+	NotificationPercent   = 0;
+	
+	if (WorldInfo.GRI == None)
+	{
+		`Log_Debug("ClientSyncFinished: Waiting GRI");
+		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
+		NotificationLeftText   = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
+		NotificationRightText  = "";
+		SetTimer(1.0f, false, nameof(ClientSyncFinished));
+		return;
+	}
+	
+	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
+	if (KFGRI == None)
+	{
+		`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
+		ClearTimer(nameof(KeepNotification));
+		UpdateNotification(
+			LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI),
+			LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0);
+		Cleanup();
+		ConsoleCommand("Disconnect");
+		SafeDestroy();
+		return;
+	}
+	
+	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished);
+	NotificationLeftText   = "";
+	NotificationRightText  = "";
+	NotificationPercent    = 0;
+
+	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, LogLevel);
+	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
+
+	ClearTimer(nameof(KeepNotification)); 
+	ShowReadyButton();
+	
+	Cleanup();
+	
+	SafeDestroy();
+}
+
+private reliable server function Cleanup()
+{
+	`Log_Trace();
+	
+	`Log_Debug("Cleanup");
+	if (!CTI.DestroyRepInfo(Controller(Owner)))
+	{
+		`Log_Debug("Cleanup (forced)");
+		SafeDestroy();
+	}
+}
+
+public reliable server function ServerSync()
+{
+	`Log_Trace();
+	
+	PendingSync = false;
+	
+	if (bPendingDelete || bDeleteMe) return;
+	
+	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
+	{
+		`Log_Debug("ServerSync: Finished");
+		ClientSyncFinished();
+	}
+	else
+	{
+		if (Recieved < RemoveItems.Length)
+		{
+			`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
+			ClientSync(RemoveItems[Recieved++], true);
+		}
+		else
+		{
+			`Log_Debug("ServerSync[+]:" @ (Recieved + 1) @ "/" @ SyncSize @ AddItems[Recieved - RemoveItems.Length]);
+			ClientSync(AddItems[Recieved++ - RemoveItems.Length], false);
+		}
+	}
+}
+
+defaultproperties
+{
+	bAlwaysRelevant               = false
+	bOnlyRelevantToOwner          = true
+	bSkipActorPropertyReplication = false
+	
+	PendingSync = false
+	Recieved    = 0
+	
+	NotificationPercent    = 0
+	WaitingGRI             = 0
+}

CTI/Classes/CTI_WeapDef_AutoTurret.uc

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

CTI/Classes/CTI_WeapDef_BladedPistol.uc

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

CTI/Classes/CTI_WeapDef_Blunderbuss.uc

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

CTI/Classes/CTI_WeapDef_ChainBat.uc

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

CTI/Classes/CTI_WeapDef_ChiappaRhino.uc

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

CTI/Classes/CTI_WeapDef_ChiappaRhinoDual.uc

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

CTI/Classes/CTI_WeapDef_CompoundBow.uc

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

CTI/Classes/CTI_WeapDef_Doshinegun.uc

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

CTI/Classes/CTI_WeapDef_DualBladed.uc

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

CTI/Classes/CTI_WeapDef_FAMAS.uc

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

CTI/Classes/CTI_WeapDef_G18.uc

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

CTI/Classes/CTI_WeapDef_G36C.uc

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

CTI/Classes/CTI_WeapDef_GravityImploder.uc

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

CTI/Classes/CTI_WeapDef_HVStormCannon.uc

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

CTI/Classes/CTI_WeapDef_MG3.uc

@@ -1,13 +0,0 @@
-class CTI_WeapDef_MG3 extends KFWeapDef_MG3
-	abstract;
-
-static function String GetItemLocalization(String KeyName)
-{
-	return class'KFGame.KFWeapDef_MG3'.static.GetItemLocalization(KeyName);
-}
-
-defaultproperties
-{
-	SharedUnlockId  = SCU_None
-	WeaponClassPath = "CTI.CTI_Weap_LMG_MG3"
-}

CTI/Classes/CTI_WeapDef_Mine_Reconstructor.uc

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

CTI/Classes/CTI_WeapDef_Minigun.uc

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

CTI/Classes/CTI_WeapDef_MosinNagant.uc

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

CTI/Classes/CTI_WeapDef_ParasiteImplanter.uc

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

CTI/Classes/CTI_WeapDef_Pistol_DualG18.uc

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

CTI/Classes/CTI_WeapDef_Pistol_G18C.uc

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

CTI/Classes/CTI_WeapDef_Rifle_FrostShotgunAxe.uc

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

CTI/Classes/CTI_WeapDef_Scythe.uc

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

CTI/Classes/CTI_WeapDef_Shotgun_S12.uc

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

CTI/Classes/CTI_WeapDef_ThermiteBore.uc

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

CTI/Classes/CTI_WeapDef_ZedMKIII.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_Doshinegun.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_FAMAS.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_G36C.uc

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

CTI/Classes/CTI_Weap_AutoTurret.uc

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

CTI/Classes/CTI_Weap_Blunt_ChainBat.uc

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

CTI/Classes/CTI_Weap_Bow_CompoundBow.uc

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

CTI/Classes/CTI_Weap_Edged_IonThruster.uc

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

CTI/Classes/CTI_Weap_Edged_Scythe.uc

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

CTI/Classes/CTI_Weap_Edged_Zweihander.uc

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

CTI/Classes/CTI_Weap_GravityImploder.uc

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

CTI/Classes/CTI_Weap_HVStormCannon.uc

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

CTI/Classes/CTI_Weap_LMG_MG3.uc

@@ -1,6 +0,0 @@
-class CTI_Weap_LMG_MG3 extends KFWeap_LMG_MG3;
-
-defaultproperties
-{
-
-}

CTI/Classes/CTI_Weap_Mine_Reconstructor.uc

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

CTI/Classes/CTI_Weap_Minigun.uc

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

CTI/Classes/CTI_Weap_Pistol_Bladed.uc

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

CTI/Classes/CTI_Weap_Pistol_Blunderbuss.uc

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

CTI/Classes/CTI_Weap_Pistol_ChiappaRhino.uc

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

CTI/Classes/CTI_Weap_Pistol_ChiappaRhinoDual.uc

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

CTI/Classes/CTI_Weap_Pistol_DualBladed.uc

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

CTI/Classes/CTI_Weap_Pistol_DualG18.uc

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

CTI/Classes/CTI_Weap_Pistol_G18C.uc

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

CTI/Classes/CTI_Weap_Rifle_FrostShotgunAxe.uc

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

CTI/Classes/CTI_Weap_Rifle_MosinNagant.uc

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

CTI/Classes/CTI_Weap_Rifle_ParasiteImplanter.uc

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

CTI/Classes/CTI_Weap_RocketLauncher_ThermiteBore.uc

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

CTI/Classes/CTI_Weap_SMG_G18.uc

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

CTI/Classes/CTI_Weap_Shotgun_S12.uc

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

CTI/Classes/CTI_Weap_ShrinkRayGun.uc

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

CTI/Classes/CTI_Weap_ZedMKIII.uc

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

CTI/Classes/KFW_Access.uc

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

CTI/Classes/Mut.uc

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

CTI/Classes/OfficialWeapons.uc

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

CTI/Classes/RemoveItems.uc

@@ -1,105 +1,88 @@
-class RemoveItems extends Object
-	dependson(CTI)
-	config(CTI);
-
-var public  config bool bALL;
-var public  config bool bHRG;
-var public  config bool bDLC;
-var private config Array<String> Item;
-
-public static function InitConfig(int Version, int LatestVersion)
-{
-	switch (Version)
-	{
-		case `NO_CONFIG:
-			ApplyDefault();
-
-		case 2:
-			default.bHRG = false;
-			default.bDLC = false;
-
-		default: break;
-	}
-
-	if (LatestVersion != Version)
-	{
-		StaticSaveConfig();
-	}
-}
-
-private static function ApplyDefault()
-{
-	default.bALL = false;
-	default.bHRG = false;
-	default.bDLC = false;
-	default.Item.Length = 0;
-	default.Item.AddItem("KFGame.SomeWeapon");
-}
-
-public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
-{
-	local Array<class<KFWeaponDefinition> > ItemList;
-	local class<KFWeaponDefinition> ItemWeapDef;
-	local class<KFWeapon> ItemWeapon;
-	local String ItemRaw;
-	local int    Line;
-
-	`Log_Info("Load items to remove:");
-	if (default.bALL)
-	{
-		`Log_Info("Remove all default items");
-	}
-	else
-	{
-		if (default.bHRG)
-		{
-			`Log_Info("Remove all HRG items");
-		}
-		if (default.bDLC)
-		{
-			`Log_Info("Remove all DLC items");
-		}
-
-		foreach default.Item(ItemRaw, Line)
-		{
-			ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-			if (ItemWeapDef == None)
-			{
-				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
-				continue;
-			}
-
-			ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
-			if (ItemWeapon == None)
-			{
-				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
-				continue;
-			}
-
-			if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
-			{
-				`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
-				continue;
-			}
-
-			ItemList.AddItem(ItemWeapDef);
-			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
-		}
-
-		if (ItemList.Length == default.Item.Length)
-		{
-			`Log_Info("Items to remove list loaded successfully (" $ ItemList.Length @ "entries)");
-		}
-		else
-		{
-			`Log_Info("Items to remove list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
-		}
-	}
-
-	return ItemList;
-}
-
-defaultproperties
-{
-
-}
+class RemoveItems extends Object
+	dependson(CTI)
+	config(CTI);
+
+var public  config bool bAll;
+var private config Array<String> Item;
+
+public static function InitConfig(int Version, int LatestVersion)
+{
+	switch (Version)
+	{
+		case `NO_CONFIG:
+			ApplyDefault();
+			
+		default: break;
+	}
+	
+	if (LatestVersion != Version)
+	{
+		StaticSaveConfig();
+	}
+}
+
+private static function ApplyDefault()
+{
+	default.bAll = false;
+	default.Item.Length = 0;
+	default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
+}
+
+public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
+{
+	local Array<class<KFWeaponDefinition> > ItemList;
+	local class<KFWeaponDefinition> ItemWeapDef;
+	local class<KFWeapon> ItemWeapon;
+	local String ItemRaw;
+	local int    Line;
+	
+	`Log_Info("Load items to remove:");
+	if (default.bAll)
+	{
+		`Log_Info("Remove all default items");
+	}
+	else
+	{
+		foreach default.Item(ItemRaw, Line)
+		{
+			ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+			if (ItemWeapDef == None)
+			{
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
+				continue;
+			}
+			
+			ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
+			if (ItemWeapon == None)
+			{
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
+				continue;
+			}
+			
+			if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
+			{
+				`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
+				continue;
+			}
+			
+			ItemList.AddItem(ItemWeapDef);
+			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
+		}
+		
+		if (ItemList.Length == default.Item.Length)
+		{
+			`Log_Info("Items to remove list loaded successfully (" $ 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,222 +1,161 @@
-class Trader extends Object
-	abstract;
-
-// Bug:
-// The wrong weapon is purchased if the index is greater than 256 😡
-// Some greedy guy saved 3 bytes for no reason again
-const ITEMS_LIMIT = 256;
-
-private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
-{
-	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
-}
-
-public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
-{
-	local String TraderItemsPath;
-
-	if (KFGRI == None)
-	{
-		TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
-	}
-	else
-	{
-		TraderItemsPath = KFGRI.TraderItemsPath;
-	}
-
-	return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
-}
-
-public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
-{
-	local Array<class<KFWeaponDefinition> > KFWeapDefs;
-	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
-
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
-
-	foreach TraderItems.SaleItems(Item)
-	{
-		if (Item.WeaponDef != None)
-		{
-			KFWeapDefs.AddItem(Item.WeaponDef);
-		}
-	}
-
-	return KFWeapDefs;
-}
-
-public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
-{
-	local Array<class<KFWeapon> > KFWeapons;
-	local class<KFWeapon> KFWeapon;
-	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
-
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
-
-	foreach TraderItems.SaleItems(Item)
-	{
-		if (Item.WeaponDef != None)
-		{
-			KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
-			if (KFWeapon != None)
-			{
-				KFWeapons.AddItem(KFWeapon);
-			}
-		}
-	}
-
-	return KFWeapons;
-}
-
-public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KFGameReplicationInfo KFGRI, E_LogLevel LogLevel)
-{
-	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
-	local Array<class<KFWeaponDefinition> > WeapDefs;
-
-	`Log_TraceStatic();
-
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
-
-	foreach TraderItems.SaleItems(Item)
-	{
-		if (Item.WeaponDef != None && Item.WeaponDef.default.SharedUnlockId != SCU_None)
-		{
-			WeapDefs.AddItem(Item.WeaponDef);
-		}
-	}
-
-	return WeapDefs;
-}
-
-public static simulated function Array< class<KFWeaponDefinition> > GenerateWeapDefList(
-	KFGameReplicationInfo KFGRI,
-	const out Array<class<KFWeaponDefinition> > RemoveItems,
-	const out Array<class<KFWeaponDefinition> > AddItems,
-	bool RemoveAll,
-	bool RemoveHRG,
-	bool RemoveDLC,
-	bool bDisableItemLimitCheck,
-	E_LogLevel LogLevel)
-{
-	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
-	local Array< class<KFWeaponDefinition> > WeapDefs;
-	local int Index;
-
-	`Log_TraceStatic();
-
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
-
-	if (!RemoveAll)
-	{
-		foreach TraderItems.SaleItems(Item)
-		{
-			if (Item.WeaponDef != None
-			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
-			&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
-			&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None))
-			&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
-			{
-				WeapDefs.AddItem(Item.WeaponDef);
-			}
-		}
-	}
-
-	for (Index = 0; Index < AddItems.Length; ++Index)
-	{
-		if (WeaponClassIsUnique(AddItems[Index].default.WeaponClassPath, WeapDefs, LogLevel))
-		{
-			WeapDefs.AddItem(AddItems[Index]);
-		}
-	}
-
-	WeapDefs.Sort(ByPrice);
-
-	if (!bDisableItemLimitCheck && WeapDefs.Length > ITEMS_LIMIT)
-	{
-		`Log_Warn("The total number of items has reached the limit (" $ ITEMS_LIMIT $ ")," @ (WeapDefs.Length - ITEMS_LIMIT) @ "items will not be added.");
-		`Log_Warn("Excluded items:");
-		for (Index = ITEMS_LIMIT; Index < WeapDefs.Length; ++Index)
-		{
-			`Log_Warn("[" $ Index + 1 $ "]" @ String(WeapDefs[Index]));
-		}
-		WeapDefs.Length = ITEMS_LIMIT;
-	}
-
-	return WeapDefs;
-}
-
-public static simulated function OverwriteTraderItems(
-	KFGameReplicationInfo KFGRI,
-	const out Array<class<KFWeaponDefinition> > WeapDefs,
-	bool ApplyPatch,
-	E_LogLevel LogLevel)
-{
-	local CTI_GFxObject_TraderItems TraderItemsCTI;
-	local KFGFxObject_TraderItems TraderItemsDef;
-	local STraderItem Item;
-	local class<KFWeaponDefinition> WeapDef;
-	local int MaxItemID;
-
-	`Log_TraceStatic();
-
-	TraderItemsDef = GetTraderItems(KFGRI, LogLevel);
-	TraderItemsCTI = new class'CTI_GFxObject_TraderItems';
-	TraderItemsCTI.AllItems = TraderItemsDef.SaleItems;
-
-	TraderItemsCTI.SaleItems.Length = 0;
-	MaxItemID = 0;
-
-	`Log_Debug("Trader Items:");
-	foreach WeapDefs(WeapDef)
-	{
-		Item.WeaponDef = WeapDef;
-		Item.ItemID = MaxItemID++;
-		TraderItemsCTI.SaleItems.AddItem(Item);
-		TraderItemsCTI.AllItems.AddItem(Item);
-		`Log_Debug("[" $ MaxItemID $ "]" @ String(WeapDef));
-	}
-
-	foreach TraderItemsDef.SaleItems(Item)
-	{
-		Item.ItemID = MaxItemID++;
-		TraderItemsCTI.AllItems.AddItem(Item);
-	}
-
-	TraderItemsCTI.SetItemsInfo(TraderItemsCTI.SaleItems);
-	TraderItemsCTI.SetItemsInfo(TraderItemsCTI.AllItems);
-
-	if (ApplyPatch)
-	{
-		KFGRI.TraderItems = TraderItemsCTI;
-	}
-	else
-	{
-		KFGRI.TraderItems.SaleItems = TraderItemsCTI.SaleItems;
-	}
-}
-
-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
-{
-
-}
+class Trader extends Object
+	abstract;
+
+private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
+{
+	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
+}
+
+public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
+{
+	local String TraderItemsPath;
+	
+	if (KFGRI == None)
+	{
+		TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
+	}
+	else
+	{
+		TraderItemsPath = KFGRI.TraderItemsPath;
+	}
+	
+	return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
+}
+
+public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+{
+	local Array<class<KFWeaponDefinition> > KFWeapDefs;
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	foreach TraderItems.SaleItems(Item)
+	{
+		if (Item.WeaponDef != None)
+		{
+			KFWeapDefs.AddItem(Item.WeaponDef);
+		}
+	}
+	
+	return KFWeapDefs;
+}
+
+public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+{
+	local Array<class<KFWeapon> > KFWeapons;
+	local class<KFWeapon> KFWeapon;
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	foreach TraderItems.SaleItems(Item)
+	{
+		if (Item.WeaponDef != None)
+		{
+			KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
+			if (KFWeapon != None)
+			{
+				KFWeapons.AddItem(KFWeapon);
+			}
+		}
+	}
+	
+	return KFWeapons;
+}
+
+public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KFGameReplicationInfo KFGRI, E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local Array<class<KFWeaponDefinition> > WeapDefs;
+	
+	`Log_TraceStatic();
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	foreach TraderItems.SaleItems(Item)
+	{
+		if (Item.WeaponDef != None && Item.WeaponDef.default.SharedUnlockId != SCU_None)
+		{
+			WeapDefs.AddItem(Item.WeaponDef);
+		}
+	}
+	
+	return WeapDefs;
+}
+
+public static simulated function ModifyTrader(
+	KFGameReplicationInfo KFGRI,
+	Array<class<KFWeaponDefinition> > RemoveItems,
+	Array<class<KFWeaponDefinition> > AddItems,
+	bool ReplaceMode,
+	E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local class<KFWeaponDefinition> WeapDef;
+	local Array<class<KFWeaponDefinition> > WeapDefs;
+	local int Index;
+	local int MaxItemID;
+	
+	`Log_TraceStatic();
+	
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	
+	if (!ReplaceMode)
+	{
+		foreach TraderItems.SaleItems(Item)
+		{
+			if (Item.WeaponDef != None
+			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
+			&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
+			{
+				WeapDefs.AddItem(Item.WeaponDef);
+			}
+		}
+	}
+	
+	for (Index = 0; Index < AddItems.Length; ++Index)
+	{
+		WeapDefs.AddItem(AddItems[Index]);
+	}
+	
+	WeapDefs.Sort(ByPrice);
+	
+	TraderItems.SaleItems.Length = 0;
+	MaxItemID = 0;
+	foreach WeapDefs(WeapDef)
+	{
+		Item.WeaponDef = WeapDef;
+		Item.ItemID = ++MaxItemID;
+		TraderItems.SaleItems.AddItem(Item);
+	}
+
+	TraderItems.SetItemsInfo(TraderItems.SaleItems);
+	
+	KFGRI.TraderItems = TraderItems;
+}
+
+private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
+{
+	local class<KFWeaponDefinition> WeapDef;
+	
+	`Log_TraceStatic();
+	
+	foreach WeapDefs(WeapDef)
+	{
+		if (WeapDef.default.WeaponClassPath == WeaponClassPath)
+		{
+			return false;
+		}
+	}
+	
+	return true;
+}
+
+defaultproperties
+{
+	
+}

CTI/Classes/Unlocker.uc

@@ -1,194 +1,197 @@
-class Unlocker extends Object
-	dependson(WeaponReplacements)
-	abstract;
-
-// TODO:
-// replace shopContainer (KFGFxTraderContainer_Store)
-// without replacing KFGFxMoviePlayer_Manager
-// but how? 🤔
-
-const Trader       = class'Trader';
-const Replacements = class'WeaponReplacements';
-
-public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
-{
-	`Log_TraceStatic();
-
-	switch (Locs(UnlockType))
-	{
-		case "true":
-		case "false":
-		case "auto":
-		case "replaceweapons":
-		case "replacefilter":
-			return true;
-	}
-
-	return false;
-}
-
-public static function bool UnlockDLC(
-	KFGameInfo KFGI,
-	KFGameReplicationInfo KFGRI,
-	String UnlockType,
-	out Array<class<KFWeaponDefinition> > WeapDefs,
-	out BoolWrapper DLCSkinUpdateRequired,
-	E_LogLevel LogLevel)
-{
-	`Log_TraceStatic();
-
-	switch (Locs(UnlockType))
-	{
-		case "true":
-		case "auto":
-			return Auto(KFGI, KFGRI, WeapDefs, DLCSkinUpdateRequired, LogLevel);
-
-		case "replaceweapons":
-			return ReplaceWeapons(KFGRI, WeapDefs, DLCSkinUpdateRequired, LogLevel);
-
-		case "replacefilter":
-			DLCSkinUpdateRequired.Value = false;
-			return ReplaceFilter(KFGI, LogLevel);
-
-		case "false":
-		default:
-			return false;
-	}
-}
-
-private static function bool Auto(
-	KFGameInfo KFGI,
-	KFGameReplicationInfo KFGRI,
-	out Array<class<KFWeaponDefinition> > WeapDefs,
-	out BoolWrapper DLCSkinUpdateRequired,
-	E_LogLevel LogLevel)
-{
-	`Log_TraceStatic();
-
-	if (KFGI == None) return false;
-
-	if (CustomGFxManager(KFGI))
-	{
-		return ReplaceWeapons(KFGRI, WeapDefs, DLCSkinUpdateRequired, LogLevel);
-	}
-	else
-	{
-		DLCSkinUpdateRequired.Value = false;
-		return ReplaceFilter(KFGI, LogLevel);
-	}
-}
-
-public static function bool CustomGFxManager(KFGameInfo KFGI)
-{
-	if (KFGameInfo_VersusSurvival(KFGI) != None)
-	{
-		return (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
-	}
-	else
-	{
-		return (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
-	}
-}
-
-private static function bool ReplaceWeapons(
-	KFGameReplicationInfo KFGRI,
-	out Array<class<KFWeaponDefinition> > WeapDefs,
-	out BoolWrapper DLCSkinUpdateRequired,
-	E_LogLevel LogLevel)
-{
-	local class<KFWeaponDefinition> WeapDef;
-	local class<KFWeaponDefinition> WeapDefReplacement;
-	local bool Unlock, PartialUnlock;
-	local int Index;
-
-	`Log_TraceStatic();
-
-	`Log_Debug("Unlock by replace weapons");
-
-	Unlock = false;
-	PartialUnlock = false;
-	DLCSkinUpdateRequired.Value = false;
-
-	for (Index = 0; Index < WeapDefs.Length; Index++)
-	{
-		WeapDef = WeapDefs[Index];
-
-		if (WeapDef.default.SharedUnlockId == SCU_None) continue;
-
-		WeapDefReplacement = PickReplacementWeapDefDLC(WeapDef, LogLevel);
-		if (WeapDefReplacement != None)
-		{
-			Unlock = true;
-			DLCSkinUpdateRequired.Value = true;
-			if (WeapDefs.Find(WeapDefReplacement) == INDEX_NONE)
-			{
-				WeapDefs[Index] = WeapDefReplacement;
-				`Log_Debug(WeapDef @ "replaced by" @ WeapDefReplacement);
-			}
-			else
-			{
-				WeapDefs.Remove(Index--, 1);
-				`Log_Debug("Skip already unlocked weapon:" @ WeapDef);
-			}
-		}
-		else
-		{
-			PartialUnlock = true;
-			`Log_Warn("Can't unlock item:" @ WeapDef @ "SharedUnlockId:" @ WeapDef.default.SharedUnlockId);
-		}
-	}
-
-	if (PartialUnlock)
-	{
-		`Log_Warn("Some DLCs are not unlocked. Try to set 'UnlockDLC=ReplaceFilter' or ask the author to update the mod");
-	}
-
-	return Unlock;
-}
-
-private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
-{
-	local SWeapReplace WeapReplace;
-
-	`Log_TraceStatic();
-
-	foreach Replacements.default.DLC(WeapReplace)
-	{
-		if (ClassIsChildOf(WeapReplace.WeapDef, WeapDefDLC))
-		{
-			return WeapReplace.WeapDef;
-		}
-	}
-
-	return None;
-}
-
-private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
-{
-	`Log_TraceStatic();
-
-	`Log_Debug("Unlock by replace filter");
-
-	if (KFGI == None) return false;
-
-	if (CustomGFxManager(KFGI))
-	{
-		`Log_Warn("Custom KFGFxMoviePlayer_Manager detected:" @ String(KFGI.KFGFxManagerClass) $ ". There may be compatibility issues.");
-	}
-
-	if (KFGameInfo_VersusSurvival(KFGI) != None)
-	{
-		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus_DLC';
-	}
-	else
-	{
-		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_DLC';
-	}
-
-	return true;
-}
-
-defaultproperties
-{
-
-}
+class Unlocker extends Object
+	abstract;
+
+// TODO:
+// replace shopContainer (KFGFxTraderContainer_Store)
+// without replacing KFGFxMoviePlayer_Manager
+// but how? 🤔
+
+const Trader = class'Trader';
+
+var private const Array<class<KFWeaponDefinition> > WeapDefDLCReplacements;
+
+public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
+{
+	`Log_TraceStatic();
+	
+	switch (Locs(UnlockType))
+	{
+		case "true":
+		case "false":
+		case "auto":
+		case "replaceweapons":
+		case "replacefilter":
+			return true;
+	}
+	
+	return false;
+}
+
+public static function bool UnlockDLC(
+	KFGameInfo KFGI,
+	KFGameReplicationInfo KFGRI,
+	String UnlockType,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
+	E_LogLevel LogLevel)
+{
+	`Log_TraceStatic();
+	
+	switch (Locs(UnlockType))
+	{
+		case "true":
+		case "auto":
+			return Auto(KFGI, KFGRI, RemoveItems, AddItems, LogLevel);
+
+		case "replaceweapons":
+			return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
+			
+		case "replacefilter":
+			return ReplaceFilter(KFGI, LogLevel);
+			
+		case "false":
+		default:
+			return false;
+	}
+}
+
+private static function bool Auto(
+	KFGameInfo KFGI,
+	KFGameReplicationInfo KFGRI,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
+	E_LogLevel LogLevel)
+{
+	local bool CustomGFxManager;
+	
+	`Log_TraceStatic();
+	
+	if (KFGI == None) return false;
+	
+	if (KFGameInfo_VersusSurvival(KFGI) != None)
+	{
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
+	}
+	else
+	{
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
+	}
+
+	if (CustomGFxManager)
+	{
+		return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
+	}
+	else
+	{
+		return ReplaceFilter(KFGI, LogLevel);
+	}
+}
+
+private static function bool ReplaceWeapons(
+	KFGameReplicationInfo KFGRI,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
+	E_LogLevel LogLevel)
+{
+	local Array<class<KFWeaponDefinition> > WeapDefsDLCs;
+	local class<KFWeaponDefinition> WeapDefDLC;
+	local class<KFWeaponDefinition> WeapDefReplacement;
+	local bool Unlock, PartialUnlock;
+	
+	`Log_TraceStatic();
+	
+	Unlock = false;
+	PartialUnlock = false;
+	
+	WeapDefsDLCs = Trader.static.GetTraderWeapDefsDLC(KFGRI, LogLevel);
+	
+	foreach WeapDefsDLCs(WeapDefDLC)
+	{
+		WeapDefReplacement = PickReplacementWeapDefDLC(WeapDefDLC, LogLevel);
+		if (WeapDefReplacement != None)
+		{
+			Unlock = true;
+			if (AddItems.Find(WeapDefReplacement) == INDEX_NONE)
+			{
+				AddItems.AddItem(WeapDefReplacement);
+			}
+			`Log_Debug(WeapDefDLC @ "replaced by" @ WeapDefReplacement);
+		}
+		else
+		{
+			PartialUnlock = true;
+			`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
+		}
+	}
+	
+	if (PartialUnlock)
+	{
+		`Log_Warn("Some DLCs are not unlocked. Try to set 'UnlockDLC=ReplaceFilter' or ask the author to update the mod");
+	}
+	
+	return Unlock;
+}
+
+private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
+{
+	local class<KFWeaponDefinition> WeapDef;
+	
+	`Log_TraceStatic();
+	
+	foreach default.WeapDefDLCReplacements(WeapDef)
+	{
+		if (ClassIsChildOf(WeapDef, WeapDefDLC))
+		{
+			return WeapDef;
+		}
+	}
+	
+	return None;
+}
+
+private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
+{
+	`Log_TraceStatic();
+	
+	if (KFGI == None) return false;
+	
+	if (KFGameInfo_VersusSurvival(KFGI) != None)
+	{
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
+	}
+	else
+	{
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
+	}
+	
+	return true;
+}
+
+defaultproperties
+{
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_AutoTurret')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Mine_Reconstructor')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Minigun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_MosinNagant')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ParasiteImplanter')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_DualG18')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_G18C')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Rifle_FrostShotgunAxe')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Scythe')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ShrinkRayGun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander')
+}

CTI/Classes/WeaponReplacements.uc

@@ -1,189 +0,0 @@
-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_MG3',
-		WeapDefParent=class'KFWeapDef_MG3',
-		Weap=class'CTI_Weap_LMG_MG3',
-		WeapParent=class'KFWeap_LMG_MG3'
-	)})
-	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
-	abstract;
-
-enum E_LogLevel
-{
-	LL_WrongLevel,
-	LL_None,
-	LL_Fatal,
-	LL_Error,
-	LL_Warning,
-	LL_Info,
-	LL_Debug,
-	LL_Trace,
-	LL_All
-};
-
-defaultproperties
-{
-
-}
+class _Logger extends Object
+	abstract;
+
+enum E_LogLevel
+{
+	LL_WrongLevel,
+	LL_None,
+	LL_Fatal,
+	LL_Error,
+	LL_Warning,
+	LL_Info,
+	LL_Debug,
+	LL_Trace,
+	LL_All
+};
+
+defaultproperties
+{
+	
+}

CTI/Constants.uci

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

CTI/Globals.uci

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

CTI/Logger.uci

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

PublicationContent/description.txt

@@ -1,17 +1,12 @@
 [img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory[/img] [img]https://img.shields.io/steam/downloads/2830826239[/img] [img]https://img.shields.io/steam/favorites/2830826239[/img] [img]https://img.shields.io/steam/update-date/2830826239[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2830826239][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory[/img][/url]
 
-[h1]Description[/h1]
-Trader inventory management
-
 [h1]Features[/h1]
 [list]
 [*]remove/add items to trader;
 [*]can preload weapon models (no lags when someone buys weapons);
 [*]unlock DLC weapons;
 [*]correct items sorting (by price);
-[*]don't have to worry about adding new guns after each KF2 update;
-[*]add an unlimited number of items to the trader;
-[*]players can sell weapons excluded from trader inventory.
+[*]don't have to worry about adding new guns after each KF2 update.
 [/list]
 
 [h1]Whitelisted?[/h1]
@@ -20,17 +15,11 @@ 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;
-[*]Create a file [b](*)[/b]: [b]C:\Users\<username>\Documents\My Games\KillingFloor2\KFGame\Config\KFCTI.ini[/b]
-with the following content:
-[b][CTI.CTI]
-Version=0[/b]
-[*]Start KF2;
-[*]Open console (~) and start any map with CTI (this will generate the default KFCTI.ini content):
-[b]open KF-BioticsLab?Mutator=CTI.Mut[/b]
-[*]Close the game and configure CTI as you need (see the [b]Setup (KFCTI.ini)[/b] section below);
-[*]Start KF2, open the console, start the game:
-[b]open KF-BioticsLab?Mutator=CTI.Mut[/b]
-(replace the map and add the parameters you need).
+[*]Start KF2; 
+[*]Open console (~) and input:
+[b]open KF-BioticsLab?Mutator=CTI.CTIMut[/b]
+(replace the map and add the parameters you need)
+[*]<Enter>.
 [/olist]
 [h1]Usage (server)[/h1]
 [b]Note:[/b] [i]If you don't understand what is written here, read the article [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server (KF2 wiki)[/u][/url] before following these instructions.[/i]
@@ -42,59 +31,52 @@ Version=0[/b]
 [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
 [b]ServerSubscribedWorkshopItems=2830826239[/b]
 [*]Start the server and wait while the mutator is downloading;
-[*]When the download is complete, close the server;
-[*]Create a file [b](*)[/b]: [b]<kf2-server>\KFGame\Config\KFCTI.ini[/b]
-with the following content:
-[b][CTI.CTI]
-Version=0[/b]
-[*]Add mutator to server start parameters: [b]?Mutator=CTI.Mut[/b] and start the server (this will generate the default KFCTI.ini content);
-[*]Close the server and configure CTI as you need (see the [b]Setup (KFCTI.ini)[/b] section below);
-[*]Start the server (with [b]?Mutator=CTI.Mut[/b]) again.
+[*]Add mutator to server start parameters: [b]?Mutator=CTI.CTIMut[/b] and restart the server.
 [/olist]
 
-[h1][b](*)[/b] Buggy config variables initialization[/h1]
-CTI, like many other mutators, initializes the config by relying on the unreal script feature which uses default values for each data type that is not explicitly specified. For the int type (which is used to store the config version) this is zero - detecting zero allows to understand that the mutator is being used for the first time (which means it's need to generate a config). But now the game contains a bug that initializes the config values ​​randomly if they are not explicitly set. Thus, the config may have incorrect values ​​or not be created at all. This is why I recommend explicitly set [b]Version=0[/b] in the config for the first time.
-
+[h1]Important setup information[/h1]
+The config should be created on first start, but now the game contains a bug that initializes the config values ​​randomly if they are not explicitly set. Thus, the config may have incorrect values ​​or not be created at all.
+So if you are using this mutator for the first time, I highly recommend doing the following:
+[olist]
+[*]Create (modify) [b]KFCTI.ini[/b] manually. Put the following content there:
+[b][CTI.CTI]
+Version=0[/b]
+[*]Start the game/server with CTI to generate the contents of the config.
+[*]Close the game/server.
+[/olist]
+[b]Right now this is the only way to correctly create the default config.[/b]
 Unfortunately I can't do anything about it because it's a game problem (not mutator). I hope TWI fixes this someday.
 
 [h1]Setup (KFCTI.ini)[/h1]
 [list]
-[*][b]bDisableItemLimitCheck[/b]: The original game does not support more than 256 trader items, adding items above this limit causes bugs. If this problem is solved (For example, if you are using a mutator that has already fixed this problem or by enabling [b]bApplyPatch[/b]) then it can be set [b]bDisableItemLimitCheck=True[/b] to remove the limit, otherwise it is better to leave it [b]False[/b].
+[*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags during the game.
 
-[*]Set [b]bApplyPatch=True[/b] to fix some base classes of the game: this fixes problems when adding more than 256 items to a trader and will allow players to sell weapons that have been removed from trader inventory. Note that enabling this parameter replaces the following classes: [b]KFAutoPurchaseHelper[/b], [b]KFInventoryManager[/b], [b]KFGFxMenu_Trader[/b], [b]KFGFxObject_TraderItems[/b]. There may be compatibility issues with mutators that also replace them.
-
-[*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags when someone buys weapons. In some cases (usually if there is a lot of custom content), enabling preload can cause models to disappear. It is recommended to test how this setting affects the game for your server configuration and then decide whether to enable preloading or not.
-
-[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste) or leave it [b]False[/b] if you want a clean config without unnecessary things.
+[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste).
 
 [*]Set [b]UnlockDLC[/b] to customize DLC weapon unlocks. Here are the possible values:
 [list]
 [*][b]False[/b] - disable DLC unlock.
 [*][b]ReplaceFilter[/b] - changes the trader filter allowing you to buy original DLC weapons without restrictions, unlocks future DLCs as well (no need to update this mutator). However, it replaces the - [b]KFGFxMoviePlayer_Manager[/b] class so it may not be compatible with mods that also replace it.
 [*][b]ReplaceWeapons[/b] - replaces DLC weapons with their unlocked variants. Compatible with any mods, but may require a CTI update after the release of new DLC weapons.
-[*][b]True[/b] or [b]Auto[/b] - selects the most appropriate option automatically. Recommend putting CTI.Mut last in the mutator load queue if you use this.
+[*][b]True[/b] or [b]Auto[/b] - selects the most appropriate option automatically. Recommend putting CTIMut last in the mutator load queue if you use this.
 [/list]
 
 [*]Use [b][CTI.RemoveItems][/b] to remove items from the trader inventory.
 example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
 
-[*]Set [b]bALL=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
-[*]Set [b]bHRG=True[/b] to remove HRG items.
-[*]Set [b]bDLC=True[/b] to remove DLC items.
+[*]Set [b]bAll=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
 
 [*]Use [b][CTI.AddItems][/b] to add items to the trader inventory.
-example: [b]Item=WeaponPackExt.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
+example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
 [/list]
 
+❗️ Note that if you need an empty list anywhere (for example, you don't want to delete some of the traders's weapons), leave at least one line there:
+[b]Item=""[/b]
+This is necessary to explicitly initialize the list (because of the bug I wrote about above) to avoid initialization with random values.
+
 [h1]Notes[/h1]
-📌 If you need an empty list anywhere (for example, you don't want to delete some of the traders's weapons), leave at least one line there:
-[b]Item=[/b]
-This is necessary to explicitly initialize the list (because of the bug I wrote about above) to avoid initialization with incorrect values.
 📌 Mutator does not contain custom weapons. You must have the required weapon packs in your subscriptions to be able to add them to the trader.
 📌 If you are using this mutator to add weapons, you should [b]not[/b] use mutators from weapon packs (just having them in subscriptions is enough).
 
-[h1]Translators:[/h1]
-[url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
-
 [h1]Sources[/h1]
 [url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]

README.md

@@ -3,26 +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)
-[![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)
+[![Steam Update Date](https://img.shields.io/steam/update-date/2830826239)](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory)](https://github.com/GenZmeY/KF2-CustomTraderInventory/tags)
 [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory)](LICENSE)
 
-## Description
-Trader inventory management  
+# 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 KF2 update;
-- add an unlimited number of items to the trader;
-- players can sell weapons excluded from trader inventory.
+- 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:  
@@ -36,9 +34,16 @@ Trader inventory management
 5. The compiled files will be here:  
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
 
-## Bug reports
+# Testing
+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](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)
+# License
+[GNU GPLv3](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"
 
 

tools

@@ -1 +1 @@
-Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f
+Subproject commit d830a5ea169e230fa40d63319b838fde1e25f6c1