Merge pull request #4 from GenZmeY/group-names

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

LTI/Classes/LTI.uc

@@ -1,228 +1,238 @@
-class LTI extends Info
+class LTI extends Info
-	config(LTI);
+	config(LTI);
-
+
-const LatestVersion = 1;
+const LatestVersion = 2;
-
+
-const CfgRemoveItems     = class'RemoveItems';
+const CfgRemoveItems     = class'RemoveItems';
-const CfgOfficialWeapons = class'OfficialWeapons';
+const CfgOfficialWeapons = class'OfficialWeapons';
-const Trader             = class'Trader';
+const Trader             = class'Trader';
-
+
-var private config int        Version;
+var private config int        Version;
-var private config E_LogLevel LogLevel;
+var private config E_LogLevel LogLevel;
-var private config bool       bOfficialWeaponsList;
+var private config bool       bOfficialWeaponsList;
-
+
-var private KFGameInfo KFGI;
+var private KFGameInfo KFGI;
-var private KFGameReplicationInfo KFGRI;
+var private KFGameReplicationInfo KFGRI;
-
+
-var private Array<class<KFWeaponDefinition> > RemoveItems;
+var private Array<class<KFWeaponDefinition> > RemoveItems;
-var private Array<LTI_RepInfo> RepInfos;
+var private Array<LTI_RepInfo> RepInfos;
-var private bool ReadyToSync;
+var private bool ReadyToSync;
-
+
-public simulated function bool SafeDestroy()
+public simulated function bool SafeDestroy()
-{
+{
-	`Log_Trace();
+	`Log_Trace();
-	
+
-	return (bPendingDelete || bDeleteMe || Destroy());
+	return (bPendingDelete || bDeleteMe || Destroy());
-}
+}
-
+
-public event PreBeginPlay()
+public event PreBeginPlay()
-{
+{
-	`Log_Trace();
+	`Log_Trace();
-	
+
-	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
+	`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
-	
+
-	if (WorldInfo.NetMode == NM_Client)
+	if (WorldInfo.NetMode == NM_Client)
-	{
+	{
-		`Log_Fatal("NetMode == NM_Client, Destroy...");
+		`Log_Fatal("NetMode == NM_Client, Destroy...");
-		SafeDestroy();
+		SafeDestroy();
-		return;
+		return;
-	}
+	}
-	
+
-	Super.PreBeginPlay();
+	Super.PreBeginPlay();
-	
+
-	PreInit();
+	PreInit();
-}
+}
-
+
-public event PostBeginPlay()
+public event PostBeginPlay()
-{
+{
-	`Log_Trace();
+	`Log_Trace();
-	
+
-	if (bPendingDelete || bDeleteMe) return;
+	if (bPendingDelete || bDeleteMe) return;
-	
+
-	Super.PostBeginPlay();
+	Super.PostBeginPlay();
-	
+
-	PostInit();
+	PostInit();
-}
+}
-
+
-private function PreInit()
+private function PreInit()
-{
+{
-	`Log_Trace();
+	`Log_Trace();
-	
+
-	if (Version == `NO_CONFIG)
+	if (Version == `NO_CONFIG)
-	{
+	{
-		LogLevel = LL_Info;
+		LogLevel = LL_Info;
-		SaveConfig();
+		SaveConfig();
-	}
+	}
-	
+
-	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
+	CfgRemoveItems.static.InitConfig(Version, LatestVersion);
-	
+
-	switch (Version)
+	switch (Version)
-	{
+	{
-		case `NO_CONFIG:
+		case `NO_CONFIG:
-			`Log_Info("Config created");
+			`Log_Info("Config created");
-			
+
-		case MaxInt:
+		case 1:
-			`Log_Info("Config updated to version" @ LatestVersion);
+
-			break;
+		case MaxInt:
-			
+			`Log_Info("Config updated to version" @ LatestVersion);
-		case LatestVersion:
+			break;
-			`Log_Info("Config is up-to-date");
+
-			break;
+		case LatestVersion:
-			
+			`Log_Info("Config is up-to-date");
-		default:
+			break;
-			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
+
-			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
+		default:
-			`Log_Warn("The config version will be changed to" @ LatestVersion);
+			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
-			break;
+			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
-	}
+			`Log_Warn("The config version will be changed to" @ LatestVersion);
-	
+			break;
-	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
+	}
-
+
-	if (LatestVersion != Version)
+	CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
-	{
+
-		Version = LatestVersion;
+	if (LatestVersion != Version)
-		SaveConfig();
+	{
-	}
+		Version = LatestVersion;
-
+		SaveConfig();
-	if (LogLevel == LL_WrongLevel)
+	}
-	{
+
-		LogLevel = LL_Info;
+	if (LogLevel == LL_WrongLevel)
-		`Log_Warn("Wrong 'LogLevel', return to default value");
+	{
-		SaveConfig();
+		LogLevel = LL_Info;
-	}
+		`Log_Warn("Wrong 'LogLevel', return to default value");
-	`Log_Base("LogLevel:" @ LogLevel);
+		SaveConfig();
-	
+	}
-	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
+	`Log_Base("LogLevel:" @ LogLevel);
-}
+
-
+	RemoveItems = CfgRemoveItems.static.Load(LogLevel);
-private function PostInit()
+}
-{
+
-	local LTI_RepInfo RepInfo;
+private function PostInit()
-	
+{
-	`Log_Trace();
+	local LTI_RepInfo RepInfo;
-	
+
-	if (WorldInfo == None || WorldInfo.Game == None)
+	`Log_Trace();
-	{
+
-		SetTimer(1.0f, false, nameof(PostInit));
+	if (WorldInfo == None || WorldInfo.Game == None)
-		return;
+	{
-	}
+		SetTimer(1.0f, false, nameof(PostInit));
-	
+		return;
-	KFGI = KFGameInfo(WorldInfo.Game);
+	}
-	if (KFGI == None)
+
-	{
+	KFGI = KFGameInfo(WorldInfo.Game);
-		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
+	if (KFGI == None)
-		SafeDestroy();
+	{
-		return;
+		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
-	}
+		SafeDestroy();
-	
+		return;
-	if (KFGI.GameReplicationInfo == None)
+	}
-	{
+
-		SetTimer(1.0f, false, nameof(PostInit));
+	if (KFGI.GameReplicationInfo == None)
-		return;
+	{
-	}
+		SetTimer(1.0f, false, nameof(PostInit));
-	
+		return;
-	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
+	}
-	if (KFGRI == None)
+
-	{
+	KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
-		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
+	if (KFGRI == None)
-		SafeDestroy();
+	{
-		return;
+		`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
-	}
+		SafeDestroy();
-	
+		return;
-	Trader.static.ModifyTrader(KFGRI, RemoveItems, CfgRemoveItems.default.bAll, LogLevel);
+	}
-	
+
-	ReadyToSync = true;
+	Trader.static.ModifyTrader(
-	
+		KFGRI,
-	foreach RepInfos(RepInfo)
+		RemoveItems,
-	{
+		CfgRemoveItems.default.bAll,
-		if (RepInfo.PendingSync)
+		CfgRemoveItems.default.bHRG,
-		{
+		CfgRemoveItems.default.bDLC,
-			RepInfo.ServerSync();
+		LogLevel);
-		}
+
-	}
+	ReadyToSync = true;
-}
+
-
+	foreach RepInfos(RepInfo)
-public function NotifyLogin(Controller C)
+	{
-{
+		if (RepInfo.PendingSync)
-	`Log_Trace();
+		{
-
+			RepInfo.ServerSync();
-	if (!CreateRepInfo(C))
+		}
-	{
+	}
-		`Log_Error("Can't create RepInfo for:" @ C);
+}
-	}
+
-}
+public function NotifyLogin(Controller C)
-
+{
-public function NotifyLogout(Controller C)
+	`Log_Trace();
-{
+
-	`Log_Trace();
+	if (!CreateRepInfo(C))
-
+	{
-	DestroyRepInfo(C);
+		`Log_Error("Can't create RepInfo for:" @ C);
-}
+	}
-
+}
-public function bool CreateRepInfo(Controller C)
+
-{
+public function NotifyLogout(Controller C)
-	local LTI_RepInfo RepInfo;
+{
-	
+	`Log_Trace();
-	`Log_Trace();
+
-	
+	DestroyRepInfo(C);
-	if (C == None) return false;
+}
-	
+
-	RepInfo = Spawn(class'LTI_RepInfo', C);
+public function bool CreateRepInfo(Controller C)
-	
+{
-	if (RepInfo == None) return false;
+	local LTI_RepInfo RepInfo;
-	
+
-	RepInfo.PrepareSync(
+	`Log_Trace();
-		Self,
+
-		LogLevel,
+	if (C == None) return false;
-		RemoveItems,
+
-		CfgRemoveItems.default.bAll);
+	RepInfo = Spawn(class'LTI_RepInfo', C);
-	
+
-	RepInfos.AddItem(RepInfo);
+	if (RepInfo == None) return false;
-	
+
-	if (ReadyToSync)
+	RepInfo.PrepareSync(
-	{
+		Self,
-		RepInfo.ServerSync();
+		LogLevel,
-	}
+		RemoveItems,
-	else
+		CfgRemoveItems.default.bAll,
-	{
+		CfgRemoveItems.default.bHRG,
-		RepInfo.PendingSync = true;
+		CfgRemoveItems.default.bDLC);
-	}
+
-	
+	RepInfos.AddItem(RepInfo);
-	return true;
+
-}
+	if (ReadyToSync)
-
+	{
-public function bool DestroyRepInfo(Controller C)
+		RepInfo.ServerSync();
-{
+	}
-	local LTI_RepInfo RepInfo;
+	else
-	
+	{
-	`Log_Trace();
+		RepInfo.PendingSync = true;
-	
+	}
-	if (C == None) return false;
+
-	
+	return true;
-	foreach RepInfos(RepInfo)
+}
-	{
+
-		if (RepInfo.Owner == C)
+public function bool DestroyRepInfo(Controller C)
-		{
+{
-			RepInfos.RemoveItem(RepInfo);
+	local LTI_RepInfo RepInfo;
-			RepInfo.SafeDestroy();
+
-			return true;
+	`Log_Trace();
-		}
+
-	}
+	if (C == None) return false;
-	
+
-	return false;
+	foreach RepInfos(RepInfo)
-}
+	{
-
+		if (RepInfo.Owner == C)
-DefaultProperties
+		{
-{
+			RepInfos.RemoveItem(RepInfo);
-	ReadyToSync = false
+			RepInfo.SafeDestroy();
+			return true;
+		}
+	}
+
+	return false;
+}
+
+DefaultProperties
+{
+	ReadyToSync = false
 }

