.editorconfig

@@ -1,33 +0,0 @@
-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

@@ -1,114 +0,0 @@
----
-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

@@ -1,7 +1,7 @@
 class LTI extends Info
 	config(LTI);
 
-const LatestVersion = 2;
+const LatestVersion = 1;
 
 const CfgRemoveItems     = class'RemoveItems';
 const CfgOfficialWeapons = class'OfficialWeapons';
@@ -14,7 +14,6 @@ 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;
@@ -72,8 +71,6 @@ private function PreInit()
 		case `NO_CONFIG:
 			`Log_Info("Config created");
 			
-		case 1:
-
 		case MaxInt:
 			`Log_Info("Config updated to version" @ LatestVersion);
 			break;
@@ -142,15 +139,7 @@ private function PostInit()
 		return;
 	}
 	
-	Trader.static.ModifyTrader(
+	Trader.static.ModifyTrader(KFGRI, RemoveItems, CfgRemoveItems.default.bAll, LogLevel);
-		KFGRI,
-		RemoveItems,
-		CfgRemoveItems.default.bAll,
-		CfgRemoveItems.default.bHRG,
-		CfgRemoveItems.default.bDLC,
-		LogLevel);
-
-	WeapDefs = Trader.static.GetTraderWeapDefs(KFGRI, LogLevel);
 	
 	ReadyToSync = true;
 	
@@ -158,7 +147,7 @@ private function PostInit()
 	{
 		if (RepInfo.PendingSync)
 		{
-			RepInfo.Replicate(WeapDefs);
+			RepInfo.ServerSync();
 		}
 	}
 }
@@ -192,13 +181,17 @@ public function bool CreateRepInfo(Controller C)
 	
 	if (RepInfo == None) return false;
 	
-	RepInfo.PrepareSync(Self, LogLevel);
+	RepInfo.PrepareSync(
+		Self,
+		LogLevel,
+		RemoveItems,
+		CfgRemoveItems.default.bAll);
 	
 	RepInfos.AddItem(RepInfo);
 	
 	if (ReadyToSync)
 	{
-		RepInfo.Replicate(WeapDefs);
+		RepInfo.ServerSync();
 	}
 	else
 	{

LTI/Classes/LTIMut.uc

@@ -1 +1,60 @@
-class LTIMut extends Mut; // backward compatibility
+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)
+		Mut.Destroy();
+	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
+{
+
+}

LTI/Classes/LTI_LocalMessage.uc

@@ -4,37 +4,29 @@ 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 IncompatibleGRIWarningDefault;
+var const             String DisconnectDefault;
-var private localized String IncompatibleGRIWarning;
+var private localized String Disconnect;
-
-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_IncompatibleGRIWarning,
+	LTI_Disconnect,
-	LTI_NoneGRI,
+	LTI_SecondsShort
-	LTI_NoneGRIWarning,
-	LTI_SecondsShort,
-	LTI_PleaseWait
 };
 
 public static function String GetLocalizedString(
@@ -51,26 +43,20 @@ 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) @ String1;
+			return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
 		
-		case LTI_IncompatibleGRIWarning:
+		case LTI_Disconnect:
-			return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
+			return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
-
-		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 "";
@@ -79,11 +65,9 @@ public static function String GetLocalizedString(
 defaultproperties
 {
 	SyncItemsDefault       = "Sync items:"
+	SyncFinishedDefault    = "Sync finished."
 	WaitingGRIDefault      = "Waiting GRI..."
 	IncompatibleGRIDefault = "Incompatible GRI:"
-	IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
+	DisconnectDefault      = "Disconnect..."
-	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,25 +1,18 @@
 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 int  Recieved;
+var private int  SyncSize;
 
-var private GameReplicationInfo     GRI;
 var private KFPlayerController      KFPC;
 var private KFGFxWidget_PartyInGame PartyInGameWidget;
 var private GFxObject               Notification;
@@ -30,16 +23,11 @@ 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;
+		LogLevel, ReplaceMode, SyncSize;
 }
 
 public simulated function bool SafeDestroy()
@@ -49,143 +37,19 @@ public simulated function bool SafeDestroy()
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
 
-public function PrepareSync(LTI _LTI, E_LogLevel _LogLevel)
+public function PrepareSync(
+	LTI _LTI,
+	E_LogLevel _LogLevel,
+	Array<class<KFWeaponDefinition> > _RemoveItems,
+	bool _ReplaceMode)
 {
 	`Log_Trace();
 	
 	LTI                 = _LTI;
 	LogLevel            = _LogLevel;
