Compare commits

...

26 Commits

Author SHA1 Message Date
bf5e6e7b9c
update description.txt 2024-04-28 20:57:28 +03:00
bb8225bc8f
add CHN and CHT localizations
translator: cheungfatzong
https://steamcommunity.com/profiles/76561199126205919
2024-04-28 20:11:43 +03:00
e6ed3a4ebf
Update description.txt 2024-03-24 22:07:28 +03:00
85e235316c
Merge pull request #6 from GenZmeY/gri-advice
add advice in case of problems with GRI replication
2024-01-08 12:29:33 +03:00
10bd48e082
Merge pull request #5 from GenZmeY/short-name
add short alias for mutator
2024-01-08 12:26:49 +03:00
d55cc77e05
add advice in case of problems with GRI replication 2024-01-01 00:09:09 +03:00
7e2351c1c1
add short alias for mutator 2023-12-31 23:32:55 +03:00
6344c3b3e3
update ci/cd 2023-12-31 20:49:56 +03:00
e0f6ab61b0
try to force init WorldInfo.GRI if possible 2023-10-08 21:38:55 +03:00
2b45b7ae56
speed up item sync 2023-10-08 20:20:17 +03:00
9ab02e29a1
update megalinter ci/cd 2023-10-08 18:05:05 +03:00
f66b991b26
Merge pull request #4 from GenZmeY/group-names
add mutator group name
2023-06-29 22:59:47 +03:00
05e2ca250c
Merge pull request #3 from GenZmeY/waiting-gri-limit
add waiting GRI limit
2023-06-29 22:59:31 +03:00
281b10e427 add mutator group name 2023-06-03 17:05:37 +03:00
728e0b3be3 update .editorconfig 2023-05-14 12:19:55 +03:00
335ca77980 add waiting GRI limit 2023-05-14 03:47:20 +03:00
1af2ef0b80
Merge pull request #1 from GenZmeY/MegaLinter
Mega linter
2023-05-14 03:25:41 +03:00
f1f6478548 style fixes 2023-05-14 03:22:31 +03:00
3ffd4dcd15 update README.md 2023-05-14 03:19:05 +03:00
07a339f188 add MegaLinter 2023-05-14 03:13:43 +03:00
eb3965e68a add .editorconfig 2023-05-14 03:12:48 +03:00
36a61fd084 update build tools 2023-05-14 03:07:30 +03:00
7668a07a18
Update description.txt 2022-11-27 20:26:08 +03:00
65dc9f537b remove DLC and HRG 2022-11-27 20:08:16 +03:00
19d360ed46 update description 2022-10-01 21:21:38 +03:00
cde46735aa update description 2022-10-01 20:44:59 +03:00
23 changed files with 1298 additions and 954 deletions

33
.editorconfig Normal file
View File

@ -0,0 +1,33 @@
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 Normal file
View File

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

View File

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

View File

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

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

