KillingFloor2/KF2-LootedTraderInventory
KillingFloor2/KF2-LootedTraderInventory
1
0
Fork 0
Code Releases 4 Activity

Compare commits

base: KillingFloor2:master
Branches Tags
KillingFloor2:master
KillingFloor2:gri-advice
KillingFloor2:short-name
KillingFloor2:v1.2.1
KillingFloor2:v1.2.0
KillingFloor2:v1.1.1
KillingFloor2:v1.1.0
KillingFloor2:v1.0.0
..
compare: KillingFloor2:v1.0.0
Branches Tags
KillingFloor2:master
KillingFloor2:gri-advice
KillingFloor2:short-name
KillingFloor2:v1.2.1
KillingFloor2:v1.2.0
KillingFloor2:v1.1.1
KillingFloor2:v1.1.0
KillingFloor2:v1.0.0

No commits in common. "master" and "v1.0.0" have entirely different histories.
master ... v1.0.0

23 changed files with 954 additions and 1298 deletions
Show Stats Expand all files Collapse all files

33
.editorconfig
View File

@ -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
View File

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

461
LTI/Classes/LTI.uc
View File

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

8
LTI/Classes/LTI.upkg
View File

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

61
LTI/Classes/LTIMut.uc
View File

@ -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
{
}

160
LTI/Classes/LTI_LocalMessage.uc
View File

@ -1,89 +1,73 @@
class LTI_LocalMessage extends Object
abstract;
var const String SyncItemsDefault;
var private localized String SyncItems;
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 SecondsShortDefault;
var private localized String SecondsShort;
var const String PleaseWaitDefault;
var private localized String PleaseWait;
enum E_LTI_LocalMessageType
{
LTI_SyncItems,
LTI_WaitingGRI,
LTI_IncompatibleGRI,
LTI_IncompatibleGRIWarning,
LTI_NoneGRI,
LTI_NoneGRIWarning,
LTI_SecondsShort,
LTI_PleaseWait
};
public static function String GetLocalizedString(
E_LogLevel LogLevel,
E_LTI_LocalMessageType LMT,
optional String String1,
optional String String2,
optional String String3)
{
`Log_TraceStatic();
switch (LMT)
{
case LTI_SyncItems:
return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
case LTI_WaitingGRI:
return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
case LTI_IncompatibleGRI:
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault) @ String1;
case LTI_IncompatibleGRIWarning:
return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
case LTI_NoneGRI:
return (default.NoneGRI != "" ? default.NoneGRI : default.NoneGRIDefault);
case LTI_NoneGRIWarning:
return (default.NoneGRIWarning != "" ? default.NoneGRIWarning : default.NoneGRIWarningDefault);
case LTI_SecondsShort:
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
case LTI_PleaseWait:
return (default.PleaseWait != "" ? default.PleaseWait : default.PleaseWaitDefault);
}
return "";
}
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"
class LTI_LocalMessage extends Object
abstract;
var const String SyncItemsDefault;
var private localized String SyncItems;
var const String SyncFinishedDefault;
var private localized String SyncFinished;
var const String WaitingGRIDefault;
var private localized String WaitingGRI;
var const String IncompatibleGRIDefault;
var private localized String IncompatibleGRI;
var const String DisconnectDefault;
var private localized String Disconnect;
var const String SecondsShortDefault;
var private localized String SecondsShort;
enum E_LTI_LocalMessageType
{
LTI_SyncItems,
LTI_SyncFinished,
LTI_WaitingGRI,
LTI_IncompatibleGRI,
LTI_Disconnect,
LTI_SecondsShort
};
public static function String GetLocalizedString(
E_LogLevel LogLevel,
E_LTI_LocalMessageType LMT,
optional String String1,
optional String String2,
optional String String3)
{
`Log_TraceStatic();
switch (LMT)
{
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);
case LTI_Disconnect:
return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
case LTI_SecondsShort:
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
}
return "";
}
defaultproperties
{
SyncItemsDefault = "Sync items:"
SyncFinishedDefault = "Sync finished."
WaitingGRIDefault = "Waiting GRI..."
IncompatibleGRIDefault = "Incompatible GRI:"
DisconnectDefault = "Disconnect..."
SecondsShortDefault = "s"
}

672
LTI/Classes/LTI_RepInfo.uc
View File

