Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3580be6ea7 | |||
| 09561e64cc | |||
| 69162ab37b | |||
| f2bd4d165c | |||
| 94cf543d41 | |||
| 45d327fc81 | |||
| 6f06033e3c | |||
| 0cbd5deb47 | |||
| d6a64d6932 | |||
| 406c785cf1 | |||
| f99b8cdb39 | |||
| 227c5f470f | |||
| d6db549eaa | |||
| cc6482a9ed | |||
| 334fe3e9ba | |||
| 94a4368842 | |||
| 22862616c0 | |||
| 6c3d9f094e | |||
| 8c3ed68acb | |||
| 89c7eccb6f | |||
| f7d86b4492 | |||
| c25366d207 | |||
| f9b70d8066 | |||
| 95871b2f89 | |||
| 11768dfbc2 | |||
| cc55913e5a | |||
| eb33a6e1ff |
33
.editorconfig
Normal file
33
.editorconfig
Normal 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
|
||||||
72
.github/workflows/mega-linter.yml
vendored
Normal file
72
.github/workflows/mega-linter.yml
vendored
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
---
|
||||||
|
name: MegaLinter
|
||||||
|
|
||||||
|
permissions: read-all
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
|
branches: [master]
|
||||||
|
|
||||||
|
env:
|
||||||
|
APPLY_FIXES: none
|
||||||
|
APPLY_FIXES_EVENT: pull_request
|
||||||
|
APPLY_FIXES_MODE: commit
|
||||||
|
DISABLE: SPELL
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.ref }}-${{ github.workflow }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: MegaLinter
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Code
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: MegaLinter
|
||||||
|
id: ml
|
||||||
|
uses: oxsecurity/megalinter@v6
|
||||||
|
env:
|
||||||
|
VALIDATE_ALL_CODEBASE: true
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Archive production artifacts
|
||||||
|
if: ${{ success() }} || ${{ failure() }}
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: MegaLinter reports
|
||||||
|
path: |
|
||||||
|
megalinter-reports
|
||||||
|
mega-linter.log
|
||||||
|
|
||||||
|
- name: Create Pull Request with applied fixes
|
||||||
|
id: cpr
|
||||||
|
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
|
uses: peter-evans/create-pull-request@v5
|
||||||
|
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: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
|
run: |
|
||||||
|
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
||||||
|
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
||||||
|
|
||||||
|
- name: Prepare commit
|
||||||
|
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
|
run: sudo chown -Rc $UID .git/
|
||||||
|
- name: Commit and push applied linter fixes
|
||||||
|
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
|
uses: stefanzweifel/git-auto-commit-action@v4
|
||||||
|
with:
|
||||||
|
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
|
||||||
|
commit_message: "[MegaLinter] Apply linters fixes"
|
||||||
|
commit_user_name: megalinter-bot
|
||||||
|
commit_user_email: nicolas.vuillamy@ox.security
|
||||||
@ -1,79 +1,79 @@
|
|||||||
class AddItems extends Object
|
class AddItems extends Object
|
||||||
dependson(CTI)
|
dependson(CTI)
|
||||||
config(CTI);
|
config(CTI);
|
||||||
|
|
||||||
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();
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LatestVersion != Version)
|
if (LatestVersion != Version)
|
||||||
{
|
{
|
||||||
StaticSaveConfig();
|
StaticSaveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function ApplyDefault()
|
private static function ApplyDefault()
|
||||||
{
|
{
|
||||||
default.Item.Length = 0;
|
default.Item.Length = 0;
|
||||||
default.Item.AddItem("SomePackage.SomeWeapon");
|
default.Item.AddItem("SomePackage.SomeWeapon");
|
||||||
}
|
}
|
||||||
|
|
||||||
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 add:");
|
`Log_Info("Load Items to add:");
|
||||||
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 add list loaded successfully (" $ default.Item.Length @ "entries)");
|
`Log_Info("Items to add list loaded successfully (" $ default.Item.Length @ "entries)");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
`Log_Info("Items to add list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
|
`Log_Info("Items to add list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
|
||||||
}
|
}
|
||||||
|
|
||||||
return ItemList;
|
return ItemList;
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,316 +1,327 @@
|
|||||||
class CTI extends Info
|
class CTI extends Info
|
||||||
config(CTI);
|
config(CTI);
|
||||||
|
|
||||||
const LatestVersion = 2;
|
const LatestVersion = 3;
|
||||||
|
|
||||||
const CfgRemoveItems = class'RemoveItems';
|
const CfgRemoveItems = class'RemoveItems';
|
||||||
const CfgAddItems = class'AddItems';
|
const CfgAddItems = class'AddItems';
|
||||||
const CfgOfficialWeapons = class'OfficialWeapons';
|
const CfgOfficialWeapons = class'OfficialWeapons';
|
||||||
const Trader = class'Trader';
|
const Trader = class'Trader';
|
||||||
const Unlocker = class'Unlocker';
|
const Unlocker = class'Unlocker';
|
||||||
|
|
||||||
struct S_PreloadContent
|
struct S_PreloadContent
|
||||||
{
|
{
|
||||||
var class<KFWeaponDefinition> KFWD;
|
var class<KFWeaponDefinition> KFWD;
|
||||||
var class<KFWeapon> KFWC;
|
var class<KFWeapon> KFWC;
|
||||||
var KFWeapon KFW;
|
var KFWeapon KFW;
|
||||||
var KFW_Access KFWA;
|
var KFW_Access KFWA;
|
||||||
};
|
};
|
||||||
|
|
||||||
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 String UnlockDLC;
|
var private config String UnlockDLC;
|
||||||
var private config bool bPreloadContent;
|
var private config bool bPreloadContent;
|
||||||
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> > RemoveItems;
|
||||||
var private Array<class<KFWeaponDefinition> > AddItems;
|
var private Array<class<KFWeaponDefinition> > AddItems;
|
||||||
|
|
||||||
var private Array<CTI_RepInfo> RepInfos;
|
var private Array<CTI_RepInfo> RepInfos;
|
||||||
|
|
||||||
var private bool ReadyToSync;
|
var private bool ReadyToSync;
|
||||||
|
|
||||||
var private Array<S_PreloadContent> PreloadContent;
|
var private Array<S_PreloadContent> PreloadContent;
|
||||||
|
|
||||||
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;
|
||||||
bPreloadContent = true;
|
bPreloadContent = true;
|
||||||
UnlockDLC = "False";
|
UnlockDLC = "False";
|
||||||
SaveConfig();
|
SaveConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
CfgRemoveItems.static.InitConfig(Version, LatestVersion);
|
CfgRemoveItems.static.InitConfig(Version, LatestVersion);
|
||||||
CfgAddItems.static.InitConfig(Version, LatestVersion);
|
CfgAddItems.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:
|
||||||
bOfficialWeaponsList = false;
|
bOfficialWeaponsList = false;
|
||||||
|
|
||||||
case MaxInt:
|
case 2:
|
||||||
`Log_Info("Config updated to version" @ LatestVersion);
|
|
||||||
break;
|
case MaxInt:
|
||||||
|
`Log_Info("Config updated to version" @ LatestVersion);
|
||||||
case LatestVersion:
|
break;
|
||||||
`Log_Info("Config is up-to-date");
|
|
||||||
break;
|
case LatestVersion:
|
||||||
|
`Log_Info("Config is up-to-date");
|
||||||
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);
|
default:
|
||||||
`Log_Warn("The config version will be changed to" @ LatestVersion);
|
`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);
|
||||||
|
break;
|
||||||
CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
|
}
|
||||||
|
|
||||||
if (LatestVersion != Version)
|
CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
|
||||||
{
|
|
||||||
Version = LatestVersion;
|
if (LatestVersion != Version)
|
||||||
SaveConfig();
|
{
|
||||||
}
|
Version = LatestVersion;
|
||||||
|
SaveConfig();
|
||||||
if (LogLevel == LL_WrongLevel)
|
}
|
||||||
{
|
|
||||||
LogLevel = LL_Info;
|
if (LogLevel == LL_WrongLevel)
|
||||||
`Log_Warn("Wrong 'LogLevel', return to default value");
|
{
|
||||||
SaveConfig();
|
LogLevel = LL_Info;
|
||||||
}
|
`Log_Warn("Wrong 'LogLevel', return to default value");
|
||||||
`Log_Base("LogLevel:" @ LogLevel);
|
SaveConfig();
|
||||||
|
}
|
||||||
if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
|
`Log_Base("LogLevel:" @ LogLevel);
|
||||||
{
|
|
||||||
`Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)");
|
if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
|
||||||
UnlockDLC = "False";
|
{
|
||||||
SaveConfig();
|
`Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)");
|
||||||
}
|
UnlockDLC = "False";
|
||||||
|
SaveConfig();
|
||||||
RemoveItems = CfgRemoveItems.static.Load(LogLevel);
|
}
|
||||||
AddItems = CfgAddItems.static.Load(LogLevel);
|
|
||||||
}
|
RemoveItems = CfgRemoveItems.static.Load(LogLevel);
|
||||||
|
AddItems = CfgAddItems.static.Load(LogLevel);
|
||||||
private function PostInit()
|
}
|
||||||
{
|
|
||||||
local CTI_RepInfo RepInfo;
|
private function PostInit()
|
||||||
|
{
|
||||||
`Log_Trace();
|
local CTI_RepInfo RepInfo;
|
||||||
|
|
||||||
if (WorldInfo == None || WorldInfo.Game == None)
|
`Log_Trace();
|
||||||
{
|
|
||||||
SetTimer(1.0f, false, nameof(PostInit));
|
if (WorldInfo == None || WorldInfo.Game == None)
|
||||||
return;
|
{
|
||||||
}
|
SetTimer(1.0f, false, nameof(PostInit));
|
||||||
|
return;
|
||||||
KFGI = KFGameInfo(WorldInfo.Game);
|
}
|
||||||
if (KFGI == None)
|
|
||||||
{
|
KFGI = KFGameInfo(WorldInfo.Game);
|
||||||
`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
|
if (KFGI == None)
|
||||||
SafeDestroy();
|
{
|
||||||
return;
|
`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
|
||||||
}
|
SafeDestroy();
|
||||||
|
return;
|
||||||
if (KFGI.GameReplicationInfo == None)
|
}
|
||||||
{
|
|
||||||
SetTimer(1.0f, false, nameof(PostInit));
|
if (KFGI.GameReplicationInfo == None)
|
||||||
return;
|
{
|
||||||
}
|
SetTimer(1.0f, false, nameof(PostInit));
|
||||||
|
return;
|
||||||
KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
|
}
|
||||||
if (KFGRI == None)
|
|
||||||
{
|
KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
|
||||||
`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
|
if (KFGRI == None)
|
||||||
SafeDestroy();
|
{
|
||||||
return;
|
`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
|
||||||
}
|
SafeDestroy();
|
||||||
|
return;
|
||||||
if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel))
|
}
|
||||||
{
|
|
||||||
`Log_Info("DLC unlocked");
|
if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel))
|
||||||
}
|
{
|
||||||
|
`Log_Info("DLC unlocked");
|
||||||
if (bPreloadContent)
|
}
|
||||||
{
|
|
||||||
Preload(AddItems);
|
if (bPreloadContent)
|
||||||
}
|
{
|
||||||
|
Preload(AddItems);
|
||||||
Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, CfgRemoveItems.default.bAll, LogLevel);
|
}
|
||||||
|
|
||||||
ReadyToSync = true;
|
Trader.static.ModifyTrader(
|
||||||
|
KFGRI,
|
||||||
foreach RepInfos(RepInfo)
|
RemoveItems,
|
||||||
{
|
AddItems,
|
||||||
if (RepInfo.PendingSync)
|
CfgRemoveItems.default.bAll,
|
||||||
{
|
CfgRemoveItems.default.bHRG,
|
||||||
RepInfo.ServerSync();
|
CfgRemoveItems.default.bDLC,
|
||||||
}
|
LogLevel);
|
||||||
}
|
|
||||||
}
|
ReadyToSync = true;
|
||||||
|
|
||||||
private function Preload(Array<class<KFWeaponDefinition> > Content)
|
foreach RepInfos(RepInfo)
|
||||||
{
|
{
|
||||||
local Array<class<KFWeapon> > OfficialWeapons;
|
if (RepInfo.PendingSync)
|
||||||
local S_PreloadContent SPC;
|
{
|
||||||
|
RepInfo.ServerSync();
|
||||||
`Log_Trace();
|
}
|
||||||
|
}
|
||||||
OfficialWeapons = Trader.static.GetTraderWeapons();
|
}
|
||||||
|
|
||||||
foreach Content(SPC.KFWD)
|
private function Preload(Array<class<KFWeaponDefinition> > Content)
|
||||||
{
|
{
|
||||||
SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
|
local Array<class<KFWeapon> > OfficialWeapons;
|
||||||
if (SPC.KFWC != None)
|
local S_PreloadContent SPC;
|
||||||
{
|
|
||||||
if (OfficialWeapons.Find(SPC.KFWC) != INDEX_NONE)
|
`Log_Trace();
|
||||||
{
|
|
||||||
`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
|
OfficialWeapons = Trader.static.GetTraderWeapons();
|
||||||
continue;
|
|
||||||
}
|
foreach Content(SPC.KFWD)
|
||||||
|
{
|
||||||
SPC.KFW = KFGI.Spawn(SPC.KFWC);
|
SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
|
||||||
if (SPC.KFW == None)
|
if (SPC.KFWC != None)
|
||||||
{
|
{
|
||||||
`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
|
if (OfficialWeapons.Find(SPC.KFWC) != INDEX_NONE)
|
||||||
continue;
|
{
|
||||||
}
|
`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
|
||||||
|
continue;
|
||||||
SPC.KFWA = new (SPC.KFW) class'KFW_Access';
|
}
|
||||||
if (SPC.KFWA == None)
|
|
||||||
{
|
SPC.KFW = KFGI.Spawn(SPC.KFWC);
|
||||||
`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
|
if (SPC.KFW == None)
|
||||||
continue;
|
{
|
||||||
}
|
`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
|
||||||
|
continue;
|
||||||
PreloadContent.AddItem(SPC);
|
}
|
||||||
}
|
|
||||||
}
|
SPC.KFWA = new (SPC.KFW) class'KFW_Access';
|
||||||
|
if (SPC.KFWA == None)
|
||||||
foreach PreloadContent(SPC)
|
{
|
||||||
{
|
`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
|
||||||
SPC.KFWA.KFW_StartLoadWeaponContent();
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
|
PreloadContent.AddItem(SPC);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function NotifyLogin(Controller C)
|
|
||||||
{
|
foreach PreloadContent(SPC)
|
||||||
`Log_Trace();
|
{
|
||||||
|
SPC.KFWA.KFW_StartLoadWeaponContent();
|
||||||
if (!CreateRepInfo(C))
|
}
|
||||||
{
|
|
||||||
`Log_Error("Can't create RepInfo for:" @ C);
|
`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function NotifyLogin(Controller C)
|
||||||
public function NotifyLogout(Controller C)
|
{
|
||||||
{
|
`Log_Trace();
|
||||||
`Log_Trace();
|
|
||||||
|
if (!CreateRepInfo(C))
|
||||||
DestroyRepInfo(C);
|
{
|
||||||
}
|
`Log_Error("Can't create RepInfo for:" @ C);
|
||||||
|
}
|
||||||
public function bool CreateRepInfo(Controller C)
|
}
|
||||||
{
|
|
||||||
local CTI_RepInfo RepInfo;
|
public function NotifyLogout(Controller C)
|
||||||
|
{
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
if (C == None) return false;
|
DestroyRepInfo(C);
|
||||||
|
}
|
||||||
RepInfo = Spawn(class'CTI_RepInfo', C);
|
|
||||||
|
public function bool CreateRepInfo(Controller C)
|
||||||
if (RepInfo == None) return false;
|
{
|
||||||
|
local CTI_RepInfo RepInfo;
|
||||||
RepInfo.PrepareSync(
|
|
||||||
Self,
|
`Log_Trace();
|
||||||
LogLevel,
|
|
||||||
RemoveItems,
|
if (C == None) return false;
|
||||||
AddItems,
|
|
||||||
CfgRemoveItems.default.bAll);
|
RepInfo = Spawn(class'CTI_RepInfo', C);
|
||||||
|
|
||||||
RepInfos.AddItem(RepInfo);
|
if (RepInfo == None) return false;
|
||||||
|
|
||||||
if (ReadyToSync)
|
RepInfo.PrepareSync(
|
||||||
{
|
Self,
|
||||||
RepInfo.ServerSync();
|
LogLevel,
|
||||||
}
|
RemoveItems,
|
||||||
else
|
AddItems,
|
||||||
{
|
CfgRemoveItems.default.bAll,
|
||||||
RepInfo.PendingSync = true;
|
CfgRemoveItems.default.bHRG,
|
||||||
}
|
CfgRemoveItems.default.bDLC);
|
||||||
|
|
||||||
return true;
|
RepInfos.AddItem(RepInfo);
|
||||||
}
|
|
||||||
|
if (ReadyToSync)
|
||||||
public function bool DestroyRepInfo(Controller C)
|
{
|
||||||
{
|
RepInfo.ServerSync();
|
||||||
local CTI_RepInfo RepInfo;
|
}
|
||||||
|
else
|
||||||
`Log_Trace();
|
{
|
||||||
|
RepInfo.PendingSync = true;
|
||||||
if (C == None) return false;
|
}
|
||||||
|
|
||||||
foreach RepInfos(RepInfo)
|
return true;
|
||||||
{
|
}
|
||||||
if (RepInfo.Owner == C)
|
|
||||||
{
|
public function bool DestroyRepInfo(Controller C)
|
||||||
RepInfos.RemoveItem(RepInfo);
|
{
|
||||||
RepInfo.SafeDestroy();
|
local CTI_RepInfo RepInfo;
|
||||||
return true;
|
|
||||||
}
|
`Log_Trace();
|
||||||
}
|
|
||||||
|
if (C == None) return false;
|
||||||
return false;
|
|
||||||
}
|
foreach RepInfos(RepInfo)
|
||||||
|
{
|
||||||
DefaultProperties
|
if (RepInfo.Owner == C)
|
||||||
{
|
{
|
||||||
ReadyToSync = false
|
RepInfos.RemoveItem(RepInfo);
|
||||||
|
RepInfo.SafeDestroy();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
DefaultProperties
|
||||||
|
{
|
||||||
|
ReadyToSync = false
|
||||||
}
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
[Flags]
|
[Flags]
|
||||||
AllowDownload=True
|
AllowDownload=True
|
||||||
ClientOptional=False
|
ClientOptional=False
|
||||||
ServerSideOnly=False
|
ServerSideOnly=False
|
||||||
|
|||||||
@ -1,60 +1,60 @@
|
|||||||
class CTIMut extends KFMutator;
|
class CTIMut extends KFMutator;
|
||||||
|
|
||||||
var private CTI CTI;
|
var private CTI CTI;
|
||||||
|
|
||||||
public simulated function bool SafeDestroy()
|
public simulated function bool SafeDestroy()
|
||||||
{
|
{
|
||||||
return (bPendingDelete || bDeleteMe || Destroy());
|
return (bPendingDelete || bDeleteMe || Destroy());
|
||||||
}
|
}
|
||||||
|
|
||||||
public event PreBeginPlay()
|
public event PreBeginPlay()
|
||||||
{
|
{
|
||||||
Super.PreBeginPlay();
|
Super.PreBeginPlay();
|
||||||
|
|
||||||
if (WorldInfo.NetMode == NM_Client) return;
|
if (WorldInfo.NetMode == NM_Client) return;
|
||||||
|
|
||||||
foreach WorldInfo.DynamicActors(class'CTI', CTI)
|
foreach WorldInfo.DynamicActors(class'CTI', CTI)
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CTI == None)
|
if (CTI == None)
|
||||||
{
|
{
|
||||||
CTI = WorldInfo.Spawn(class'CTI');
|
CTI = WorldInfo.Spawn(class'CTI');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CTI == None)
|
if (CTI == None)
|
||||||
{
|
{
|
||||||
`Log_Base("FATAL: Can't Spawn 'CTI'");
|
`Log_Base("FATAL: Can't Spawn 'CTI'");
|
||||||
SafeDestroy();
|
SafeDestroy();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function AddMutator(Mutator Mut)
|
public function AddMutator(Mutator Mut)
|
||||||
{
|
{
|
||||||
if (Mut == Self) return;
|
if (Mut == Self) return;
|
||||||
|
|
||||||
if (Mut.Class == Class)
|
if (Mut.Class == Class)
|
||||||
Mut.Destroy();
|
CTIMut(Mut).SafeDestroy();
|
||||||
else
|
else
|
||||||
Super.AddMutator(Mut);
|
Super.AddMutator(Mut);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function NotifyLogin(Controller C)
|
public function NotifyLogin(Controller C)
|
||||||
{
|
{
|
||||||
CTI.NotifyLogin(C);
|
CTI.NotifyLogin(C);
|
||||||
|
|
||||||
Super.NotifyLogin(C);
|
Super.NotifyLogin(C);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function NotifyLogout(Controller C)
|
public function NotifyLogout(Controller C)
|
||||||
{
|
{
|
||||||
CTI.NotifyLogout(C);
|
CTI.NotifyLogout(C);
|
||||||
|
|
||||||
Super.NotifyLogout(C);
|
Super.NotifyLogout(C);
|
||||||
}
|
}
|
||||||
|
|
||||||
DefaultProperties
|
DefaultProperties
|
||||||
{
|
{
|
||||||
|
GroupNames.Add("TraderItems")
|
||||||
}
|
}
|
||||||
@ -1,8 +1,8 @@
|
|||||||
class CTI_GFxMenu_Trader extends KFGFxMenu_Trader
|
class CTI_GFxMenu_Trader extends KFGFxMenu_Trader
|
||||||
dependsOn(CTI_GFxTraderContainer_Store);
|
dependsOn(CTI_GFxTraderContainer_Store);
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SubWidgetBindings.Remove((WidgetName="shopContainer",WidgetClass=class'KFGFxTraderContainer_Store'))
|
SubWidgetBindings.Remove((WidgetName="shopContainer",WidgetClass=class'KFGFxTraderContainer_Store'))
|
||||||
SubWidgetBindings.Add((WidgetName="shopContainer",WidgetClass=class'CTI_GFxTraderContainer_Store'))
|
SubWidgetBindings.Add((WidgetName="shopContainer",WidgetClass=class'CTI_GFxTraderContainer_Store'))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
class CTI_GFxMoviePlayer_Manager extends KFGFxMoviePlayer_Manager
|
class CTI_GFxMoviePlayer_Manager extends KFGFxMoviePlayer_Manager
|
||||||
dependsOn(CTI_GFxMenu_Trader);
|
dependsOn(CTI_GFxMenu_Trader);
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
|
WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
|
||||||
WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
|
WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
class CTI_GFxMoviePlayer_Manager_Versus extends KFGFxMoviePlayer_Manager_Versus
|
class CTI_GFxMoviePlayer_Manager_Versus extends KFGFxMoviePlayer_Manager_Versus
|
||||||
dependsOn(CTI_GFxMenu_Trader);
|
dependsOn(CTI_GFxMenu_Trader);
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
|
WidgetBindings.Remove((WidgetName="traderMenu",WidgetClass=class'KFGFxMenu_Trader'))
|
||||||
WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
|
WidgetBindings.Add((WidgetName="traderMenu",WidgetClass=class'CTI_GFxMenu_Trader'))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,20 +1,20 @@
|
|||||||
class CTI_GFxTraderContainer_Store extends KFGFxTraderContainer_Store;
|
class CTI_GFxTraderContainer_Store extends KFGFxTraderContainer_Store;
|
||||||
|
|
||||||
function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
|
function bool IsItemFiltered(STraderItem Item, optional bool bDebug)
|
||||||
{
|
{
|
||||||
if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.ClassName))
|
if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.ClassName))
|
||||||
return true;
|
return true;
|
||||||
if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.DualClassName))
|
if (KFPC.GetPurchaseHelper().IsInOwnedItemList(Item.DualClassName))
|
||||||
return true;
|
return true;
|
||||||
if (!KFPC.GetPurchaseHelper().IsSellable(Item))
|
if (!KFPC.GetPurchaseHelper().IsSellable(Item))
|
||||||
return true;
|
return true;
|
||||||
if (Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted(Item.WeaponDef.default.PlatformRestriction))
|
if (Item.WeaponDef.default.PlatformRestriction != PR_All && class'KFUnlockManager'.static.IsPlatformRestricted(Item.WeaponDef.default.PlatformRestriction))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,73 +1,65 @@
|
|||||||
class CTI_LocalMessage extends Object
|
class CTI_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 SecondsShortDefault;
|
||||||
var private localized String Disconnect;
|
var private localized String SecondsShort;
|
||||||
|
|
||||||
var const String SecondsShortDefault;
|
enum E_CTI_LocalMessageType
|
||||||
var private localized String SecondsShort;
|
{
|
||||||
|
CTI_SyncItems,
|
||||||
enum E_CTI_LocalMessageType
|
CTI_WaitingGRI,
|
||||||
{
|
CTI_IncompatibleGRI,
|
||||||
CTI_SyncItems,
|
CTI_IncompatibleGRIWarning,
|
||||||
CTI_SyncFinished,
|
CTI_SecondsShort
|
||||||
CTI_WaitingGRI,
|
};
|
||||||
CTI_IncompatibleGRI,
|
|
||||||
CTI_Disconnect,
|
public static function String GetLocalizedString(
|
||||||
CTI_SecondsShort
|
E_LogLevel LogLevel,
|
||||||
};
|
E_CTI_LocalMessageType LMT,
|
||||||
|
optional String String1,
|
||||||
public static function String GetLocalizedString(
|
optional String String2,
|
||||||
E_LogLevel LogLevel,
|
optional String String3)
|
||||||
E_CTI_LocalMessageType LMT,
|
{
|
||||||
optional String String1,
|
`Log_TraceStatic();
|
||||||
optional String String2,
|
|
||||||
optional String String3)
|
switch (LMT)
|
||||||
{
|
{
|
||||||
`Log_TraceStatic();
|
case CTI_SyncItems:
|
||||||
|
return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
|
||||||
switch (LMT)
|
|
||||||
{
|
case CTI_WaitingGRI:
|
||||||
case CTI_SyncItems:
|
return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
|
||||||
return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
|
|
||||||
|
case CTI_IncompatibleGRI:
|
||||||
case CTI_SyncFinished:
|
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault) @ String1;
|
||||||
return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
|
|
||||||
|
case CTI_IncompatibleGRIWarning:
|
||||||
case CTI_WaitingGRI:
|
return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
|
||||||
return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
|
|
||||||
|
case CTI_SecondsShort:
|
||||||
case CTI_IncompatibleGRI:
|
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
|
||||||
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
|
}
|
||||||
|
|
||||||
case CTI_Disconnect:
|
return "";
|
||||||
return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
|
}
|
||||||
|
|
||||||
case CTI_SecondsShort:
|
defaultproperties
|
||||||
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
|
{
|
||||||
}
|
SyncItemsDefault = "Sync items:"
|
||||||
|
WaitingGRIDefault = "Waiting GRI..."
|
||||||
return "";
|
IncompatibleGRIDefault = "Incompatible GRI:"
|
||||||
}
|
IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
|
||||||
|
SecondsShortDefault = "s"
|
||||||
defaultproperties
|
|
||||||
{
|
|
||||||
SyncItemsDefault = "Sync items:"
|
|
||||||
SyncFinishedDefault = "Sync finished."
|
|
||||||
WaitingGRIDefault = "Waiting GRI..."
|
|
||||||
IncompatibleGRIDefault = "Incompatible GRI:"
|
|
||||||
DisconnectDefault = "Disconnect..."
|
|
||||||
SecondsShortDefault = "s"
|
|
||||||
}
|
}
|
||||||
@ -1,292 +1,330 @@
|
|||||||
class CTI_RepInfo extends ReplicationInfo;
|
class CTI_RepInfo extends ReplicationInfo;
|
||||||
|
|
||||||
const Trader = class'Trader';
|
const Trader = class'Trader';
|
||||||
const LocalMessage = class'CTI_LocalMessage';
|
const LocalMessage = class'CTI_LocalMessage';
|
||||||
|
|
||||||
var public bool PendingSync;
|
var public bool PendingSync;
|
||||||
|
|
||||||
var private CTI CTI;
|
var private CTI CTI;
|
||||||
var private E_LogLevel LogLevel;
|
var private E_LogLevel LogLevel;
|
||||||
var private Array<class<KFWeaponDefinition> > RemoveItems;
|
var private Array<class<KFWeaponDefinition> > RemoveItems;
|
||||||
var private Array<class<KFWeaponDefinition> > AddItems;
|
var private Array<class<KFWeaponDefinition> > AddItems;
|
||||||
var private bool ReplaceMode;
|
var private bool ReplaceMode;
|
||||||
var private bool PreloadContent;
|
var private bool RemoveHRG;
|
||||||
|
var private bool RemoveDLC;
|
||||||
var private int Recieved;
|
var private bool PreloadContent;
|
||||||
var private int SyncSize;
|
|
||||||
|
var private int Recieved;
|
||||||
var private KFPlayerController KFPC;
|
var private int SyncSize;
|
||||||
var private KFGFxWidget_PartyInGame PartyInGameWidget;
|
|
||||||
var private GFxObject Notification;
|
var private KFPlayerController KFPC;
|
||||||
|
var private KFGFxWidget_PartyInGame PartyInGameWidget;
|
||||||
var private String NotificationHeaderText;
|
var private GFxObject Notification;
|
||||||
var private String NotificationLeftText;
|
|
||||||
var private String NotificationRightText;
|
var private String NotificationHeaderText;
|
||||||
var private int NotificationPercent;
|
var private String NotificationLeftText;
|
||||||
|
var private String NotificationRightText;
|
||||||
var private int WaitingGRI;
|
var private int NotificationPercent;
|
||||||
|
|
||||||
replication
|
var private int WaitingGRI;
|
||||||
{
|
var private int WaitingGRILimit;
|
||||||
if (bNetInitial && Role == ROLE_Authority)
|
|
||||||
LogLevel, ReplaceMode, SyncSize;
|
replication
|
||||||
}
|
{
|
||||||
|
if (bNetInitial && Role == ROLE_Authority)
|
||||||
public simulated function bool SafeDestroy()
|
LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
|
||||||
{
|
}
|
||||||
`Log_Trace();
|
|
||||||
|
public simulated function bool SafeDestroy()
|
||||||
return (bPendingDelete || bDeleteMe || Destroy());
|
{
|
||||||
}
|
`Log_Trace();
|
||||||
|
|
||||||
public function PrepareSync(
|
return (bPendingDelete || bDeleteMe || Destroy());
|
||||||
CTI _CTI,
|
}
|
||||||
E_LogLevel _LogLevel,
|
|
||||||
Array<class<KFWeaponDefinition> > _RemoveItems,
|
public function PrepareSync(
|
||||||
Array<class<KFWeaponDefinition> > _AddItems,
|
CTI _CTI,
|
||||||
bool _ReplaceMode)
|
E_LogLevel _LogLevel,
|
||||||
{
|
Array<class<KFWeaponDefinition> > _RemoveItems,
|
||||||
`Log_Trace();
|
Array<class<KFWeaponDefinition> > _AddItems,
|
||||||
|
bool _ReplaceMode,
|
||||||
CTI = _CTI;
|
bool _RemoveHRG,
|
||||||
LogLevel = _LogLevel;
|
bool _RemoveDLC)
|
||||||
RemoveItems = _RemoveItems;
|
{
|
||||||
AddItems = _AddItems;
|
`Log_Trace();
|
||||||
ReplaceMode = _ReplaceMode;
|
|
||||||
SyncSize = RemoveItems.Length + AddItems.Length;
|
CTI = _CTI;
|
||||||
}
|
LogLevel = _LogLevel;
|
||||||
|
RemoveItems = _RemoveItems;
|
||||||
private simulated function KFPlayerController GetKFPC()
|
AddItems = _AddItems;
|
||||||
{
|
ReplaceMode = _ReplaceMode;
|
||||||
`Log_Trace();
|
RemoveHRG = _RemoveHRG;
|
||||||
|
RemoveDLC = _RemoveDLC;
|
||||||
if (KFPC != None) return KFPC;
|
SyncSize = RemoveItems.Length + AddItems.Length;
|
||||||
|
}
|
||||||
KFPC = KFPlayerController(Owner);
|
|
||||||
|
private simulated function KFPlayerController GetKFPC()
|
||||||
if (KFPC == None && ROLE < ROLE_Authority)
|
{
|
||||||
{
|
`Log_Trace();
|
||||||
KFPC = KFPlayerController(GetALocalPlayerController());
|
|
||||||
}
|
if (KFPC != None) return KFPC;
|
||||||
|
|
||||||
return KFPC;
|
KFPC = KFPlayerController(Owner);
|
||||||
}
|
|
||||||
|
if (KFPC == None && ROLE < ROLE_Authority)
|
||||||
private simulated function SetPartyInGameWidget()
|
{
|
||||||
{
|
KFPC = KFPlayerController(GetALocalPlayerController());
|
||||||
`Log_Trace();
|
}
|
||||||
|
|
||||||
if (GetKFPC() == None) return;
|
return KFPC;
|
||||||
|
}
|
||||||
if (KFPC.MyGFxManager == None) return;
|
|
||||||
if (KFPC.MyGFxManager.PartyWidget == None) return;
|
public reliable client function WriteToChatLocalized(
|
||||||
|
E_CTI_LocalMessageType LMT,
|
||||||
PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
|
optional String HexColor,
|
||||||
Notification = PartyInGameWidget.Notification;
|
optional String String1,
|
||||||
}
|
optional String String2,
|
||||||
|
optional String String3)
|
||||||
private simulated function bool CheckPartyInGameWidget()
|
{
|
||||||
{
|
`Log_Trace();
|
||||||
`Log_Trace();
|
|
||||||
|
WriteToChat(LocalMessage.static.GetLocalizedString(LogLevel, LMT, String1, String2, String3), HexColor);
|
||||||
if (PartyInGameWidget == None)
|
}
|
||||||
{
|
|
||||||
SetPartyInGameWidget();
|
public reliable client function WriteToChat(String Message, optional String HexColor)
|
||||||
}
|
{
|
||||||
|
local KFGFxHudWrapper HUD;
|
||||||
return (PartyInGameWidget != None);
|
|
||||||
}
|
`Log_Trace();
|
||||||
|
|
||||||
private simulated function HideReadyButton()
|
if (GetKFPC() == None) return;
|
||||||
{
|
|
||||||
`Log_Trace();
|
if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
|
||||||
|
{
|
||||||
if (CheckPartyInGameWidget())
|
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
|
||||||
{
|
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
|
||||||
PartyInGameWidget.SetReadyButtonVisibility(false);
|
}
|
||||||
}
|
|
||||||
}
|
HUD = KFGFxHudWrapper(KFPC.myHUD);
|
||||||
|
if (HUD != None && HUD.HUDMovie != None && HUD.HUDMovie.HudChatBox != None)
|
||||||
private simulated function ShowReadyButton()
|
{
|
||||||
{
|
HUD.HUDMovie.HudChatBox.AddChatMessage(Message, HexColor);
|
||||||
`Log_Trace();
|
}
|
||||||
|
}
|
||||||
if (CheckPartyInGameWidget())
|
|
||||||
{
|
private simulated function SetPartyInGameWidget()
|
||||||
Notification.SetVisible(false);
|
{
|
||||||
PartyInGameWidget.SetReadyButtonVisibility(true);
|
`Log_Trace();
|
||||||
PartyInGameWidget.UpdateReadyButtonText();
|
|
||||||
PartyInGameWidget.UpdateReadyButtonVisibility();
|
if (GetKFPC() == None) return;
|
||||||
}
|
|
||||||
}
|
if (KFPC.MyGFxManager == None) return;
|
||||||
|
if (KFPC.MyGFxManager.PartyWidget == None) return;
|
||||||
private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
|
|
||||||
{
|
PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
|
||||||
`Log_Trace();
|
Notification = PartyInGameWidget.Notification;
|
||||||
|
}
|
||||||
if (CheckPartyInGameWidget() && Notification != None)
|
|
||||||
{
|
private simulated function bool CheckPartyInGameWidget()
|
||||||
Notification.SetString("itemName", Title);
|
{
|
||||||
Notification.SetFloat("percent", Percent);
|
`Log_Trace();
|
||||||
Notification.SetInt("queue", 0);
|
|
||||||
Notification.SetString("downLoading", Left);
|
if (PartyInGameWidget == None)
|
||||||
Notification.SetString("remaining", Right);
|
{
|
||||||
Notification.SetObject("notificationInfo", Notification);
|
SetPartyInGameWidget();
|
||||||
Notification.SetVisible(true);
|
}
|
||||||
}
|
|
||||||
}
|
return (PartyInGameWidget != None);
|
||||||
|
}
|
||||||
private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
|
|
||||||
{
|
private simulated function HideReadyButton()
|
||||||
`Log_Trace();
|
{
|
||||||
|
`Log_Trace();
|
||||||
if (WeapDef == None)
|
|
||||||
{
|
if (CheckPartyInGameWidget())
|
||||||
`Log_Fatal("WeapDef is:" @ WeapDef);
|
{
|
||||||
Cleanup();
|
PartyInGameWidget.SetReadyButtonVisibility(false);
|
||||||
ConsoleCommand("Disconnect");
|
}
|
||||||
SafeDestroy();
|
}
|
||||||
return;
|
|
||||||
}
|
private simulated function ShowReadyButton()
|
||||||
|
{
|
||||||
if (!IsTimerActive(nameof(KeepNotification)))
|
`Log_Trace();
|
||||||
{
|
|
||||||
SetTimer(0.1f, true, nameof(KeepNotification));
|
if (CheckPartyInGameWidget())
|
||||||
}
|
{
|
||||||
|
Notification.SetVisible(false);
|
||||||
if (Remove)
|
PartyInGameWidget.SetReadyButtonVisibility(true);
|
||||||
{
|
PartyInGameWidget.UpdateReadyButtonText();
|
||||||
RemoveItems.AddItem(WeapDef);
|
PartyInGameWidget.UpdateReadyButtonVisibility();
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
{
|
|
||||||
AddItems.AddItem(WeapDef);
|
private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
|
||||||
}
|
{
|
||||||
|
`Log_Trace();
|
||||||
Recieved = RemoveItems.Length + AddItems.Length;
|
|
||||||
|
if (CheckPartyInGameWidget() && Notification != None)
|
||||||
NotificationHeaderText = (Remove ? "-" : "+") @ WeapDef.static.GetItemName();
|
{
|
||||||
NotificationLeftText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
|
Notification.SetString("itemName", Title);
|
||||||
NotificationRightText = Recieved @ "/" @ SyncSize;
|
Notification.SetFloat("percent", Percent);
|
||||||
if (SyncSize != 0)
|
Notification.SetInt("queue", 0);
|
||||||
{
|
Notification.SetString("downLoading", Left);
|
||||||
NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
|
Notification.SetString("remaining", Right);
|
||||||
}
|
Notification.SetObject("notificationInfo", Notification);
|
||||||
|
Notification.SetVisible(true);
|
||||||
`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
|
}
|
||||||
|
}
|
||||||
ServerSync();
|
|
||||||
}
|
private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
|
||||||
|
{
|
||||||
private simulated function KeepNotification()
|
`Log_Trace();
|
||||||
{
|
|
||||||
HideReadyButton();
|
if (WeapDef == None)
|
||||||
UpdateNotification(
|
{
|
||||||
NotificationHeaderText,
|
`Log_Fatal("WeapDef is:" @ WeapDef);
|
||||||
NotificationLeftText,
|
Cleanup();
|
||||||
NotificationRightText,
|
ConsoleCommand("Disconnect");
|
||||||
NotificationPercent);
|
SafeDestroy();
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
private simulated reliable client function ClientSyncFinished()
|
|
||||||
{
|
if (!IsTimerActive(nameof(KeepNotification)))
|
||||||
local KFGameReplicationInfo KFGRI;
|
{
|
||||||
|
SetTimer(0.1f, true, nameof(KeepNotification));
|
||||||
`Log_Trace();
|
}
|
||||||
|
|
||||||
NotificationLeftText = "";
|
if (Remove)
|
||||||
NotificationRightText = "";
|
{
|
||||||
NotificationPercent = 0;
|
RemoveItems.AddItem(WeapDef);
|
||||||
|
}
|
||||||
if (WorldInfo.GRI == None)
|
else
|
||||||
{
|
{
|
||||||
`Log_Debug("ClientSyncFinished: Waiting GRI");
|
AddItems.AddItem(WeapDef);
|
||||||
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
|
}
|
||||||
NotificationLeftText = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
|
|
||||||
NotificationRightText = "";
|
Recieved = RemoveItems.Length + AddItems.Length;
|
||||||
SetTimer(1.0f, false, nameof(ClientSyncFinished));
|
|
||||||
return;
|
NotificationHeaderText = (Remove ? "-" : "+") @ WeapDef.static.GetItemName();
|
||||||
}
|
NotificationLeftText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
|
||||||
|
NotificationRightText = Recieved @ "/" @ SyncSize;
|
||||||
KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
|
if (SyncSize != 0)
|
||||||
if (KFGRI == None)
|
{
|
||||||
{
|
NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
|
||||||
`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
|
}
|
||||||
ClearTimer(nameof(KeepNotification));
|
|
||||||
UpdateNotification(
|
`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
|
||||||
LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI),
|
|
||||||
LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0);
|
ServerSync();
|
||||||
Cleanup();
|
}
|
||||||
ConsoleCommand("Disconnect");
|
|
||||||
SafeDestroy();
|
private simulated function KeepNotification()
|
||||||
return;
|
{
|
||||||
}
|
HideReadyButton();
|
||||||
|
UpdateNotification(
|
||||||
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished);
|
NotificationHeaderText,
|
||||||
NotificationLeftText = "";
|
NotificationLeftText,
|
||||||
NotificationRightText = "";
|
NotificationRightText,
|
||||||
NotificationPercent = 0;
|
NotificationPercent);
|
||||||
|
}
|
||||||
Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, LogLevel);
|
|
||||||
`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
|
private simulated reliable client function ClientSyncFinished()
|
||||||
|
{
|
||||||
ClearTimer(nameof(KeepNotification));
|
local KFGameReplicationInfo KFGRI;
|
||||||
ShowReadyButton();
|
|
||||||
|
`Log_Trace();
|
||||||
Cleanup();
|
|
||||||
|
if (WorldInfo.GRI == None && WaitingGRI++ < WaitingGRILimit)
|
||||||
SafeDestroy();
|
{
|
||||||
}
|
`Log_Debug("ClientSyncFinished: Waiting GRI" @ WaitingGRI);
|
||||||
|
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
|
||||||
private reliable server function Cleanup()
|
NotificationLeftText = String(WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
|
||||||
{
|
NotificationRightText = "";
|
||||||
`Log_Trace();
|
NotificationPercent = 0;
|
||||||
|
SetTimer(1.0f, false, nameof(ClientSyncFinished));
|
||||||
`Log_Debug("Cleanup");
|
return;
|
||||||
if (!CTI.DestroyRepInfo(Controller(Owner)))
|
}
|
||||||
{
|
|
||||||
`Log_Debug("Cleanup (forced)");
|
NotificationHeaderText = "";
|
||||||
SafeDestroy();
|
NotificationLeftText = "";
|
||||||
}
|
NotificationRightText = "";
|
||||||
}
|
NotificationPercent = 0;
|
||||||
|
|
||||||
public reliable server function ServerSync()
|
KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
|
||||||
{
|
if (KFGRI != None)
|
||||||
`Log_Trace();
|
{
|
||||||
|
`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
|
||||||
PendingSync = false;
|
Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
|
||||||
|
}
|
||||||
if (bPendingDelete || bDeleteMe) return;
|
else
|
||||||
|
{
|
||||||
if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
|
`Log_Error("Incompatible Replication info:" @ String(WorldInfo.GRI));
|
||||||
{
|
WriteToChatLocalized(
|
||||||
`Log_Debug("ServerSync: Finished");
|
CTI_IncompatibleGRI,
|
||||||
ClientSyncFinished();
|
class'KFLocalMessage'.default.InteractionColor,
|
||||||
}
|
WorldInfo.GRI == None ? "None" : String(WorldInfo.GRI.class));
|
||||||
else
|
WriteToChatLocalized(
|
||||||
{
|
CTI_IncompatibleGRIWarning,
|
||||||
if (Recieved < RemoveItems.Length)
|
class'KFLocalMessage'.default.InteractionColor);
|
||||||
{
|
}
|
||||||
`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
|
|
||||||
ClientSync(RemoveItems[Recieved++], true);
|
ClearTimer(nameof(KeepNotification));
|
||||||
}
|
ShowReadyButton();
|
||||||
else
|
|
||||||
{
|
Cleanup();
|
||||||
`Log_Debug("ServerSync[+]:" @ (Recieved + 1) @ "/" @ SyncSize @ AddItems[Recieved - RemoveItems.Length]);
|
SafeDestroy();
|
||||||
ClientSync(AddItems[Recieved++ - RemoveItems.Length], false);
|
}
|
||||||
}
|
|
||||||
}
|
private reliable server function Cleanup()
|
||||||
}
|
{
|
||||||
|
`Log_Trace();
|
||||||
defaultproperties
|
|
||||||
{
|
`Log_Debug("Cleanup");
|
||||||
bAlwaysRelevant = false
|
if (!CTI.DestroyRepInfo(Controller(Owner)))
|
||||||
bOnlyRelevantToOwner = true
|
{
|
||||||
bSkipActorPropertyReplication = false
|
`Log_Debug("Cleanup (forced)");
|
||||||
|
SafeDestroy();
|
||||||
PendingSync = false
|
}
|
||||||
Recieved = 0
|
}
|
||||||
|
|
||||||
NotificationPercent = 0
|
public reliable server function ServerSync()
|
||||||
WaitingGRI = 0
|
{
|
||||||
}
|
`Log_Trace();
|
||||||
|
|
||||||
|
PendingSync = false;
|
||||||
|
|
||||||
|
if (bPendingDelete || bDeleteMe) return;
|
||||||
|
|
||||||
|
if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
|
||||||
|
{
|
||||||
|
`Log_Debug("ServerSync: Finished");
|
||||||
|
ClientSyncFinished();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (Recieved < RemoveItems.Length)
|
||||||
|
{
|
||||||
|
`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
|
||||||
|
ClientSync(RemoveItems[Recieved++], true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
`Log_Debug("ServerSync[+]:" @ (Recieved + 1) @ "/" @ SyncSize @ AddItems[Recieved - RemoveItems.Length]);
|
||||||
|
ClientSync(AddItems[Recieved++ - RemoveItems.Length], false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
defaultproperties
|
||||||
|
{
|
||||||
|
bAlwaysRelevant = false
|
||||||
|
bOnlyRelevantToOwner = true
|
||||||
|
bSkipActorPropertyReplication = false
|
||||||
|
|
||||||
|
PendingSync = false
|
||||||
|
Recieved = 0
|
||||||
|
|
||||||
|
NotificationPercent = 0
|
||||||
|
WaitingGRI = 0
|
||||||
|
WaitingGRILimit = 15
|
||||||
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_AutoTurret extends KFWeapDef_AutoTurret
|
class CTI_WeapDef_AutoTurret extends KFWeapDef_AutoTurret
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_BladedPistol extends KFWeapDef_BladedPistol
|
class CTI_WeapDef_BladedPistol extends KFWeapDef_BladedPistol
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Blunderbuss extends KFWeapDef_Blunderbuss
|
class CTI_WeapDef_Blunderbuss extends KFWeapDef_Blunderbuss
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_ChainBat extends KFWeapDef_ChainBat
|
class CTI_WeapDef_ChainBat extends KFWeapDef_ChainBat
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_ChiappaRhino extends KFWeapDef_ChiappaRhino
|
class CTI_WeapDef_ChiappaRhino extends KFWeapDef_ChiappaRhino
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_ChiappaRhinoDual extends KFWeapDef_ChiappaRhinoDual
|
class CTI_WeapDef_ChiappaRhinoDual extends KFWeapDef_ChiappaRhinoDual
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_CompoundBow extends KFWeapDef_CompoundBow
|
class CTI_WeapDef_CompoundBow extends KFWeapDef_CompoundBow
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Doshinegun extends KFWeapDef_Doshinegun
|
class CTI_WeapDef_Doshinegun extends KFWeapDef_Doshinegun
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_DualBladed extends KFWeapDef_DualBladed
|
class CTI_WeapDef_DualBladed extends KFWeapDef_DualBladed
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_FAMAS extends KFWeapDef_FAMAS
|
class CTI_WeapDef_FAMAS extends KFWeapDef_FAMAS
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_G18 extends KFWeapDef_G18
|
class CTI_WeapDef_G18 extends KFWeapDef_G18
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
7
CTI/Classes/CTI_WeapDef_G36C.uc
Normal file
7
CTI/Classes/CTI_WeapDef_G36C.uc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
class CTI_WeapDef_G36C extends KFWeapDef_G36C
|
||||||
|
abstract;
|
||||||
|
|
||||||
|
defaultproperties
|
||||||
|
{
|
||||||
|
SharedUnlockId = SCU_None
|
||||||
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_GravityImploder extends KFWeapDef_GravityImploder
|
class CTI_WeapDef_GravityImploder extends KFWeapDef_GravityImploder
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
7
CTI/Classes/CTI_WeapDef_HVStormCannon.uc
Normal file
7
CTI/Classes/CTI_WeapDef_HVStormCannon.uc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
class CTI_WeapDef_HVStormCannon extends KFWeapDef_HVStormCannon
|
||||||
|
abstract;
|
||||||
|
|
||||||
|
defaultproperties
|
||||||
|
{
|
||||||
|
SharedUnlockId = SCU_None
|
||||||
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_IonThruster extends KFWeapDef_IonThruster
|
class CTI_WeapDef_IonThruster extends KFWeapDef_IonThruster
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Mine_Reconstructor extends KFWeapDef_Mine_Reconstructor
|
class CTI_WeapDef_Mine_Reconstructor extends KFWeapDef_Mine_Reconstructor
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Minigun extends KFWeapDef_Minigun
|
class CTI_WeapDef_Minigun extends KFWeapDef_Minigun
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_MosinNagant extends KFWeapDef_MosinNagant
|
class CTI_WeapDef_MosinNagant extends KFWeapDef_MosinNagant
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_ParasiteImplanter extends KFWeapDef_ParasiteImplanter
|
class CTI_WeapDef_ParasiteImplanter extends KFWeapDef_ParasiteImplanter
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Pistol_DualG18 extends KFWeapDef_Pistol_DualG18
|
class CTI_WeapDef_Pistol_DualG18 extends KFWeapDef_Pistol_DualG18
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Pistol_G18C extends KFWeapDef_Pistol_G18C
|
class CTI_WeapDef_Pistol_G18C extends KFWeapDef_Pistol_G18C
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Rifle_FrostShotgunAxe extends KFWeapDef_Rifle_FrostShotgunAxe
|
class CTI_WeapDef_Rifle_FrostShotgunAxe extends KFWeapDef_Rifle_FrostShotgunAxe
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
7
CTI/Classes/CTI_WeapDef_Scythe.uc
Normal file
7
CTI/Classes/CTI_WeapDef_Scythe.uc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
class CTI_WeapDef_Scythe extends KFWeapDef_Scythe
|
||||||
|
abstract;
|
||||||
|
|
||||||
|
defaultproperties
|
||||||
|
{
|
||||||
|
SharedUnlockId = SCU_None
|
||||||
|
}
|
||||||
7
CTI/Classes/CTI_WeapDef_Shotgun_S12.uc
Normal file
7
CTI/Classes/CTI_WeapDef_Shotgun_S12.uc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
class CTI_WeapDef_Shotgun_S12 extends KFWeapDef_Shotgun_S12
|
||||||
|
abstract;
|
||||||
|
|
||||||
|
defaultproperties
|
||||||
|
{
|
||||||
|
SharedUnlockId = SCU_None
|
||||||
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_ShrinkRayGun extends KFWeapDef_ShrinkRayGun
|
class CTI_WeapDef_ShrinkRayGun extends KFWeapDef_ShrinkRayGun
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_ThermiteBore extends KFWeapDef_ThermiteBore
|
class CTI_WeapDef_ThermiteBore extends KFWeapDef_ThermiteBore
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
7
CTI/Classes/CTI_WeapDef_ZedMKIII.uc
Normal file
7
CTI/Classes/CTI_WeapDef_ZedMKIII.uc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
class CTI_WeapDef_ZedMKIII extends KFWeapDef_ZedMKIII
|
||||||
|
abstract;
|
||||||
|
|
||||||
|
defaultproperties
|
||||||
|
{
|
||||||
|
SharedUnlockId = SCU_None
|
||||||
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
class CTI_WeapDef_Zweihander extends KFWeapDef_Zweihander
|
class CTI_WeapDef_Zweihander extends KFWeapDef_Zweihander
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
SharedUnlockId = SCU_None
|
SharedUnlockId = SCU_None
|
||||||
}
|
}
|
||||||
@ -8,5 +8,5 @@ public function KFW_StartLoadWeaponContent()
|
|||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,43 +1,43 @@
|
|||||||
class OfficialWeapons extends Object
|
class OfficialWeapons extends Object
|
||||||
config(CTI);
|
config(CTI);
|
||||||
|
|
||||||
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
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,88 +1,105 @@
|
|||||||
class RemoveItems extends Object
|
class RemoveItems extends Object
|
||||||
dependson(CTI)
|
dependson(CTI)
|
||||||
config(CTI);
|
config(CTI);
|
||||||
|
|
||||||
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 2:
|
||||||
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
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@ -1,161 +1,165 @@
|
|||||||
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 function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KFGameReplicationInfo KFGRI, E_LogLevel LogLevel)
|
public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefsDLC(KFGameReplicationInfo KFGRI, E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
local KFGFxObject_TraderItems TraderItems;
|
local KFGFxObject_TraderItems TraderItems;
|
||||||
local STraderItem Item;
|
local STraderItem Item;
|
||||||
local Array<class<KFWeaponDefinition> > WeapDefs;
|
local Array<class<KFWeaponDefinition> > WeapDefs;
|
||||||
|
|
||||||
`Log_TraceStatic();
|
`Log_TraceStatic();
|
||||||
|
|
||||||
TraderItems = GetTraderItems(KFGRI, LogLevel);
|
TraderItems = GetTraderItems(KFGRI, LogLevel);
|
||||||
|
|
||||||
foreach TraderItems.SaleItems(Item)
|
foreach TraderItems.SaleItems(Item)
|
||||||
{
|
{
|
||||||
if (Item.WeaponDef != None && Item.WeaponDef.default.SharedUnlockId != SCU_None)
|
if (Item.WeaponDef != None && Item.WeaponDef.default.SharedUnlockId != SCU_None)
|
||||||
{
|
{
|
||||||
WeapDefs.AddItem(Item.WeaponDef);
|
WeapDefs.AddItem(Item.WeaponDef);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return WeapDefs;
|
return WeapDefs;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static simulated function ModifyTrader(
|
public static simulated function ModifyTrader(
|
||||||
KFGameReplicationInfo KFGRI,
|
KFGameReplicationInfo KFGRI,
|
||||||
Array<class<KFWeaponDefinition> > RemoveItems,
|
Array<class<KFWeaponDefinition> > RemoveItems,
|
||||||
Array<class<KFWeaponDefinition> > AddItems,
|
Array<class<KFWeaponDefinition> > AddItems,
|
||||||
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 Index;
|
local class<KFWeaponDefinition> WeapDef;
|
||||||
local int MaxItemID;
|
local Array<class<KFWeaponDefinition> > WeapDefs;
|
||||||
|
local int Index;
|
||||||
`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
|
{
|
||||||
&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
|
if (Item.WeaponDef != None
|
||||||
{
|
&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
|
||||||
WeapDefs.AddItem(Item.WeaponDef);
|
&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
|
||||||
}
|
&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None))
|
||||||
}
|
&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
|
||||||
}
|
{
|
||||||
|
WeapDefs.AddItem(Item.WeaponDef);
|
||||||
for (Index = 0; Index < AddItems.Length; ++Index)
|
}
|
||||||
{
|
}
|
||||||
WeapDefs.AddItem(AddItems[Index]);
|
}
|
||||||
}
|
|
||||||
|
for (Index = 0; Index < AddItems.Length; ++Index)
|
||||||
WeapDefs.Sort(ByPrice);
|
{
|
||||||
|
WeapDefs.AddItem(AddItems[Index]);
|
||||||
TraderItems.SaleItems.Length = 0;
|
}
|
||||||
MaxItemID = 0;
|
|
||||||
foreach WeapDefs(WeapDef)
|
WeapDefs.Sort(ByPrice);
|
||||||
{
|
|
||||||
Item.WeaponDef = WeapDef;
|
TraderItems.SaleItems.Length = 0;
|
||||||
Item.ItemID = ++MaxItemID;
|
MaxItemID = 0;
|
||||||
TraderItems.SaleItems.AddItem(Item);
|
foreach WeapDefs(WeapDef)
|
||||||
}
|
{
|
||||||
|
Item.WeaponDef = WeapDef;
|
||||||
TraderItems.SetItemsInfo(TraderItems.SaleItems);
|
Item.ItemID = ++MaxItemID;
|
||||||
|
TraderItems.SaleItems.AddItem(Item);
|
||||||
KFGRI.TraderItems = TraderItems;
|
}
|
||||||
}
|
|
||||||
|
TraderItems.SetItemsInfo(TraderItems.SaleItems);
|
||||||
private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
|
|
||||||
{
|
KFGRI.TraderItems = TraderItems;
|
||||||
local class<KFWeaponDefinition> WeapDef;
|
}
|
||||||
|
|
||||||
`Log_TraceStatic();
|
private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
|
||||||
|
{
|
||||||
foreach WeapDefs(WeapDef)
|
local class<KFWeaponDefinition> WeapDef;
|
||||||
{
|
|
||||||
if (WeapDef.default.WeaponClassPath == WeaponClassPath)
|
`Log_TraceStatic();
|
||||||
{
|
|
||||||
return false;
|
foreach WeapDefs(WeapDef)
|
||||||
}
|
{
|
||||||
}
|
if (WeapDef.default.WeaponClassPath == WeaponClassPath)
|
||||||
|
{
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
defaultproperties
|
|
||||||
{
|
return true;
|
||||||
|
}
|
||||||
}
|
|
||||||
|
defaultproperties
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@ -1,195 +1,200 @@
|
|||||||
class Unlocker extends Object
|
class Unlocker extends Object
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
// TODO:
|
// TODO:
|
||||||
// replace shopContainer (KFGFxTraderContainer_Store)
|
// replace shopContainer (KFGFxTraderContainer_Store)
|
||||||
// without replacing KFGFxMoviePlayer_Manager
|
// without replacing KFGFxMoviePlayer_Manager
|
||||||
// but how? 🤔
|
// but how? 🤔
|
||||||
|
|
||||||
const Trader = class'Trader';
|
const Trader = class'Trader';
|
||||||
|
|
||||||
var private const Array<class<KFWeaponDefinition> > WeapDefDLCReplacements;
|
var private const Array<class<KFWeaponDefinition> > WeapDefDLCReplacements;
|
||||||
|
|
||||||
public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
|
public static function bool IsValidTypeUnlockDLC(String UnlockType, E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
`Log_TraceStatic();
|
`Log_TraceStatic();
|
||||||
|
|
||||||
switch (Locs(UnlockType))
|
switch (Locs(UnlockType))
|
||||||
{
|
{
|
||||||
case "true":
|
case "true":
|
||||||
case "false":
|
case "false":
|
||||||
case "auto":
|
case "auto":
|
||||||
case "replaceweapons":
|
case "replaceweapons":
|
||||||
case "replacefilter":
|
case "replacefilter":
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function bool UnlockDLC(
|
public static function bool UnlockDLC(
|
||||||
KFGameInfo KFGI,
|
KFGameInfo KFGI,
|
||||||
KFGameReplicationInfo KFGRI,
|
KFGameReplicationInfo KFGRI,
|
||||||
String UnlockType,
|
String UnlockType,
|
||||||
out Array<class<KFWeaponDefinition> > RemoveItems,
|
out Array<class<KFWeaponDefinition> > RemoveItems,
|
||||||
out Array<class<KFWeaponDefinition> > AddItems,
|
out Array<class<KFWeaponDefinition> > AddItems,
|
||||||
E_LogLevel LogLevel)
|
E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
`Log_TraceStatic();
|
`Log_TraceStatic();
|
||||||
|
|
||||||
switch (Locs(UnlockType))
|
switch (Locs(UnlockType))
|
||||||
{
|
{
|
||||||
case "true":
|
case "true":
|
||||||
case "auto":
|
case "auto":
|
||||||
return Auto(KFGI, KFGRI, RemoveItems, AddItems, LogLevel);
|
return Auto(KFGI, KFGRI, RemoveItems, AddItems, LogLevel);
|
||||||
|
|
||||||
case "replaceweapons":
|
case "replaceweapons":
|
||||||
return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
|
return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
|
||||||
|
|
||||||
case "replacefilter":
|
case "replacefilter":
|
||||||
return ReplaceFilter(KFGI, LogLevel);
|
return ReplaceFilter(KFGI, LogLevel);
|
||||||
|
|
||||||
case "false":
|
case "false":
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function bool Auto(
|
private static function bool Auto(
|
||||||
KFGameInfo KFGI,
|
KFGameInfo KFGI,
|
||||||
KFGameReplicationInfo KFGRI,
|
KFGameReplicationInfo KFGRI,
|
||||||
out Array<class<KFWeaponDefinition> > RemoveItems,
|
out Array<class<KFWeaponDefinition> > RemoveItems,
|
||||||
out Array<class<KFWeaponDefinition> > AddItems,
|
out Array<class<KFWeaponDefinition> > AddItems,
|
||||||
E_LogLevel LogLevel)
|
E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
local bool CustomGFxManager;
|
local bool CustomGFxManager;
|
||||||
|
|
||||||
`Log_TraceStatic();
|
`Log_TraceStatic();
|
||||||
|
|
||||||
if (KFGI == None) return false;
|
if (KFGI == None) return false;
|
||||||
|
|
||||||
if (KFGameInfo_VersusSurvival(KFGI) != None)
|
if (KFGameInfo_VersusSurvival(KFGI) != None)
|
||||||
{
|
{
|
||||||
CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
|
CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo_VersusSurvival'.default.KFGFxManagerClass);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
|
CustomGFxManager = (KFGI.KFGFxManagerClass != class'KFGameInfo'.default.KFGFxManagerClass);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CustomGFxManager)
|
if (CustomGFxManager)
|
||||||
{
|
{
|
||||||
return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
|
return ReplaceWeapons(KFGRI, RemoveItems, AddItems, LogLevel);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return ReplaceFilter(KFGI, LogLevel);
|
return ReplaceFilter(KFGI, LogLevel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function bool ReplaceWeapons(
|
private static function bool ReplaceWeapons(
|
||||||
KFGameReplicationInfo KFGRI,
|
KFGameReplicationInfo KFGRI,
|
||||||
out Array<class<KFWeaponDefinition> > RemoveItems,
|
out Array<class<KFWeaponDefinition> > RemoveItems,
|
||||||
out Array<class<KFWeaponDefinition> > AddItems,
|
out Array<class<KFWeaponDefinition> > AddItems,
|
||||||
E_LogLevel LogLevel)
|
E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
local Array<class<KFWeaponDefinition> > WeapDefsDLCs;
|
local Array<class<KFWeaponDefinition> > WeapDefsDLCs;
|
||||||
local class<KFWeaponDefinition> WeapDefDLC;
|
local class<KFWeaponDefinition> WeapDefDLC;
|
||||||
local class<KFWeaponDefinition> WeapDefReplacement;
|
local class<KFWeaponDefinition> WeapDefReplacement;
|
||||||
local bool Unlock, PartialUnlock;
|
local bool Unlock, PartialUnlock;
|
||||||
|
|
||||||
`Log_TraceStatic();
|
`Log_TraceStatic();
|
||||||
|
|
||||||
Unlock = false;
|
Unlock = false;
|
||||||
PartialUnlock = false;
|
PartialUnlock = false;
|
||||||
|
|
||||||
WeapDefsDLCs = Trader.static.GetTraderWeapDefsDLC(KFGRI, LogLevel);
|
WeapDefsDLCs = Trader.static.GetTraderWeapDefsDLC(KFGRI, LogLevel);
|
||||||
|
|
||||||
foreach WeapDefsDLCs(WeapDefDLC)
|
foreach WeapDefsDLCs(WeapDefDLC)
|
||||||
{
|
{
|
||||||
WeapDefReplacement = PickReplacementWeapDefDLC(WeapDefDLC, LogLevel);
|
WeapDefReplacement = PickReplacementWeapDefDLC(WeapDefDLC, LogLevel);
|
||||||
if (WeapDefReplacement != None)
|
if (WeapDefReplacement != None)
|
||||||
{
|
{
|
||||||
Unlock = true;
|
Unlock = true;
|
||||||
if (AddItems.Find(WeapDefReplacement) == INDEX_NONE)
|
if (AddItems.Find(WeapDefReplacement) == INDEX_NONE)
|
||||||
{
|
{
|
||||||
AddItems.AddItem(WeapDefReplacement);
|
AddItems.AddItem(WeapDefReplacement);
|
||||||
}
|
}
|
||||||
`Log_Debug(WeapDefDLC @ "replaced by" @ WeapDefReplacement);
|
`Log_Debug(WeapDefDLC @ "replaced by" @ WeapDefReplacement);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
PartialUnlock = true;
|
PartialUnlock = true;
|
||||||
`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
|
`Log_Warn("Can't unlock item:" @ WeapDefDLC @ "SharedUnlockId:" @ WeapDefDLC.default.SharedUnlockId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PartialUnlock)
|
if (PartialUnlock)
|
||||||
{
|
{
|
||||||
`Log_Warn("Some DLCs are not unlocked. Try to set 'UnlockDLC=ReplaceFilter' or ask the author to update the mod");
|
`Log_Warn("Some DLCs are not unlocked. Try to set 'UnlockDLC=ReplaceFilter' or ask the author to update the mod");
|
||||||
}
|
}
|
||||||
|
|
||||||
return Unlock;
|
return Unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
|
private static function class<KFWeaponDefinition> PickReplacementWeapDefDLC(class<KFWeaponDefinition> WeapDefDLC, E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
local class<KFWeaponDefinition> WeapDef;
|
local class<KFWeaponDefinition> WeapDef;
|
||||||
|
|
||||||
`Log_TraceStatic();
|
`Log_TraceStatic();
|
||||||
|
|
||||||
foreach default.WeapDefDLCReplacements(WeapDef)
|
foreach default.WeapDefDLCReplacements(WeapDef)
|
||||||
{
|
{
|
||||||
if (ClassIsChildOf(WeapDef, WeapDefDLC))
|
if (ClassIsChildOf(WeapDef, WeapDefDLC))
|
||||||
{
|
{
|
||||||
return WeapDef;
|
return WeapDef;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
|
private static function bool ReplaceFilter(KFGameInfo KFGI, E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
`Log_TraceStatic();
|
`Log_TraceStatic();
|
||||||
|
|
||||||
if (KFGI == None) return false;
|
if (KFGI == None) return false;
|
||||||
|
|
||||||
if (KFGameInfo_VersusSurvival(KFGI) != None)
|
if (KFGameInfo_VersusSurvival(KFGI) != None)
|
||||||
{
|
{
|
||||||
KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
|
KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager_Versus';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
|
KFGI.KFGFxManagerClass = class'CTI_GFxMoviePlayer_Manager';
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
WeapDefDLCReplacements(0) = class'CTI_WeapDef_AutoTurret'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_AutoTurret')
|
||||||
WeapDefDLCReplacements(1) = class'CTI_WeapDef_BladedPistol'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol')
|
||||||
WeapDefDLCReplacements(2) = class'CTI_WeapDef_Blunderbuss'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss')
|
||||||
WeapDefDLCReplacements(3) = class'CTI_WeapDef_ChainBat'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat')
|
||||||
WeapDefDLCReplacements(4) = class'CTI_WeapDef_ChiappaRhino'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino')
|
||||||
WeapDefDLCReplacements(5) = class'CTI_WeapDef_ChiappaRhinoDual'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual')
|
||||||
WeapDefDLCReplacements(6) = class'CTI_WeapDef_CompoundBow'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow')
|
||||||
WeapDefDLCReplacements(7) = class'CTI_WeapDef_Doshinegun'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun')
|
||||||
WeapDefDLCReplacements(8) = class'CTI_WeapDef_DualBladed'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed')
|
||||||
WeapDefDLCReplacements(9) = class'CTI_WeapDef_FAMAS'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS')
|
||||||
WeapDefDLCReplacements(10) = class'CTI_WeapDef_G18'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18')
|
||||||
WeapDefDLCReplacements(11) = class'CTI_WeapDef_GravityImploder'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C')
|
||||||
WeapDefDLCReplacements(12) = class'CTI_WeapDef_IonThruster'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder')
|
||||||
WeapDefDLCReplacements(13) = class'CTI_WeapDef_Mine_Reconstructor'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_HVStormCannon')
|
||||||
WeapDefDLCReplacements(14) = class'CTI_WeapDef_Minigun'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster')
|
||||||
WeapDefDLCReplacements(15) = class'CTI_WeapDef_MosinNagant'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Mine_Reconstructor')
|
||||||
WeapDefDLCReplacements(16) = class'CTI_WeapDef_ParasiteImplanter'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Minigun')
|
||||||
WeapDefDLCReplacements(17) = class'CTI_WeapDef_Pistol_DualG18'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_MosinNagant')
|
||||||
WeapDefDLCReplacements(18) = class'CTI_WeapDef_Pistol_G18C'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ParasiteImplanter')
|
||||||
WeapDefDLCReplacements(19) = class'CTI_WeapDef_Rifle_FrostShotgunAxe'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_DualG18')
|
||||||
WeapDefDLCReplacements(20) = class'CTI_WeapDef_ShrinkRayGun'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_G18C')
|
||||||
WeapDefDLCReplacements(21) = class'CTI_WeapDef_ThermiteBore'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Rifle_FrostShotgunAxe')
|
||||||
WeapDefDLCReplacements(22) = class'CTI_WeapDef_Zweihander'
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Scythe')
|
||||||
}
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Shotgun_S12')
|
||||||
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ShrinkRayGun')
|
||||||
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore')
|
||||||
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ZedMKIII')
|
||||||
|
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander')
|
||||||
|
}
|
||||||
|
|||||||
@ -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
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
// Constants
|
// Constants
|
||||||
`define NO_CONFIG 0
|
`define NO_CONFIG 0
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
// Imports
|
// Imports
|
||||||
`include(Logger.uci)
|
`include(Logger.uci)
|
||||||
`include(Constants.uci)
|
`include(Constants.uci)
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
// Logger
|
// Logger
|
||||||
`define Log_Tag 'CTI'
|
`define Log_Tag 'CTI'
|
||||||
|
|
||||||
`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.
@ -15,8 +15,8 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
|
|||||||
[h1]Usage (single player)[/h1]
|
[h1]Usage (single player)[/h1]
|
||||||
[olist]
|
[olist]
|
||||||
[*]Subscribe to this mutator;
|
[*]Subscribe to this mutator;
|
||||||
[*]Start KF2;
|
[*]Start KF2;
|
||||||
[*]Open console (`) and input:
|
[*]Open console (~) and input:
|
||||||
[b]open KF-BioticsLab?Mutator=CTI.CTIMut[/b]
|
[b]open KF-BioticsLab?Mutator=CTI.CTIMut[/b]
|
||||||
(replace the map and add the parameters you need)
|
(replace the map and add the parameters you need)
|
||||||
[*]<Enter>.
|
[*]<Enter>.
|
||||||
@ -34,8 +34,20 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
|
|||||||
[*]Add mutator to server start parameters: [b]?Mutator=CTI.CTIMut[/b] and restart the server.
|
[*]Add mutator to server start parameters: [b]?Mutator=CTI.CTIMut[/b] and restart the server.
|
||||||
[/olist]
|
[/olist]
|
||||||
|
|
||||||
|
[h1]Important setup information[/h1]
|
||||||
|
The config should be created on first start, but now the game contains a bug that initializes the config values randomly if they are not explicitly set. Thus, the config may have incorrect values or not be created at all.
|
||||||
|
So if you are using this mutator for the first time, I highly recommend doing the following:
|
||||||
|
[olist]
|
||||||
|
[*]Create (modify) [b]KFCTI.ini[/b] manually. Put the following content there:
|
||||||
|
[b][CTI.CTI]
|
||||||
|
Version=0[/b]
|
||||||
|
[*]Start the game/server with CTI 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.
|
||||||
|
|
||||||
[h1]Setup (KFCTI.ini)[/h1]
|
[h1]Setup (KFCTI.ini)[/h1]
|
||||||
Config will be created at the first start[b]*[/b].
|
|
||||||
[list]
|
[list]
|
||||||
[*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags during the game.
|
[*]Set [b]bPreloadContent=True[/b] to load weapon models in advance and have no lags during the game.
|
||||||
|
|
||||||
@ -53,22 +65,20 @@ Config will be created at the first start[b]*[/b].
|
|||||||
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]bAll=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
|
[*]Set [b]bAll=True[/b] if you want to remove all items (can be useful if you want to set the entire sale list in the [b][CTI.AddItems][/b] section yourself).
|
||||||
|
[*]Set [b]bHRG=True[/b] to remove HRG items.
|
||||||
|
[*]Set [b]bDLC=True[/b] to remove DLC items.
|
||||||
|
|
||||||
[*]Use [b][CTI.AddItems][/b] to add items to the trader inventory.
|
[*]Use [b][CTI.AddItems][/b] to add items to the trader inventory.
|
||||||
example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
|
example: [b]Item=WeaponPack.KFWeapDef_XM25[/b] will add [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1147408497]XM25[/url] to sale.
|
||||||
[/list]
|
[/list]
|
||||||
|
|
||||||
|
❗️ Note that if you need an empty list anywhere (for example, you don't want to delete some of the traders's weapons), leave at least one line there:
|
||||||
|
[b]Item=[/b]
|
||||||
|
This is necessary to explicitly initialize the list (because of the bug I wrote about above) to avoid initialization with random values.
|
||||||
|
|
||||||
[h1]Notes[/h1]
|
[h1]Notes[/h1]
|
||||||
📌 Mutator does not contain custom weapons. You must have the required weapon packs in your subscriptions to be able to add them to the trader.
|
📌 Mutator does not contain custom weapons. You must have the required weapon packs in your subscriptions to be able to add them to the trader.
|
||||||
📌 If you are using this mutator to add weapons, you should [b]not[/b] use mutators from weapon packs (just having them in subscriptions is enough).
|
📌 If you are using this mutator to add weapons, you should [b]not[/b] use mutators from weapon packs (just having them in subscriptions is enough).
|
||||||
|
|
||||||
[h1]Troubleshooting[/h1]
|
|
||||||
[b](*)[/b] If your config is not created for some reason, create it manually with the following content:
|
|
||||||
[b][CTI.CTI]
|
|
||||||
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-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]
|
[url=https://github.com/GenZmeY/KF2-CustomTraderInventory]https://github.com/GenZmeY/KF2-CustomTraderInventory[/url] [b](GNU GPLv3)[/b]
|
||||||
|
|||||||
23
README.md
23
README.md
@ -3,24 +3,24 @@
|
|||||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
||||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
||||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
||||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
[](https://github.com/GenZmeY/KF2-CustomTraderInventory/actions/workflows/mega-linter.yml)
|
||||||
[](https://github.com/GenZmeY/KF2-CustomTraderInventory/tags)
|
[](https://github.com/GenZmeY/KF2-CustomTraderInventory/tags)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
|
|
||||||
# Description
|
## Description
|
||||||
Add/Remove Items in the Trader's Inventory
|
Add/Remove Items in the Trader's Inventory
|
||||||
|
|
||||||
# Features
|
## Features
|
||||||
- remove/add items to trader;
|
- remove/add items to trader;
|
||||||
- can preload weapon models (no lags when buying weapons);
|
- can preload weapon models (no lags when buying weapons);
|
||||||
- unlock DLC weapons;
|
- unlock DLC weapons;
|
||||||
- correct items sorting (by price);
|
- correct items sorting (by price);
|
||||||
- don't have to worry about adding new guns after each Tripware update.
|
- don't have to worry about adding new guns after each Tripware update.
|
||||||
|
|
||||||
# Usage & Setup
|
## Usage & Setup
|
||||||
[See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
[See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2830826239)
|
||||||
|
|
||||||
# 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:
|
||||||
@ -34,16 +34,9 @@ Add/Remove Items in the Trader's Inventory
|
|||||||
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\`
|
||||||
|
|
||||||
# Testing
|
## Bug reports
|
||||||
Open git-bash in the source folder and run command:
|
|
||||||
`./tools/builder -t`
|
|
||||||
(or `./tools/builder -ct` if you haven't compiled the mutator yet)
|
|
||||||
|
|
||||||
A local single-user test will be launched with parameters from `builder.cfg` (edit this file if you want to test mutator with different parameters).
|
|
||||||
|
|
||||||
# Bug reports
|
|
||||||
If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-CustomTraderInventory/issues) and check if there is a description of your bug. If not, create a new issue.
|
If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-CustomTraderInventory/issues) and check if there is a description of your bug. If not, create a new issue.
|
||||||
Describe what the bug looks like and how reproduce it.
|
Describe what the bug looks like and how reproduce it.
|
||||||
|
|
||||||
# License
|
## License
|
||||||
[GNU GPLv3](LICENSE)
|
[](LICENSE)
|
||||||
|
|||||||
@ -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="CTI"
|
PackageBuildOrder="CTI"
|
||||||
|
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ PackageBuildOrder="CTI"
|
|||||||
# 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="CTI"
|
PackageUpload="CTI"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
tools
2
tools
Submodule tools updated: 88b35bd7eb...fb458ac61f
Reference in New Issue
Block a user