Compare commits

...

11 Commits

Author SHA1 Message Date
bf5e6e7b9c
update description.txt 2024-04-28 20:57:28 +03:00
bb8225bc8f
add CHN and CHT localizations
translator: cheungfatzong
https://steamcommunity.com/profiles/76561199126205919
2024-04-28 20:11:43 +03:00
e6ed3a4ebf
Update description.txt 2024-03-24 22:07:28 +03:00
85e235316c
Merge pull request #6 from GenZmeY/gri-advice
add advice in case of problems with GRI replication
2024-01-08 12:29:33 +03:00
10bd48e082
Merge pull request #5 from GenZmeY/short-name
add short alias for mutator
2024-01-08 12:26:49 +03:00
d55cc77e05
add advice in case of problems with GRI replication 2024-01-01 00:09:09 +03:00
7e2351c1c1
add short alias for mutator 2023-12-31 23:32:55 +03:00
6344c3b3e3
update ci/cd 2023-12-31 20:49:56 +03:00
e0f6ab61b0
try to force init WorldInfo.GRI if possible 2023-10-08 21:38:55 +03:00
2b45b7ae56
speed up item sync 2023-10-08 20:20:17 +03:00
9ab02e29a1
update megalinter ci/cd 2023-10-08 18:05:05 +03:00
12 changed files with 398 additions and 226 deletions

View File

@ -6,12 +6,14 @@ permissions: read-all
on: on:
push: push:
pull_request: pull_request:
branches: [master] branches:
- master
env: env:
APPLY_FIXES: none APPLY_FIXES: none
APPLY_FIXES_EVENT: pull_request APPLY_FIXES_EVENT: pull_request
APPLY_FIXES_MODE: commit APPLY_FIXES_MODE: commit
FILTER_REGEX_EXCLUDE: (mega-linter.yml)
DISABLE: SPELL DISABLE: SPELL
concurrency: concurrency:
@ -19,54 +21,94 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
build: megalinter:
name: MegaLinter name: MegaLinter
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: write
issues: write
pull-requests: write
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v3 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with: with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
fetch-depth: 0
- name: MegaLinter - name: MegaLinter
uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
id: ml id: ml
uses: oxsecurity/megalinter@v6
env: env:
VALIDATE_ALL_CODEBASE: true VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Archive production artifacts - name: Archive production artifacts
if: ${{ success() }} || ${{ failure() }} uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
uses: actions/upload-artifact@v3 if: success() || failure()
with: with:
name: MegaLinter reports name: MegaLinter reports
path: | path: |
megalinter-reports megalinter-reports
mega-linter.log 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 - name: Create Pull Request with applied fixes
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
id: cpr 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) if: env.APPLY_FIXES_IF_PR == 'true'
uses: peter-evans/create-pull-request@v5
with: with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
commit-message: "[MegaLinter] Apply linters automatic fixes" commit-message: "[MegaLinter] Apply linters automatic fixes"
title: "[MegaLinter] Apply linters automatic fixes" title: "[MegaLinter] Apply linters automatic fixes"
labels: bot labels: bot
- name: Create PR output - 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) if: env.APPLY_FIXES_IF_PR == 'true'
run: | run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
- name: Prepare commit - 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) if: env.APPLY_FIXES_IF_COMMIT == 'true'
run: sudo chown -Rc $UID .git/ run: sudo chown -Rc $UID .git/
- name: Commit and push applied linter fixes - 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@8756aa072ef5b4a080af5dc8fef36c5d586e521d
uses: stefanzweifel/git-auto-commit-action@v4 if: env.APPLY_FIXES_IF_COMMIT == 'true'
with: with:
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }} branch: >-
${{
github.event.pull_request.head.ref ||
github.head_ref ||
github.ref
}}
commit_message: "[MegaLinter] Apply linters fixes" commit_message: "[MegaLinter] Apply linters fixes"
commit_user_name: megalinter-bot commit_user_name: "github-actions"
commit_user_email: nicolas.vuillamy@ox.security commit_user_email: "github-actions[bot]@users.noreply.github.com"

View File

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

View File

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

View File

