update style

This commit is contained in:
GenZmeY 2023-05-13 02:33:32 +03:00
parent 227c5f470f
commit f99b8cdb39
50 changed files with 1607 additions and 1606 deletions

View File

@ -10,13 +10,15 @@ charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = unset insert_final_newline = unset
# Source # Unreal Engine 3 / Source
[*.{sh,bash,dash,ksh}] [*.uc]
indent_style = tab indent_style = tab
insert_final_newline = true
[builder] [*.{uci,upkg}]
insert_final_newline = true
# 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 # Other
[*.md] [*.md]
@ -25,7 +27,6 @@ trim_trailing_whitespace = false
[*.yml] [*.yml]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
insert_final_newline = true
[*.{txt,cfg,conf}] [*.{txt,cfg,conf}]
indent_style = tab indent_style = tab

View File

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

View File

@ -1,327 +1,327 @@
class CTI extends Info class CTI extends Info
config(CTI); config(CTI);
const LatestVersion = 3; 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 2: case 2:
case MaxInt: case MaxInt:
`Log_Info("Config updated to version" @ LatestVersion); `Log_Info("Config updated to version" @ LatestVersion);
break; break;
case LatestVersion: case LatestVersion:
`Log_Info("Config is up-to-date"); `Log_Info("Config is up-to-date");
break; break;
default: default:
`Log_Warn("The config version is higher than the current version (are you using an old mutator?)"); `Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion); `Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
`Log_Warn("The config version will be changed to" @ LatestVersion); `Log_Warn("The config version will be changed to" @ LatestVersion);
break; break;
} }
CfgOfficialWeapons.static.Update(bOfficialWeaponsList); CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
if (LatestVersion != Version) if (LatestVersion != Version)
{ {
Version = LatestVersion; Version = LatestVersion;
SaveConfig(); SaveConfig();
} }
if (LogLevel == LL_WrongLevel) if (LogLevel == LL_WrongLevel)
{ {
LogLevel = LL_Info; LogLevel = LL_Info;
`Log_Warn("Wrong 'LogLevel', return to default value"); `Log_Warn("Wrong 'LogLevel', return to default value");
SaveConfig(); SaveConfig();
} }
`Log_Base("LogLevel:" @ LogLevel); `Log_Base("LogLevel:" @ LogLevel);
if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel)) if (!Unlocker.static.IsValidTypeUnlockDLC(UnlockDLC, LogLevel))
{ {
`Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)"); `Log_Warn("Wrong 'UnlockDLC' (" $ UnlockDLC $ "), return to default value (False)");
UnlockDLC = "False"; UnlockDLC = "False";
SaveConfig(); SaveConfig();
} }
RemoveItems = CfgRemoveItems.static.Load(LogLevel); RemoveItems = CfgRemoveItems.static.Load(LogLevel);
AddItems = CfgAddItems.static.Load(LogLevel); AddItems = CfgAddItems.static.Load(LogLevel);
} }
private function PostInit() private function PostInit()
{ {
local CTI_RepInfo RepInfo; local CTI_RepInfo RepInfo;
`Log_Trace(); `Log_Trace();
if (WorldInfo == None || WorldInfo.Game == None) if (WorldInfo == None || WorldInfo.Game == None)
{ {
SetTimer(1.0f, false, nameof(PostInit)); SetTimer(1.0f, false, nameof(PostInit));
return; return;
} }
KFGI = KFGameInfo(WorldInfo.Game); KFGI = KFGameInfo(WorldInfo.Game);
if (KFGI == None) if (KFGI == None)
{ {
`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game); `Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
SafeDestroy(); SafeDestroy();
return; return;
} }
if (KFGI.GameReplicationInfo == None) if (KFGI.GameReplicationInfo == None)
{ {
SetTimer(1.0f, false, nameof(PostInit)); SetTimer(1.0f, false, nameof(PostInit));
return; return;
} }
KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo); KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
if (KFGRI == None) if (KFGRI == None)
{ {
`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo); `Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
SafeDestroy(); SafeDestroy();
return; return;
} }
if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel)) if (Unlocker.static.UnlockDLC(KFGI, KFGRI, UnlockDLC, RemoveItems, AddItems, LogLevel))
{ {
`Log_Info("DLC unlocked"); `Log_Info("DLC unlocked");
} }
if (bPreloadContent) if (bPreloadContent)
{ {
Preload(AddItems); Preload(AddItems);
} }
Trader.static.ModifyTrader( Trader.static.ModifyTrader(
KFGRI, KFGRI,
RemoveItems, RemoveItems,
AddItems, AddItems,
CfgRemoveItems.default.bAll, CfgRemoveItems.default.bAll,
CfgRemoveItems.default.bHRG, CfgRemoveItems.default.bHRG,
CfgRemoveItems.default.bDLC, CfgRemoveItems.default.bDLC,
LogLevel); LogLevel);
ReadyToSync = true; ReadyToSync = true;
foreach RepInfos(RepInfo) foreach RepInfos(RepInfo)
{ {
if (RepInfo.PendingSync) if (RepInfo.PendingSync)
{ {
RepInfo.ServerSync(); RepInfo.ServerSync();
} }
} }
} }
private function Preload(Array<class<KFWeaponDefinition> > Content) private function Preload(Array<class<KFWeaponDefinition> > Content)
{ {
local Array<class<KFWeapon> > OfficialWeapons; local Array<class<KFWeapon> > OfficialWeapons;
local S_PreloadContent SPC; local S_PreloadContent SPC;
`Log_Trace(); `Log_Trace();
OfficialWeapons = Trader.static.GetTraderWeapons(); OfficialWeapons = Trader.static.GetTraderWeapons();
foreach Content(SPC.KFWD) foreach Content(SPC.KFWD)
{ {
SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class')); SPC.KFWC = class<KFWeapon> (DynamicLoadObject(SPC.KFWD.default.WeaponClassPath, class'Class'));
if (SPC.KFWC != None) if (SPC.KFWC != None)
{ {
if (OfficialWeapons.Find(SPC.KFWC) != INDEX_NONE) if (OfficialWeapons.Find(SPC.KFWC) != INDEX_NONE)
{ {
`Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD); `Log_Debug("Skip preload:" @ SPC.KFWD.GetPackageName() $ "." $ SPC.KFWD);
continue; continue;
} }
SPC.KFW = KFGI.Spawn(SPC.KFWC); SPC.KFW = KFGI.Spawn(SPC.KFWC);
if (SPC.KFW == None) if (SPC.KFW == None)
{ {
`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath); `Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath);
continue; continue;
} }
SPC.KFWA = new (SPC.KFW) class'KFW_Access'; SPC.KFWA = new (SPC.KFW) class'KFW_Access';
if (SPC.KFWA == None) if (SPC.KFWA == None)
{ {
`Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access"); `Log_Warn("Spawn failed:" @ SPC.KFWD.default.WeaponClassPath @ "KFW_Access");
continue; continue;
} }
PreloadContent.AddItem(SPC); PreloadContent.AddItem(SPC);
} }
} }
foreach PreloadContent(SPC) foreach PreloadContent(SPC)
{ {
SPC.KFWA.KFW_StartLoadWeaponContent(); SPC.KFWA.KFW_StartLoadWeaponContent();
} }
`Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models"); `Log_Info("Preloaded" @ PreloadContent.Length @ "weapon models");
} }
public function NotifyLogin(Controller C) public function NotifyLogin(Controller C)
{ {
`Log_Trace(); `Log_Trace();
if (!CreateRepInfo(C)) if (!CreateRepInfo(C))
{ {
`Log_Error("Can't create RepInfo for:" @ C); `Log_Error("Can't create RepInfo for:" @ C);
} }
} }
public function NotifyLogout(Controller C) public function NotifyLogout(Controller C)
{ {
`Log_Trace(); `Log_Trace();
DestroyRepInfo(C); DestroyRepInfo(C);
} }
public function bool CreateRepInfo(Controller C) public function bool CreateRepInfo(Controller C)
{ {
local CTI_RepInfo RepInfo; local CTI_RepInfo RepInfo;
`Log_Trace(); `Log_Trace();
if (C == None) return false; if (C == None) return false;
RepInfo = Spawn(class'CTI_RepInfo', C); RepInfo = Spawn(class'CTI_RepInfo', C);
if (RepInfo == None) return false; if (RepInfo == None) return false;
RepInfo.PrepareSync( RepInfo.PrepareSync(
Self, Self,
LogLevel, LogLevel,
RemoveItems, RemoveItems,
AddItems, AddItems,
CfgRemoveItems.default.bAll, CfgRemoveItems.default.bAll,
CfgRemoveItems.default.bHRG, CfgRemoveItems.default.bHRG,
CfgRemoveItems.default.bDLC); CfgRemoveItems.default.bDLC);
RepInfos.AddItem(RepInfo); RepInfos.AddItem(RepInfo);
if (ReadyToSync) if (ReadyToSync)
{ {
RepInfo.ServerSync(); RepInfo.ServerSync();
} }
else else
{ {
RepInfo.PendingSync = true; RepInfo.PendingSync = true;
} }
return true; return true;
} }
public function bool DestroyRepInfo(Controller C) public function bool DestroyRepInfo(Controller C)
{ {
local CTI_RepInfo RepInfo; local CTI_RepInfo RepInfo;
`Log_Trace(); `Log_Trace();
if (C == None) return false; if (C == None) return false;
foreach RepInfos(RepInfo) foreach RepInfos(RepInfo)
{ {
if (RepInfo.Owner == C) if (RepInfo.Owner == C)
{ {
RepInfos.RemoveItem(RepInfo); RepInfos.RemoveItem(RepInfo);
RepInfo.SafeDestroy(); RepInfo.SafeDestroy();
return true; return true;
} }
} }
return false; return false;
} }
DefaultProperties DefaultProperties
{ {
ReadyToSync = false ReadyToSync = false
} }