@ -1,396 +1,276 @@
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 GameReplicationInfo GRI;
var private KFPlayerController KFPC;
var private KFGFxWidget_PartyInGame PartyInGameWidget;
var private GFxObject Notification;
var private String NotificationHeaderText;
var private String NotificationLeftText;
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;
}
public simulated function bool SafeDestroy()
{
`Log_Trace();
return (bPendingDelete || bDeleteMe || Destroy());
}
public function PrepareSync(LTI _LTI, E_LogLevel _LogLevel)
{
`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;
}
private simulated function KFPlayerController GetKFPC()
{
`Log_Trace();
if (KFPC != None) return KFPC;
KFPC = KFPlayerController(Owner);
if (KFPC == None && ROLE < ROLE_Authority)
{
KFPC = KFPlayerController(GetALocalPlayerController());
}
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();
if (GetKFPC() == None) return;
if (KFPC.MyGFxManager == None) return;
if (KFPC.MyGFxManager.PartyWidget == None) return;
PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
Notification = PartyInGameWidget.Notification;
}
private simulated function bool CheckPartyInGameWidget()
{
`Log_Trace();
if (PartyInGameWidget == None)
{
SetPartyInGameWidget();
}
return (PartyInGameWidget != None);
}
private simulated function HideReadyButton()
{
`Log_Trace();
if (CheckPartyInGameWidget())
{
PartyInGameWidget.SetReadyButtonVisibility(false);
}
}
private simulated function ShowReadyButton()
{
`Log_Trace();
ClearTimer(nameof(KeepNotification));
if (CheckPartyInGameWidget())
{
Notification.SetVisible(false);
PartyInGameWidget.SetReadyButtonVisibility(true);
PartyInGameWidget.UpdateReadyButtonText();
PartyInGameWidget.UpdateReadyButtonVisibility();
}
}
private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
{
`Log_Trace();
if (CheckPartyInGameWidget() && Notification != None)
{
Notification.SetString("itemName", Title);
Notification.SetFloat("percent", Percent);
Notification.SetInt("queue", 0);
Notification.SetString("downLoading", Left);
Notification.SetString("remaining", Right);
Notification.SetObject("notificationInfo", Notification);
Notification.SetVisible(true);
}
}
private simulated function KeepNotification()
{
HideReadyButton();
UpdateNotification(
NotificationHeaderText,
NotificationLeftText,
NotificationRightText,
NotificationPercent);
}
private simulated function ClientCleanup()
{
`Log_Debug("Cleanup");
ServerCleanup();
SafeDestroy();
}
private reliable server function ServerCleanup()
{
`Log_Trace();
`Log_Debug("Cleanup");
if (!LTI.DestroyRepInfo(GetKFPC()))
{
`Log_Debug("Cleanup (forced)");
SafeDestroy();
}
}
private simulated function NotifyWaitingGRI()
{
if (!IsTimerActive(nameof(KeepNotification)))
{
SetTimer(0.1f, true, nameof(KeepNotification));
}
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
NotificationLeftText = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
NotificationRightText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_PleaseWait);
NotificationPercent = 0;
KeepNotification();
}
private simulated function NotifyProgress(int Value, int Size)
{
if (!IsTimerActive(nameof(KeepNotification)))
{
SetTimer(0.1f, true, nameof(KeepNotification));
}
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
NotificationLeftText = Value @ "/" @ Size;
NotificationRightText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_PleaseWait);
NotificationPercent = (float(Value) / float(Size)) * 100;
KeepNotification();
}
private simulated function NotifyIncompatibleGRI()
{
WriteToChatLocalized(
LTI_IncompatibleGRI,
class'KFLocalMessage'.default.InteractionColor,
String(GRI.class));
WriteToChatLocalized(
LTI_IncompatibleGRIWarning,
class'KFLocalMessage'.default.InteractionColor);
}
private simulated function NotifyNoneGRI()
{
WriteToChatLocalized(
LTI_NoneGRI,
class'KFLocalMessage'.default.InteractionColor);
WriteToChatLocalized(
LTI_NoneGRIWarning,
class'KFLocalMessage'.default.InteractionColor);
}
defaultproperties
{
bAlwaysRelevant = false
bOnlyRelevantToOwner = true
bSkipActorPropertyReplication = false
PendingSync = false
NotificationPercent = 0
WaitingGRI = 0
WaitingGRIThreshold = 10
WaitingGRILimit = 20
}
class LTI_RepInfo extends ReplicationInfo;
const Trader = class'Trader';
const LocalMessage = class'LTI_LocalMessage';
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 KFPlayerController KFPC;
var private KFGFxWidget_PartyInGame PartyInGameWidget;
var private GFxObject Notification;
var private String NotificationHeaderText;
var private String NotificationLeftText;
var private String NotificationRightText;
var private int NotificationPercent;
var private int WaitingGRI;
replication
{
if (bNetInitial && Role == ROLE_Authority)
LogLevel, ReplaceMode, SyncSize;
}
public simulated function bool SafeDestroy()
{
`Log_Trace();
return (bPendingDelete || bDeleteMe || Destroy());
}
public function PrepareSync(
LTI _LTI,
E_LogLevel _LogLevel,
Array<class<KFWeaponDefinition> > _RemoveItems,
bool _ReplaceMode)
{
`Log_Trace();
LTI = _LTI;
LogLevel = _LogLevel;
RemoveItems = _RemoveItems;
ReplaceMode = _ReplaceMode;
SyncSize = RemoveItems.Length;
}
private simulated function KFPlayerController GetKFPC()
{
`Log_Trace();
if (KFPC != None) return KFPC;
KFPC = KFPlayerController(Owner);
if (KFPC == None && ROLE < ROLE_Authority)
{
KFPC = KFPlayerController(GetALocalPlayerController());
}
return KFPC;
}
private simulated function SetPartyInGameWidget()
{
`Log_Trace();
if (GetKFPC() == None) return;
if (KFPC.MyGFxManager == None) return;
if (KFPC.MyGFxManager.PartyWidget == None) return;
PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
Notification = PartyInGameWidget.Notification;
}
private simulated function bool CheckPartyInGameWidget()
{
`Log_Trace();
if (PartyInGameWidget == None)
{
SetPartyInGameWidget();
}
return (PartyInGameWidget != None);
}
private simulated function HideReadyButton()
{
`Log_Trace();
if (CheckPartyInGameWidget())
{
PartyInGameWidget.SetReadyButtonVisibility(false);
}
}
private simulated function ShowReadyButton()
{
`Log_Trace();
if (CheckPartyInGameWidget())
{
Notification.SetVisible(false);
PartyInGameWidget.SetReadyButtonVisibility(true);
PartyInGameWidget.UpdateReadyButtonText();
PartyInGameWidget.UpdateReadyButtonVisibility();
}
}
private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
{
`Log_Trace();
if (CheckPartyInGameWidget() && Notification != None)
{
Notification.SetString("itemName", Title);
Notification.SetFloat("percent", Percent);
Notification.SetInt("queue", 0);
Notification.SetString("downLoading", Left);
Notification.SetString("remaining", Right);
Notification.SetObject("notificationInfo", Notification);
Notification.SetVisible(true);
}
}
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();
UpdateNotification(
NotificationHeaderText,
NotificationLeftText,
NotificationRightText,
NotificationPercent);
}
private simulated reliable client function ClientSyncFinished()
{
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, LogLevel);
`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
ClearTimer(nameof(KeepNotification));
ShowReadyButton();
Cleanup();
SafeDestroy();
}
private reliable server function Cleanup()
{
`Log_Trace();
`Log_Debug("Cleanup");
if (!LTI.DestroyRepInfo(Controller(Owner)))
{
`Log_Debug("Cleanup (forced)");
SafeDestroy();
}
}
public reliable server function ServerSync()
{
`Log_Trace();
PendingSync = false;
if (bPendingDelete || bDeleteMe) return;
if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
{
`Log_Debug("ServerSync: Finished");
ClientSyncFinished();
}
else
{
if (Recieved < RemoveItems.Length)
{
`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
ClientSync(RemoveItems[Recieved++]);
}
}
}
defaultproperties
{
bAlwaysRelevant = false
bOnlyRelevantToOwner = true
bSkipActorPropertyReplication = false
PendingSync = false
Recieved = 0
NotificationPercent = 0
WaitingGRI = 0
}

60
LTI/Classes/Mut.uc
View File

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

86
LTI/Classes/OfficialWeapons.uc
View File

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

193
LTI/Classes/RemoveItems.uc
View File

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

252
LTI/Classes/Trader.uc
View File

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

40
LTI/Classes/_Logger.uc
View File

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

4
LTI/Constants.uci
View File

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

6
LTI/Globals.uci
View File

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

30
LTI/Logger.uci
View File

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

BIN
Localization/CHN/LTI.chn
View File

Binary file not shown.

BIN
Localization/CHT/LTI.cht
View File

Binary file not shown.

BIN
Localization/INT/LTI.int
View File

Binary file not shown.

BIN
Localization/RUS/LTI.rus
View File

Binary file not shown.

52
PublicationContent/description.txt
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/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):
[b]open KF-BioticsLab?Mutator=LTI.Mut[/b]
[*]Close the game and configure LTI as you need (see the [b]Setup (KFLTI.ini)[/b] section below);
[*]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).
[*]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 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;
[*]When the download is complete, close 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.
[*]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][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]
[url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
[h1]Troubleshooting[/h1]
[b](*)[/b] If your config is not created for some reason, create it manually with the following content:
[b][LTI.LTI]
Version=0
[/b]
Then start the server and check the file again - config content should be generated.
[h1]Sources[/h1]
[url=https://github.com/GenZmeY/KF2-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b]

12
README.md
View File

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

6
builder.cfg
View File

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

2
tools

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