fix weapon replacements

add mutator group name

.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@v6
+        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: megalinter-bot
+          commit_user_email: nicolas.vuillamy@ox.security

CTI/Classes/CTI.uc

@@ -1,7 +1,7 @@
 class CTI extends Info
 	config(CTI);
 
-const LatestVersion = 2;
+const LatestVersion = 3;
 
 const CfgRemoveItems     = class'RemoveItems';
 const CfgAddItems        = class'AddItems';
@@ -94,6 +94,8 @@ private function PreInit()
 		case 1:
 			bOfficialWeaponsList = false;
 
+		case 2:
+
 		case MaxInt:
 			`Log_Info("Config updated to version" @ LatestVersion);
 			break;
@@ -180,7 +182,14 @@ private function PostInit()
 		Preload(AddItems);
 	}
 
-	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll, LogLevel);
+	Trader.static.ModifyTrader(
+		KFGRI,
+		RemoveItems,
+		AddItems,
+		CfgRemoveItems.default.bAll,
+		CfgRemoveItems.default.bHRG,
+		CfgRemoveItems.default.bDLC,
+		LogLevel);
 
 	ReadyToSync = true;
 
@@ -273,7 +282,9 @@ public function bool CreateRepInfo(Controller C)
 		LogLevel,
 		RemoveItems,
 		AddItems,
-		CfgRemoveItems.default.bAll);
+		CfgRemoveItems.default.bAll,
+		CfgRemoveItems.default.bHRG,
+		CfgRemoveItems.default.bDLC);
 
 	RepInfos.AddItem(RepInfo);
 

CTI/Classes/CTIMut.uc

@@ -35,7 +35,7 @@ public function AddMutator(Mutator Mut)
 	if (Mut == Self) return;
 
 	if (Mut.Class == Class)
-		Mut.Destroy();
+		CTIMut(Mut).SafeDestroy();
 	else
 		Super.AddMutator(Mut);
 }
@@ -56,5 +56,5 @@ public function NotifyLogout(Controller C)
 
 DefaultProperties
 {
-
+	GroupNames.Add("TraderItems")
 }

CTI/Classes/CTI_GFxTraderContainer_Store.uc

@@ -11,7 +11,7 @@ function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
 	if (Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted(Item.WeaponDef.default.PlatformRestriction))
 		return true;
 
-   	return false;
+	return false;
 }
 
 defaultproperties

CTI/Classes/CTI_LocalMessage.uc

@@ -4,17 +4,14 @@ class CTI_LocalMessage extends Object
 var const             String SyncItemsDefault;
 var private localized String SyncItems;
 
-var const             String SyncFinishedDefault;
-var private localized String SyncFinished;
-
 var const             String WaitingGRIDefault;
 var private localized String WaitingGRI;
 
 var const             String IncompatibleGRIDefault;
 var private localized String IncompatibleGRI;
 
-var const             String DisconnectDefault;
-var private localized String Disconnect;
+var const             String IncompatibleGRIWarningDefault;
+var private localized String IncompatibleGRIWarning;
 
 var const             String SecondsShortDefault;
 var private localized String SecondsShort;
@@ -22,10 +19,9 @@ var private localized String SecondsShort;
 enum E_CTI_LocalMessageType
 {
 	CTI_SyncItems,
-	CTI_SyncFinished,
 	CTI_WaitingGRI,
 	CTI_IncompatibleGRI,
-	CTI_Disconnect,
+	CTI_IncompatibleGRIWarning,
 	CTI_SecondsShort
 };
 
@@ -43,17 +39,14 @@ public static function String GetLocalizedString(
 		case CTI_SyncItems:
 			return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
 
-		case CTI_SyncFinished:
-			return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
-		
 		case CTI_WaitingGRI:
 			return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
 
 		case CTI_IncompatibleGRI:
-			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
+			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault) @ String1;
 
-		case CTI_Disconnect:
-			return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
+		case CTI_IncompatibleGRIWarning:
+			return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
 
 		case CTI_SecondsShort:
 			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
@@ -64,10 +57,9 @@ public static function String GetLocalizedString(
 
 defaultproperties
 {
-	SyncItemsDefault       = "Sync items:"
-	SyncFinishedDefault    = "Sync finished."
-	WaitingGRIDefault      = "Waiting GRI..."
-	IncompatibleGRIDefault = "Incompatible GRI:"
-	DisconnectDefault      = "Disconnect..."
-	SecondsShortDefault    = "s"
+	SyncItemsDefault              = "Sync items:"
+	WaitingGRIDefault             = "Waiting GRI..."
+	IncompatibleGRIDefault        = "Incompatible GRI:"
+	IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
+	SecondsShortDefault           = "s"
 }

CTI/Classes/CTI_RepInfo.uc

@@ -10,6 +10,8 @@ var private E_LogLevel LogLevel;
 var private Array<class<KFWeaponDefinition> > RemoveItems;
 var private Array<class<KFWeaponDefinition> > AddItems;
 var private bool ReplaceMode;
+var private bool RemoveHRG;
+var private bool RemoveDLC;
 var private bool PreloadContent;
 
 var private int  Recieved;
@@ -25,11 +27,12 @@ var private String NotificationRightText;
 var private int    NotificationPercent;
 
 var private int    WaitingGRI;
+var private int    WaitingGRILimit;
 
 replication
 {
 	if (bNetInitial && Role == ROLE_Authority)
-		LogLevel, ReplaceMode, SyncSize;
+		LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
 }
 
 public simulated function bool SafeDestroy()
@@ -44,7 +47,9 @@ public function PrepareSync(
 	E_LogLevel _LogLevel,
 	Array<class<KFWeaponDefinition> > _RemoveItems,
 	Array<class<KFWeaponDefinition> > _AddItems,
-	bool _ReplaceMode)
+	bool _ReplaceMode,
+	bool _RemoveHRG,
+	bool _RemoveDLC)
 {
 	`Log_Trace();
 