View File

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

View File

@ -1,60 +1,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(); Mut.Destroy();
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
{ {
} }

View File

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

View File

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

View File

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

View File

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

View File

@ -1,73 +1,73 @@
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 SyncFinishedDefault;
var private localized String SyncFinished; var private localized String SyncFinished;
var const String WaitingGRIDefault; var const String WaitingGRIDefault;
var private localized String WaitingGRI; var private localized String WaitingGRI;
var const String IncompatibleGRIDefault; var const String IncompatibleGRIDefault;
var private localized String IncompatibleGRI; var private localized String IncompatibleGRI;
var const String DisconnectDefault; var const String DisconnectDefault;
var private localized String Disconnect; var private localized String Disconnect;
var const String SecondsShortDefault; var const String SecondsShortDefault;
var private localized String SecondsShort; var private localized String SecondsShort;
enum E_CTI_LocalMessageType enum E_CTI_LocalMessageType
{ {
CTI_SyncItems, CTI_SyncItems,
CTI_SyncFinished, CTI_SyncFinished,
CTI_WaitingGRI, CTI_WaitingGRI,
CTI_IncompatibleGRI, CTI_IncompatibleGRI,
CTI_Disconnect, CTI_Disconnect,
CTI_SecondsShort CTI_SecondsShort
}; };
public static function String GetLocalizedString( public static function String GetLocalizedString(
E_LogLevel LogLevel, E_LogLevel LogLevel,
E_CTI_LocalMessageType LMT, E_CTI_LocalMessageType LMT,
optional String String1, optional String String1,
optional String String2, optional String String2,
optional String String3) optional String String3)
{ {
`Log_TraceStatic(); `Log_TraceStatic();
switch (LMT) switch (LMT)
{ {
case CTI_SyncItems: case CTI_SyncItems:
return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault); return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
case CTI_SyncFinished: case CTI_SyncFinished:
return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault); return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
case CTI_WaitingGRI: case CTI_WaitingGRI:
return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault); return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
case CTI_IncompatibleGRI: case CTI_IncompatibleGRI:
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault); return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
case CTI_Disconnect: case CTI_Disconnect:
return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault); return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
case CTI_SecondsShort: case CTI_SecondsShort:
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault); return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
} }
return ""; return "";
} }
defaultproperties defaultproperties
{ {
SyncItemsDefault = "Sync items:" SyncItemsDefault = "Sync items:"
SyncFinishedDefault = "Sync finished." SyncFinishedDefault = "Sync finished."
WaitingGRIDefault = "Waiting GRI..." WaitingGRIDefault = "Waiting GRI..."
IncompatibleGRIDefault = "Incompatible GRI:" IncompatibleGRIDefault = "Incompatible GRI:"
DisconnectDefault = "Disconnect..." DisconnectDefault = "Disconnect..."
SecondsShortDefault = "s" SecondsShortDefault = "s"
} }

