Merge pull request #6 from GenZmeY/gri-advice

add advice in case of problems with GRI replication

.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,114 @@
+---
+name: MegaLinter
+
+permissions: read-all
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+
+env:
+  APPLY_FIXES: none
+  APPLY_FIXES_EVENT: pull_request
+  APPLY_FIXES_MODE: commit
+  FILTER_REGEX_EXCLUDE: (mega-linter.yml)
+  DISABLE: SPELL
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  megalinter:
+    name: MegaLinter
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: MegaLinter
+        uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
+        id: ml
+        env:
+          VALIDATE_ALL_CODEBASE: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
+        if: success() || failure()
+        with:
+          name: MegaLinter reports
+          path: |
+            megalinter-reports
+            mega-linter.log
+
+      - name: Set APPLY_FIXES_IF var
+        run: |
+          printf 'APPLY_FIXES_IF=%s\n' "${{
+            steps.ml.outputs.has_updated_sources == 1 &&
+            (
+              env.APPLY_FIXES_EVENT == 'all' ||
+              env.APPLY_FIXES_EVENT == github.event_name
+            ) &&
+            (
+              github.event_name == 'push' ||
+              github.event.pull_request.head.repo.full_name == github.repository
+            )
+          }}" >> "${GITHUB_ENV}"
+
+      - name: Set APPLY_FIXES_IF_* vars
+        run: |
+          printf 'APPLY_FIXES_IF_PR=%s\n' "${{
+            env.APPLY_FIXES_IF == 'true' &&
+            env.APPLY_FIXES_MODE == 'pull_request'
+          }}" >> "${GITHUB_ENV}"
+          printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
+            env.APPLY_FIXES_IF == 'true' &&
+            env.APPLY_FIXES_MODE == 'commit' &&
+            (!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
+          }}" >> "${GITHUB_ENV}"
+
+      - name: Create Pull Request with applied fixes
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
+        id: cpr
+        if: env.APPLY_FIXES_IF_PR == 'true'
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          commit-message: "[MegaLinter] Apply linters automatic fixes"
+          title: "[MegaLinter] Apply linters automatic fixes"
+          labels: bot
+
+      - name: Create PR output
+        if: env.APPLY_FIXES_IF_PR == 'true'
+        run: |
+          echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+      - name: Prepare commit
+        if: env.APPLY_FIXES_IF_COMMIT == 'true'
+        run: sudo chown -Rc $UID .git/
+
+      - name: Commit and push applied linter fixes
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
+        if: env.APPLY_FIXES_IF_COMMIT == 'true'
+        with:
+          branch: >-
+            ${{
+              github.event.pull_request.head.ref ||
+              github.head_ref ||
+              github.ref
+            }}
+          commit_message: "[MegaLinter] Apply linters fixes"
+          commit_user_name: "github-actions"
+          commit_user_email: "github-actions[bot]@users.noreply.github.com"

LTI/Classes/LTI.uc

@@ -14,6 +14,7 @@ var private config bool       bOfficialWeaponsList;
 var private KFGameInfo KFGI;
 var private KFGameReplicationInfo KFGRI;
 
+var private Array<class<KFWeaponDefinition> > WeapDefs;
 var private Array<class<KFWeaponDefinition> > RemoveItems;
 var private Array<LTI_RepInfo> RepInfos;
 var private bool ReadyToSync;
@@ -149,13 +150,15 @@ private function PostInit()
 		CfgRemoveItems.default.bDLC,
 		LogLevel);
 
+	WeapDefs = Trader.static.GetTraderWeapDefs(KFGRI, LogLevel);
+
 	ReadyToSync = true;
 
 	foreach RepInfos(RepInfo)
 	{
 		if (RepInfo.PendingSync)
 		{
-			RepInfo.ServerSync();
+			RepInfo.Replicate(WeapDefs);
 		}
 	}
 }
@@ -189,19 +192,13 @@ public function bool CreateRepInfo(Controller C)
 
 	if (RepInfo == None) return false;
 
