Compare commits
No commits in common. "master" and "v1.1.0" have entirely different histories.
@ -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
|
||||
114
.github/workflows/mega-linter.yml
vendored
114
.github/workflows/mega-linter.yml
vendored
@ -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"
|
||||
@ -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;
|
||||
@ -150,15 +149,13 @@ private function PostInit()
|
||||
CfgRemoveItems.default.bDLC,
|
||||
LogLevel);
|
||||
|
||||
WeapDefs = Trader.static.GetTraderWeapDefs(KFGRI, LogLevel);
|
||||
|
||||
ReadyToSync = true;
|
||||
|
||||
foreach RepInfos(RepInfo)
|
||||
{
|
||||
if (RepInfo.PendingSync)
|
||||
{
|
||||
RepInfo.Replicate(WeapDefs);
|
||||
RepInfo.ServerSync();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -192,13 +189,19 @@ public function bool CreateRepInfo(Controller C)
|
||||
|
||||
if (RepInfo == None) return false;
|
||||
|
||||
RepInfo.PrepareSync(Self, LogLevel);
|
||||
RepInfo.PrepareSync(
|
||||
Self,
|
||||
LogLevel,
|
||||
RemoveItems,
|
||||
CfgRemoveItems.default.bAll,
|
||||
CfgRemoveItems.default.bHRG,
|
||||
CfgRemoveItems.default.bDLC);
|
||||
|
||||
RepInfos.AddItem(RepInfo);
|
||||
|
||||
if (ReadyToSync)
|
||||
{
|
||||
RepInfo.Replicate(WeapDefs);
|
||||
RepInfo.ServerSync();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -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)
|
||||
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
|
||||
{
|
||||
|
||||
}
|
||||
@ -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 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 DisconnectDefault;
|
||||
var private localized String Disconnect;
|
||||
|
||||
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_NoneGRI,
|
||||
LTI_NoneGRIWarning,
|
||||
LTI_SecondsShort,
|
||||
LTI_PleaseWait
|
||||
LTI_Disconnect,
|
||||
LTI_SecondsShort
|
||||
};
|
||||
|
||||
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:
|
||||
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_Disconnect:
|
||||
return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
|
||||
|
||||
case LTI_SecondsShort:
|
||||
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
|
||||
|
||||
case LTI_PleaseWait:
|
||||
return (default.PleaseWait != "" ? default.PleaseWait : default.PleaseWaitDefault);
|
||||
}
|
||||
|
||||
return "";
|
||||
@ -78,12 +64,10 @@ public static function String GetLocalizedString(
|
||||
|
||||
defaultproperties
|
||||
{
|
||||
SyncItemsDefault = "Sync items:"
|
||||
WaitingGRIDefault = "Waiting GRI..."
|
||||
IncompatibleGRIDefault = "Incompatible GRI:"
|
||||
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"
|
||||
SyncItemsDefault = "Sync items:"
|
||||
SyncFinishedDefault = "Sync finished."
|
||||
WaitingGRIDefault = "Waiting GRI..."
|
||||
IncompatibleGRIDefault = "Incompatible GRI:"
|
||||
DisconnectDefault = "Disconnect..."
|
||||
SecondsShortDefault = "s"
|
||||
}
|
||||
@ -1,25 +1,20 @@
|
||||
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;
|
||||
@ -30,16 +25,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, RemoveHRG, RemoveDLC, SyncSize;
|
||||
}
|
||||
|
||||
public simulated function bool SafeDestroy()
|
||||
@ -49,143 +39,23 @@ 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,
|
||||
bool _RemoveHRG,
|
||||
bool _RemoveDLC)
|
||||
{
|
||||
`Log_Trace();
|
||||
|
||||
LTI = _LTI;
|
||||
LogLevel = _LogLevel;
|
||||
}
|
||||
|
||||
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;
|
||||
RemoveItems = _RemoveItems;
|
||||
ReplaceMode = _ReplaceMode;
|
||||
RemoveHRG = _RemoveHRG;
|
||||
RemoveDLC = _RemoveDLC;
|
||||
SyncSize = RemoveItems.Length;
|
||||
}
|
||||
|
||||
private simulated function KFPlayerController GetKFPC()
|
||||
@ -204,39 +74,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 +113,6 @@ private simulated function ShowReadyButton()
|
||||
{
|
||||
`Log_Trace();
|
||||
|
||||
ClearTimer(nameof(KeepNotification));
|
||||
|
||||
if (CheckPartyInGameWidget())
|
||||
{
|
||||
Notification.SetVisible(false);
|
||||
@ -303,6 +138,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 +183,89 @@ private simulated function KeepNotification()
|
||||
NotificationPercent);
|
||||
}
|
||||
|
||||
private simulated function ClientCleanup()
|
||||
private simulated reliable client function ClientSyncFinished()
|
||||
{
|
||||
`Log_Debug("Cleanup");
|
||||
ServerCleanup();
|
||||
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();
|
||||
|
||||
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();
|
||||
|
||||
PendingSync = false;
|
||||
|
||||
if (bPendingDelete || bDeleteMe) return;
|
||||
|
||||
if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
|
||||
{
|
||||
SetTimer(0.1f, true, nameof(KeepNotification));
|
||||
`Log_Debug("ServerSync: Finished");
|
||||
ClientSyncFinished();
|
||||
}
|
||||
|
||||
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)))
|
||||
else
|
||||
{
|
||||
SetTimer(0.1f, true, nameof(KeepNotification));
|
||||
if (Recieved < RemoveItems.Length)
|
||||
{
|
||||
`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
|
||||
@ -388,9 +275,8 @@ defaultproperties
|
||||
bSkipActorPropertyReplication = false
|
||||
|
||||
PendingSync = false
|
||||
Recieved = 0
|
||||
|
||||
NotificationPercent = 0
|
||||
WaitingGRI = 0
|
||||
WaitingGRIThreshold = 10
|
||||
WaitingGRILimit = 20
|
||||
}
|
||||
|
||||
@ -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")
|
||||
}
|
||||
@ -75,7 +75,9 @@ 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();
|
||||
|
||||
@ -97,33 +99,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);
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,86 +1,65 @@
|
||||
[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]📋 Description[/h1]
|
||||
[h1]Features[/h1]
|
||||
[list]
|
||||
[*]remove items from trader.
|
||||
[/list]
|
||||
|
||||
[h1]Description[/h1]
|
||||
This is a heavily stripped-down version of [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239]CTI[/url] that only allows you to remove weapons, not add them.
|
||||
[url=https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239]CTI[/url] has no chance of being whitelisted, but this version has a chance because it can't add anything unbalanced to the game - and that's the only reason this version exists.
|
||||
If we're lucky with that then server operators will have more tools to fine-tune the server.
|
||||
|
||||
[h1]✨ Features[/h1]
|
||||
[list]
|
||||
[*]Remove items from trader
|
||||
[/list]
|
||||
[h1]Whitelisted?[/h1]
|
||||
[b]No.[/b] But I really hope that it will be whitelisted.
|
||||
|
||||
[h1]❌ Whitelisted?[/h1]
|
||||
No. This mod is not whitelisted and will de-rank your server. Any XP earned will not be saved.
|
||||
|
||||
But I hope that it will be whitelisted - I submitted whitelist request here:
|
||||
[b]⚠️ I submitted whitelist request here:[/b]
|
||||
https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-mutators.120340/post-2353665
|
||||
|
||||
[h1]🎮 Usage (single player)[/h1]
|
||||
[h1]Usage (single player)[/h1]
|
||||
[olist]
|
||||
[*]Subscribe to this mutator.
|
||||
[*]Create a file [b](*)[/b]: [code]C:\Users\<username>\Documents\My Games\KillingFloor2\KFGame\Config\KFLTI.ini[/code]
|
||||
with content:
|
||||
[code][LTI.LTI]
|
||||
Version=0[/code]
|
||||
[*]Launch KF2.
|
||||
[*]Open console (~) and start any map with the mutator (this will generate the default KFLTI.ini content):
|
||||
[code]open KF-BioticsLab?Mutator=LTI.Mut[/code]
|
||||
[*]Close the game and configure the mutator (see [b]⚙️ Setup (KFLTI.ini)[/b] below).
|
||||
[*]Launch KF2 again, open the console, and start the game:
|
||||
[code]open KF-BioticsLab?Game=KFGameContent.KFGameInfo_Survival?Difficulty=3?GameLength=2?Mutator=LTI.Mut[/code]
|
||||
(replace the map and set/add parameters you need).
|
||||
[*]Subscribe to this mutator;
|
||||
[*]Start KF2;
|
||||
[*]Open console (~) and input:
|
||||
[b]open KF-BioticsLab?Mutator=LTI.LTIMut[/b]
|
||||
(replace the map and add the parameters you need)
|
||||
[*]<Enter>.
|
||||
[/olist]
|
||||
|
||||
[h1]🖥️ Usage (server)[/h1]
|
||||
[b]Note:[/b] [i]If this is unclear, first read: [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server Guide (KF2 wiki)[/u][/url][/i]
|
||||
[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]
|
||||
[olist]
|
||||
[*]Open [b]PCServer-KFEngine.ini[/b] / [b]LinuxServer-KFEngine.ini[/b].
|
||||
[*]Find [b][IpDrv.TcpNetDriver][/b] section and ensure line exists (add if missing):
|
||||
[code]DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload[/code]
|
||||
(If there are several [b]DownloadManagers[/b] then the line above should be the first)
|
||||
[*]Open your [b]PCServer-KFEngine.ini[/b] / [b]LinuxServer-KFEngine.ini[/b];
|
||||
[*]Find the [b][IpDrv.TcpNetDriver][/b] section and make sure that there is a line (add if not):
|
||||
[b]DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload[/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):
|
||||
[code]ServerSubscribedWorkshopItems=2864857909[/code]
|
||||
[*]Start server and wait for mutator download.
|
||||
[*]When the download is complete, stop the server.
|
||||
[*]Create a file [b](*)[/b]: [code]<kf2-server>\KFGame\Config\KFLTI.ini[/code]
|
||||
with content:
|
||||
[code][LTI.LTI]
|
||||
Version=0[/code]
|
||||
[*]Add mutator to server start parameters: [code]?Mutator=LTI.Mut[/code] and start the server (this will generate the default KFLTI.ini content).
|
||||
[*]Stop the server and configure the mutator (see [b]⚙️ Setup (KFLTI.ini)[/b] below).
|
||||
[*]Start the server.
|
||||
[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.
|
||||
[/olist]
|
||||
|
||||
[h1]🐞 (*) Buggy config initialization[/h1]
|
||||
This mutator (like many others) relies on UnrealScript's default values (0 for int type) to detect first-time use and generate a config.
|
||||
However, the game contains a bug that initializes unset values to random data, which can lead to incorrect settings or missing configs.
|
||||
[h1]Important setup information[/h1]
|
||||
The config should be created on first start, but now the game contains a bug that initializes the config values randomly if they are not explicitly set. Thus, the config may have incorrect values or not be created at all.
|
||||
So if you are using this mutator for the first time, I highly recommend doing the following:
|
||||
[olist]
|
||||
[*]Create (modify) [b]KFLTI.ini[/b] manually. Put the following content there:
|
||||
[b][LTI.LTI]
|
||||
Version=0[/b]
|
||||
[*]Start the game/server with LTI to generate the contents of the config
|
||||
[*]Close the game/server
|
||||
[/olist]
|
||||
[b]Right now this is the only way to correctly create the default config.[/b]
|
||||
Unfortunately I can't do anything about it because it's a game problem (not mutator). I hope TWI fixes this someday.
|
||||
|
||||
As a workaround, I recommend explicitly setting [b]Version=0[/b] in the config during the first initialization.
|
||||
|
||||
Unfortunately, I can't fix this issue because it's a game engine problem (not the mutator's fault).
|
||||
|
||||
[h1]⚙️ Setup (KFLTI.ini)[/h1]
|
||||
[h1]Setup (KFLTI.ini)[/h1]
|
||||
[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]🌍 Credits[/h1]
|
||||
[list]
|
||||
[*]The cat on the cover is Meawbin (original character by [url=https://x.com/horrormove]Cotton Valent[/url]).
|
||||
[/list]
|
||||
[b]Translators:[/b]
|
||||
[list]
|
||||
[*][url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
|
||||
[/list]
|
||||
|
||||
[h1]☑️ Status: Completed[/h1]
|
||||
✔️ The mutator works with the current version of the game (v1150) and I have implemented everything I planned.
|
||||
⛔️ Development has stopped: I no longer have the time or motivation to maintain this mod. No further updates or bug fixes are planned.
|
||||
|
||||
[h1]📜 Sources[/h1]
|
||||
https://github.com/GenZmeY/KF2-LootedTraderInventory [b](GNU GPLv3)[/b]
|
||||
[h1]Sources[/h1]
|
||||
[url=https://github.com/GenZmeY/KF2-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b]
|
||||
|
||||
12
README.md
12
README.md
@ -3,17 +3,17 @@
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
|
||||
[](https://github.com/GenZmeY/KF2-LootedTraderInventory/actions/workflows/mega-linter.yml)
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
|
||||
[](https://github.com/GenZmeY/KF2-LootedTraderInventory/tags)
|
||||
[](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
|
||||
[GNU GPLv3](LICENSE)
|
||||
|
||||
2
tools
2
tools
@ -1 +1 @@
|
||||
Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f
|
||||
Subproject commit 0e821f3dbbc6b3528f2028b0060d3b6f7f1c4b93
|
||||
Loading…
x
Reference in New Issue
Block a user