View File

@ -1,298 +1,298 @@
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 RemoveHRG; var private bool RemoveHRG;
var private bool RemoveDLC; var private bool RemoveDLC;
var private bool PreloadContent; var private bool PreloadContent;
var private int Recieved; var private int Recieved;
var private int SyncSize; var private int SyncSize;
var private KFPlayerController KFPC; var private KFPlayerController KFPC;
var private KFGFxWidget_PartyInGame PartyInGameWidget; var private KFGFxWidget_PartyInGame PartyInGameWidget;
var private GFxObject Notification; var private GFxObject Notification;
var private String NotificationHeaderText; var private String NotificationHeaderText;
var private String NotificationLeftText; var private String NotificationLeftText;
var private String NotificationRightText; var private String NotificationRightText;
var private int NotificationPercent; var private int NotificationPercent;
var private int WaitingGRI; var private int WaitingGRI;
replication replication
{ {
if (bNetInitial && Role == ROLE_Authority) if (bNetInitial && Role == ROLE_Authority)
LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize; LogLevel, ReplaceMode, RemoveHRG, RemoveDLC, SyncSize;
} }
public simulated function bool SafeDestroy() public simulated function bool SafeDestroy()
{ {
`Log_Trace(); `Log_Trace();
return (bPendingDelete || bDeleteMe || Destroy()); return (bPendingDelete || bDeleteMe || Destroy());
} }
public function PrepareSync( public function PrepareSync(
CTI _CTI, CTI _CTI,
E_LogLevel _LogLevel, E_LogLevel _LogLevel,
Array<class<KFWeaponDefinition> > _RemoveItems, Array<class<KFWeaponDefinition> > _RemoveItems,
Array<class<KFWeaponDefinition> > _AddItems, Array<class<KFWeaponDefinition> > _AddItems,
bool _ReplaceMode, bool _ReplaceMode,
bool _RemoveHRG, bool _RemoveHRG,
bool _RemoveDLC) bool _RemoveDLC)
{ {
`Log_Trace(); `Log_Trace();
CTI = _CTI; CTI = _CTI;
LogLevel = _LogLevel; LogLevel = _LogLevel;
RemoveItems = _RemoveItems; RemoveItems = _RemoveItems;
AddItems = _AddItems; AddItems = _AddItems;
ReplaceMode = _ReplaceMode; ReplaceMode = _ReplaceMode;
RemoveHRG = _RemoveHRG; RemoveHRG = _RemoveHRG;
RemoveDLC = _RemoveDLC; RemoveDLC = _RemoveDLC;
SyncSize = RemoveItems.Length + AddItems.Length; SyncSize = RemoveItems.Length + AddItems.Length;
} }
private simulated function KFPlayerController GetKFPC() private simulated function KFPlayerController GetKFPC()
{ {
`Log_Trace(); `Log_Trace();
if (KFPC != None) return KFPC; if (KFPC != None) return KFPC;
KFPC = KFPlayerController(Owner); KFPC = KFPlayerController(Owner);
if (KFPC == None && ROLE < ROLE_Authority) if (KFPC == None && ROLE < ROLE_Authority)
{ {
KFPC = KFPlayerController(GetALocalPlayerController()); KFPC = KFPlayerController(GetALocalPlayerController());
} }
return KFPC; return KFPC;
} }
private simulated function SetPartyInGameWidget() private simulated function SetPartyInGameWidget()
{ {
`Log_Trace(); `Log_Trace();
if (GetKFPC() == None) return; if (GetKFPC() == None) return;
if (KFPC.MyGFxManager == None) return; if (KFPC.MyGFxManager == None) return;
if (KFPC.MyGFxManager.PartyWidget == None) return; if (KFPC.MyGFxManager.PartyWidget == None) return;
PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget); PartyInGameWidget = KFGFxWidget_PartyInGame(KFPC.MyGFxManager.PartyWidget);
Notification = PartyInGameWidget.Notification; Notification = PartyInGameWidget.Notification;
} }
private simulated function bool CheckPartyInGameWidget() private simulated function bool CheckPartyInGameWidget()
{ {
`Log_Trace(); `Log_Trace();
if (PartyInGameWidget == None) if (PartyInGameWidget == None)
{ {
SetPartyInGameWidget(); SetPartyInGameWidget();
} }
return (PartyInGameWidget != None); return (PartyInGameWidget != None);
} }
private simulated function HideReadyButton() private simulated function HideReadyButton()
{ {
`Log_Trace(); `Log_Trace();
if (CheckPartyInGameWidget()) if (CheckPartyInGameWidget())
{ {
PartyInGameWidget.SetReadyButtonVisibility(false); PartyInGameWidget.SetReadyButtonVisibility(false);
} }
} }
private simulated function ShowReadyButton() private simulated function ShowReadyButton()
{ {
`Log_Trace(); `Log_Trace();
if (CheckPartyInGameWidget()) if (CheckPartyInGameWidget())
{ {
Notification.SetVisible(false); Notification.SetVisible(false);
PartyInGameWidget.SetReadyButtonVisibility(true); PartyInGameWidget.SetReadyButtonVisibility(true);
PartyInGameWidget.UpdateReadyButtonText(); PartyInGameWidget.UpdateReadyButtonText();
PartyInGameWidget.UpdateReadyButtonVisibility(); PartyInGameWidget.UpdateReadyButtonVisibility();
} }
} }
private simulated function UpdateNotification(String Title, String Left, String Right, int Percent) private simulated function UpdateNotification(String Title, String Left, String Right, int Percent)
{ {
`Log_Trace(); `Log_Trace();
if (CheckPartyInGameWidget() && Notification != None) if (CheckPartyInGameWidget() && Notification != None)
{ {
Notification.SetString("itemName", Title); Notification.SetString("itemName", Title);
Notification.SetFloat("percent", Percent); Notification.SetFloat("percent", Percent);
Notification.SetInt("queue", 0); Notification.SetInt("queue", 0);
Notification.SetString("downLoading", Left); Notification.SetString("downLoading", Left);
Notification.SetString("remaining", Right); Notification.SetString("remaining", Right);
Notification.SetObject("notificationInfo", Notification); Notification.SetObject("notificationInfo", Notification);
Notification.SetVisible(true); Notification.SetVisible(true);
} }
} }
private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false) private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef, optional bool Remove = false)
{ {
`Log_Trace(); `Log_Trace();
if (WeapDef == None) if (WeapDef == None)
{ {
`Log_Fatal("WeapDef is:" @ WeapDef); `Log_Fatal("WeapDef is:" @ WeapDef);
Cleanup(); Cleanup();
ConsoleCommand("Disconnect"); ConsoleCommand("Disconnect");
SafeDestroy(); SafeDestroy();
return; return;
} }
if (!IsTimerActive(nameof(KeepNotification))) if (!IsTimerActive(nameof(KeepNotification)))
{ {
SetTimer(0.1f, true, nameof(KeepNotification)); SetTimer(0.1f, true, nameof(KeepNotification));
} }
if (Remove) if (Remove)
{ {
RemoveItems.AddItem(WeapDef); RemoveItems.AddItem(WeapDef);
} }
else else
{ {
AddItems.AddItem(WeapDef); AddItems.AddItem(WeapDef);
} }
Recieved = RemoveItems.Length + AddItems.Length; Recieved = RemoveItems.Length + AddItems.Length;
NotificationHeaderText = (Remove ? "-" : "+") @ WeapDef.static.GetItemName(); NotificationHeaderText = (Remove ? "-" : "+") @ WeapDef.static.GetItemName();
NotificationLeftText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems); NotificationLeftText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncItems);
NotificationRightText = Recieved @ "/" @ SyncSize; NotificationRightText = Recieved @ "/" @ SyncSize;
if (SyncSize != 0) if (SyncSize != 0)
{ {
NotificationPercent = (float(Recieved) / float(SyncSize)) * 100; NotificationPercent = (float(Recieved) / float(SyncSize)) * 100;
} }
`Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText); `Log_Debug("ClientSync:" @ (Remove ? "-" : "+") @ String(WeapDef) @ NotificationRightText);
ServerSync(); ServerSync();
} }
private simulated function KeepNotification() private simulated function KeepNotification()
{ {
HideReadyButton(); HideReadyButton();
UpdateNotification( UpdateNotification(
NotificationHeaderText, NotificationHeaderText,
NotificationLeftText, NotificationLeftText,
NotificationRightText, NotificationRightText,
NotificationPercent); NotificationPercent);
} }
private simulated reliable client function ClientSyncFinished() private simulated reliable client function ClientSyncFinished()
{ {
local KFGameReplicationInfo KFGRI; local KFGameReplicationInfo KFGRI;
`Log_Trace(); `Log_Trace();
NotificationLeftText = ""; NotificationLeftText = "";
NotificationRightText = ""; NotificationRightText = "";
NotificationPercent = 0; NotificationPercent = 0;
if (WorldInfo.GRI == None) if (WorldInfo.GRI == None)
{ {
`Log_Debug("ClientSyncFinished: Waiting GRI"); `Log_Debug("ClientSyncFinished: Waiting GRI");
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI); NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_WaitingGRI);
NotificationLeftText = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort); NotificationLeftText = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, CTI_SecondsShort);
NotificationRightText = ""; NotificationRightText = "";
SetTimer(1.0f, false, nameof(ClientSyncFinished)); SetTimer(1.0f, false, nameof(ClientSyncFinished));
return; return;
} }
KFGRI = KFGameReplicationInfo(WorldInfo.GRI); KFGRI = KFGameReplicationInfo(WorldInfo.GRI);
if (KFGRI == None) if (KFGRI == None)
{ {
`Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI)); `Log_Fatal("Incompatible Replication info:" @ String(WorldInfo.GRI));
ClearTimer(nameof(KeepNotification)); ClearTimer(nameof(KeepNotification));
UpdateNotification( UpdateNotification(
LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI), LocalMessage.static.GetLocalizedString(LogLevel, CTI_IncompatibleGRI) @ String(WorldInfo.GRI),
LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0); LocalMessage.static.GetLocalizedString(LogLevel, CTI_Disconnect), "", 0);
Cleanup(); Cleanup();
ConsoleCommand("Disconnect"); ConsoleCommand("Disconnect");
SafeDestroy(); SafeDestroy();
return; return;
} }
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished); NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, CTI_SyncFinished);
NotificationLeftText = ""; NotificationLeftText = "";
NotificationRightText = ""; NotificationRightText = "";
NotificationPercent = 0; NotificationPercent = 0;
Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel); Trader.static.ModifyTrader(KFGRI, RemoveItems, AddItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
`Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader"); `Log_Debug("ClientSyncFinished: Trader.static.ModifyTrader");
ClearTimer(nameof(KeepNotification)); ClearTimer(nameof(KeepNotification));
ShowReadyButton(); ShowReadyButton();
Cleanup(); Cleanup();
SafeDestroy(); SafeDestroy();
} }
private reliable server function Cleanup() private reliable server function Cleanup()
{ {
`Log_Trace(); `Log_Trace();
`Log_Debug("Cleanup"); `Log_Debug("Cleanup");
if (!CTI.DestroyRepInfo(Controller(Owner))) if (!CTI.DestroyRepInfo(Controller(Owner)))
{ {
`Log_Debug("Cleanup (forced)"); `Log_Debug("Cleanup (forced)");
SafeDestroy(); SafeDestroy();
} }
} }
public reliable server function ServerSync() public reliable server function ServerSync()
{ {
`Log_Trace(); `Log_Trace();
PendingSync = false; PendingSync = false;
if (bPendingDelete || bDeleteMe) return; if (bPendingDelete || bDeleteMe) return;
if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone) if (SyncSize <= Recieved || WorldInfo.NetMode == NM_StandAlone)
{ {
`Log_Debug("ServerSync: Finished"); `Log_Debug("ServerSync: Finished");
ClientSyncFinished(); ClientSyncFinished();
} }
else else
{ {
if (Recieved < RemoveItems.Length) if (Recieved < RemoveItems.Length)
{ {
`Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]); `Log_Debug("ServerSync[-]:" @ (Recieved + 1) @ "/" @ SyncSize @ RemoveItems[Recieved]);
ClientSync(RemoveItems[Recieved++], true); ClientSync(RemoveItems[Recieved++], true);
} }
else else
{ {
`Log_Debug("ServerSync[+]:" @ (Recieved + 1) @ "/" @ SyncSize @ AddItems[Recieved - RemoveItems.Length]); `Log_Debug("ServerSync[+]:" @ (Recieved + 1) @ "/" @ SyncSize @ AddItems[Recieved - RemoveItems.Length]);
ClientSync(AddItems[Recieved++ - RemoveItems.Length], false); ClientSync(AddItems[Recieved++ - RemoveItems.Length], false);
} }
} }
} }
defaultproperties defaultproperties
{ {
bAlwaysRelevant = false bAlwaysRelevant = false
bOnlyRelevantToOwner = true bOnlyRelevantToOwner = true
bSkipActorPropertyReplication = false bSkipActorPropertyReplication = false
PendingSync = false PendingSync = false
Recieved = 0 Recieved = 0
NotificationPercent = 0 NotificationPercent = 0
WaitingGRI = 0 WaitingGRI = 0
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
class CTI_WeapDef_G36C extends KFWeapDef_G36C class CTI_WeapDef_G36C extends KFWeapDef_G36C
abstract; abstract;
defaultproperties defaultproperties
{ {
SharedUnlockId = SCU_None SharedUnlockId = SCU_None
} }

View File

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

View File

@ -1,7 +1,7 @@
class CTI_WeapDef_HVStormCannon extends KFWeapDef_HVStormCannon class CTI_WeapDef_HVStormCannon extends KFWeapDef_HVStormCannon
abstract; abstract;
defaultproperties defaultproperties
{ {
SharedUnlockId = SCU_None SharedUnlockId = SCU_None
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
class CTI_WeapDef_Scythe extends KFWeapDef_Scythe class CTI_WeapDef_Scythe extends KFWeapDef_Scythe
abstract; abstract;
defaultproperties defaultproperties
{ {
SharedUnlockId = SCU_None SharedUnlockId = SCU_None
} }

View File

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

View File

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

View File

@ -1,7 +1,7 @@
class CTI_WeapDef_ZedMKIII extends KFWeapDef_ZedMKIII class CTI_WeapDef_ZedMKIII extends KFWeapDef_ZedMKIII
abstract; abstract;
defaultproperties defaultproperties
{ {
SharedUnlockId = SCU_None SharedUnlockId = SCU_None
} }

View File

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

View File

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

View File

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

View File

@ -1,165 +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,
bool RemoveHRG, bool RemoveHRG,
bool RemoveDLC, bool RemoveDLC,
E_LogLevel LogLevel) E_LogLevel LogLevel)
{ {
local KFGFxObject_TraderItems TraderItems; local KFGFxObject_TraderItems TraderItems;
local STraderItem Item; local STraderItem Item;
local class<KFWeaponDefinition> WeapDef; local class<KFWeaponDefinition> WeapDef;
local Array<class<KFWeaponDefinition> > WeapDefs; local Array<class<KFWeaponDefinition> > WeapDefs;
local int Index; local int Index;
local int MaxItemID; local int MaxItemID;
`Log_TraceStatic(); `Log_TraceStatic();
TraderItems = GetTraderItems(KFGRI, LogLevel); TraderItems = GetTraderItems(KFGRI, LogLevel);
if (!ReplaceMode) if (!ReplaceMode)
{ {
foreach TraderItems.SaleItems(Item) foreach TraderItems.SaleItems(Item)
{ {
if (Item.WeaponDef != None if (Item.WeaponDef != None
&& RemoveItems.Find(Item.WeaponDef) == INDEX_NONE && RemoveItems.Find(Item.WeaponDef) == INDEX_NONE
&& (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE)) && (!RemoveHRG || (RemoveHRG && InStr(Item.WeaponDef, "_HRG", true) == INDEX_NONE))
&& (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None)) && (!RemoveDLC || (RemoveDLC && Item.WeaponDef.default.SharedUnlockId == SCU_None))
&& WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel)) && WeaponClassIsUnique(Item.WeaponDef.default.WeaponClassPath, AddItems, LogLevel))
{ {
WeapDefs.AddItem(Item.WeaponDef); WeapDefs.AddItem(Item.WeaponDef);
} }
} }
} }
for (Index = 0; Index < AddItems.Length; ++Index) for (Index = 0; Index < AddItems.Length; ++Index)
{ {
WeapDefs.AddItem(AddItems[Index]); WeapDefs.AddItem(AddItems[Index]);
} }
WeapDefs.Sort(ByPrice); WeapDefs.Sort(ByPrice);
TraderItems.SaleItems.Length = 0; TraderItems.SaleItems.Length = 0;
MaxItemID = 0; MaxItemID = 0;
foreach WeapDefs(WeapDef) foreach WeapDefs(WeapDef)
{ {
Item.WeaponDef = WeapDef; Item.WeaponDef = WeapDef;
Item.ItemID = ++MaxItemID; Item.ItemID = ++MaxItemID;
TraderItems.SaleItems.AddItem(Item); TraderItems.SaleItems.AddItem(Item);
} }
TraderItems.SetItemsInfo(TraderItems.SaleItems); TraderItems.SetItemsInfo(TraderItems.SaleItems);
KFGRI.TraderItems = TraderItems; KFGRI.TraderItems = TraderItems;
} }
private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel) private static function bool WeaponClassIsUnique(String WeaponClassPath, Array<class<KFWeaponDefinition> > WeapDefs, E_LogLevel LogLevel)
{ {
local class<KFWeaponDefinition> WeapDef; local class<KFWeaponDefinition> WeapDef;
`Log_TraceStatic(); `Log_TraceStatic();
foreach WeapDefs(WeapDef) foreach WeapDefs(WeapDef)
{ {
if (WeapDef.default.WeaponClassPath == WeaponClassPath) if (WeapDef.default.WeaponClassPath == WeaponClassPath)
{ {
return false; return false;
} }
} }
return true; return true;
} }
defaultproperties defaultproperties
{ {
} }