-	RepInfo.PrepareSync(
-		Self,
-		LogLevel,
-		RemoveItems,
-		CfgRemoveItems.default.bAll,
-		CfgRemoveItems.default.bHRG,
-		CfgRemoveItems.default.bDLC);
+	RepInfo.PrepareSync(Self, LogLevel);
 
 	RepInfos.AddItem(RepInfo);
 
 	if (ReadyToSync)
 	{
-		RepInfo.ServerSync();
+		RepInfo.Replicate(WeapDefs);
 	}
 	else
 	{

LTI/Classes/LTIMut.uc

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

LTI/Classes/LTI_LocalMessage.uc

@@ -4,29 +4,37 @@ class LTI_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 NoneGRIDefault;
+var private localized String NoneGRI;
+
+var const             String NoneGRIWarningDefault;
+var private localized String NoneGRIWarning;
 
 var const             String SecondsShortDefault;
 var private localized String SecondsShort;
 
+var const             String PleaseWaitDefault;
+var private localized String PleaseWait;
+
 enum E_LTI_LocalMessageType
 {
 	LTI_SyncItems,
-	LTI_SyncFinished,
 	LTI_WaitingGRI,
 	LTI_IncompatibleGRI,
-	LTI_Disconnect,
-	LTI_SecondsShort
+	LTI_IncompatibleGRIWarning,
+	LTI_NoneGRI,
+	LTI_NoneGRIWarning,
+	LTI_SecondsShort,
+	LTI_PleaseWait
 };
 
 public static function String GetLocalizedString(
@@ -43,20 +51,26 @@ public static function String GetLocalizedString(
 		case LTI_SyncItems:
 			return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
 
-		case LTI_SyncFinished:
-			return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
-		
 		case LTI_WaitingGRI:
 			return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
 
 		case LTI_IncompatibleGRI:
-			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
+			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault) @ String1;
 
-		case LTI_Disconnect:
-			return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
+		case LTI_IncompatibleGRIWarning:
+			return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
+
+		case LTI_NoneGRI:
+			return (default.NoneGRI != "" ? default.NoneGRI : default.NoneGRIDefault);
+
+		case LTI_NoneGRIWarning:
+			return (default.NoneGRIWarning != "" ? default.NoneGRIWarning : default.NoneGRIWarningDefault);
 
 		case LTI_SecondsShort:
 			return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
+
+		case LTI_PleaseWait:
+			return (default.PleaseWait != "" ? default.PleaseWait : default.PleaseWaitDefault);
 	}
 
 	return "";
@@ -65,9 +79,11 @@ public static function String GetLocalizedString(
 defaultproperties
 {
 	SyncItemsDefault              = "Sync items:"
-	SyncFinishedDefault    = "Sync finished."
 	WaitingGRIDefault             = "Waiting GRI..."
 	IncompatibleGRIDefault        = "Incompatible GRI:"
-	DisconnectDefault      = "Disconnect..."
+	IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
+	NoneGRIDefault                = "GRI is not initialized!"
+	NoneGRIWarningDefault         = "It is recommended to reconnect. If you enter the game right now, the trader may not work correctly.";
 	SecondsShortDefault           = "s"
+	PleaseWaitDefault             = "Please wait"
 }

LTI/Classes/LTI_RepInfo.uc

@@ -1,20 +1,25 @@
 class LTI_RepInfo extends ReplicationInfo;
 
+const CAPACITY = 64; // max: 128
+
 const Trader       = class'Trader';
 const LocalMessage = class'LTI_LocalMessage';
 
+struct ReplicationStruct
+{
+	var int Size;
+	var int Transfered;
+
+	var class<KFWeaponDefinition> Items[CAPACITY];
+	var int Length;
+};
+
 var public  bool PendingSync;
 
 var private LTI LTI;
 var private E_LogLevel LogLevel;
-var private Array<class<KFWeaponDefinition> > RemoveItems;
-var private bool ReplaceMode;
-var private bool RemoveHRG;
-var private bool RemoveDLC;
-
-var private int  Recieved;
-var private int  SyncSize;
 
+var private GameReplicationInfo     GRI;
 var private KFPlayerController      KFPC;
 var private KFGFxWidget_PartyInGame PartyInGameWidget;
 var private GFxObject               Notification;
@@ -25,11 +30,16 @@ var private String NotificationRightText;
 var private int    NotificationPercent;
 
 var private int    WaitingGRI;
+var private int    WaitingGRIThreshold;
+var private int    WaitingGRILimit;
+
+var private ReplicationStruct                 RepData;
+var private Array<class<KFWeaponDefinition> > RepArray;
 
 replication
 {
 	if (bNetInitial && Role == ROLE_Authority)
-		LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
+		LogLevel;
 }
 
 public simulated function bool SafeDestroy()
@@ -39,23 +49,143 @@ public simulated function bool SafeDestroy()
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
 
-public function PrepareSync(
-	LTI _LTI,
-	E_LogLevel _LogLevel,
-	Array<class<KFWeaponDefinition> > _RemoveItems,
-	bool _ReplaceMode,
-	bool _RemoveHRG,
-	bool _RemoveDLC)
+public function PrepareSync(LTI _LTI, E_LogLevel _LogLevel)
 {
 	`Log_Trace();
 
 	LTI                 = _LTI;
 	LogLevel            = _LogLevel;
-	RemoveItems         = _RemoveItems;
-	ReplaceMode         = _ReplaceMode;
-	RemoveHRG           = _RemoveHRG;
-	RemoveDLC           = _RemoveDLC;
-	SyncSize            = RemoveItems.Length;
+}
+
+public function Replicate(const out Array<class<KFWeaponDefinition> > WeapDefs)
+{
+	`Log_Trace();
+
+	RepArray = WeapDefs;
+	RepData.Size = RepArray.Length;
+
+	if (WorldInfo.NetMode == NM_StandAlone)
+	{
+		Progress(RepArray.Length, RepArray.Length);
+		return;
+	}
+
+	Sync();
+}
+
+private reliable server function Sync()
+{
+	local int LocalIndex;
+	local int GlobalIndex;
+
+	`Log_Trace();
+
+	LocalIndex = 0;
+	GlobalIndex = RepData.Transfered;
+
+	while (LocalIndex < CAPACITY && GlobalIndex < RepData.Size)
+	{
+		RepData.Items[LocalIndex++] = RepArray[GlobalIndex++];
+	}
+
+	if (RepData.Transfered == GlobalIndex) return; // Finished
+
+	RepData.Transfered = GlobalIndex;
+	RepData.Length = LocalIndex;
+
+	Send(RepData);
+
+	Progress(RepData.Transfered, RepData.Size);
+}
+
+private reliable client function Send(ReplicationStruct RD)
+{
+	local int LocalIndex;
+
+	`Log_Trace();
+
+	for (LocalIndex = 0; LocalIndex < RD.Length; LocalIndex++)
+	{
+		RepArray.AddItem(RD.Items[LocalIndex]);
+	}
+
+	Progress(RD.Transfered, RD.Size);
+
+	Sync();
+}
+
+private simulated function Progress(int Value, int Size)
+{
+	`Log_Trace();
+
+	`Log_Debug("Replicated:" @ Value @ "/" @ Size);
+
+	if (ROLE < ROLE_Authority)
+	{
+		NotifyProgress(Value, Size);
+		if (Value >= Size) Finished();
+	}
+}
+
+private simulated function Finished()
+{
+	local KFGameReplicationInfo KFGRI;
+
+	`Log_Trace();
+
+	if (GetGRI(WaitingGRI > WaitingGRIThreshold) == None && WaitingGRI++ < WaitingGRILimit)
+	{
+		`Log_Debug("Finished: Waiting GRI" @ WaitingGRI);
+		NotifyWaitingGRI();
+		SetTimer(1.0f, false, nameof(Finished));
+		return;
+	}
+
+	KFGRI = KFGameReplicationInfo(GRI);
+	if (KFGRI != None)
+	{
+		`Log_Debug("Finished: Trader.static.OverwriteTraderItems");
+		Trader.static.OverwriteTraderItems(KFGRI, RepArray, LogLevel);
+		`Log_Info("Trader items successfully synchronized!");
+	}
+	else
+	{
+		`Log_Error("Incompatible Game Replication info:" @ String(GRI));
+		if (GRI == None)
+		{
+			NotifyNoneGRI();
+		}
+		else
+		{
+			NotifyIncompatibleGRI();
+		}
+	}
+
+	ShowReadyButton();
+	ClientCleanup();
+}
+
+private simulated function GameReplicationInfo GetGRI(optional bool ForcedSearch = false)
+{
+	`Log_Trace();
+
+	if (GRI == None)
+	{
+		GRI = WorldInfo.GRI;
+	}
+
+	if (GRI == None && ForcedSearch)
+	{
+		foreach WorldInfo.DynamicActors(class'GameReplicationInfo', GRI) break;
+	}
+
+	if (WorldInfo.GRI == None && GRI != None)
+	{
+		`Log_Warn("Force initialization of WorldInfo.GRI" @ String(GRI));
+		WorldInfo.GRI = GRI;
+	}
+
+	return GRI;
 }
 
 private simulated function KFPlayerController GetKFPC()
@@ -74,6 +204,39 @@ private simulated function KFPlayerController GetKFPC()
 	return KFPC;
 }
 
+public reliable client function WriteToChatLocalized(
+	E_LTI_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();
@@ -113,6 +276,8 @@ private simulated function ShowReadyButton()
 {
 	`Log_Trace();
 
+	ClearTimer(nameof(KeepNotification));
+
 	if (CheckPartyInGameWidget())
 	{
 		Notification.SetVisible(false);
@@ -138,41 +303,6 @@ private simulated function UpdateNotification(String Title, String Left, String
 	}
 }
 
-private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef)
-{
-	`Log_Trace();
-
-	if (WeapDef == None)
-	{
-		`Log_Fatal("WeapDef is:" @ WeapDef);
-		Cleanup();
-		ConsoleCommand("Disconnect");
-		SafeDestroy();
-		return;
-	}
-	
-	if (!IsTimerActive(nameof(KeepNotification)))
-	{
-		SetTimer(0.1f, true, nameof(KeepNotification));
-	}
-	
-	RemoveItems.AddItem(WeapDef);
-	
-	Recieved = RemoveItems.Length;
-	
-	NotificationHeaderText  = "-" @ WeapDef.static.GetItemName();
-	NotificationLeftText    = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
-	NotificationRightText   = Recieved @ "/" @ SyncSize;
-	if (SyncSize != 0)
-	{
-		NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
-	}
-	
-	`Log_Debug("ClientSync: -" @ String(WeapDef) @ NotificationRightText);
-	
-	ServerSync();
-}
-
 private simulated function KeepNotification()
 {
 	HideReadyButton();
@@ -183,89 +313,72 @@ private simulated function KeepNotification()
 		NotificationPercent);
 }
 
-private simulated reliable client function ClientSyncFinished()
+private simulated function ClientCleanup()
 {
-	local KFGameReplicationInfo KFGRI;
-
-	`Log_Trace();
-	
-	NotificationLeftText  = "";
-	NotificationRightText = "";
-	NotificationPercent   = 0;
-	
-	if (WorldInfo.GRI == None)
-	{
-		`Log_Debug("ClientSyncFinished: Waiting GRI");
-		NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
-		NotificationLeftText   = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
-		NotificationRightText  = "";
-		SetTimer(1.0f, false, nameof(ClientSyncFinished));
-		return;
-	}
-	
-	KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
-	if (KFGRI == None)
-	{
-		`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
-		ClearTimer(nameof(KeepNotification));
-		UpdateNotification(
-			LocalMessage.static.GetLocalizedString(LogLevel, LTI_IncompatibleGRI) @ String(WorldInfo.GRI),
-			LocalMessage.static.GetLocalizedString(LogLevel, LTI_Disconnect), "", 0);
-		Cleanup();
-		ConsoleCommand("Disconnect");
-		SafeDestroy();
-		return;
-	}
-	
-	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncFinished);
-	NotificationLeftText   = "";
-	NotificationRightText  = "";
-	NotificationPercent    = 0;
-
-	Trader.static.ModifyTrader(KFGRI, RemoveItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
-	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
-
-	ClearTimer(nameof(KeepNotification)); 
-	ShowReadyButton();
-	
-	Cleanup();
-	
+	`Log_Debug("Cleanup");
+	ServerCleanup();
 	SafeDestroy();
 }
 
-private reliable server function Cleanup()
+private reliable server function ServerCleanup()
 {
 	`Log_Trace();
 
 	`Log_Debug("Cleanup");
-	if (!LTI.DestroyRepInfo(Controller(Owner)))
+	if (!LTI.DestroyRepInfo(GetKFPC()))
 	{
 		`Log_Debug("Cleanup (forced)");
 		SafeDestroy();
 	}
 }
 
-public reliable server function ServerSync()
+private simulated function NotifyWaitingGRI()
 {
-	`Log_Trace();
-	
-	PendingSync = false;
-	
-	if (bPendingDelete || bDeleteMe) return;
-	
-	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
+	if (!IsTimerActive(nameof(KeepNotification)))
 	{
-		`Log_Debug("ServerSync: Finished");
-		ClientSyncFinished();
+		SetTimer(0.1f, true, nameof(KeepNotification));
 	}
-	else
-	{
-		if (Recieved < RemoveItems.Length)
-		{
-			`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
-			ClientSync(RemoveItems[Recieved++]);
+
+	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
+	NotificationLeftText   = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
+	NotificationRightText  = LocalMessage.static.GetLocalizedString(LogLevel, LTI_PleaseWait);
+	NotificationPercent    = 0;
+	KeepNotification();
 }
+
+private simulated function NotifyProgress(int Value, int Size)
+{
+	if (!IsTimerActive(nameof(KeepNotification)))
+	{
+		SetTimer(0.1f, true, nameof(KeepNotification));
 	}
+
+	NotificationHeaderText  = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
+	NotificationLeftText    = Value @ "/" @ Size;
+	NotificationRightText   = LocalMessage.static.GetLocalizedString(LogLevel, LTI_PleaseWait);
+	NotificationPercent     = (float(Value) / float(Size)) * 100;
+	KeepNotification();
+}
+
+private simulated function NotifyIncompatibleGRI()
+{
+	WriteToChatLocalized(
+		LTI_IncompatibleGRI,
+		class'KFLocalMessage'.default.InteractionColor,
+		String(GRI.class));
+	WriteToChatLocalized(
+		LTI_IncompatibleGRIWarning,
+		class'KFLocalMessage'.default.InteractionColor);
+}
+
+private simulated function NotifyNoneGRI()
+{
+	WriteToChatLocalized(
+		LTI_NoneGRI,
+		class'KFLocalMessage'.default.InteractionColor);
+	WriteToChatLocalized(
+		LTI_NoneGRIWarning,
+		class'KFLocalMessage'.default.InteractionColor);
 }
 
 defaultproperties
@@ -275,8 +388,9 @@ defaultproperties
 	bSkipActorPropertyReplication = false
 
 	PendingSync = false
-	Recieved    = 0
 
 	NotificationPercent    = 0
 	WaitingGRI             = 0
+	WaitingGRIThreshold    = 10
+	WaitingGRILimit        = 20
 }

LTI/Classes/Mut.uc

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

LTI/Classes/Trader.uc

@@ -75,9 +75,7 @@ public static simulated function ModifyTrader(
 {
 	local KFGFxObject_TraderItems TraderItems;
 	local STraderItem Item;
-	local class<KFWeaponDefinition> WeapDef;
 	local Array<class<KFWeaponDefinition> > WeapDefs;
-	local int MaxItemID;
 
 	`Log_TraceStatic();
 
@@ -99,13 +97,33 @@ public static simulated function ModifyTrader(
 
 	WeapDefs.Sort(ByPrice);
 
+	OverwriteTraderItems(KFGRI, WeapDefs, LogLevel);
+}
+
+public static simulated function OverwriteTraderItems(
+	KFGameReplicationInfo KFGRI,
+	const out Array<class<KFWeaponDefinition> > WeapDefs,
+	E_LogLevel LogLevel)
+{
+	local KFGFxObject_TraderItems TraderItems;
+	local STraderItem Item;
+	local class<KFWeaponDefinition> WeapDef;
+	local int MaxItemID;
+
+	`Log_TraceStatic();
+
+	TraderItems = GetTraderItems(KFGRI, LogLevel);
+
 	TraderItems.SaleItems.Length = 0;
 	MaxItemID = 0;
+
+	`Log_Debug("Trader Items:");
 	foreach WeapDefs(WeapDef)
 	{
 		Item.WeaponDef = WeapDef;
-		Item.ItemID = ++MaxItemID;
+		Item.ItemID = MaxItemID++;
 		TraderItems.SaleItems.AddItem(Item);
+		`Log_Debug("[" $ MaxItemID $ "]" @ String(WeapDef));
 	}
 
 	TraderItems.SetItemsInfo(TraderItems.SaleItems);

PublicationContent/description.txt

@@ -21,7 +21,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
 [*]Subscribe to this mutator;
 [*]Start KF2;
 [*]Open console (~) and input:
-[b]open KF-BioticsLab?Mutator=LTI.LTIMut[/b]
+[b]open KF-BioticsLab?Mutator=LTI.Mut[/b]
 (replace the map and add the parameters you need)
 [*]<Enter>.
 [/olist]
@@ -35,7 +35,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
 [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
 [b]ServerSubscribedWorkshopItems=2864857909[/b]
 [*]Start the server and wait until the mutator is downloading;
-[*]Add mutator to server start parameters: [b]?Mutator=LTI.LTIMut[/b] and restart the server.
+[*]Add mutator to server start parameters: [b]?Mutator=LTI.Mut[/b] and restart the server.
 [/olist]
 
 [h1]Important setup information[/h1]
@@ -56,7 +56,6 @@ Unfortunately I can't do anything about it because it's a game problem (not muta
 [*]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]

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
-[GNU GPLv3](LICENSE)  
+## License
+[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)