@ -0,0 +1,60 @@
class Mut extends KFMutator;
var private LTI LTI;
public simulated function bool SafeDestroy()
{
return (bPendingDelete || bDeleteMe || Destroy());
}
public event PreBeginPlay()
{
Super.PreBeginPlay();
if (WorldInfo.NetMode == NM_Client) return;
foreach WorldInfo.DynamicActors(class'LTI', LTI)
{
break;
}
if (LTI == None)
{
LTI = WorldInfo.Spawn(class'LTI');
}
if (LTI == None)
{
`Log_Base("FATAL: Can't Spawn 'LTI'");
SafeDestroy();
}
}
public function AddMutator(Mutator M)
{
if (M == Self) return;
if (M.Class == Class)
Mut(M).SafeDestroy();
else
Super.AddMutator(M);
}
public function NotifyLogin(Controller C)
{
LTI.NotifyLogin(C);
Super.NotifyLogin(C);
}
public function NotifyLogout(Controller C)
{
LTI.NotifyLogout(C);
Super.NotifyLogout(C);
}
DefaultProperties
{
GroupNames.Add("TraderItems")
}

View File

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

View File

@ -1,115 +1,137 @@
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,
E_LogLevel LogLevel) bool RemoveHRG,
{ bool RemoveDLC,
local KFGFxObject_TraderItems TraderItems; E_LogLevel LogLevel)
local STraderItem Item; {
local class<KFWeaponDefinition> WeapDef; local KFGFxObject_TraderItems TraderItems;
local Array<class<KFWeaponDefinition> > WeapDefs; local STraderItem Item;
local int MaxItemID; local Array<class<KFWeaponDefinition> > WeapDefs;
`Log_TraceStatic(); `Log_TraceStatic();
TraderItems = GetTraderItems(KFGRI, LogLevel); TraderItems = GetTraderItems(KFGRI, LogLevel);
if (!ReplaceMode) if (!ReplaceMode)
{ {
foreach TraderItems.SaleItems(Item) foreach TraderItems.SaleItems(Item)
{ {
if (Item.WeaponDef != None if (Item.WeaponDef != None
&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE) && RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
{ && (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
WeapDefs.AddItem(Item.WeaponDef); && (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None)))
} {
} WeapDefs.AddItem(Item.WeaponDef);
} }
}
WeapDefs.Sort(ByPrice); }
TraderItems.SaleItems.Length = 0; WeapDefs.Sort(ByPrice);
MaxItemID = 0;
foreach WeapDefs(WeapDef) OverwriteTraderItems(KFGRI, WeapDefs, LogLevel);
{ }
Item.WeaponDef = WeapDef;
Item.ItemID = ++MaxItemID; public static simulated function OverwriteTraderItems(
TraderItems.SaleItems.AddItem(Item); KFGameReplicationInfo KFGRI,
} const out Array<class<KFWeaponDefinition> > WeapDefs,
E_LogLevel LogLevel)
TraderItems.SetItemsInfo(TraderItems.SaleItems); {
local KFGFxObject_TraderItems TraderItems;
KFGRI.TraderItems = TraderItems; local STraderItem Item;
} local class<KFWeaponDefinition> WeapDef;
local int MaxItemID;
defaultproperties
{ `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
{
}

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)

BIN
Localization/CHN/LTI.chn Normal file

Binary file not shown.

BIN
Localization/CHT/LTI.cht Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +1,4 @@
[img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-LootedTraderInventory[/img] [img]https://img.shields.io/steam/downloads/2864857909[/img] [img]https://img.shields.io/steam/favorites/2864857909[/img] [img]https://img.shields.io/steam/update-date/2864857909[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2864857909][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-LootedTraderInventory[/img][/url] [img]https://img.shields.io/static/v1?logo=GitHub&labelColor=gray&color=blue&logoColor=white&label=&message=Open Source[/img] [img]https://img.shields.io/github/license/GenZmeY/KF2-LootedTraderInventory[/img] [img]https://img.shields.io/steam/favorites/2864857909[/img] [img]https://img.shields.io/steam/update-date/2864857909[/img] [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2864857909][img]https://img.shields.io/github/v/tag/GenZmeY/KF2-LootedTraderInventory[/img][/url]
[h1]Features[/h1] [h1]Features[/h1]
[list] [list]
@ -11,19 +11,25 @@ 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. If we're lucky with that then server operators will have more tools to fine-tune the server.
[h1]Whitelisted?[/h1] [h1]Whitelisted?[/h1]
No. But I really hope that it will be whitelisted. [b]No.[/b] But I really hope that it will be whitelisted.
[b]⚠️ I submitted whitelist request here:[/b] [b]⚠️ I submitted whitelist request here:[/b]
https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-mutators.120340/ 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;
[*]Start KF2; [*]Create a file [b](*)[/b]: [b]C:\Users\<username>\Documents\My Games\KillingFloor2\KFGame\Config\KFLTI.ini[/b]
[*]Open console (`) and input: with the following content:
[b]open KF-BioticsLab?Mutator=LTI.LTIMut[/b] [b][LTI.LTI]
(replace the map and add the parameters you need) Version=0[/b]
[*]<Enter>. [*]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).
[/olist] [/olist]
[h1]Usage (server)[/h1] [h1]Usage (server)[/h1]
[b]Note:[/b] [i]If you don't understand what is written here, read the article [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server (KF2 wiki)[/u][/url] before following these instructions.[/i] [b]Note:[/b] [i]If you don't understand what is written here, read the article [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server (KF2 wiki)[/u][/url] before following these instructions.[/i]
@ -34,25 +40,33 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
❗️ If there are several [b]DownloadManagers=[/b] then the line above should be the first ❗️ ❗️ If there are several [b]DownloadManagers=[/b] then the line above should be the first ❗️
[*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist): [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
[b]ServerSubscribedWorkshopItems=2864857909[/b] [b]ServerSubscribedWorkshopItems=2864857909[/b]
[*]Start the server and wait until the mutator is downloading; [*]Start the server and wait while the mutator is downloading;
[*]Add mutator to server start parameters: [b]?Mutator=LTI.LTIMut[/b] and restart the server. [*]When the download is complete, close the server;
[*]Create a file [b](*)[/b]: [b]<kf2-server>\KFGame\Config\KFLTI.ini[/b]
with the following content:
[b][LTI.LTI]
Version=0[/b]
[*]Add mutator to server start parameters: [b]?Mutator=LTI.Mut[/b] and start the server (this will generate the default KFLTI.ini content);
[*]Close the server and configure LTI as you need (see the [b]Setup (KFLTI.ini)[/b] section below);
[*]Start the server (with [b]?Mutator=LTI.Mut[/b]) again.
[/olist] [/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] [h1]Setup (KFLTI.ini)[/h1]
Config will be created at the first start[b]*[/b].
[list] [list]
[*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste). [*]Set [b]bOfficialWeaponsList=True[/b] to have an auto-updated list of all official weapons in the config (for a convenient copy-paste) or leave it [b]False[/b] if you want a clean config without unnecessary things.
[*]Use [b][LTI.RemoveItems][/b] to remove items from the trader inventory. [*]Use [b][LTI.RemoveItems][/b] to remove items from the trader inventory.
example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale. example: [b]Item=KFGame.KFWeapDef_Mac10[/b] will remove MAC10 from sale.
[*]Set [b]bHRG=True[/b] to remove HRG items.
[*]Set [b]bDLC=True[/b] to remove DLC items.
[/list] [/list]
[h1]Troubleshooting[/h1] [h1]Translators:[/h1]
[b](*)[/b] If your config is not created for some reason, create it manually with the following content: [url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
[b][LTI.LTI]
Version=0
[/b]
Then start the server and check the file again - config content should be generated.
[h1]Sources[/h1] [h1]Sources[/h1]
[url=https://github.com/GenZmeY/KF2-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b] [url=https://github.com/GenZmeY/KF2-LootedTraderInventory]https://github.com/GenZmeY/KF2-LootedTraderInventory[/url] [b](GNU GPLv3)[/b]

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)
[![Steam Update Date](https://img.shields.io/steam/update-date/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)
[![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
[GNU GPLv3](LICENSE) [![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](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 0e821f3dbbc6b3528f2028b0060d3b6f7f1c4b93 Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f