@@ -53,6 +58,8 @@ public function PrepareSync(
 	RemoveItems         = _RemoveItems;
 	AddItems            = _AddItems;
 	ReplaceMode         = _ReplaceMode;
+	RemoveHRG           = _RemoveHRG;
+	RemoveDLC           = _RemoveDLC;
 	SyncSize            = RemoveItems.Length + AddItems.Length;
 }
 
@@ -72,6 +79,39 @@ private simulated function KFPlayerController GetKFPC()
 	return KFPC;
 }
 
+public reliable client function WriteToChatLocalized(
+	E_CTI_LocalMessageType LMT,
+	optional String HexColor,
+	optional String String1,
+	optional String String2,
+	optional String String3)
+{
+	`Log_Trace();
+
+	WriteToChat(LocalMessage.static.GetLocalizedString(LogLevel, LMT, String1, String2, String3), HexColor);
+}
+
+public reliable client function WriteToChat(String Message, optional String HexColor)
+{
+	local KFGFxHudWrapper HUD;
+
+	`Log_Trace();
+
+	if (GetKFPC() == None) return;
+
+	if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
+	{
+		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
+		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
+	}
+
+	HUD = KFGFxHudWrapper(KFPC.myHUD);
+	if (HUD != None && HUD.HUDMovie != None && HUD.HUDMovie.HudChatBox != None)
+	{
+		HUD.HUDMovie.HudChatBox.AddChatMessage(Message, HexColor);
+	}
+}
+
 private simulated function SetPartyInGameWidget()
 {
 	`Log_Trace();
@@ -194,47 +234,44 @@ private simulated reliable client function ClientSyncFinished()
 
 	`Log_Trace();
 
-	NotificationLeftText  = "";
-	NotificationRightText = "";
-	NotificationPercent   = 0;
-	
-	if (WorldInfo.GRI == None)
+	if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
 	{
-		`Log_Debug("ClientSyncFinished: Waiting GRI");
+		`Log_Debug("ClientSyncFinished: Waiting GRI" @ WaitingGRI);
 		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
-		NotificationLeftText   = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
+		NotificationLeftText   = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
 		NotificationRightText  = "";
+		NotificationPercent    = 0;
 		SetTimer(1.0f, false, nameof(ClientSyncFinished));
 		return;
 	}
 
-	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
-	if (KFGRI == None)
-	{
-		`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
-		ClearTimer(nameof(KeepNotification));
-		UpdateNotification(
-			LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI),
-			LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0);
-		Cleanup();
-		ConsoleCommand("Disconnect");
-		SafeDestroy();
-		return;
-	}
-	
-	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished);
+	NotificationHeaderText = "";
 	NotificationLeftText   = "";
 	NotificationRightText  = "";
 	NotificationPercent    = 0;
 
-	Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, LogLevel);
-	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
+	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
+	if (KFGRI != None)
+	{
+		`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
+		Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
+	}
+	else
+	{
+		`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
+		WriteToChatLocalized(
+			CTI_IncompatibleGRI,
+			class'KFLocalMessage'.default.InteractionColor,
+			WorldInfo.GRI == None ? "None" : String(WorldInfo.GRI.class));
+		WriteToChatLocalized(
+			CTI_IncompatibleGRIWarning,
+			class'KFLocalMessage'.default.InteractionColor);
+	}
 
 	ClearTimer(nameof(KeepNotification));
 	ShowReadyButton();
 
 	Cleanup();
-	
 	SafeDestroy();
 }
 
@@ -289,4 +326,5 @@ defaultproperties
 
 	NotificationPercent    = 0
 	WaitingGRI             = 0
+	WaitingGRILimit        = 15
 }

CTI/Classes/CTI_WeapDef_AutoTurret.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_AutoTurret extends KFWeapDef_AutoTurret
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_AutoTurret'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AutoTurret"
 }

CTI/Classes/CTI_WeapDef_BladedPistol.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_BladedPistol extends KFWeapDef_BladedPistol
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_BladedPistol'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_Bladed"
 }

CTI/Classes/CTI_WeapDef_Blunderbuss.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Blunderbuss extends KFWeapDef_Blunderbuss
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Blunderbuss'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_Blunderbuss"
 }

CTI/Classes/CTI_WeapDef_ChainBat.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_ChainBat extends KFWeapDef_ChainBat
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_ChainBat'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Blunt_ChainBat"
 }

CTI/Classes/CTI_WeapDef_ChiappaRhino.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_ChiappaRhino extends KFWeapDef_ChiappaRhino
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_ChiappaRhino'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_ChiappaRhino"
 }

CTI/Classes/CTI_WeapDef_ChiappaRhinoDual.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_ChiappaRhinoDual extends KFWeapDef_ChiappaRhinoDual
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_ChiappaRhinoDual'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_ChiappaRhinoDual"
 }

CTI/Classes/CTI_WeapDef_CompoundBow.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_CompoundBow extends KFWeapDef_CompoundBow
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_CompoundBow'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Bow_CompoundBow"
 }

CTI/Classes/CTI_WeapDef_Doshinegun.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Doshinegun extends KFWeapDef_Doshinegun
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Doshinegun'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AssaultRifle_Doshinegun"
 }

CTI/Classes/CTI_WeapDef_DualBladed.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_DualBladed extends KFWeapDef_DualBladed
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_DualBladed'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_DualBladed"
 }

CTI/Classes/CTI_WeapDef_FAMAS.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_FAMAS extends KFWeapDef_FAMAS
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_FAMAS'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AssaultRifle_FAMAS"
 }

CTI/Classes/CTI_WeapDef_G18.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_G18 extends KFWeapDef_G18
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_G18'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_SMG_G18"
 }

CTI/Classes/CTI_WeapDef_G36C.uc

@@ -0,0 +1,15 @@
+class CTI_WeapDef_G36C extends KFWeapDef_G36C
+	abstract;
+
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_G36C'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
+defaultproperties
+{
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_AssaultRifle_G36C"
+}

CTI/Classes/CTI_WeapDef_GravityImploder.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_GravityImploder extends KFWeapDef_GravityImploder
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_GravityImploder'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_GravityImploder"
 }

CTI/Classes/CTI_WeapDef_HVStormCannon.uc

@@ -0,0 +1,15 @@
+class CTI_WeapDef_HVStormCannon extends KFWeapDef_HVStormCannon
+	abstract;
+
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_HVStormCannon'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
+defaultproperties
+{
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_HVStormCannon"
+}

CTI/Classes/CTI_WeapDef_IonThruster.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_IonThruster extends KFWeapDef_IonThruster
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_IonThruster'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Edged_IonThruster"
 }

CTI/Classes/CTI_WeapDef_Mine_Reconstructor.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Mine_Reconstructor extends KFWeapDef_Mine_Reconstructor
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Mine_Reconstructor'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Mine_Reconstructor"
 }

CTI/Classes/CTI_WeapDef_Minigun.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Minigun extends KFWeapDef_Minigun
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Minigun'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Minigun"
 }

CTI/Classes/CTI_WeapDef_MosinNagant.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_MosinNagant extends KFWeapDef_MosinNagant
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_MosinNagant'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Rifle_MosinNagant"
 }

CTI/Classes/CTI_WeapDef_ParasiteImplanter.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_ParasiteImplanter extends KFWeapDef_ParasiteImplanter
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_ParasiteImplanter'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Rifle_ParasiteImplanter"
 }

CTI/Classes/CTI_WeapDef_Pistol_DualG18.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Pistol_DualG18 extends KFWeapDef_Pistol_DualG18
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Pistol_DualG18'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_DualG18"
 }

CTI/Classes/CTI_WeapDef_Pistol_G18C.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Pistol_G18C extends KFWeapDef_Pistol_G18C
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Pistol_G18C'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Pistol_G18C"
 }

CTI/Classes/CTI_WeapDef_Rifle_FrostShotgunAxe.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Rifle_FrostShotgunAxe extends KFWeapDef_Rifle_FrostShotgunAxe
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Rifle_FrostShotgunAxe'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Rifle_FrostShotgunAxe"
 }

CTI/Classes/CTI_WeapDef_Scythe.uc

@@ -0,0 +1,15 @@
+class CTI_WeapDef_Scythe extends KFWeapDef_Scythe
+	abstract;
+
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Scythe'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
+defaultproperties
+{
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Edged_Scythe"
+}

CTI/Classes/CTI_WeapDef_Shotgun_S12.uc

@@ -0,0 +1,15 @@
+class CTI_WeapDef_Shotgun_S12 extends KFWeapDef_Shotgun_S12
+	abstract;
+
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Shotgun_S12'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
+defaultproperties
+{
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Shotgun_S12"
+}

CTI/Classes/CTI_WeapDef_ShrinkRayGun.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_ShrinkRayGun extends KFWeapDef_ShrinkRayGun
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_ShrinkRayGun'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_ShrinkRayGun"
 }

CTI/Classes/CTI_WeapDef_ThermiteBore.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_ThermiteBore extends KFWeapDef_ThermiteBore
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_ThermiteBore'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_RocketLauncher_ThermiteBore"
 }

CTI/Classes/CTI_WeapDef_ZedMKIII.uc

@@ -0,0 +1,15 @@
+class CTI_WeapDef_ZedMKIII extends KFWeapDef_ZedMKIII
+	abstract;
+
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_ZedMKIII'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
+defaultproperties
+{
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_ZedMKIII"
+}

CTI/Classes/CTI_WeapDef_Zweihander.uc

@@ -1,7 +1,15 @@
 class CTI_WeapDef_Zweihander extends KFWeapDef_Zweihander
 	abstract;
 
+static function String GetItemLocalization(String KeyName)
+{
+	local Array<String> Strings;
+	ParseStringIntoArray(class'KFGame.KFWeapDef_Zweihander'.default.WeaponClassPath, Strings, ".", true);
+	return Localize(Strings[1], KeyName, Strings[0]);
+}
+
 defaultproperties
 {
-	SharedUnlockId = SCU_None
+	SharedUnlockId  = SCU_None
+	WeaponClassPath = "CTI.CTI_Weap_Edged_Zweihander"
 }

CTI/Classes/CTI_Weap_AssaultRifle_Doshinegun.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_FAMAS.uc

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

CTI/Classes/CTI_Weap_AssaultRifle_G36C.uc

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

CTI/Classes/CTI_Weap_AutoTurret.uc

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

CTI/Classes/CTI_Weap_Blunt_ChainBat.uc

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

CTI/Classes/CTI_Weap_Bow_CompoundBow.uc

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

CTI/Classes/CTI_Weap_Edged_IonThruster.uc

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

CTI/Classes/CTI_Weap_Edged_Scythe.uc

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

CTI/Classes/CTI_Weap_Edged_Zweihander.uc

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

CTI/Classes/CTI_Weap_GravityImploder.uc

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

CTI/Classes/CTI_Weap_HVStormCannon.uc

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

CTI/Classes/CTI_Weap_Mine_Reconstructor.uc

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

CTI/Classes/CTI_Weap_Minigun.uc

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

CTI/Classes/CTI_Weap_Pistol_Bladed.uc

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

CTI/Classes/CTI_Weap_Pistol_Blunderbuss.uc

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

CTI/Classes/CTI_Weap_Pistol_ChiappaRhino.uc

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

CTI/Classes/CTI_Weap_Pistol_ChiappaRhinoDual.uc

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

CTI/Classes/CTI_Weap_Pistol_DualBladed.uc

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

CTI/Classes/CTI_Weap_Pistol_DualG18.uc

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

CTI/Classes/CTI_Weap_Pistol_G18C.uc

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

CTI/Classes/CTI_Weap_Rifle_FrostShotgunAxe.uc

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

CTI/Classes/CTI_Weap_Rifle_MosinNagant.uc

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

CTI/Classes/CTI_Weap_Rifle_ParasiteImplanter.uc

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

CTI/Classes/CTI_Weap_RocketLauncher_ThermiteBore.uc

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

CTI/Classes/CTI_Weap_SMG_G18.uc

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

CTI/Classes/CTI_Weap_Shotgun_S12.uc

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

CTI/Classes/CTI_Weap_ShrinkRayGun.uc

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

CTI/Classes/CTI_Weap_ZedMKIII.uc

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

CTI/Classes/RemoveItems.uc

@@ -3,6 +3,8 @@ class RemoveItems extends Object
 	config(CTI);
 
 var public  config bool bAll;
+var public  config bool bHRG;
+var public  config bool bDLC;
 var private config Array<String> Item;
 
 public static function InitConfig(int Version, int LatestVersion)
@@ -12,6 +14,10 @@ public static function InitConfig(int Version, int LatestVersion)
 		case `NO_CONFIG:
 			ApplyDefault();
 
+		case 2:
+			default.bHRG = false;
+			default.bDLC = false;
+
 		default: break;
 	}
 
@@ -24,6 +30,8 @@ public static function InitConfig(int Version, int LatestVersion)
 private static function ApplyDefault()
 {
 	default.bAll = false;
+	default.bHRG = false;
+	default.bDLC = false;
 	default.Item.Length = 0;
 	default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
 }
@@ -43,6 +51,15 @@ public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLeve
 	}
 	else
 	{
+		if (default.bHRG)
+		{
+			`Log_Info("Remove all HRG items");
+		}
+		if (default.bDLC)
+		{
+			`Log_Info("Remove all DLC items");
+		}
+
 		foreach default.Item(ItemRaw, Line)
 		{
 			ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));

