Compare commits

..

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

23 changed files with 1014 additions and 1328 deletions

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

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"

View File

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

View File

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

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

View File

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

View File

@ -1,396 +1,282 @@
class LTI_RepInfo extends ReplicationInfo; class LTI_RepInfo extends ReplicationInfo;
const CAPACITY = 64; // max: 128 const Trader = class'Trader';
const LocalMessage = class'LTI_LocalMessage';
const Trader = class'Trader';
const LocalMessage = class'LTI_LocalMessage'; var public bool PendingSync;
struct ReplicationStruct var private LTI LTI;
{ var private E_LogLevel LogLevel;
var int Size; var private Array<class<KFWeaponDefinition> > RemoveItems;
var int Transfered; var private bool ReplaceMode;
var private bool RemoveHRG;
var class<KFWeaponDefinition> Items[CAPACITY]; var private bool RemoveDLC;
var int Length;
}; var private int Recieved;
var private int SyncSize;
var public bool PendingSync;
var private KFPlayerController KFPC;
var private LTI LTI; var private KFGFxWidget_PartyInGame PartyInGameWidget;
var private E_LogLevel LogLevel; var private GFxObject Notification;
var private GameReplicationInfo GRI; var private String NotificationHeaderText;
var private KFPlayerController KFPC; var private String NotificationLeftText;
var private KFGFxWidget_PartyInGame PartyInGameWidget; var private String NotificationRightText;
var private GFxObject Notification; var private int NotificationPercent;
var private String NotificationHeaderText; var private int WaitingGRI;
var private String NotificationLeftText;
var private String NotificationRightText; replication
var private int NotificationPercent; {
if (bNetInitial && Role == ROLE_Authority)
var private int WaitingGRI; LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
var private int WaitingGRIThreshold; }
var private int WaitingGRILimit;
public simulated function bool SafeDestroy()
var private ReplicationStruct RepData; {
var private Array<class<KFWeaponDefinition> > RepArray; `Log_Trace();
replication return (bPendingDelete || bDeleteMe || Destroy());
{ }
if (bNetInitial && Role == ROLE_Authority)
LogLevel; public function PrepareSync(
} LTI _LTI,
E_LogLevel _LogLevel,
public simulated function bool SafeDestroy() Array<class<KFWeaponDefinition> > _RemoveItems,
{ bool _ReplaceMode,
`Log_Trace(); bool _RemoveHRG,
bool _RemoveDLC)
return (bPendingDelete || bDeleteMe || Destroy()); {
} `Log_Trace();
public function PrepareSync(LTI _LTI, E_LogLevel _LogLevel) LTI = _LTI;
{ LogLevel = _LogLevel;
`Log_Trace(); RemoveItems = _RemoveItems;
ReplaceMode = _ReplaceMode;
LTI = _LTI; RemoveHRG = _RemoveHRG;
LogLevel = _LogLevel; RemoveDLC = _RemoveDLC;
} SyncSize = RemoveItems.Length;
}
public function Replicate(const out Array<class<KFWeaponDefinition> > WeapDefs)
{ private simulated function KFPlayerController GetKFPC()
`Log_Trace(); {
`Log_Trace();
RepArray = WeapDefs;
RepData.Size = RepArray.Length; if (KFPC != None) return KFPC;
if (WorldInfo.NetMode == NM_StandAlone) KFPC = KFPlayerController(Owner);
{
Progress(RepArray.Length, RepArray.Length); if (KFPC == None && ROLE < ROLE_Authority)
return; {
} KFPC = KFPlayerController(GetALocalPlayerController());
}
Sync();
} return KFPC;
}
private reliable server function Sync()
{ private simulated function SetPartyInGameWidget()
local int LocalIndex; {
local int GlobalIndex; `Log_Trace();
`Log_Trace(); if (GetKFPC() == None) return;
LocalIndex = 0; if (KFPC.MyGFxManager == None) return;
GlobalIndex = RepData.Transfered; if (KFPC.MyGFxManager.PartyWidget == None) return;
while (LocalIndex < CAPACITY && GlobalIndex < RepData.Size) PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
{ Notification = PartyInGameWidget.Notification;
RepData.Items[LocalIndex++] = RepArray[GlobalIndex++]; }
}
private simulated function bool CheckPartyInGameWidget()
if (RepData.Transfered == GlobalIndex) return; // Finished {
`Log_Trace();
RepData.Transfered = GlobalIndex;
RepData.Length = LocalIndex; if (PartyInGameWidget == None)
{
Send(RepData); SetPartyInGameWidget();
}
Progress(RepData.Transfered, RepData.Size);
} return (PartyInGameWidget != None);
}
private reliable client function Send(ReplicationStruct RD)
{ private simulated function HideReadyButton()
local int LocalIndex; {
`Log_Trace();
`Log_Trace();
if (CheckPartyInGameWidget())
for (LocalIndex = 0; LocalIndex < RD.Length; LocalIndex++) {
{ PartyInGameWidget.SetReadyButtonVisibility(false);
RepArray.AddItem(RD.Items[LocalIndex]); }
} }
Progress(RD.Transfered, RD.Size); private simulated function ShowReadyButton()
{
Sync(); `Log_Trace();
}
if (CheckPartyInGameWidget())
private simulated function Progress(int Value, int Size) {
{ Notification.SetVisible(false);
`Log_Trace(); PartyInGameWidget.SetReadyButtonVisibility(true);
PartyInGameWidget.UpdateReadyButtonText();
`Log_Debug("Replicated:" @ Value @ "/" @ Size); PartyInGameWidget.UpdateReadyButtonVisibility();
}
if (ROLE < ROLE_Authority) }
{
NotifyProgress(Value, Size); private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
if (Value >= Size) Finished(); {
} `Log_Trace();
}
if (CheckPartyInGameWidget() && Notification != None)
private simulated function Finished() {
{ Notification.SetString("itemName", Title);
local KFGameReplicationInfo KFGRI; Notification.SetFloat("percent", Percent);
Notification.SetInt("queue", 0);
`Log_Trace(); Notification.SetString("downLoading", Left);
Notification.SetString("remaining", Right);
if (GetGRI(WaitingGRI > WaitingGRIThreshold) == None && WaitingGRI++ < WaitingGRILimit) Notification.SetObject("notificationInfo", Notification);
{ Notification.SetVisible(true);
`Log_Debug("Finished: Waiting GRI" @ WaitingGRI); }
NotifyWaitingGRI(); }
SetTimer(1.0f, false, nameof(Finished));
return; private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef)
} {
`Log_Trace();
KFGRI = KFGameReplicationInfo(GRI);
if (KFGRI != None) if (WeapDef == None)
{ {
`Log_Debug("Finished: Trader.static.OverwriteTraderItems"); `Log_Fatal("WeapDef is:" @ WeapDef);
Trader.static.OverwriteTraderItems(KFGRI, RepArray, LogLevel); Cleanup();
`Log_Info("Trader items successfully synchronized!"); ConsoleCommand("Disconnect");
} SafeDestroy();
else return;
{ }
`Log_Error("Incompatible Game Replication info:" @ String(GRI));
if (GRI == None) if (!IsTimerActive(nameof(KeepNotification)))
{ {
NotifyNoneGRI(); SetTimer(0.1f, true, nameof(KeepNotification));
} }
else
{ RemoveItems.AddItem(WeapDef);
NotifyIncompatibleGRI();
} Recieved = RemoveItems.Length;
}
NotificationHeaderText = "-" @ WeapDef.static.GetItemName();
ShowReadyButton(); NotificationLeftText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
ClientCleanup(); NotificationRightText = Recieved @ "/" @ SyncSize;
} if (SyncSize != 0)
{
private simulated function GameReplicationInfo GetGRI(optional bool ForcedSearch = false) NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
{ }
`Log_Trace();
`Log_Debug("ClientSync: -" @ String(WeapDef) @ NotificationRightText);
if (GRI == None)
{ ServerSync();
GRI = WorldInfo.GRI; }
}
private simulated function KeepNotification()
if (GRI == None && ForcedSearch) {
{ HideReadyButton();
foreach WorldInfo.DynamicActors(class'GameReplicationInfo', GRI) break; UpdateNotification(
} NotificationHeaderText,
NotificationLeftText,
if (WorldInfo.GRI == None && GRI != None) NotificationRightText,
{ NotificationPercent);
`Log_Warn("Force initialization of WorldInfo.GRI" @ String(GRI)); }
WorldInfo.GRI = GRI;
} private simulated reliable client function ClientSyncFinished()
{
return GRI; local KFGameReplicationInfo KFGRI;
}
`Log_Trace();
private simulated function KFPlayerController GetKFPC()
{ NotificationLeftText = "";
`Log_Trace(); NotificationRightText = "";
NotificationPercent = 0;
if (KFPC != None) return KFPC;
if (WorldInfo.GRI == None)
KFPC = KFPlayerController(Owner); {
`Log_Debug("ClientSyncFinished: Waiting GRI");
if (KFPC == None && ROLE < ROLE_Authority) NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
{ NotificationLeftText = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
KFPC = KFPlayerController(GetALocalPlayerController()); NotificationRightText = "";
} SetTimer(1.0f, false, nameof(ClientSyncFinished));
return;
return KFPC; }
}
KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
public reliable client function WriteToChatLocalized( if (KFGRI == None)
E_LTI_LocalMessageType LMT, {
optional String HexColor, `Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
optional String String1, ClearTimer(nameof(KeepNotification));
optional String String2, UpdateNotification(
optional String String3) LocalMessage.static.GetLocalizedString(LogLevel, LTI_IncompatibleGRI) @ String(WorldInfo.GRI),
{ LocalMessage.static.GetLocalizedString(LogLevel, LTI_Disconnect), "", 0);
`Log_Trace(); Cleanup();
ConsoleCommand("Disconnect");
WriteToChat(LocalMessage.static.GetLocalizedString(LogLevel, LMT, String1, String2, String3), HexColor); SafeDestroy();
} return;
}
public reliable client function WriteToChat(String Message, optional String HexColor)
{ NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncFinished);
local KFGFxHudWrapper HUD; NotificationLeftText = "";
NotificationRightText = "";
`Log_Trace(); NotificationPercent = 0;
if (GetKFPC() == None) return; Trader.static.ModifyTrader(KFGRI, RemoveItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
{ ClearTimer(nameof(KeepNotification));
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true); ShowReadyButton();
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
} Cleanup();
HUD = KFGFxHudWrapper(KFPC.myHUD); SafeDestroy();
if (HUD != None && HUD.HUDMovie != None && HUD.HUDMovie.HudChatBox != None) }
{
HUD.HUDMovie.HudChatBox.AddChatMessage(Message, HexColor); private reliable server function Cleanup()
} {
} `Log_Trace();
private simulated function SetPartyInGameWidget() `Log_Debug("Cleanup");
{ if (!LTI.DestroyRepInfo(Controller(Owner)))
`Log_Trace(); {
`Log_Debug("Cleanup (forced)");
if (GetKFPC() == None) return; SafeDestroy();
}
if (KFPC.MyGFxManager == None) return; }
if (KFPC.MyGFxManager.PartyWidget == None) return;
public reliable server function ServerSync()
PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget); {
Notification = PartyInGameWidget.Notification; `Log_Trace();
}
PendingSync = false;
private simulated function bool CheckPartyInGameWidget()
{ if (bPendingDelete || bDeleteMe) return;
`Log_Trace();
if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
if (PartyInGameWidget == None) {
{ `Log_Debug("ServerSync: Finished");
SetPartyInGameWidget(); ClientSyncFinished();
} }
else
return (PartyInGameWidget != None); {
} if (Recieved < RemoveItems.Length)
{
private simulated function HideReadyButton() `Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
{ ClientSync(RemoveItems[Recieved++]);
`Log_Trace(); }
}
if (CheckPartyInGameWidget()) }
{
PartyInGameWidget.SetReadyButtonVisibility(false); defaultproperties
} {
} bAlwaysRelevant = false
bOnlyRelevantToOwner = true
private simulated function ShowReadyButton() bSkipActorPropertyReplication = false
{
`Log_Trace(); PendingSync = false
Recieved = 0
ClearTimer(nameof(KeepNotification));
NotificationPercent = 0
if (CheckPartyInGameWidget()) WaitingGRI = 0
{ }
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
}

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,15 +1,15 @@
// Logger // Logger
`define Log_Tag 'LTI' `define Log_Tag 'LTI'
`define LocationStatic "`{ClassName}::" $ GetFuncName() `define LocationStatic "`{ClassName}::" $ GetFuncName()
`define Log_Base(msg, cond) `log(`msg `if(`cond), `cond`{endif}, `Log_Tag) `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_Fatal(msg) `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal), `Log_Tag)
`define Log_Error(msg) `log("ERROR:" @ `msg, (LogLevel >= LL_Error), `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_Warn(msg) `log("WARN:" @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
`define Log_Info(msg) `log("INFO:" @ `msg, (LogLevel >= LL_Info), `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_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_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) `define Log_TraceStatic(msg) `log("TRACE:" @ `LocationStatic `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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] [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. 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. [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. If we're lucky with that then server operators will have more tools to fine-tune the server.
[h1]✨ Features[/h1] [h1]Whitelisted?[/h1]
[list] [b]No.[/b] But I really hope that it will be whitelisted.
[*]Remove items from trader
[/list]
[h1]❌ Whitelisted?[/h1] [b]⚠️ I submitted whitelist request here:[/b]
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:
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/post-2353665
[h1]🎮 Usage (single player)[/h1] [h1]Usage (single player)[/h1]
[olist] [olist]
[*]Subscribe to this mutator. [*]Subscribe to this mutator;
[*]Create a file [b](*)[/b]: [code]C:\Users\<username>\Documents\My Games\KillingFloor2\KFGame\Config\KFLTI.ini[/code] [*]Start KF2;
with content: [*]Open console (~) and input:
[code][LTI.LTI] [b]open KF-BioticsLab?Mutator=LTI.LTIMut[/b]
Version=0[/code] (replace the map and add the parameters you need)
[*]Launch KF2. [*]<Enter>.
[*]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).
[/olist] [/olist]
[h1]Usage (server)[/h1]
[h1]🖥️ Usage (server)[/h1] [b]Note:[/b] [i]If you don't understand what is written here, read the article [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server (KF2 wiki)[/u][/url] before following these instructions.[/i]
[b]Note:[/b] [i]If 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]
[olist] [olist]
[*]Open [b]PCServer-KFEngine.ini[/b] / [b]LinuxServer-KFEngine.ini[/b]. [*]Open your [b]PCServer-KFEngine.ini[/b] / [b]LinuxServer-KFEngine.ini[/b];
[*]Find [b][IpDrv.TcpNetDriver][/b] section and ensure line exists (add if missing): [*]Find the [b][IpDrv.TcpNetDriver][/b] section and make sure that there is a line (add if not):
[code]DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload[/code] [b]DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload[/b]
(If there are several [b]DownloadManagers[/b] then the line above should be the first) ❗️ If there are several [b]DownloadManagers=[/b] then the line above should be the first ❗️
[*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist): [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
[code]ServerSubscribedWorkshopItems=2864857909[/code] [b]ServerSubscribedWorkshopItems=2864857909[/b]
[*]Start server and wait for mutator download. [*]Start the server and wait until the mutator is downloading;
[*]When the download is complete, stop the server. [*]Add mutator to server start parameters: [b]?Mutator=LTI.LTIMut[/b] and restart 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.
[/olist] [/olist]
[h1]🐞 (*) Buggy config initialization[/h1] [h1]Important setup information[/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. 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.
However, the game contains a bug that initializes unset values to random data, which can lead to incorrect settings or missing configs. 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. [h1]Setup (KFLTI.ini)[/h1]
Unfortunately, I can't fix this issue because it's a game engine problem (not the mutator's fault).
[h1]⚙️ Setup (KFLTI.ini)[/h1]
[list] [list]
[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste) 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. [*]Use [b][LTI.RemoveItems][/b] to remove items from the trader inventory.
example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale. example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
[*]Set [b]bHRG=True[/b] to remove HRG items. [*]Set [b]bHRG=True[/b] to remove HRG items.
[*]Set [b]bDLC=True[/b] to remove DLC items. [*]Set [b]bDLC=True[/b] to remove DLC items.
[/list] [/list]
[h1]🌍 Credits[/h1] [h1]Sources[/h1]
[list] [url=https://github.com/GenZmeY/KF2-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b]
[*]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]

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 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 Downloads](https://img.shields.io/steam/downloads/2864857909)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909)
[![Steam Favorites](https://img.shields.io/steam/favorites/2864857909)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864857909) [![Steam 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 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) [![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. 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) [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. **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); 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: 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: 5. The compiled files will be here:
`C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\` `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
## License # License
[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE) [GNU GPLv3](LICENSE)

View File

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

2
tools

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