26 changed files with 221 additions and 1654 deletions
--- a/.github/workflows/mega-linter.yml
+++ b/.github/workflows/mega-linter.yml
@ -6,14 +6,12 @@ permissions: read-all
 on:
  push:
  pull_request:
-    branches:
-      - master
+    branches: [master]

 env:
  APPLY_FIXES: none
  APPLY_FIXES_EVENT: pull_request
  APPLY_FIXES_MODE: commit
-  FILTER_REGEX_EXCLUDE: (mega-linter.yml)
  DISABLE: SPELL

 concurrency:
@ -21,94 +19,54 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  megalinter:
+  build:
    name: MegaLinter
    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-
    steps:
      - name: Checkout Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@v3
        with:
          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-          fetch-depth: 0

      - name: MegaLinter
-        uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
        id: ml
+        uses: oxsecurity/megalinter@v7
        env:
          VALIDATE_ALL_CODEBASE: true
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Archive production artifacts
-        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
-        if: success() || failure()
+        if: ${{ success() }} || ${{ failure() }}
+        uses: actions/upload-artifact@v3
        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'
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        uses: peter-evans/create-pull-request@v5
        with:
          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
          commit-message: "[MegaLinter] Apply linters automatic fixes"
          title: "[MegaLinter] Apply linters automatic fixes"
          labels: bot
-
      - name: Create PR output
-        if: env.APPLY_FIXES_IF_PR == 'true'
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
        run: |
-          echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
-          echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

      - name: Prepare commit
-        if: env.APPLY_FIXES_IF_COMMIT == 'true'
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
        run: sudo chown -Rc $UID .git/
-
      - name: Commit and push applied linter fixes
-        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
-        if: env.APPLY_FIXES_IF_COMMIT == 'true'
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        uses: stefanzweifel/git-auto-commit-action@v4
        with:
-          branch: >-
-            ${{
-              github.event.pull_request.head.ref ||
-              github.head_ref ||
-              github.ref
-            }}
+          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"
--- a/CTI/Classes/CTI.uc
+++ b/CTI/Classes/CTI.uc
@ -1,7 +1,7 @@
 class CTI extends Info
 	config(CTI);

-const LatestVersion = 5;
+const LatestVersion = 4;

 const CfgRemoveItems     = class'RemoveItems';
 const CfgAddItems        = class'AddItems';
@ -23,7 +23,6 @@ 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;
@ -112,9 +111,6 @@ private function PreInit()
 		case 3:
 			bDisableItemLimitCheck = false;