LTI/Classes/LTI.upkg

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

LTI/Classes/LTIMut.uc

@@ -1,60 +1,60 @@
-class LTIMut extends KFMutator;
+class LTIMut extends KFMutator;
-	
+
-var private LTI LTI;
+var private LTI LTI;
-
+
-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'LTI', LTI)
+	foreach WorldInfo.DynamicActors(class'LTI', LTI)
-	{
+	{
-		break;
+		break;
-	}
+	}
-	
+
-	if (LTI == None)
+	if (LTI == None)
-	{
+	{
-		LTI = WorldInfo.Spawn(class'LTI');
+		LTI = WorldInfo.Spawn(class'LTI');
-	}
+	}
-	
+
-	if (LTI == None)
+	if (LTI == None)
-	{
+	{
-		`Log_Base("FATAL: Can't Spawn 'LTI'");
+		`Log_Base("FATAL: Can't Spawn 'LTI'");
-		SafeDestroy();
+		SafeDestroy();
-	}
+	}
-}
+}
-
+
-public function AddMutator(Mutator Mut)
+public function AddMutator(Mutator Mut)
-{
+{
-	if (Mut == Self) return;
+	if (Mut == Self) return;
-	
+
-	if (Mut.Class == Class)
+	if (Mut.Class == Class)
-		Mut.Destroy();
+		LTIMut(Mut).SafeDestroy();
-	else
+	else
-		Super.AddMutator(Mut);
+		Super.AddMutator(Mut);
-}
+}
-
+
-public function NotifyLogin(Controller C)
+public function NotifyLogin(Controller C)
-{
+{
-	LTI.NotifyLogin(C);
+	LTI.NotifyLogin(C);
-	
+
-	Super.NotifyLogin(C);
+	Super.NotifyLogin(C);
-}
+}
-
+
-public function NotifyLogout(Controller C)
+public function NotifyLogout(Controller C)
-{
+{
-	LTI.NotifyLogout(C);
+	LTI.NotifyLogout(C);
-	
+
-	Super.NotifyLogout(C);
+	Super.NotifyLogout(C);
-}
+}
-
+
-DefaultProperties
+DefaultProperties
-{
+{
-
+	GroupNames.Add("TraderItems")
 }

LTI/Classes/LTI_LocalMessage.uc

@@ -1,73 +1,65 @@
-class LTI_LocalMessage extends Object
+class LTI_LocalMessage extends Object
-	abstract;
+	abstract;
-
+
-var const             String SyncItemsDefault;
+var const             String SyncItemsDefault;
-var private localized String SyncItems;
+var private localized String SyncItems;
-
+
-var const             String SyncFinishedDefault;
+var const             String WaitingGRIDefault;
-var private localized String SyncFinished;
+var private localized String WaitingGRI;
-
+
-var const             String WaitingGRIDefault;
+var const             String IncompatibleGRIDefault;
-var private localized String WaitingGRI;
+var private localized String IncompatibleGRI;
-
+
-var const             String IncompatibleGRIDefault;
+var const             String IncompatibleGRIWarningDefault;
-var private localized String IncompatibleGRI;
+var private localized String IncompatibleGRIWarning;
-
+
-var const             String DisconnectDefault;
+var const             String SecondsShortDefault;
-var private localized String Disconnect;
+var private localized String SecondsShort;
-
+
-var const             String SecondsShortDefault;
+enum E_LTI_LocalMessageType
-var private localized String SecondsShort;
+{
-
+	LTI_SyncItems,
-enum E_LTI_LocalMessageType
+	LTI_WaitingGRI,
-{
+	LTI_IncompatibleGRI,
-	LTI_SyncItems,
+	LTI_IncompatibleGRIWarning,
-	LTI_SyncFinished,
+	LTI_SecondsShort
-	LTI_WaitingGRI,
+};
-	LTI_IncompatibleGRI,
+
-	LTI_Disconnect,
+public static function String GetLocalizedString(
-	LTI_SecondsShort
+	E_LogLevel LogLevel,
-};
+	E_LTI_LocalMessageType LMT,
-
+	optional String String1,
-public static function String GetLocalizedString(
+	optional String String2,
-	E_LogLevel LogLevel,
+	optional String String3)
-	E_LTI_LocalMessageType LMT,
+{
-	optional String String1,
+	`Log_TraceStatic();
-	optional String String2,
+
-	optional String String3)
+	switch (LMT)
-{
+	{
-	`Log_TraceStatic();
+		case LTI_SyncItems:
-	
+			return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
-	switch (LMT)
+
-	{
+		case LTI_WaitingGRI:
-		case LTI_SyncItems:
+			return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
-			return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
+
-			
+		case LTI_IncompatibleGRI:
-		case LTI_SyncFinished:
+			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault) @ String1;
-			return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
+
-		
+		case LTI_IncompatibleGRIWarning:
-		case LTI_WaitingGRI:
+			return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
-			return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
+
-		
+		case LTI_SecondsShort:
-		case LTI_IncompatibleGRI:
+			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
-			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
+	}
-		
+
-		case LTI_Disconnect:
+	return "";
-			return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
+}
-		
+
-		case LTI_SecondsShort:
+defaultproperties
-			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
+{
-	}
+	SyncItemsDefault              = "Sync items:"
-	
+	WaitingGRIDefault             = "Waiting GRI..."
-	return "";
+	IncompatibleGRIDefault        = "Incompatible GRI:"
-}
+	IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
-
+	SecondsShortDefault           = "s"
-defaultproperties
-{
-	SyncItemsDefault       = "Sync items:"
-	SyncFinishedDefault    = "Sync finished."
-	WaitingGRIDefault      = "Waiting GRI..."
-	IncompatibleGRIDefault = "Incompatible GRI:"
-	DisconnectDefault      = "Disconnect..."
-	SecondsShortDefault    = "s"
 }

