Merge pull request #11 from GenZmeY/skins

Apply weapon skins for replaced DLCs

.editorconfig

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

.github/workflows/mega-linter.yml

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

.gitignore

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

CTI/Classes/AddItems.uc

@@ -1,66 +1,79 @@
-class AddItems extends Object
+class AddItems extends Object
-	dependson(CTI)
+	dependson(CTI)
-	config(CTI);
+	config(CTI);
-
+
-var private config Array<String> Item;
+var private config Array<String> Item;
-
+
-public static function InitConfig(int Version, int LatestVersion)
+public static function InitConfig(int Version, int LatestVersion)
-{
+{
-	switch (Version)
+	switch (Version)
-	{
+	{
-		case `NO_CONFIG:
+		case `NO_CONFIG:
-			ApplyDefault();
+			ApplyDefault();
-			
+
-		default: break;
+		default: break;
-	}
+	}
-	
+
-	if (LatestVersion != Version)
+	if (LatestVersion != Version)
-	{
+	{
-		StaticSaveConfig();
+		StaticSaveConfig();
-	}
+	}
-}
+}
-
+
-private static function ApplyDefault()
+private static function ApplyDefault()
-{
+{
-	default.Item.Length = 0;
+	default.Item.Length = 0;
-	default.Item.AddItem("SomePackage.SomeWeapon");
+	default.Item.AddItem("SomePackage.SomeWeapon");
-}
+}
-
+
-public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
+public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
-{
+{
-	local Array<class<KFWeaponDefinition> > ItemList;
+	local Array<class<KFWeaponDefinition> > ItemList;
-	local class<KFWeaponDefinition> ItemClass;
+	local class<KFWeaponDefinition> ItemWeapDef;
-	local String ItemRaw;
+	local class<KFWeapon> ItemWeapon;
-	local int    Line;
+	local String ItemRaw;
-	
+	local int    Line;
-	`Log_Info("Load Items to add:");
+
-	foreach default.Item(ItemRaw, Line)
+	`Log_Info("Load Items to add:");
-	{
+	foreach default.Item(ItemRaw, Line)
-		ItemClass = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
+	{
-		if (ItemClass == None)
+		ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
-		{
+		if (ItemWeapDef == None)
-			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load Item class:" @ ItemRaw);
+		{
-		}
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
-		else
+			continue;
-		{
+		}
-			ItemList.AddItem(ItemClass);
+
-			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
+		ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
-		}
+		if (ItemWeapon == None)
-	}
+		{
-	
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
-	if (ItemList.Length == default.Item.Length)
+			continue;
-	{
+		}
-		`Log_Info("Items to add list loaded successfully (" $ default.Item.Length @ "entries)");
+
-	}
+		if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
-	else
+		{
-	{
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
-		`Log_Info("Items to add list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
+			continue;
-	}
+		}
-	
+
-	return ItemList;
+		ItemList.AddItem(ItemWeapDef);
-}
+		`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
-
+	}
-defaultproperties
+
-{
+	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,316 +1,337 @@
-class CTI extends Info
+class CTI extends Info
-	config(CTI);
+	config(CTI);
-
+
-const LatestVersion = 1;
+const LatestVersion = 4;
-
+
-const CfgRemoveItems = class'RemoveItems';
+const CfgRemoveItems     = class'RemoveItems';
-const CfgAddItems    = class'AddItems';
+const CfgAddItems        = class'AddItems';
-const Helper         = class'Helper';
+const CfgOfficialWeapons = class'OfficialWeapons';
-
+const Trader             = class'Trader';
-struct S_PreloadContent
+const Unlocker           = class'Unlocker';
-{
+
-	var class<KFWeaponDefinition> KFWD;
+struct S_PreloadContent
-	var class<KFWeapon>           KFWC;
+{
-	var KFWeapon                  KFW;
+	var class<KFWeaponDefinition> KFWD;
-	var KFW_Access                KFWA;
+	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 bool       UnlockDLC;
+var private config int        Version;
-var private config bool       bPreloadContent;
+var private config E_LogLevel LogLevel;
-
+var private config String     UnlockDLC;
-var private KFGameInfo KFGI;
+var private config bool       bPreloadContent;
-var private KFGameReplicationInfo KFGRI;
+var private config bool       bOfficialWeaponsList;
-
+var private config bool       bDisableItemLimitCheck;
-var private Array<class<KFWeaponDefinition> > RemoveItems;
+
-var private Array<class<KFWeaponDefinition> > AddItems;
+var private KFGameInfo            KFGI;
-
+var private KFGameReplicationInfo KFGRI;
-var private Array<CTI_RepInfo> RepInfos;
+
-
+var private Array<class<KFWeaponDefinition> > WeapDefs;
-var private bool ReadyToSync;
+var private Array<class<KFWeaponDefinition> > RemoveItems;
-
+var private Array<class<KFWeaponDefinition> > AddItems;
-var private Array<S_PreloadContent> PreloadContent;
+
-
+var private Array<CTI_RepInfo> RepInfos;
-public simulated function bool SafeDestroy()
+
-{
+var private bool ReadyToSync;
-	`Log_Trace(`Location);
+
-	
+// To bypass "Booleans may not be out parameters" error
-	return (bPendingDelete || bDeleteMe || Destroy());
+struct BoolWrapper
-}
+{
-
+	var bool Value;
-public event PreBeginPlay()
+
-{
+	structdefaultproperties
-	`Log_Trace(`Location);
+	{
-	
+		Value = false
-	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
+	}
-	
+};
-	if (WorldInfo.NetMode == NM_Client)
+
-	{
+var private BoolWrapper DLCSkinUpdateRequired;
-		`Log_Fatal("NetMode == NM_Client, Destroy...");
+
-		SafeDestroy();
+public simulated function bool SafeDestroy()
-		return;
+{
-	}
+	`Log_Trace();
-	
+
-	Super.PreBeginPlay();
+	return (bPendingDelete || bDeleteMe || Destroy());
-	
+}
-	PreInit();
+
-}
+public event PreBeginPlay()
-
+{
-public event PostBeginPlay()
+	`Log_Trace();
-{
+
-	`Log_Trace(`Location);
+	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
-	
+
-	if (bPendingDelete || bDeleteMe) return;
+	if (WorldInfo.NetMode == NM_Client)
-	
+	{
-	Super.PostBeginPlay();
+		`Log_Fatal("NetMode == NM_Client, Destroy...");
-	
+		SafeDestroy();
-	PostInit();
+		return;
-}
+	}
-
+
-private function PreInit()
+	Super.PreBeginPlay();
-{
+
-	`Log_Trace(`Location);
+	PreInit();
-	
+}
-	if (Version == `NO_CONFIG)
+
-	{
+public event PostBeginPlay()
-		LogLevel = LL_Info;
+{
-		bPreloadContent = true;
+	`Log_Trace();
-		UnlockDLC = false;
+
-		SaveConfig();
+	if (bPendingDelete || bDeleteMe) return;
-	}
+
-	
+	Super.PostBeginPlay();
-	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
+
-	CfgAddItems.static.InitConfig(Version, LatestVersion);
+	PostInit();
-	
+}
-	switch (Version)
+
-	{
+private function PreInit()
-		case `NO_CONFIG:
+{
-			`Log_Info("Config created");
+	`Log_Trace();
-			
+
-		case MaxInt:
+	if (Version == `NO_CONFIG)
-			`Log_Info("Config updated to version"@LatestVersion);
+	{
-			break;
+		LogLevel = LL_Info;
-			
+		bPreloadContent = true;
-		case LatestVersion:
+		UnlockDLC = "False";
-			`Log_Info("Config is up-to-date");
+		SaveConfig();
-			break;
+	}
-			
+
-		default:
+	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
-			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
+	CfgAddItems.static.InitConfig(Version, LatestVersion);
-			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
+
-			`Log_Warn("The config version will be changed to" @ LatestVersion);
+	switch (Version)
-			break;
+	{
-	}
+		case `NO_CONFIG:
-
+			`Log_Info("Config created");
-	if (LatestVersion != Version)
+
-	{
+		case 1:
-		Version = LatestVersion;
+			bOfficialWeaponsList = false;
-		SaveConfig();
+
-	}
+		case 2:
-
+		case 3:
-	if (LogLevel == LL_WrongLevel)
+			bDisableItemLimitCheck = false;
-	{
+
-		LogLevel = LL_Info;
+		case MaxInt:
-		`Log_Warn("Wrong 'LogLevel', return to default value");
+			`Log_Info("Config updated to version" @ LatestVersion);
-		SaveConfig();
+			break;
-	}
+
-	`Log_Base("LogLevel:" @ LogLevel);
+		case LatestVersion:
-	
+			`Log_Info("Config is up-to-date");
-	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
+			break;
-	AddItems    = CfgAddItems.static.Load(LogLevel);
+
-}
+		default:
-
+			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
-private function PostInit()
+			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
-{
+			`Log_Warn("The config version will be changed to" @ LatestVersion);
-	local CTI_RepInfo RepLink;
+			break;
-	
+	}
-	`Log_Trace(`Location);
+
-	
+	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
-	if (WorldInfo == None || WorldInfo.Game == None)
+
-	{
+	if (LatestVersion != Version)
-		SetTimer(1.0f, false, nameof(PostInit));
+	{
-		return;
+		Version = LatestVersion;
-	}
+		SaveConfig();
-	
+	}
-	KFGI = KFGameInfo(WorldInfo.Game);
+
-	if (KFGI == None)
+	if (LogLevel == LL_WrongLevel)
-	{
+	{
-		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
+		LogLevel = LL_Info;
-		SafeDestroy();
+		`Log_Warn("Wrong 'LogLevel', return to default value");
-		return;
+		SaveConfig();
-	}
+	}
-	
+	`Log_Base("LogLevel:" @ LogLevel);
-	// TODO:
+
-	// replace shopContainer (KFGFxTraderContainer_Store)
+	if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
-	// without replacing KFGFxMoviePlayer_Manager
+	{
-	// but how? 🤔
+		`Log_Warn("Wrong 'UnlockDLC' value (" $ UnlockDLC $ "), return to default value (False)");
-	if (UnlockDLC)
+		UnlockDLC = "False";
-	{
+		SaveConfig();
-		if (KFGameInfo_VersusSurvival(KFGI) != None)
+	}
-		{
+
-			if (KFGI.KFGFxManagerClass != class'CTI_GFxMoviePlayer_Manager_Versus')
+	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
-			{
+	AddItems    = CfgAddItems.static.Load(LogLevel);
-				if (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass)
+}
-				{
+
-					`Log_Warn("Found custom 'KFGFxManagerClass' (" $ KFGI.KFGFxManagerClass $ "), there may be compatibility issues");
+private function PostInit()
-					`Log_Warn("If you notice problems, try disabling UnlockDLC");
+{
-				}
+	local CTI_RepInfo RepInfo;
-				
+
-				KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
+	`Log_Trace();
-				`Log_Info("DLC unlocked");
+
-			}
+	if (WorldInfo == None || WorldInfo.Game == None)
-		}
+	{
-		else
+		SetTimer(1.0f, false, nameof(PostInit));
-		{
+		return;
-			if (KFGI.KFGFxManagerClass != class'CTI_GFxMoviePlayer_Manager')
+	}
-			{
+
-				if (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass)
+	KFGI = KFGameInfo(WorldInfo.Game);
-				{
+	if (KFGI == None)
-					`Log_Warn("Found custom 'KFGFxManagerClass' (" $ KFGI.KFGFxManagerClass $ "), there may be compatibility issues");
+	{
-					`Log_Warn("If you notice problems, try disabling UnlockDLC");
+		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
-				}
+		SafeDestroy();
-				
+		return;
-				KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
+	}
-				`Log_Info("DLC unlocked");
+
-			}
+	if (KFGI.GameReplicationInfo == None)
-		}
+	{
-	}
+		SetTimer(1.0f, false, nameof(PostInit));
-	
+		return;
-	if (KFGI.GameReplicationInfo == None)
+	}
-	{
+
-		SetTimer(1.0f, false, nameof(PostInit));
+	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
-		return;
+	if (KFGRI == None)
-	}
+	{
-	
+		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
-	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
+		SafeDestroy();
-	if (KFGRI == None)
+		return;
-	{
+	}
-		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
+
-		SafeDestroy();
+	if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel))
-		return;
+	{
-	}
+		`Log_Info("DLC unlocked");
-	
+	}
-	Helper.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll);
+	`Log_Debug("DLCSkinUpdateRequired:" @ String(DLCSkinUpdateRequired.Value));
-	
+
-	if (bPreloadContent)
+	if (bPreloadContent)
-	{
+	{
-		Preload(AddItems);
+		Preload(AddItems);
-	}
+	}
-	
+
-	ReadyToSync = true;
+	Trader.static.ModifyTrader(
-	
+		KFGRI,
-	foreach RepInfos(RepLink)
+		RemoveItems,
-	{
+		AddItems,
-		if (RepLink.PendingSync)
+		CfgRemoveItems.default.bAll,
-		{
+		CfgRemoveItems.default.bHRG,
-			RepLink.ServerSync();
+		CfgRemoveItems.default.bDLC,
-		}
+		bDisableItemLimitCheck,
-	}
+		LogLevel);
-}
+
-
+	WeapDefs = Trader.static.GetTraderWeapDefs(KFGRI, LogLevel);
-private function Preload(Array<class<KFWeaponDefinition> > Content)
+
-{
+	ReadyToSync = true;
-	local S_PreloadContent SPC;
+
-	
+	foreach RepInfos(RepInfo)
-	foreach Content(SPC.KFWD)
+	{
-	{
+		if (RepInfo.PendingSync)
-		SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
+		{
-		if (SPC.KFWC != None)
+			RepInfo.Replicate(WeapDefs);
-		{
+		}
-			SPC.KFW = KFGI.Spawn(SPC.KFWC);
+	}
-			if (SPC.KFW == None)
+}
-			{
+
-				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
+private function Preload(const out Array<class<KFWeaponDefinition> > Content)
-				continue;
+{
-			}
+	local Array<S_PreloadContent> PreloadContent;
-			
+	local S_PreloadContent SPC;
-			SPC.KFWA = new (SPC.KFW) class'KFW_Access';
+
-			if (SPC.KFWA == None)
+	`Log_Trace();
-			{
+
-				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
+	foreach Content(SPC.KFWD)
-				continue;
+	{
-			}
+		SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
-			
+		if (SPC.KFWC != None)
-			PreloadContent.AddItem(SPC);
+		{
-		}
+			if (SPC.KFWC.GetPackageName() == 'CTI' || SPC.KFWC.GetPackageName() == 'KFGameContent')
-	}
+			{
-	
+				`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
-	foreach PreloadContent(SPC)
+				continue;
-	{
+			}
-		SPC.KFWA.KFW_StartLoadWeaponContent();
+
-	}
+			SPC.KFW = KFGI.Spawn(SPC.KFWC);
-}
+			if (SPC.KFW == None)
-
+			{
-public function NotifyLogin(Controller C)
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
-{
+				continue;
-	`Log_Trace(`Location);
+			}
-
+
-	CreateRepLink(C);
+			SPC.KFWA = new (SPC.KFW) class'KFW_Access';
-}
+			if (SPC.KFWA == None)
-
+			{
-public function NotifyLogout(Controller C)
+				`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
-{
+				continue;
-	`Log_Trace(`Location);
+			}
-
+
-	DestroyRepLink(C);
+			PreloadContent.AddItem(SPC);
-}
+		}
-
+	}
-public function bool CreateRepLink(Controller C)
+
-{
+	foreach PreloadContent(SPC)
-	local CTI_RepInfo RepLink;
+	{
-	
+		SPC.KFWA.KFW_StartLoadWeaponContent();
-	`Log_Trace(`Location);
+	}
-	
+
-	if (C == None) return false;
+	`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
-	
+}
-	RepLink = Spawn(class'CTI_RepInfo', C);
+
-	
+public function NotifyLogin(Controller C)
-	if (RepLink == None) return false;
+{
-	
+	`Log_Trace();
-	RepLink.PrepareSync(
+
-		Self,
+	if (!CreateRepInfo(C))
-		LogLevel,
+	{
-		RemoveItems,
+		`Log_Error("Can't create RepInfo for:" @ C);
-		AddItems,
+	}
-		CfgRemoveItems.default.bAll);
+}
-	
+
-	RepInfos.AddItem(RepLink);
+public function NotifyLogout(Controller C)
-	
+{
-	if (ReadyToSync)
+	`Log_Trace();
-	{
+
-		RepLink.ServerSync();
+	DestroyRepInfo(C);
-	}
+}
-	else
+
-	{
+public function bool CreateRepInfo(Controller C)
-		RepLink.PendingSync = true;
+{
-	}
+	local CTI_RepInfo RepInfo;
-	
+
-	return true;
+	`Log_Trace();
-}
+
-
+	if (C == None || KFPlayerController(C) == None) return false;
-public function bool DestroyRepLink(Controller C)
+
-{
+	RepInfo = Spawn(class'CTI_RepInfo', C);
-	local CTI_RepInfo RepLink;
+
-	
+	if (RepInfo == None) return false;
-	`Log_Trace(`Location);
+
-	
+	RepInfo.PrepareSync(Self, KFPlayerController(C), LogLevel, DLCSkinUpdateRequired.Value);
-	if (C == None) return false;
+
-	
+	RepInfos.AddItem(RepInfo);
-	foreach RepInfos(RepLink)
+
-	{
+	if (ReadyToSync)
-		if (RepLink.Owner == C)
+	{
-		{
+		RepInfo.Replicate(WeapDefs);
-			RepLink.SafeDestroy();
+	}
-			RepInfos.RemoveItem(RepLink);
+	else
-			return true;
+	{
-		}
+		RepInfo.PendingSync = true;
-	}
+	}
-	
+
-	return false;
+	return true;
-}
+}
-
+
-DefaultProperties
+public function bool DestroyRepInfo(Controller C)
-{
+{
-	ReadyToSync = false
+	local CTI_RepInfo RepInfo;
+
+	`Log_Trace();
+
+	if (C == None) return false;
+
+	foreach RepInfos(RepInfo)
+	{
+		if (RepInfo.Owner == C)
+		{
+			RepInfos.RemoveItem(RepInfo);
+			RepInfo.SafeDestroy();
+			return true;
+		}
+	}
+
+	return false;
+}
+
+DefaultProperties
+{
+	ReadyToSync = false
 }

CTI/Classes/CTI.upkg

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

CTI/Classes/CTIMut.uc

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

CTI/Classes/CTI_GFxMenu_Trader.uc

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

CTI/Classes/CTI_GFxMoviePlayer_Manager.uc

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

CTI/Classes/CTI_GFxMoviePlayer_Manager_Versus.uc

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

CTI/Classes/CTI_GFxTraderContainer_Store.uc

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

CTI/Classes/CTI_LocalMessage.uc

@@ -0,0 +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 SecondsShortDefault;
+var private localized String SecondsShort;
+
+var const             String PleaseWaitDefault;
+var private localized String PleaseWait;
+
+enum E_CTI_LocalMessageType
+{
+	CTI_SyncItems,
+	CTI_WaitingGRI,
+	CTI_IncompatibleGRI,
+	CTI_IncompatibleGRIWarning,
+	CTI_SecondsShort,
+	CTI_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_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.";
+	SecondsShortDefault           = "s"
+	PleaseWaitDefault             = "Please wait"
+}

CTI/Classes/CTI_RepInfo.uc

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

CTI/Classes/CTI_WeapDef_AutoTurret.uc

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

CTI/Classes/CTI_WeapDef_BladedPistol.uc

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

CTI/Classes/CTI_WeapDef_Blunderbuss.uc

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

CTI/Classes/CTI_WeapDef_ChainBat.uc

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

CTI/Classes/CTI_WeapDef_ChiappaRhino.uc

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

CTI/Classes/CTI_WeapDef_ChiappaRhinoDual.uc

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

CTI/Classes/CTI_WeapDef_CompoundBow.uc

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

CTI/Classes/CTI_WeapDef_Doshinegun.uc

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

CTI/Classes/CTI_WeapDef_DualBladed.uc

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

CTI/Classes/CTI_WeapDef_FAMAS.uc

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

CTI/Classes/CTI_WeapDef_G18.uc

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

CTI/Classes/CTI_WeapDef_G36C.uc

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

CTI/Classes/CTI_WeapDef_GravityImploder.uc

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

CTI/Classes/CTI_WeapDef_HVStormCannon.uc

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

CTI/Classes/CTI_WeapDef_IonThruster.uc

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

CTI/Classes/CTI_WeapDef_Mine_Reconstructor.uc

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

CTI/Classes/CTI_WeapDef_Minigun.uc

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

CTI/Classes/CTI_WeapDef_MosinNagant.uc

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

CTI/Classes/CTI_WeapDef_ParasiteImplanter.uc

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

CTI/Classes/CTI_WeapDef_Pistol_DualG18.uc

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

CTI/Classes/CTI_WeapDef_Pistol_G18C.uc

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

CTI/Classes/CTI_WeapDef_Rifle_FrostShotgunAxe.uc

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

CTI/Classes/CTI_WeapDef_Scythe.uc

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

CTI/Classes/CTI_WeapDef_Shotgun_S12.uc

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

CTI/Classes/CTI_WeapDef_ShrinkRayGun.uc

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

CTI/Classes/CTI_WeapDef_ThermiteBore.uc

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

CTI/Classes/CTI_WeapDef_ZedMKIII.uc

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

CTI/Classes/CTI_WeapDef_Zweihander.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_Doshinegun.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_FAMAS.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_G36C.uc

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

CTI/Classes/CTI_Weap_AutoTurret.uc

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

CTI/Classes/CTI_Weap_Blunt_ChainBat.uc

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

CTI/Classes/CTI_Weap_Bow_CompoundBow.uc

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

CTI/Classes/CTI_Weap_Edged_IonThruster.uc

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

CTI/Classes/CTI_Weap_Edged_Scythe.uc

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

CTI/Classes/CTI_Weap_Edged_Zweihander.uc

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

CTI/Classes/CTI_Weap_GravityImploder.uc

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

CTI/Classes/CTI_Weap_HVStormCannon.uc

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

CTI/Classes/CTI_Weap_Mine_Reconstructor.uc

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

CTI/Classes/CTI_Weap_Minigun.uc

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

CTI/Classes/CTI_Weap_Pistol_Bladed.uc

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

CTI/Classes/CTI_Weap_Pistol_Blunderbuss.uc

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

CTI/Classes/CTI_Weap_Pistol_ChiappaRhino.uc

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

CTI/Classes/CTI_Weap_Pistol_ChiappaRhinoDual.uc

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

CTI/Classes/CTI_Weap_Pistol_DualBladed.uc

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

CTI/Classes/CTI_Weap_Pistol_DualG18.uc

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

CTI/Classes/CTI_Weap_Pistol_G18C.uc

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

CTI/Classes/CTI_Weap_Rifle_FrostShotgunAxe.uc

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

CTI/Classes/CTI_Weap_Rifle_MosinNagant.uc

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

CTI/Classes/CTI_Weap_Rifle_ParasiteImplanter.uc

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

CTI/Classes/CTI_Weap_RocketLauncher_ThermiteBore.uc

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

CTI/Classes/CTI_Weap_SMG_G18.uc

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

CTI/Classes/CTI_Weap_Shotgun_S12.uc

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

CTI/Classes/CTI_Weap_ShrinkRayGun.uc

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

CTI/Classes/CTI_Weap_ZedMKIII.uc

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

CTI/Classes/Helper.uc

@@ -1,58 +0,0 @@
-class Helper extends Object;
-
-private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
-{
-	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
-}
-
-public static simulated function ModifyTrader(
-	KFGameReplicationInfo KFGRI,
-	Array<class<KFWeaponDefinition> > RemoveItems,
-	Array<class<KFWeaponDefinition> > AddItems,
-	bool ReplaceMode)
-{
-	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
-	local class<KFWeaponDefinition> WeapDef;
-	local Array<class<KFWeaponDefinition> > WeapDefs;
-	local int Index;
-	local int MaxItemID;
-	
-	if (KFGRI == None) return;
-	
-	TraderItems = KFGFxObject_TraderItems(DynamicLoadObject(KFGRI.TraderItemsPath, class'KFGFxObject_TraderItems'));
-	
-	if (!ReplaceMode)
-	{
-		foreach TraderItems.SaleItems(Item)
-		{
-			if (Item.WeaponDef != None && RemoveItems.Find(Item.WeaponDef) == INDEX_NONE)
-			{
-				WeapDefs.AddItem(Item.WeaponDef);
-			}
-		}
-	}
-	
-	for (Index = 0; Index < AddItems.Length; Index++)
-		WeapDefs.AddItem(AddItems[Index]);
-	
-	WeapDefs.Sort(ByPrice);
-	
-	TraderItems.SaleItems.Length = 0;
-	MaxItemID = 0;
-	foreach WeapDefs(WeapDef)
-	{
-		Item.WeaponDef = WeapDef;
-		Item.ItemID = ++MaxItemID;
-		TraderItems.SaleItems.AddItem(Item);
-	}
-
-	TraderItems.SetItemsInfo(TraderItems.SaleItems);
-	
-	KFGRI.TraderItems = TraderItems;
-}
-
-defaultproperties
-{
-	
-}

CTI/Classes/KFW_Access.uc

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

CTI/Classes/OfficialWeapons.uc

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

CTI/Classes/RemoveItems.uc

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

@@ -0,0 +1,200 @@
+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 ModifyTrader(
+	KFGameReplicationInfo KFGRI,
+	const out Array<class<KFWeaponDefinition> > RemoveItems,
+	const out Array<class<KFWeaponDefinition> > AddItems,
+	bool ReplaceMode,
+	bool RemoveHRG,
+	bool RemoveDLC,
+	bool bDisableItemLimitCheck,
+	E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local Array<class<KFWeaponDefinition> > WeapDefs;
+	local int Index;
+
+	`Log_TraceStatic();
+
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+
+	if (!ReplaceMode)
+	{
+		foreach TraderItems.SaleItems(Item)
+		{
+			if (Item.WeaponDef != None
+			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
+			&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
+			&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None))
+			&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
+			{
+				WeapDefs.AddItem(Item.WeaponDef);
+			}
+		}
+	}
+
+	for (Index = 0; Index < AddItems.Length; ++Index)
+	{
+		WeapDefs.AddItem(AddItems[Index]);
+	}
+
+	WeapDefs.Sort(ByPrice);
+
+	if (!bDisableItemLimitCheck && WeapDefs.Length > ITEMS_LIMIT)
+	{
+		`Log_Warn("The total number of items has reached the limit (" $ ITEMS_LIMIT $ ")," @ (WeapDefs.Length - ITEMS_LIMIT) @ "items will not be added.");
+		`Log_Warn("Excluded items:");
+		for (Index = ITEMS_LIMIT; Index < WeapDefs.Length; ++Index)
+		{
+			`Log_Warn("[" $ Index + 1 $ "]" @ String(WeapDefs[Index]));
+		}
+		WeapDefs.Length = ITEMS_LIMIT;
+	}
+
+	OverwriteTraderItems(KFGRI, WeapDefs, LogLevel);
+}
+
+public static simulated function OverwriteTraderItems(
+	KFGameReplicationInfo KFGRI,
+	const out Array<class<KFWeaponDefinition> > WeapDefs,
+	E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local class<KFWeaponDefinition> WeapDef;
+	local int MaxItemID;
+
+	`Log_TraceStatic();
+
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+
+	TraderItems.SaleItems.Length = 0;
+	MaxItemID = 0;
+
+	`Log_Debug("Trader Items:");
+	foreach WeapDefs(WeapDef)
+	{
+		Item.WeaponDef = WeapDef;
+		Item.ItemID = MaxItemID++;
+		TraderItems.SaleItems.AddItem(Item);
+		`Log_Debug("[" $ MaxItemID $ "]" @ String(WeapDef));
+	}
+
+	TraderItems.SetItemsInfo(TraderItems.SaleItems);
+
+	KFGRI.TraderItems = TraderItems;
+}
+
+private static function bool WeaponClassIsUnique(String WeaponClassPath, const out Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
+{
+	local class<KFWeaponDefinition> WeapDef;
+
+	`Log_TraceStatic();
+
+	foreach WeapDefs(WeapDef)
+	{
+		if (WeapDef.default.WeaponClassPath == WeaponClassPath)
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+defaultproperties
+{
+
+}

CTI/Classes/Unlocker.uc

@@ -0,0 +1,188 @@
+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> > RemoveItems,
+	out Array<class<KFWeaponDefinition> > AddItems,
+	out BoolWrapper DLCSkinUpdateRequired,
+	E_LogLevel LogLevel)
+{
+	`Log_TraceStatic();
+
+	switch (Locs(UnlockType))
+	{
+		case "true":
+		case "auto":
+			return Auto(KFGI, KFGRI, RemoveItems, AddItems, DLCSkinUpdateRequired, LogLevel);
+
+		case "replaceweapons":
+			DLCSkinUpdateRequired.Value = true;
+			return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
+
+		case "replacefilter":
+			DLCSkinUpdateRequired.Value = false;
+			return ReplaceFilter(KFGI, LogLevel);
+
+		case "false":
+		default:
+			return false;
+	}
+}
+
+private static function bool Auto(
+	KFGameInfo KFGI,
+	KFGameReplicationInfo KFGRI,
+	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 (KFGameInfo_VersusSurvival(KFGI) != None)
+	{
+		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
+	{
+		DLCSkinUpdateRequired.Value = false;
+		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();
+
+	`Log_Debug("Unlock by replace weapons");
+
+	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 (RemoveItems.Find(WeapDefDLC) == INDEX_NONE)
+		{
+			RemoveItems.AddItem(WeapDefDLC);
+		}
+	}
+
+	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 (KFGameInfo_VersusSurvival(KFGI) != None)
+	{
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
+	}
+	else
+	{
+		KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
+	}
+
+	return true;
+}
+
+defaultproperties
+{
+
+}

CTI/Classes/WeaponReplacements.uc

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

CTI/Classes/_Logger.uc

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

CTI/Constants.uci

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

CTI/Globals.uci

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

CTI/Logger.uci

@@ -1,11 +1,15 @@
-// Logger
+// Logger
-`define Log_Tag 'CTI'
+`define Log_Tag 'CTI'
-
+
-`define Log_Base(msg, cond) `log(`msg `if(`cond), `cond`{endif},            `Log_Tag)
+`define LocationStatic        "`{ClassName}::" $ GetFuncName()
-
+
-`define Log_Fatal(msg)      `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `Log_Tag)
+`define Log_Base(msg, cond)  `log(`msg `if(`cond), `cond`{endif},            `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_Fatal(msg)       `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `Log_Tag)
-`define Log_Info(msg)       `log("INFO:"  @ `msg, (LogLevel >= LL_Info),    `Log_Tag)
+`define Log_Error(msg)       `log("ERROR:" @ `msg, (LogLevel >= LL_Error),   `Log_Tag)
-`define Log_Debug(msg)      `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug),   `Log_Tag)
+`define Log_Warn(msg)        `log("WARN:"  @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
-`define Log_Trace(msg)      `log("TRACE:" @ `msg, (LogLevel >= LL_Trace),   `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,4 +1,4 @@
-[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/subscriptions/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]
+[img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory[/img] [img]https://img.shields.io/steam/downloads/2830826239[/img] [img]https://img.shields.io/steam/favorites/2830826239[/img] [img]https://img.shields.io/steam/update-date/2830826239[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2830826239][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory[/img][/url]
 
 [h1]Features[/h1]
 [list]
@@ -15,8 +15,8 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
 [h1]Usage (single player)[/h1]
 [olist]
 [*]Subscribe to this mutator;
-[*]Start KF2; 
+[*]Start KF2;
-[*]Open console (`) and input:
+[*]Open console (~) and input:
 [b]open KF-BioticsLab?Mutator=CTI.CTIMut[/b]
 (replace the map and add the parameters you need)
 [*]<Enter>.
@@ -34,26 +34,51 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
 [*]Add mutator to server start parameters: [b]?Mutator=CTI.CTIMut[/b] and restart the server.
 [/olist]
 
+[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]
-Config will be created at the first start.
 [list]
-[*]Set [b]UnlockDLC=True[/b] to allow all players to buy DLC weapons.
 [*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags during the game.
-[*]Use [b][CTI.RemoveItems][/b] to remove items from the trader inventory.
+
-For example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
+[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste).
-[*]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.
+[*]Set [b]UnlockDLC[/b] to customize DLC weapon unlocks. Here are the possible values:
-For example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
+[list]
+[*][b]False[/b] - disable DLC unlock.
+[*][b]ReplaceFilter[/b] - changes the trader filter allowing you to buy original DLC weapons without restrictions, unlocks future DLCs as well (no need to update this mutator). However, it replaces the - [b]KFGFxMoviePlayer_Manager[/b] class so it may not be compatible with mods that also replace it.
+[*][b]ReplaceWeapons[/b] - replaces DLC weapons with their unlocked variants. Compatible with any mods, but may require a CTI update after the release of new DLC weapons.
+[*][b]True[/b] or [b]Auto[/b] - selects the most appropriate option automatically. Recommend putting CTIMut last in the mutator load queue if you use this.
 [/list]
-[h1]🔗 [url=https://steamcommunity.com/workshop/filedetails/discussion/2830826239/3409804177172972154]Weapon Packs Items[/url][/h1]
+
+[*]Use [b][CTI.RemoveItems][/b] to remove items from the trader inventory.
+example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
+
+[*]Set [b]bAll=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
+[*]Set [b]bHRG=True[/b] to remove HRG items.
+[*]Set [b]bDLC=True[/b] to remove DLC items.
+
+[*]Use [b][CTI.AddItems][/b] to add items to the trader inventory.
+example: [b]Item=WeaponPackExt.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
+[/list]
+
+❗️ Note that if you need an empty list anywhere (for example, you don't want to delete some of the traders's weapons), leave at least one line there:
+[b]Item=[/b]
+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).
-📌 Unlike [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2193261170]DLC Weapon Unlocker[/url], a different method is used here.
-[url=https://steamcommunity.com/sharedfiles/filedetails/?id=2193261170]DLC Weapon Unlocker[/url] creates clones of DLC weapons and adds them to the trader. This allows you not to replace any classes in the game, so Hunter mutator has better compatibility with other mutators, however you need to update DWU every time kf2 update comes out with new guns.
-CTI unlocks DLC weapons differently - it changes the trader filter allowing you to buy original DLC weapons without restrictions. You don't need to update the mutator when new kf2 updates are released - unlocking will work with future weapons as well. However, when you set UnlockDLC=True CTI replaces the [b]KFGFxMoviePlayer_Manager[/b] class, so CTI may not be compatible with mods that replaces this class too. If you notice any compatibility issues, try turning off UnlockDLC.
-You can use this built-in method or add weapons from [url=https://steamcommunity.com/workshop/filedetails/discussion/2193261170/3046108212603783998]DLC Weapon Unlocker[/url] - choose what suits you best.
 
 [h1]Sources[/h1]
-[url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]
+[url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]

README.md

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

builder.cfg

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