-}
+	RemoveItems         = _RemoveItems;
-
+	ReplaceMode         = _ReplaceMode;
-public function Replicate(const out Array<class<KFWeaponDefinition> > WeapDefs)
+	SyncSize            = RemoveItems.Length;
-{
-	`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()
@@ -204,39 +68,6 @@ 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();
@@ -276,8 +107,6 @@ private simulated function ShowReadyButton()
 {
 	`Log_Trace();
 	
-	ClearTimer(nameof(KeepNotification));
-
 	if (CheckPartyInGameWidget())
 	{
 		Notification.SetVisible(false);
@@ -303,6 +132,41 @@ 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();
@@ -313,72 +177,89 @@ private simulated function KeepNotification()
 		NotificationPercent);
 }
 
-private simulated function ClientCleanup()
+private simulated reliable client function ClientSyncFinished()
 {
-	`Log_Debug("Cleanup");
+	local KFGameReplicationInfo KFGRI;
-	ServerCleanup();
+
+	`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, LogLevel);
+	`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
+
+	ClearTimer(nameof(KeepNotification)); 
+	ShowReadyButton();
+	
+	Cleanup();
+	
 	SafeDestroy();
 }
 
-private reliable server function ServerCleanup()
+private reliable server function Cleanup()
 {
 	`Log_Trace();
 	
 	`Log_Debug("Cleanup");
-	if (!LTI.DestroyRepInfo(GetKFPC()))
+	if (!LTI.DestroyRepInfo(Controller(Owner)))
 	{
 		`Log_Debug("Cleanup (forced)");
 		SafeDestroy();
 	}
 }
 
-private simulated function NotifyWaitingGRI()
+public reliable server function ServerSync()
 {
-	if (!IsTimerActive(nameof(KeepNotification)))
+	`Log_Trace();
-	{
-		SetTimer(0.1f, true, nameof(KeepNotification));
-	}
 	
-	NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
+	PendingSync = false;
-	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 (bPendingDelete || bDeleteMe) return;
-{
-	if (!IsTimerActive(nameof(KeepNotification)))
-	{
-		SetTimer(0.1f, true, nameof(KeepNotification));
-	}
 	
-	NotificationHeaderText  = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
+	if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
-	NotificationLeftText    = Value @ "/" @ Size;
-	NotificationRightText   = LocalMessage.static.GetLocalizedString(LogLevel, LTI_PleaseWait);
-	NotificationPercent     = (float(Value) / float(Size)) * 100;
-	KeepNotification();
-}
-
-private simulated function NotifyIncompatibleGRI()
 	{
-	WriteToChatLocalized(
+		`Log_Debug("ServerSync: Finished");
-		LTI_IncompatibleGRI,
+		ClientSyncFinished();
-		class'KFLocalMessage'.default.InteractionColor,
-		String(GRI.class));
-	WriteToChatLocalized(
-		LTI_IncompatibleGRIWarning,
-		class'KFLocalMessage'.default.InteractionColor);
 	}
-
+	else
-private simulated function NotifyNoneGRI()
 	{
-	WriteToChatLocalized(
+		if (Recieved < RemoveItems.Length)
-		LTI_NoneGRI,
+		{
-		class'KFLocalMessage'.default.InteractionColor);
+			`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
-	WriteToChatLocalized(
+			ClientSync(RemoveItems[Recieved++]);
-		LTI_NoneGRIWarning,
+		}
-		class'KFLocalMessage'.default.InteractionColor);
+	}
 }
 
 defaultproperties
@@ -388,9 +269,8 @@ defaultproperties
 	bSkipActorPropertyReplication = false
 	
 	PendingSync = false
+	Recieved    = 0
 	
 	NotificationPercent    = 0
 	WaitingGRI             = 0
-	WaitingGRIThreshold    = 10
-	WaitingGRILimit        = 20
 }

LTI/Classes/Mut.uc

@@ -1,60 +0,0 @@
-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/RemoveItems.uc

@@ -3,8 +3,6 @@ class RemoveItems extends Object
 	config(LTI);
 
 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)
@@ -14,10 +12,6 @@ public static function InitConfig(int Version, int LatestVersion)
 		case `NO_CONFIG:
 			ApplyDefault();
 			
-		case 1:
-			default.bHRG = false;
-			default.bDLC = false;
-
 		default: break;
 	}
 	
@@ -30,8 +24,6 @@ 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");
 }
@@ -51,15 +43,6 @@ 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'));

LTI/Classes/Trader.uc