LTI/Classes/LTI_RepInfo.uc

@@ -1,276 +1,314 @@
-class LTI_RepInfo extends ReplicationInfo;
+class LTI_RepInfo extends ReplicationInfo;
-
+
-const Trader       = class'Trader';
+const Trader       = class'Trader';
-const LocalMessage = class'LTI_LocalMessage';
+const LocalMessage = class'LTI_LocalMessage';
-
+
-var public  bool PendingSync;
+var public  bool PendingSync;
-
+
-var private LTI LTI;
+var private LTI LTI;
-var private E_LogLevel LogLevel;
+var private E_LogLevel LogLevel;
-var private Array<class<KFWeaponDefinition> > RemoveItems;
+var private Array<class<KFWeaponDefinition> > RemoveItems;
-var private bool ReplaceMode;
+var private bool ReplaceMode;
-
+var private bool RemoveHRG;
-var private int  Recieved;
+var private bool RemoveDLC;
-var private int  SyncSize;
+
-
+var private int  Recieved;
-var private KFPlayerController      KFPC;
+var private int  SyncSize;
-var private KFGFxWidget_PartyInGame PartyInGameWidget;
+
-var private GFxObject               Notification;
+var private KFPlayerController      KFPC;
-
+var private KFGFxWidget_PartyInGame PartyInGameWidget;
-var private String NotificationHeaderText;
+var private GFxObject               Notification;
-var private String NotificationLeftText;
+
-var private String NotificationRightText;
+var private String NotificationHeaderText;
-var private int    NotificationPercent;
+var private String NotificationLeftText;
-
+var private String NotificationRightText;
-var private int    WaitingGRI;
+var private int    NotificationPercent;
-
+
-replication
+var private int    WaitingGRI;
-{
+var private int    WaitingGRILimit;
-	if (bNetInitial && Role == ROLE_Authority)
+
-		LogLevel, ReplaceMode, SyncSize;
+replication
-}
+{
-
+	if (bNetInitial && Role == ROLE_Authority)
-public simulated function bool SafeDestroy()
+		LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
-{
+}
-	`Log_Trace();
+
-
+public simulated function bool SafeDestroy()
-	return (bPendingDelete || bDeleteMe || Destroy());
+{
-}
+	`Log_Trace();
-
+
-public function PrepareSync(
+	return (bPendingDelete || bDeleteMe || Destroy());
-	LTI _LTI,
+}
-	E_LogLevel _LogLevel,
+
-	Array<class<KFWeaponDefinition> > _RemoveItems,
+public function PrepareSync(
-	bool _ReplaceMode)
+	LTI _LTI,
-{
+	E_LogLevel _LogLevel,
-	`Log_Trace();
+	Array<class<KFWeaponDefinition> > _RemoveItems,
-	
+	bool _ReplaceMode,
-	LTI                 = _LTI;
+	bool _RemoveHRG,
-	LogLevel            = _LogLevel;
+	bool _RemoveDLC)
-	RemoveItems         = _RemoveItems;
+{
-	ReplaceMode         = _ReplaceMode;
+	`Log_Trace();
-	SyncSize            = RemoveItems.Length;
+
-}
+	LTI                 = _LTI;
-
+	LogLevel            = _LogLevel;
-private simulated function KFPlayerController GetKFPC()
+	RemoveItems         = _RemoveItems;
-{
+	ReplaceMode         = _ReplaceMode;
-	`Log_Trace();
+	RemoveHRG           = _RemoveHRG;
-	
+	RemoveDLC           = _RemoveDLC;
-	if (KFPC != None) return KFPC;
+	SyncSize            = RemoveItems.Length;
-	
+}
-	KFPC = KFPlayerController(Owner);
+
-	
+private simulated function KFPlayerController GetKFPC()
-	if (KFPC == None && ROLE < ROLE_Authority)
+{
-	{
+	`Log_Trace();
-		KFPC = KFPlayerController(GetALocalPlayerController());
+
-	}
+	if (KFPC != None) return KFPC;
-	
+
-	return KFPC;
+	KFPC = KFPlayerController(Owner);
-}
+
-
+	if (KFPC == None && ROLE < ROLE_Authority)
-private simulated function SetPartyInGameWidget()
+	{
-{
+		KFPC = KFPlayerController(GetALocalPlayerController());
-	`Log_Trace();
+	}
-	
+
-	if (GetKFPC() == None) return;
+	return KFPC;
-	
+}
-	if (KFPC.MyGFxManager == None) return;
+
-	if (KFPC.MyGFxManager.PartyWidget == None) return;
+public reliable client function WriteToChatLocalized(
-	
+	E_LTI_LocalMessageType LMT,
-	PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
+	optional String HexColor,
-	Notification = PartyInGameWidget.Notification;
+	optional String String1,
-}
+	optional String String2,
-
+	optional String String3)
-private simulated function bool CheckPartyInGameWidget()
+{
-{
+	`Log_Trace();
-	`Log_Trace();
+
-	
+	WriteToChat(LocalMessage.static.GetLocalizedString(LogLevel, LMT, String1, String2, String3), HexColor);
-	if (PartyInGameWidget == None)
+}
-	{
+
-		SetPartyInGameWidget();
+public reliable client function WriteToChat(String Message, optional String HexColor)
-	}
+{
-	
+	local KFGFxHudWrapper HUD;
-	return (PartyInGameWidget != None);
+
-}
+	`Log_Trace();
-
+
-private simulated function HideReadyButton()
+	if (GetKFPC() == None) return;
-{
+
-	`Log_Trace();
+	if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
-	
+	{
-	if (CheckPartyInGameWidget())
+		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
-	{
+		KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
-		PartyInGameWidget.SetReadyButtonVisibility(false);
+	}
-	}
+
-}
+	HUD = KFGFxHudWrapper(KFPC.myHUD);
-
+	if (HUD != None && HUD.HUDMovie != None && HUD.HUDMovie.HudChatBox != None)
-private simulated function ShowReadyButton()
+	{
-{
+		HUD.HUDMovie.HudChatBox.AddChatMessage(Message, HexColor);
-	`Log_Trace();
+	}
-	
+}
-	if (CheckPartyInGameWidget())
+
-	{
+private simulated function SetPartyInGameWidget()
-		Notification.SetVisible(false);
+{
-		PartyInGameWidget.SetReadyButtonVisibility(true);
+	`Log_Trace();
-		PartyInGameWidget.UpdateReadyButtonText();
+
-		PartyInGameWidget.UpdateReadyButtonVisibility();
+	if (GetKFPC() == None) return;
-	}
+
-}
+	if (KFPC.MyGFxManager == None) return;
-
+	if (KFPC.MyGFxManager.PartyWidget == None) return;
-private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
+
-{
+	PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
-	`Log_Trace();
+	Notification = PartyInGameWidget.Notification;
-	
+}
-	if (CheckPartyInGameWidget() && Notification != None)
+
-	{
+private simulated function bool CheckPartyInGameWidget()
-		Notification.SetString("itemName", Title);
+{
-		Notification.SetFloat("percent", Percent);
+	`Log_Trace();
-		Notification.SetInt("queue", 0);
+
-		Notification.SetString("downLoading", Left);
+	if (PartyInGameWidget == None)
-		Notification.SetString("remaining", Right);
+	{
-		Notification.SetObject("notificationInfo", Notification);
+		SetPartyInGameWidget();
-		Notification.SetVisible(true);
+	}
-	}
+
-}
+	return (PartyInGameWidget != None);
-
+}
-private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef)
+
-{
+private simulated function HideReadyButton()
-	`Log_Trace();
+{
-
+	`Log_Trace();
-	if (WeapDef == None)
+
-	{
+	if (CheckPartyInGameWidget())
-		`Log_Fatal("WeapDef is:" @ WeapDef);
+	{
-		Cleanup();
+		PartyInGameWidget.SetReadyButtonVisibility(false);
-		ConsoleCommand("Disconnect");
+	}
-		SafeDestroy();
+}
-		return;
+
-	}
+private simulated function ShowReadyButton()
-	
+{
-	if (!IsTimerActive(nameof(KeepNotification)))
+	`Log_Trace();
-	{
+
-		SetTimer(0.1f, true, nameof(KeepNotification));
+	if (CheckPartyInGameWidget())
-	}
+	{
-	
+		Notification.SetVisible(false);
-	RemoveItems.AddItem(WeapDef);
+		PartyInGameWidget.SetReadyButtonVisibility(true);
-	
+		PartyInGameWidget.UpdateReadyButtonText();
-	Recieved = RemoveItems.Length;
+		PartyInGameWidget.UpdateReadyButtonVisibility();
-	
+	}
-	NotificationHeaderText  = "-" @ WeapDef.static.GetItemName();
+}
-	NotificationLeftText    = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
+
-	NotificationRightText   = Recieved @ "/" @ SyncSize;
+private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
-	if (SyncSize != 0)
+{
-	{
+	`Log_Trace();
-		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
+
-	}
+	if (CheckPartyInGameWidget() && Notification != None)
-	
+	{
-	`Log_Debug("ClientSync: -" @ String(WeapDef) @ NotificationRightText);
+		Notification.SetString("itemName", Title);
-	
+		Notification.SetFloat("percent", Percent);
-	ServerSync();
+		Notification.SetInt("queue", 0);
-}
+		Notification.SetString("downLoading", Left);
-
+		Notification.SetString("remaining", Right);
-private simulated function KeepNotification()
+		Notification.SetObject("notificationInfo", Notification);
-{
+		Notification.SetVisible(true);
-	HideReadyButton();
+	}
-	UpdateNotification(
+}
-		NotificationHeaderText,
+
-		NotificationLeftText,
+private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef)
-		NotificationRightText,
+{
-		NotificationPercent);
+	`Log_Trace();
-}
+
-
+	if (WeapDef == None)
-private simulated reliable client function ClientSyncFinished()
+	{
-{
+		`Log_Fatal("WeapDef is:" @ WeapDef);
-	local KFGameReplicationInfo KFGRI;
+		Cleanup();
-
+		ConsoleCommand("Disconnect");
-	`Log_Trace();
+		SafeDestroy();
-	
+		return;
-	NotificationLeftText  = "";
+	}
-	NotificationRightText = "";
+
-	NotificationPercent   = 0;
+	if (!IsTimerActive(nameof(KeepNotification)))
-	
+	{
-	if (WorldInfo.GRI == None)
+		SetTimer(0.1f, true, nameof(KeepNotification));
-	{
+	}
-		`Log_Debug("ClientSyncFinished: Waiting GRI");
+
-		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
+	RemoveItems.AddItem(WeapDef);
-		NotificationLeftText   = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
+
-		NotificationRightText  = "";
+	Recieved = RemoveItems.Length;
-		SetTimer(1.0f, false, nameof(ClientSyncFinished));
+
-		return;
+	NotificationHeaderText  = "-" @ WeapDef.static.GetItemName();
-	}
+	NotificationLeftText    = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
-	
+	NotificationRightText   = Recieved @ "/" @ SyncSize;
-	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
+	if (SyncSize != 0)
-	if (KFGRI == None)
+	{
-	{
+		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
-		`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
+	}
-		ClearTimer(nameof(KeepNotification));
+
-		UpdateNotification(
+	`Log_Debug("ClientSync: -" @ String(WeapDef) @ NotificationRightText);
-			LocalMessage.static.GetLocalizedString(LogLevel, LTI_IncompatibleGRI) @ String(WorldInfo.GRI),
+
-			LocalMessage.static.GetLocalizedString(LogLevel, LTI_Disconnect), "", 0);
+	ServerSync();
-		Cleanup();
+}
-		ConsoleCommand("Disconnect");
+
-		SafeDestroy();
+private simulated function KeepNotification()
-		return;
+{
-	}
+	HideReadyButton();
-	
+	UpdateNotification(
-	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncFinished);
+		NotificationHeaderText,
-	NotificationLeftText   = "";
+		NotificationLeftText,
-	NotificationRightText  = "";
+		NotificationRightText,
-	NotificationPercent    = 0;
+		NotificationPercent);
-
+}
-	Trader.static.ModifyTrader(KFGRI, RemoveItems, ReplaceMode, LogLevel);
+
-	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
+private simulated reliable client function ClientSyncFinished()
-
+{
-	ClearTimer(nameof(KeepNotification)); 
+	local KFGameReplicationInfo KFGRI;
-	ShowReadyButton();
+
-	
+	`Log_Trace();
-	Cleanup();
+
-	
+	if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
-	SafeDestroy();
+	{
-}
+		`Log_Debug("ClientSyncFinished: Waiting GRI" @ WaitingGRI);
-
+		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
-private reliable server function Cleanup()
+		NotificationLeftText   = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
-{
+		NotificationRightText  = "";
-	`Log_Trace();
+		NotificationPercent    = 0;
-	
+		SetTimer(1.0f, false, nameof(ClientSyncFinished));
-	`Log_Debug("Cleanup");
+		return;
-	if (!LTI.DestroyRepInfo(Controller(Owner)))
+	}
-	{
+
-		`Log_Debug("Cleanup (forced)");
+	NotificationHeaderText = "";
-		SafeDestroy();
+	NotificationLeftText   = "";
-	}
+	NotificationRightText  = "";
-}
+	NotificationPercent    = 0;
-
+
-public reliable server function ServerSync()
+	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
-{
+	if (KFGRI != None)
-	`Log_Trace();
+	{
-	
+		`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
-	PendingSync = false;
+		Trader.static.ModifyTrader(KFGRI, RemoveItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
-	
+	}
-	if (bPendingDelete || bDeleteMe) return;
+	else
-	
+	{
-	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
+		`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
-	{
+		WriteToChatLocalized(
-		`Log_Debug("ServerSync: Finished");
+			LTI_IncompatibleGRI,
-		ClientSyncFinished();
+			class'KFLocalMessage'.default.InteractionColor,
-	}
+			WorldInfo.GRI == None ? "None" : String(WorldInfo.GRI.class));
-	else
+		WriteToChatLocalized(
-	{
+			LTI_IncompatibleGRIWarning,
-		if (Recieved < RemoveItems.Length)
+			class'KFLocalMessage'.default.InteractionColor);
-		{
+	}
-			`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
+
-			ClientSync(RemoveItems[Recieved++]);
+	ClearTimer(nameof(KeepNotification));
-		}
+	ShowReadyButton();
-	}
+
-}
+	Cleanup();
-
+	SafeDestroy();
-defaultproperties
+}
-{
+
-	bAlwaysRelevant               = false
+private reliable server function Cleanup()
-	bOnlyRelevantToOwner          = true
+{
-	bSkipActorPropertyReplication = false
+	`Log_Trace();
-	
+
-	PendingSync = false
+	`Log_Debug("Cleanup");
-	Recieved    = 0
+	if (!LTI.DestroyRepInfo(Controller(Owner)))
-	
+	{
-	NotificationPercent    = 0
+		`Log_Debug("Cleanup (forced)");
-	WaitingGRI             = 0
+		SafeDestroy();
-}
+	}
+}
+
+public reliable server function ServerSync()
+{
+	`Log_Trace();
+
+	PendingSync = false;
+
+	if (bPendingDelete || bDeleteMe) return;
+
+	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
+	{
+		`Log_Debug("ServerSync: Finished");
+		ClientSyncFinished();
+	}
+	else
+	{
+		if (Recieved < RemoveItems.Length)
+		{
+			`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
+			ClientSync(RemoveItems[Recieved++]);
+		}
+	}
+}
+
+defaultproperties
+{
+	bAlwaysRelevant               = false
+	bOnlyRelevantToOwner          = true
+	bSkipActorPropertyReplication = false
+
+	PendingSync = false
+	Recieved    = 0
+
+	NotificationPercent    = 0
+	WaitingGRI             = 0
+	WaitingGRILimit        = 15
+}

LTI/Classes/OfficialWeapons.uc

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

LTI/Classes/RemoveItems.uc

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

LTI/Classes/Trader.uc

@@ -1,115 +1,119 @@
-class Trader extends Object
+class Trader extends Object
-	abstract;
+	abstract;
-
+
-private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
+private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
-{
+{
-	return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
+	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)
+public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
-{
+{
-	local String TraderItemsPath;
+	local String TraderItemsPath;
-	
+
-	if (KFGRI == None)
+	if (KFGRI == None)
-	{
+	{
-		TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
+		TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
-	}
+	}
-	else
+	else
-	{
+	{
-		TraderItemsPath = KFGRI.TraderItemsPath;
+		TraderItemsPath = KFGRI.TraderItemsPath;
-	}
+	}
-	
+
-	return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
+	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)
+public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
-{
+{
-	local Array<class<KFWeaponDefinition> > KFWeapDefs;
+	local Array<class<KFWeaponDefinition> > KFWeapDefs;
-	local KFGFxObject_TraderItems TraderItems;
+	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
+	local STraderItem Item;
-	
+
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
-	
+
-	foreach TraderItems.SaleItems(Item)
+	foreach TraderItems.SaleItems(Item)
-	{
+	{
-		if (Item.WeaponDef != None)
+		if (Item.WeaponDef != None)
-		{
+		{
-			KFWeapDefs.AddItem(Item.WeaponDef);
+			KFWeapDefs.AddItem(Item.WeaponDef);
-		}
+		}
-	}
+	}
-	
+
-	return KFWeapDefs;
+	return KFWeapDefs;
-}
+}
-
+
-public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
+public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
-{
+{
-	local Array<class<KFWeapon> > KFWeapons;
+	local Array<class<KFWeapon> > KFWeapons;
-	local class<KFWeapon> KFWeapon;
+	local class<KFWeapon> KFWeapon;
-	local KFGFxObject_TraderItems TraderItems;
+	local KFGFxObject_TraderItems TraderItems;
-	local STraderItem Item;
+	local STraderItem Item;
-	
+
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
-	
+
-	foreach TraderItems.SaleItems(Item)
+	foreach TraderItems.SaleItems(Item)
-	{
+	{
-		if (Item.WeaponDef != None)
+		if (Item.WeaponDef != None)
-		{
+		{
-			KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
+			KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
-			if (KFWeapon != None)
+			if (KFWeapon != None)
-			{
+			{
-				KFWeapons.AddItem(KFWeapon);
+				KFWeapons.AddItem(KFWeapon);
-			}
+			}
-		}
+		}
-	}
+	}
-	
+
-	return KFWeapons;
+	return KFWeapons;
-}
+}
-
+
-public static simulated function ModifyTrader(
+public static simulated function ModifyTrader(
-	KFGameReplicationInfo KFGRI,
+	KFGameReplicationInfo KFGRI,
-	Array<class<KFWeaponDefinition> > RemoveItems,
+	Array<class<KFWeaponDefinition> > RemoveItems,
-	bool ReplaceMode,
+	bool ReplaceMode,
-	E_LogLevel LogLevel)
+	bool RemoveHRG,
-{
+	bool RemoveDLC,
-	local KFGFxObject_TraderItems TraderItems;
+	E_LogLevel LogLevel)
-	local STraderItem Item;
+{
-	local class<KFWeaponDefinition> WeapDef;
+	local KFGFxObject_TraderItems TraderItems;
-	local Array<class<KFWeaponDefinition> > WeapDefs;
+	local STraderItem Item;
-	local int MaxItemID;
+	local class<KFWeaponDefinition> WeapDef;
-	
+	local Array<class<KFWeaponDefinition> > WeapDefs;
-	`Log_TraceStatic();
+	local int MaxItemID;
-	
+
-	TraderItems = GetTraderItems(KFGRI, LogLevel);
+	`Log_TraceStatic();
-	
+
-	if (!ReplaceMode)
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
-	{
+
-		foreach TraderItems.SaleItems(Item)
+	if (!ReplaceMode)
-		{
+	{
-			if (Item.WeaponDef != None
+		foreach TraderItems.SaleItems(Item)
-			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE)
+		{
-			{
+			if (Item.WeaponDef != None
-				WeapDefs.AddItem(Item.WeaponDef);
+			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
-			}
+			&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
-		}
+			&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None)))
-	}
+			{
-	
+				WeapDefs.AddItem(Item.WeaponDef);
-	WeapDefs.Sort(ByPrice);
+			}
-	
+		}
-	TraderItems.SaleItems.Length = 0;
+	}
-	MaxItemID = 0;
+
-	foreach WeapDefs(WeapDef)
+	WeapDefs.Sort(ByPrice);
-	{
+
-		Item.WeaponDef = WeapDef;
+	TraderItems.SaleItems.Length = 0;
-		Item.ItemID = ++MaxItemID;
+	MaxItemID = 0;
-		TraderItems.SaleItems.AddItem(Item);
+	foreach WeapDefs(WeapDef)
-	}
+	{
-
+		Item.WeaponDef = WeapDef;
-	TraderItems.SetItemsInfo(TraderItems.SaleItems);
+		Item.ItemID = ++MaxItemID;
-	
+		TraderItems.SaleItems.AddItem(Item);
-	KFGRI.TraderItems = TraderItems;
+	}
-}
+
-
+	TraderItems.SetItemsInfo(TraderItems.SaleItems);
-defaultproperties
+
-{
+	KFGRI.TraderItems = TraderItems;
-	
+}
-}
+
+defaultproperties
+{
+
+}

LTI/Classes/_Logger.uc

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

LTI/Constants.uci

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

LTI/Globals.uci

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

LTI/Logger.uci

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

PublicationContent/description.txt

@@ -11,16 +11,16 @@ This is a heavily stripped-down version of [url=https://steamcommunity.com/share
 If we're lucky with that then server operators will have more tools to fine-tune the server.
 
 [h1]Whitelisted?[/h1]
-No. But I really hope that it will be whitelisted.
+[b]No.[/b] But I really hope that it will be whitelisted.
 
 [b]⚠️ I submitted whitelist request here:[/b]
-https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-mutators.120340/
+https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-mutators.120340/post-2353665
 
 [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=LTI.LTIMut[/b]
 (replace the map and add the parameters you need)
 [*]<Enter>.
@@ -38,21 +38,27 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
 [*]Add mutator to server start parameters: [b]?Mutator=LTI.LTIMut[/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]KFLTI.ini[/b] manually. Put the following content there:
+[b][LTI.LTI]
+Version=0[/b]
+[*]Start the game/server with LTI 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 (KFLTI.ini)[/h1]
-Config will be created at the first start[b]*[/b].
 [list]
 [*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste).
 [*]Use [b][LTI.RemoveItems][/b] to remove items from the trader inventory.
 example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
+[*]Set [b]bHRG=True[/b] to remove HRG items.
+[*]Set [b]bDLC=True[/b] to remove DLC items.
 [/list]
 
-[h1]Troubleshooting[/h1]
-[b](*)[/b] If your config is not created for some reason, create it manually with the following content:
-[b][LTI.LTI]
-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-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b]

README.md

@@ -3,17 +3,17 @@
 [![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=2864857909)
 [![Steam Downloads](https://img.shields.io/steam/downloads/2864857909)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
 [![Steam Favorites](https://img.shields.io/steam/favorites/2864857909)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
-[![Steam Update Date](https://img.shields.io/steam/update-date/2864857909)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
+[![MegaLinter](https://github.com/GenZmeY/KF2-LootedTraderInventory/actions/workflows/mega-linter.yml/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-LootedTraderInventory/actions/workflows/mega-linter.yml)
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-LootedTraderInventory)](https://github.com/GenZmeY/KF2-LootedTraderInventory/tags)
 [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-LootedTraderInventory)](LICENSE)
 
-# Description
+## Description
 This is a heavily stripped down version of [CTI](https://github.com/GenZmeY/KF2-CustomTraderInventory) that only allows you to remove the trader's weapons, not add them. This only exists in hopes of being whitelisted.  
 
-# Usage & Setup
+## Usage & Setup
 [See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
 
-# 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:  
@@ -27,5 +27,5 @@ This is a heavily stripped down version of [CTI](https://github.com/GenZmeY/KF2-
 5. The compiled files will be here:  
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
 
-# License
+## License
-[GNU GPLv3](LICENSE)  
+[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)

builder.cfg

@@ -7,7 +7,7 @@ StripSource="True"
 
 # Mutators to be compiled
 # Specify them with a space as a separator,
-# Mutators will be compiled in the specified order 
+# Mutators will be compiled in the specified order
 PackageBuildOrder="LTI"
 
 
@@ -16,7 +16,7 @@ PackageBuildOrder="LTI"
 # Packages you want to brew using @peelz's patched KFEditor.
 # Useful for cases where regular brew doesn't put *.upk inside the package.
 # Specify them with a space as a separator,
-# The order doesn't matter 
+# The order doesn't matter
 PackagePeelzBrew=""
 
 
@@ -24,7 +24,7 @@ PackagePeelzBrew=""
 
 # Mutators that will be uploaded to the workshop
 # Specify them with a space as a separator,
-# The order doesn't matter 
+# The order doesn't matter
 PackageUpload="LTI"