CTI/Classes/Trader.uc

@@ -91,6 +91,8 @@ public static simulated function ModifyTrader(
 	Array<class<KFWeaponDefinition> > RemoveItems,
 	Array<class<KFWeaponDefinition> > AddItems,
 	bool ReplaceMode,
+	bool RemoveHRG,
+	bool RemoveDLC,
 	E_LogLevel LogLevel)
 {
 	local KFGFxObject_TraderItems TraderItems;
@@ -110,6 +112,8 @@ public static simulated function ModifyTrader(
 		{
 			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);

CTI/Classes/Unlocker.uc

@@ -122,6 +122,11 @@ private static function bool ReplaceWeapons(
 			PartialUnlock = true;
 			`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
 		}
+
+		if (RemoveItems.Find(WeapDefDLC) == INDEX_NONE)
+		{
+			RemoveItems.AddItem(WeapDefDLC);
+		}
 	}
 
 	if (PartialUnlock)
@@ -169,27 +174,32 @@ private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
 
 defaultproperties
 {
-	WeapDefDLCReplacements(0)  = class'CTI_WeapDef_AutoTurret'
-	WeapDefDLCReplacements(1)  = class'CTI_WeapDef_BladedPistol'
-	WeapDefDLCReplacements(2)  = class'CTI_WeapDef_Blunderbuss'
-	WeapDefDLCReplacements(3)  = class'CTI_WeapDef_ChainBat'
-	WeapDefDLCReplacements(4)  = class'CTI_WeapDef_ChiappaRhino'
-	WeapDefDLCReplacements(5)  = class'CTI_WeapDef_ChiappaRhinoDual'
-	WeapDefDLCReplacements(6)  = class'CTI_WeapDef_CompoundBow'
-	WeapDefDLCReplacements(7)  = class'CTI_WeapDef_Doshinegun'
-	WeapDefDLCReplacements(8)  = class'CTI_WeapDef_DualBladed'
-	WeapDefDLCReplacements(9)  = class'CTI_WeapDef_FAMAS'
-	WeapDefDLCReplacements(10) = class'CTI_WeapDef_G18'
-	WeapDefDLCReplacements(11) = class'CTI_WeapDef_GravityImploder'
-	WeapDefDLCReplacements(12) = class'CTI_WeapDef_IonThruster'
-	WeapDefDLCReplacements(13) = class'CTI_WeapDef_Mine_Reconstructor'
-	WeapDefDLCReplacements(14) = class'CTI_WeapDef_Minigun'
-	WeapDefDLCReplacements(15) = class'CTI_WeapDef_MosinNagant'
-	WeapDefDLCReplacements(16) = class'CTI_WeapDef_ParasiteImplanter'
-	WeapDefDLCReplacements(17) = class'CTI_WeapDef_Pistol_DualG18'
-	WeapDefDLCReplacements(18) = class'CTI_WeapDef_Pistol_G18C'
-	WeapDefDLCReplacements(19) = class'CTI_WeapDef_Rifle_FrostShotgunAxe'
-	WeapDefDLCReplacements(20) = class'CTI_WeapDef_ShrinkRayGun'
-	WeapDefDLCReplacements(21) = class'CTI_WeapDef_ThermiteBore'
-	WeapDefDLCReplacements(22) = class'CTI_WeapDef_Zweihander'
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_AutoTurret')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_HVStormCannon')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Mine_Reconstructor')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Minigun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_MosinNagant')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ParasiteImplanter')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_DualG18')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_G18C')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Rifle_FrostShotgunAxe')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Scythe')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Shotgun_S12')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ShrinkRayGun')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_ZedMKIII')
+	WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander')
 }

PublicationContent/description.txt

@@ -16,7 +16,7 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
 [olist]
 [*]Subscribe to this mutator;
 [*]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,8 +34,20 @@ 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[b]*[/b].
 [list]
 [*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags during the game.
 
@@ -53,22 +65,20 @@ Config will be created at the first start[b]*[/b].
 example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
 
 [*]Set [b]bAll=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
+[*]Set [b]bHRG=True[/b] to remove HRG items.
+[*]Set [b]bDLC=True[/b] to remove DLC items.
 
 [*]Use [b][CTI.AddItems][/b] to add items to the trader inventory.
 example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
 [/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).
 
-[h1]Troubleshooting[/h1]
-[b](*)[/b] If your config is not created for some reason, create it manually with the following content:
-[b][CTI.CTI]
-Version=0
-[/b]
-
-Then start the server and check the file again - config content should be generated.
-
 [h1]Sources[/h1]
 [url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]

README.md

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