@@ -69,13 +69,13 @@ public static simulated function ModifyTrader(
 	KFGameReplicationInfo KFGRI,
 	Array<class<KFWeaponDefinition> > RemoveItems,
 	bool ReplaceMode,
-	bool RemoveHRG,
-	bool RemoveDLC,
 	E_LogLevel LogLevel)
 {
 	local KFGFxObject_TraderItems TraderItems;
 	local STraderItem Item;
+	local class<KFWeaponDefinition> WeapDef;
 	local Array<class<KFWeaponDefinition> > WeapDefs;
+	local int MaxItemID;
 	
 	`Log_TraceStatic();
 	
@@ -86,9 +86,7 @@ public static simulated function ModifyTrader(
 		foreach TraderItems.SaleItems(Item)
 		{
 			if (Item.WeaponDef != None
-			&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
+			&& 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);
 			}
@@ -97,33 +95,13 @@ 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

@@ -1,4 +1,4 @@
-[img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-LootedTraderInventory[/img] [img]https://img.shields.io/steam/favorites/2864857909[/img] [img]https://img.shields.io/steam/update-date/2864857909[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2864857909][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-LootedTraderInventory[/img][/url]
+[img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-LootedTraderInventory[/img] [img]https://img.shields.io/steam/downloads/2864857909[/img] [img]https://img.shields.io/steam/favorites/2864857909[/img] [img]https://img.shields.io/steam/update-date/2864857909[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2864857909][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-LootedTraderInventory[/img][/url]
 
 [h1]Features[/h1]
 [list]
@@ -11,25 +11,19 @@ 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]
-[b]No.[/b] But I really hope that it will be whitelisted.
+No. 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/post-2353665
+https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-mutators.120340/
 
 [h1]Usage (single player)[/h1]
 [olist]
 [*]Subscribe to this mutator;
-[*]Create a file [b](*)[/b]: [b]C:\Users\<username>\Documents\My Games\KillingFloor2\KFGame\Config\KFLTI.ini[/b]
-with the following content:
-[b][LTI.LTI]
-Version=0[/b]
 [*]Start KF2; 
-[*]Open console (~) and start any map with LTI (this will generate the default KFLTI.ini content):
+[*]Open console (`) and input:
-[b]open KF-BioticsLab?Mutator=LTI.Mut[/b]
+[b]open KF-BioticsLab?Mutator=LTI.LTIMut[/b]
-[*]Close the game and configure LTI as you need (see the [b]Setup (KFLTI.ini)[/b] section below);
+(replace the map and add the parameters you need)
-[*]Start KF2, open the console, start the game:
+[*]<Enter>.
-[b]open KF-BioticsLab?Mutator=LTI.Mut[/b]
-(replace the map and add the parameters you need).
 [/olist]
 [h1]Usage (server)[/h1]
 [b]Note:[/b] [i]If you don't understand what is written here, read the article [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server (KF2 wiki)[/u][/url] before following these instructions.[/i]
@@ -40,33 +34,25 @@ Version=0[/b]
 ❗️ If there are several [b]DownloadManagers=[/b] then the line above should be the first ❗️
 [*]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 while the mutator is downloading;
+[*]Start the server and wait until the mutator is downloading;
-[*]When the download is complete, close the server;
+[*]Add mutator to server start parameters: [b]?Mutator=LTI.LTIMut[/b] and restart the server.
-[*]Create a file [b](*)[/b]: [b]<kf2-server>\KFGame\Config\KFLTI.ini[/b]
-with the following content:
-[b][LTI.LTI]
-Version=0[/b]
-[*]Add mutator to server start parameters: [b]?Mutator=LTI.Mut[/b] and start the server (this will generate the default KFLTI.ini content);
-[*]Close the server and configure LTI as you need (see the [b]Setup (KFLTI.ini)[/b] section below);
-[*]Start the server (with [b]?Mutator=LTI.Mut[/b]) again.
 [/olist]
 
-[h1][b](*)[/b] Buggy config variables initialization[/h1]
-LTI, like many other mutators, initializes the config by relying on the unreal script feature which uses default values for each data type that is not explicitly specified. For the int type (which is used to store the config version) this is zero - detecting zero allows to understand that the mutator is being used for the first time (which means it's need to generate a config). But now the game contains a bug that initializes the config values ​​randomly if they are not explicitly set. Thus, the config may have incorrect values ​​or not be created at all. This is why I recommend explicitly set [b]Version=0[/b] in the config for the first time.
-
-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) or leave it [b]False[/b] if you want a clean config without unnecessary things.
+[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste).
 [*]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]Translators:[/h1]
+[h1]Troubleshooting[/h1]
-[url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
+[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)
-[![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)
+[![Steam Update Date](https://img.shields.io/steam/update-date/2864857909)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
 [![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
-[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)
+[GNU GPLv3](LICENSE)  

tools

@@ -1 +1 @@
-Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f
+Subproject commit 0e821f3dbbc6b3528f2028b0060d3b6f7f1c4b93