@ -13,16 +13,28 @@ var private localized String IncompatibleGRI;
var const String IncompatibleGRIWarningDefault; var const String IncompatibleGRIWarningDefault;
var private localized String IncompatibleGRIWarning; 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 const String SecondsShortDefault;
var private localized String SecondsShort; var private localized String SecondsShort;
var const String PleaseWaitDefault;
var private localized String PleaseWait;
enum E_LTI_LocalMessageType enum E_LTI_LocalMessageType
{ {
LTI_SyncItems, LTI_SyncItems,
LTI_WaitingGRI, LTI_WaitingGRI,
LTI_IncompatibleGRI, LTI_IncompatibleGRI,
LTI_IncompatibleGRIWarning, LTI_IncompatibleGRIWarning,
LTI_SecondsShort LTI_NoneGRI,
LTI_NoneGRIWarning,
LTI_SecondsShort,
LTI_PleaseWait
}; };
public static function String GetLocalizedString( public static function String GetLocalizedString(
@ -48,8 +60,17 @@ public static function String GetLocalizedString(
case LTI_IncompatibleGRIWarning: case LTI_IncompatibleGRIWarning:
return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault); 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: case LTI_SecondsShort:
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault); return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
case LTI_PleaseWait:
return (default.PleaseWait != "" ? default.PleaseWait : default.PleaseWaitDefault);
} }
return ""; return "";
@ -61,5 +82,8 @@ defaultproperties
WaitingGRIDefault = "Waiting GRI..." WaitingGRIDefault = "Waiting GRI..."
IncompatibleGRIDefault = "Incompatible GRI:" IncompatibleGRIDefault = "Incompatible GRI:"
IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly."; 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" SecondsShortDefault = "s"
PleaseWaitDefault = "Please wait"
} }

View File