-		case 4:
-			bApplyPatch = false;
-
 		case MaxInt:
 			`Log_Info("Config updated to version" @ LatestVersion);
 			break;
@ -191,7 +187,18 @@ private function PostInit()
 		return;
 	}

-	WeapDefs = Trader.static.GenerateWeapDefList(
+	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel))
+	{
+		`Log_Info("DLC unlocked");
+	}
+	`Log_Debug("DLCSkinUpdateRequired:" @ String(DLCSkinUpdateRequired.Value));
+
+	if (bPreloadContent)
+	{
+		Preload(AddItems);
+	}
+
+	Trader.static.ModifyTrader(
 		KFGRI,
 		RemoveItems,
 		AddItems,
@ -201,28 +208,7 @@ private function PostInit()
 		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);
-	}
+	WeapDefs = Trader.static.GetTraderWeapDefs(KFGRI, LogLevel);

 	ReadyToSync = true;

@ -230,52 +216,11 @@ private function PostInit()
 	{
 		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;
@ -349,11 +294,12 @@ public function bool CreateRepInfo(Controller C)

 	if (RepInfo == None) return false;

+	RepInfo.PrepareSync(Self, KFPlayerController(C), LogLevel, DLCSkinUpdateRequired.Value);
+
 	RepInfos.AddItem(RepInfo);

 	if (ReadyToSync)
 	{
-		RepInfo.PrepareSync(Self, LogLevel, KFGI.KFGFxManagerClass, DLCSkinUpdateRequired.Value, bApplyPatch);
 		RepInfo.Replicate(WeapDefs);
 	}
 	else
--- a/CTI/Classes/CTIMut.uc
+++ b/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)
+		CTIMut(Mut).SafeDestroy();
+	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
+{
+	GroupNames.Add("TraderItems")
+}
--- a/CTI/Classes/CTI_AutoPurchaseHelper.uc
+++ b/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
-{
-
-}
--- a/CTI/Classes/CTI_GFxMenu_Trader.uc
+++ b/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
 {
-
+	SubWidgetBindings.Remove((WidgetName="shopContainer",WidgetClass=class'KFGFxTraderContainer_Store'))
+	SubWidgetBindings.Add((WidgetName="shopContainer",WidgetClass=class'CTI_GFxTraderContainer_Store'))
 }
--- a/CTI/Classes/CTI_GFxMenu_Trader_DLC.uc
+++ b/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'))
-}
--- a/CTI/Classes/CTI_GFxMoviePlayer_Manager_DLC.uc
+++ b/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'))
-}
--- a/CTI/Classes/CTI_GFxMoviePlayer_Manager_Versus_DLC.uc
+++ b/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'))
-}
--- a/CTI/Classes/CTI_GFxObject_TraderItems.uc
+++ b/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
-{
-
-}
--- a/CTI/Classes/CTI_GFxTraderContainer_Store.uc
+++ b/CTI/Classes/CTI_GFxTraderContainer_Store.uc
@ -11,17 +11,6 @@ function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
 	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;
 }

--- a/CTI/Classes/CTI_InventoryManager.uc
+++ b/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
-{
-
-}
--- a/CTI/Classes/CTI_LocalMessage.uc
+++ b/CTI/Classes/CTI_LocalMessage.uc
@ -13,12 +13,6 @@ 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;

@ -31,8 +25,6 @@ enum E_CTI_LocalMessageType
 	CTI_WaitingGRI,
 	CTI_IncompatibleGRI,
 	CTI_IncompatibleGRIWarning,
-	CTI_NoneGRI,
-	CTI_NoneGRIWarning,
 	CTI_SecondsShort,
 	CTI_PleaseWait
 };
@ -60,12 +52,6 @@ public static function String GetLocalizedString(
 		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);

@ -82,8 +68,6 @@ defaultproperties
 	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"
 }
--- a/CTI/Classes/CTI_RepInfo.uc
+++ b/CTI/Classes/CTI_RepInfo.uc
@ -6,8 +6,6 @@ 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
 {
@ -23,9 +21,6 @@ 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;
@ -37,21 +32,17 @@ 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;
+		LogLevel, SkinUpdateRequired;
 }

 public simulated function bool SafeDestroy()
@ -61,73 +52,20 @@ public simulated function bool SafeDestroy()
 	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)
+	if (WorldInfo.NetMode == NM_StandAlone)
 	{
+		Progress(RepArray.Length, RepArray.Length);
+		return;
+	}
+
 	Sync();
-	}
-	else
-	{
-		Finished();
-	}
 }

 private reliable server function Sync()
@ -171,6 +109,16 @@ private reliable client function Send(ReplicationStruct RD)
 	Sync();
 }

+public function PrepareSync(CTI _CTI, KFPlayerController _KFPC, E_LogLevel _LogLevel, bool _SkinUpdateRequired)
+{
+	`Log_Trace();
+
+	CTI                = _CTI;
+	KFPC               = _KFPC;
+	LogLevel           = _LogLevel;
+	SkinUpdateRequired = _SkinUpdateRequired;
+}
+
 private simulated function Progress(int Value, int Size)
 {
 	`Log_Trace();
@ -190,7 +138,7 @@ private simulated function Finished()

 	`Log_Trace();

-	if ((GetGRI(WaitingGRI > WaitingGRIThreshold) == None) && WaitingGRI++ < WaitingGRILimit)
+	if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
 	{
 		`Log_Debug("Finished: Waiting GRI" @ WaitingGRI);
 		NotifyWaitingGRI();
@ -198,98 +146,50 @@ private simulated function Finished()
 		return;
 	}

-	if (PatchRequired && GetKFPC() != None)
-	{
-		KFPC.PurchaseHelperClass = PurchaseHelper;
-		KFPC.PurchaseHelper = None;
-	}
-
-	KFGRI = KFGameReplicationInfo(GRI);
+	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
 	if (KFGRI != None)
 	{
 		`Log_Debug("Finished: Trader.static.OverwriteTraderItems");
-		if (WorldInfo.NetMode != NM_StandAlone)
-		{
-			Trader.static.OverwriteTraderItems(KFGRI, RepArray, PatchRequired, LogLevel);
-		}
+		Trader.static.OverwriteTraderItems(KFGRI, RepArray, LogLevel);
 		`Log_Info("Trader items successfully synchronized!");
 	}
 	else
 	{
-		`Log_Error("Incompatible Game Replication info:" @ String(GRI));
-		if (GRI == None)
-		{
-			NotifyNoneGRI();
-		}
-		else
-		{
+		`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
 		NotifyIncompatibleGRI();
 	}
-	}

 	ShowReadyButton();

 	if (SkinUpdateRequired)
 	{
-		SkinUpdate();
+		SetTimer(1.0f, true, nameof(UpdateSkinsDLC));
 	}
 	else
 	{
-		ClientFinished();
+		ClientCleanup();
 	}
 }

-private simulated function SkinUpdate()
+private simulated function UpdateSkinsDLC()
 {
 	local SWeapReplace WeapReplace;

-	if (GetKFPRI() == None || !KFPRI.bHasSpawnedIn)
+	`Log_Debug("Wait for spawn");
+	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)
+			if (WeapReplace.WeapParent.default.SkinItemId > 0 && WeapReplace.Weap.default.SkinItemId != WeapReplace.WeapParent.default.SkinItemId)
 			{
 				`Log_Debug("Update skin for:" @ String(WeapReplace.WeapDef) @ "SkinId:" @ WeapReplace.WeapParent.default.SkinItemId);
 				class'KFWeaponSkinList'.static.SaveWeaponSkin(WeapReplace.WeapDef, WeapReplace.WeapParent.default.SkinItemId);
 			}
 		}

-	ClearTimer(nameof(SkinUpdate));
-	ClientFinished();
-}
-
-private simulated function GameReplicationInfo GetGRI(optional bool ForcedSearch = false)
-{
-	`Log_Trace();
-
-	if (GRI == None)
-	{
-		GRI = WorldInfo.GRI;
+		ClearTimer(nameof(UpdateSkinsDLC));
+		ClientCleanup();
 	}
-
-	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()
@ -430,29 +330,17 @@ private simulated function KeepNotification()
 		NotificationPercent);
 }

-private reliable server function ClientFinished()
+private simulated function ClientCleanup()
 {
-	ClientReady = true;
-	if (ClientReady && ServerReady) Cleanup();
+	ServerCleanup();
+	SafeDestroy();
 }

-private function ServerFinished()
-{
-	ServerReady = true;
-	if (ClientReady && ServerReady) Cleanup();
-}
-
-private reliable server function Cleanup()
+private reliable server function ServerCleanup()
 {
 	`Log_Trace();

-	if (PatchRequired)
-	{
-		`Log_Debug("Skip cleanup to keep CTI_RepInfo alive");
-		return;
-	}
-
-	`Log_Debug("Cleanup" @ GetKFPC() @ GetKFPRI() == None? "" : GetKFPRI().PlayerName);
+	`Log_Debug("Cleanup");
 	if (!CTI.DestroyRepInfo(GetKFPC()))
 	{
 		`Log_Debug("Cleanup (forced)");
@ -460,70 +348,6 @@ private reliable server function Cleanup()
 	}
 }

-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)))
@ -557,22 +381,12 @@ private simulated function NotifyIncompatibleGRI()
 	WriteToChatLocalized(
 		CTI_IncompatibleGRI,
 		class'KFLocalMessage'.default.InteractionColor,
-		String(GRI.class));
+		String(WorldInfo.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
@ -583,9 +397,5 @@ defaultproperties

 	NotificationPercent    = 0
 	WaitingGRI             = 0
-	WaitingGRIThreshold    = 15
 	WaitingGRILimit        = 30
-
-	ClientReady = false
-	ServerReady = false
 }
--- a/CTI/Classes/CTI_WeapDef_MG3.uc
+++ b/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"
-}
--- a/CTI/Classes/CTI_Weap_LMG_MG3.uc
+++ b/CTI/Classes/CTI_Weap_LMG_MG3.uc
@ -1,6 +0,0 @@
-class CTI_Weap_LMG_MG3 extends KFWeap_LMG_MG3;
-
-defaultproperties
-{
-
-}
--- a/CTI/Classes/Mut.uc
+++ b/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")
-}
--- a/CTI/Classes/RemoveItems.uc
+++ b/CTI/Classes/RemoveItems.uc
@ -2,7 +2,7 @@ class RemoveItems extends Object
 	dependson(CTI)
 	config(CTI);

-var public  config bool bALL;
+var public  config bool bAll;
 var public  config bool bHRG;
 var public  config bool bDLC;
 var private config Array<String> Item;
@ -29,11 +29,11 @@ public static function InitConfig(int Version, int LatestVersion)

 private static function ApplyDefault()
 {
-	default.bALL = false;
+	default.bAll = false;
 	default.bHRG = false;
 	default.bDLC = false;
 	default.Item.Length = 0;
-	default.Item.AddItem("KFGame.SomeWeapon");
+	default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
 }

 public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
@ -45,7 +45,7 @@ public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLeve
 	local int    Line;

 	`Log_Info("Load items to remove:");
-	if (default.bALL)
+	if (default.bAll)
 	{
 		`Log_Info("Remove all default items");
 	}
--- a/CTI/Classes/Trader.uc
+++ b/CTI/Classes/Trader.uc
@ -91,11 +91,11 @@ public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KF
 	return WeapDefs;
 }

-public static simulated function Array< class<KFWeaponDefinition> > GenerateWeapDefList(
+public static simulated function ModifyTrader(
 	KFGameReplicationInfo KFGRI,
 	const out Array<class<KFWeaponDefinition> > RemoveItems,
 	const out Array<class<KFWeaponDefinition> > AddItems,
-	bool RemoveAll,
+	bool ReplaceMode,
 	bool RemoveHRG,
 	bool RemoveDLC,
 	bool bDisableItemLimitCheck,
@ -103,14 +103,14 @@ public static simulated function Array< class<KFWeaponDefinition> > GenerateWeap
 {
 	local KFGFxObject_TraderItems TraderItems;
 	local STraderItem Item;
-	local Array< class<KFWeaponDefinition> > WeapDefs;
+	local Array<class<KFWeaponDefinition> > WeapDefs;
 	local int Index;

 	`Log_TraceStatic();

 	TraderItems = GetTraderItems(KFGRI, LogLevel);

-	if (!RemoveAll)
+	if (!ReplaceMode)
 	{
 		foreach TraderItems.SaleItems(Item)
 		{
@ -126,12 +126,9 @@ public static simulated function Array< class<KFWeaponDefinition> > GenerateWeap
 	}

 	for (Index = 0; Index < AddItems.Length; ++Index)
-	{
-		if (WeaponClassIsUnique(AddItems[Index].default.WeaponClassPath, WeapDefs, LogLevel))
 	{
 		WeapDefs.AddItem(AddItems[Index]);
 	}
-	}

 	WeapDefs.Sort(ByPrice);

@ -146,28 +143,24 @@ public static simulated function Array< class<KFWeaponDefinition> > GenerateWeap
 		WeapDefs.Length = ITEMS_LIMIT;
 	}

-	return WeapDefs;
+	OverwriteTraderItems(KFGRI, WeapDefs, LogLevel);
 }

 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 KFGFxObject_TraderItems TraderItems;
 	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;
+	TraderItems = GetTraderItems(KFGRI, LogLevel);

-	TraderItemsCTI.SaleItems.Length = 0;
+	TraderItems.SaleItems.Length = 0;
 	MaxItemID = 0;

 	`Log_Debug("Trader Items:");
@ -175,28 +168,13 @@ public static simulated function OverwriteTraderItems(
 	{
 		Item.WeaponDef = WeapDef;
 		Item.ItemID = MaxItemID++;
-		TraderItemsCTI.SaleItems.AddItem(Item);
-		TraderItemsCTI.AllItems.AddItem(Item);
+		TraderItems.SaleItems.AddItem(Item);
 		`Log_Debug("[" $ MaxItemID $ "]" @ String(WeapDef));
 	}

-	foreach TraderItemsDef.SaleItems(Item)
-	{
-		Item.ItemID = MaxItemID++;
-		TraderItemsCTI.AllItems.AddItem(Item);
-	}
+	TraderItems.SetItemsInfo(TraderItems.SaleItems);

-	TraderItemsCTI.SetItemsInfo(TraderItemsCTI.SaleItems);
-	TraderItemsCTI.SetItemsInfo(TraderItemsCTI.AllItems);
-
-	if (ApplyPatch)
-	{
-		KFGRI.TraderItems = TraderItemsCTI;
-	}
-	else
-	{
-		KFGRI.TraderItems.SaleItems = TraderItemsCTI.SaleItems;
-	}
+	KFGRI.TraderItems = TraderItems;
 }

 private static function bool WeaponClassIsUnique(String WeaponClassPath, const out Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
--- a/CTI/Classes/Unlocker.uc
+++ b/CTI/Classes/Unlocker.uc
@ -31,7 +31,8 @@ public static function bool UnlockDLC(
 	KFGameInfo KFGI,
 	KFGameReplicationInfo KFGRI,
 	String UnlockType,
-	out Array<class<KFWeaponDefinition> > WeapDefs,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
 	out BoolWrapper DLCSkinUpdateRequired,
 	E_LogLevel LogLevel)
 {
@ -41,10 +42,11 @@ public static function bool UnlockDLC(
 	{
 		case "true":
 		case "auto":
-			return Auto(KFGI, KFGRI, WeapDefs, DLCSkinUpdateRequired, LogLevel);
+			return Auto(KFGI, KFGRI, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel);

 		case "replaceweapons":
-			return ReplaceWeapons(KFGRI, WeapDefs, DLCSkinUpdateRequired, LogLevel);
+			DLCSkinUpdateRequired.Value = true;
+			return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);

 		case "replacefilter":
 			DLCSkinUpdateRequired.Value = false;
@ -59,17 +61,30 @@ public static function bool UnlockDLC(
 private static function bool Auto(
 	KFGameInfo KFGI,
 	KFGameReplicationInfo KFGRI,
-	out Array<class<KFWeaponDefinition> > WeapDefs,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
 	out BoolWrapper DLCSkinUpdateRequired,
 	E_LogLevel LogLevel)
 {
+	local bool CustomGFxManager;
+
 	`Log_TraceStatic();

 	if (KFGI == None) return false;

-	if (CustomGFxManager(KFGI))
+	if (KFGameInfo_VersusSurvival(KFGI) != None)
 	{
-		return ReplaceWeapons(KFGRI, WeapDefs, DLCSkinUpdateRequired, LogLevel);
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
+	}
+	else
+	{
+		CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
+	}
+
+	if (CustomGFxManager)
+	{
+		DLCSkinUpdateRequired.Value = true;
+		return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
 	}
 	else
 	{
@ -78,28 +93,16 @@ private static function bool Auto(
 	}
 }

-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,
+	out Array<class<KFWeaponDefinition> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
 	E_LogLevel LogLevel)
 {
-	local class<KFWeaponDefinition> WeapDef;
+	local Array<class<KFWeaponDefinition> > WeapDefsDLCs;
+	local class<KFWeaponDefinition> WeapDefDLC;
 	local class<KFWeaponDefinition> WeapDefReplacement;
 	local bool Unlock, PartialUnlock;
-	local int Index;

 	`Log_TraceStatic();

@ -107,34 +110,30 @@ private static function bool ReplaceWeapons(

 	Unlock = false;
 	PartialUnlock = false;
-	DLCSkinUpdateRequired.Value = false;

-	for (Index = 0; Index < WeapDefs.Length; Index++)
+	WeapDefsDLCs = Trader.static.GetTraderWeapDefsDLC(KFGRI, LogLevel);
+
+	foreach WeapDefsDLCs(WeapDefDLC)
 	{
-		WeapDef = WeapDefs[Index];
-
-		if (WeapDef.default.SharedUnlockId == SCU_None) continue;
-
-		WeapDefReplacement = PickReplacementWeapDefDLC(WeapDef, LogLevel);
+		WeapDefReplacement = PickReplacementWeapDefDLC(WeapDefDLC, LogLevel);
 		if (WeapDefReplacement != None)
 		{
 			Unlock = true;
-			DLCSkinUpdateRequired.Value = true;
-			if (WeapDefs.Find(WeapDefReplacement) == INDEX_NONE)
+			if (AddItems.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);
+				AddItems.AddItem(WeapDefReplacement);
 			}
+			`Log_Debug(WeapDefDLC @ "replaced by" @ WeapDefReplacement);
 		}
 		else
 		{
 			PartialUnlock = true;
-			`Log_Warn("Can't unlock item:" @ WeapDef @ "SharedUnlockId:" @ WeapDef.default.SharedUnlockId);
+			`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
+		}
+
+		if (RemoveItems.Find(WeapDefDLC) == INDEX_NONE)
+		{
+			RemoveItems.AddItem(WeapDefDLC);
 		}
 	}

@ -171,18 +170,13 @@ private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)

 	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';
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
 	}
 	else
 	{
-		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_DLC';
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
 	}

 	return true;
--- a/CTI/Classes/WeaponReplacements.uc
+++ b/CTI/Classes/WeaponReplacements.uc
@ -102,12 +102,6 @@ defaultproperties
 		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',
--- a/Localization/CHN/CTI.chn
+++ b/Localization/CHN/CTI.chn
--- a/Localization/CHT/CTI.cht
+++ b/Localization/CHT/CTI.cht
--- a/Localization/INT/CTI.int
+++ b/Localization/INT/CTI.int
--- a/Localization/RUS/CTI.rus
+++ b/Localization/RUS/CTI.rus
--- a/PublicationContent/description.txt
+++ b/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).
+[*]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,43 +31,40 @@ 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]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.

@ -86,15 +72,13 @@ example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
 example: [b]Item=WeaponPackExt.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
 [/list]

-[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:
+❗️ 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 incorrect values.
+This is necessary to explicitly initialize the list (because of the bug I wrote about above) to avoid initialization with random values.
+
+[h1]Notes[/h1]
 📌 Mutator does not contain custom weapons. You must have the required weapon packs in your subscriptions to be able to add them to the trader.
 📌 If you are using this mutator to add weapons, you should [b]not[/b] use mutators from weapon packs (just having them in subscriptions is enough).

-[h1]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]
--- a/README.md
+++ b/README.md
@ -8,16 +8,14 @@
 [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory)](LICENSE)

 ## Description
-Trader inventory management  
+Add/Remove Items in the Trader's Inventory  

 ## 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
 [See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)