View File

@ -1,199 +1,199 @@
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.Add(class'CTI_WeapDef_AutoTurret') WeapDefDLCReplacements.Add(class'CTI_WeapDef_AutoTurret')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol') WeapDefDLCReplacements.Add(class'CTI_WeapDef_BladedPistol')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Blunderbuss')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat') WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChainBat')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino') WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhino')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual') WeapDefDLCReplacements.Add(class'CTI_WeapDef_ChiappaRhinoDual')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow') WeapDefDLCReplacements.Add(class'CTI_WeapDef_CompoundBow')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Doshinegun')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed') WeapDefDLCReplacements.Add(class'CTI_WeapDef_DualBladed')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS') WeapDefDLCReplacements.Add(class'CTI_WeapDef_FAMAS')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18') WeapDefDLCReplacements.Add(class'CTI_WeapDef_G18')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C') WeapDefDLCReplacements.Add(class'CTI_WeapDef_G36C')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder') WeapDefDLCReplacements.Add(class'CTI_WeapDef_GravityImploder')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_HVStormCannon') WeapDefDLCReplacements.Add(class'CTI_WeapDef_HVStormCannon')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster') WeapDefDLCReplacements.Add(class'CTI_WeapDef_IonThruster')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Mine_Reconstructor') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Mine_Reconstructor')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Minigun') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Minigun')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_MosinNagant') WeapDefDLCReplacements.Add(class'CTI_WeapDef_MosinNagant')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ParasiteImplanter') WeapDefDLCReplacements.Add(class'CTI_WeapDef_ParasiteImplanter')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_DualG18') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_DualG18')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_G18C') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Pistol_G18C')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Rifle_FrostShotgunAxe') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Rifle_FrostShotgunAxe')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Scythe') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Scythe')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ShrinkRayGun') WeapDefDLCReplacements.Add(class'CTI_WeapDef_ShrinkRayGun')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore') WeapDefDLCReplacements.Add(class'CTI_WeapDef_ThermiteBore')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_ZedMKIII') WeapDefDLCReplacements.Add(class'CTI_WeapDef_ZedMKIII')
WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander') WeapDefDLCReplacements.Add(class'CTI_WeapDef_Zweihander')
} }

View File

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

View File

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

View File

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

View File

@ -1,15 +1,15 @@
// Logger // Logger
`define Log_Tag '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.

View File

@ -15,7 +15,7 @@ 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)

View File

@ -7,7 +7,7 @@ StripSource="True"
# Mutators to be compiled # Mutators to be compiled
# Specify them with a space as a separator, # Specify them with a space as a separator,
# Mutators will be compiled in the specified order # Mutators will be compiled in the specified order
PackageBuildOrder="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"