@ -1,20 +1,25 @@
class LTI_RepInfo extends ReplicationInfo; class LTI_RepInfo extends ReplicationInfo;
const CAPACITY = 64; // max: 128
const Trader = class'Trader'; const Trader = class'Trader';
const LocalMessage = class'LTI_LocalMessage'; 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 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 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 KFPlayerController KFPC;
var private KFGFxWidget_PartyInGame PartyInGameWidget; var private KFGFxWidget_PartyInGame PartyInGameWidget;
var private GFxObject Notification; var private GFxObject Notification;
@ -25,12 +30,16 @@ var private String NotificationRightText;
var private int NotificationPercent; var private int NotificationPercent;
var private int WaitingGRI; var private int WaitingGRI;
var private int WaitingGRIThreshold;
var private int WaitingGRILimit; var private int WaitingGRILimit;
var private ReplicationStruct RepData;
var private Array<class<KFWeaponDefinition> > RepArray;
replication replication
{ {
if (bNetInitial && Role == ROLE_Authority) if (bNetInitial && Role == ROLE_Authority)
LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize; LogLevel;
} }
public simulated function bool SafeDestroy() public simulated function bool SafeDestroy()
@ -40,23 +49,143 @@ public simulated function bool SafeDestroy()
return (bPendingDelete || bDeleteMe || Destroy()); return (bPendingDelete || bDeleteMe || Destroy());
} }
public function PrepareSync( public function PrepareSync(LTI _LTI, E_LogLevel _LogLevel)
LTI _LTI,
E_LogLevel _LogLevel,
Array<class<KFWeaponDefinition> > _RemoveItems,
bool _ReplaceMode,
bool _RemoveHRG,
bool _RemoveDLC)
{ {
`Log_Trace(); `Log_Trace();
LTI = _LTI; LTI = _LTI;
LogLevel = _LogLevel; LogLevel = _LogLevel;
RemoveItems = _RemoveItems; }
ReplaceMode = _ReplaceMode;
RemoveHRG = _RemoveHRG; public function Replicate(const out Array<class<KFWeaponDefinition> > WeapDefs)
RemoveDLC = _RemoveDLC; {
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() private simulated function KFPlayerController GetKFPC()
@ -147,6 +276,8 @@ private simulated function ShowReadyButton()
{ {
`Log_Trace(); `Log_Trace();
ClearTimer(nameof(KeepNotification));
if (CheckPartyInGameWidget()) if (CheckPartyInGameWidget())
{ {
Notification.SetVisible(false); Notification.SetVisible(false);
@ -172,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() private simulated function KeepNotification()
{ {
HideReadyButton(); HideReadyButton();
@ -217,86 +313,72 @@ private simulated function KeepNotification()
NotificationPercent); NotificationPercent);
} }
private simulated reliable client function ClientSyncFinished() private simulated function ClientCleanup()
{ {
local KFGameReplicationInfo KFGRI; `Log_Debug("Cleanup");
ServerCleanup();
`Log_Trace();
if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
{
`Log_Debug("ClientSyncFinished: Waiting GRI" @ WaitingGRI);
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
NotificationLeftText = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
NotificationRightText = "";
NotificationPercent = 0;
SetTimer(1.0f, false, nameof(ClientSyncFinished));
return;
}
NotificationHeaderText = "";
NotificationLeftText = "";
NotificationRightText = "";
NotificationPercent = 0;
KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
if (KFGRI != None)
{
`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
Trader.static.ModifyTrader(KFGRI, RemoveItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
}
else
{
`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
WriteToChatLocalized(
LTI_IncompatibleGRI,
class'KFLocalMessage'.default.InteractionColor,
WorldInfo.GRI == None ? "None" : String(WorldInfo.GRI.class));
WriteToChatLocalized(
LTI_IncompatibleGRIWarning,
class'KFLocalMessage'.default.InteractionColor);
}
ClearTimer(nameof(KeepNotification));
ShowReadyButton();
Cleanup();
SafeDestroy(); SafeDestroy();
} }
private reliable server function Cleanup() private reliable server function ServerCleanup()
{ {
`Log_Trace(); `Log_Trace();
`Log_Debug("Cleanup"); `Log_Debug("Cleanup");
if (!LTI.DestroyRepInfo(Controller(Owner))) if (!LTI.DestroyRepInfo(GetKFPC()))
{ {
`Log_Debug("Cleanup (forced)"); `Log_Debug("Cleanup (forced)");
SafeDestroy(); SafeDestroy();
} }
} }
public reliable server function ServerSync() private simulated function NotifyWaitingGRI()
{ {
`Log_Trace(); if (!IsTimerActive(nameof(KeepNotification)))
PendingSync = false;
if (bPendingDelete || bDeleteMe) return;
if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
{ {
`Log_Debug("ServerSync: Finished"); SetTimer(0.1f, true, nameof(KeepNotification));
ClientSyncFinished();
} }
else
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)))
{ {
if (Recieved < RemoveItems.Length) SetTimer(0.1f, true, nameof(KeepNotification));
{
`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
ClientSync(RemoveItems[Recieved++]);
}
} }
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 defaultproperties
@ -306,9 +388,9 @@ defaultproperties
bSkipActorPropertyReplication = false bSkipActorPropertyReplication = false
PendingSync = false PendingSync = false
Recieved = 0
NotificationPercent = 0 NotificationPercent = 0
WaitingGRI = 0 WaitingGRI = 0
WaitingGRILimit = 15 WaitingGRIThreshold = 10
WaitingGRILimit = 20
} }

60
LTI/Classes/Mut.uc Normal file
View File

@ -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")
}

View File

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

BIN
Localization/CHN/LTI.chn Normal file

Binary file not shown.

BIN
Localization/CHT/LTI.cht Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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/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] [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]
[h1]Features[/h1] [h1]Features[/h1]
[list] [list]
@ -19,11 +19,17 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
[h1]Usage (single player)[/h1] [h1]Usage (single player)[/h1]
[olist] [olist]
[*]Subscribe to this mutator; [*]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; [*]Start KF2;
[*]Open console (~) and input: [*]Open console (~) and start any map with LTI (this will generate the default KFLTI.ini content):
[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) [*]Close the game and configure LTI as you need (see the [b]Setup (KFLTI.ini)[/b] section below);
[*]<Enter>. [*]Start KF2, open the console, start the game:
[b]open KF-BioticsLab?Mutator=LTI.Mut[/b]
(replace the map and add the parameters you need).
[/olist] [/olist]
[h1]Usage (server)[/h1] [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] [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]
@ -34,31 +40,33 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
❗️ If there are several [b]DownloadManagers=[/b] then the line above should be the first ❗️ ❗️ 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): [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
[b]ServerSubscribedWorkshopItems=2864857909[/b] [b]ServerSubscribedWorkshopItems=2864857909[/b]
[*]Start the server and wait until the mutator is downloading; [*]Start the server and wait while the mutator is downloading;
[*]Add mutator to server start parameters: [b]?Mutator=LTI.LTIMut[/b] and restart the server. [*]When the download is complete, close the server;
[/olist] [*]Create a file [b](*)[/b]: [b]<kf2-server>\KFGame\Config\KFLTI.ini[/b]
with the following content:
[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] [b][LTI.LTI]
Version=0[/b] Version=0[/b]
[*]Start the game/server with LTI to generate the contents of the config [*]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 game/server [*]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] [/olist]
[b]Right now this is the only way to correctly create the default config.[/b]
[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. 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] [h1]Setup (KFLTI.ini)[/h1]
[list] [list]
[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste). [*]Set [b]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.
[*]Use [b][LTI.RemoveItems][/b] to remove items from the trader inventory. [*]Use [b][LTI.RemoveItems][/b] to remove items from the trader inventory.
example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale. example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
[*]Set [b]bHRG=True[/b] to remove HRG items. [*]Set [b]bHRG=True[/b] to remove HRG items.
[*]Set [b]bDLC=True[/b] to remove DLC items. [*]Set [b]bDLC=True[/b] to remove DLC items.
[/list] [/list]
[h1]Translators:[/h1]
[url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
[h1]Sources[/h1] [h1]Sources[/h1]
[url=https://github.com/GenZmeY/KF2-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b] [url=https://github.com/GenZmeY/KF2-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b]