style fixes
This commit is contained in:
parent
3ffd4dcd15
commit
f1f6478548
@ -1,238 +1,238 @@
|
|||||||
class LTI extends Info
|
class LTI extends Info
|
||||||
config(LTI);
|
config(LTI);
|
||||||
|
|
||||||
const LatestVersion = 2;
|
const LatestVersion = 2;
|
||||||
|
|
||||||
const CfgRemoveItems = class'RemoveItems';
|
const CfgRemoveItems = class'RemoveItems';
|
||||||
const CfgOfficialWeapons = class'OfficialWeapons';
|
const CfgOfficialWeapons = class'OfficialWeapons';
|
||||||
const Trader = class'Trader';
|
const Trader = class'Trader';
|
||||||
|
|
||||||
var private config int Version;
|
var private config int Version;
|
||||||
var private config E_LogLevel LogLevel;
|
var private config E_LogLevel LogLevel;
|
||||||
var private config bool bOfficialWeaponsList;
|
var private config bool bOfficialWeaponsList;
|
||||||
|
|
||||||
var private KFGameInfo KFGI;
|
var private KFGameInfo KFGI;
|
||||||
var private KFGameReplicationInfo KFGRI;
|
var private KFGameReplicationInfo KFGRI;
|
||||||
|
|
||||||
var private Array<class<KFWeaponDefinition> > RemoveItems;
|
var private Array<class<KFWeaponDefinition> > RemoveItems;
|
||||||
var private Array<LTI_RepInfo> RepInfos;
|
var private Array<LTI_RepInfo> RepInfos;
|
||||||
var private bool ReadyToSync;
|
var private bool ReadyToSync;
|
||||||
|
|
||||||
public simulated function bool SafeDestroy()
|
public simulated function bool SafeDestroy()
|
||||||
{
|
{
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
return (bPendingDelete || bDeleteMe || Destroy());
|
return (bPendingDelete || bDeleteMe || Destroy());
|
||||||
}
|
}
|
||||||
|
|
||||||
public event PreBeginPlay()
|
public event PreBeginPlay()
|
||||||
{
|
{
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
|
`Log_Debug("PreBeginPlay readyToSync" @ ReadyToSync);
|
||||||
|
|
||||||
if (WorldInfo.NetMode == NM_Client)
|
if (WorldInfo.NetMode == NM_Client)
|
||||||
{
|
{
|
||||||
`Log_Fatal("NetMode == NM_Client, Destroy...");
|
`Log_Fatal("NetMode == NM_Client, Destroy...");
|
||||||
SafeDestroy();
|
SafeDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Super.PreBeginPlay();
|
Super.PreBeginPlay();
|
||||||
|
|
||||||
PreInit();
|
PreInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
public event PostBeginPlay()
|
public event PostBeginPlay()
|
||||||
{
|
{
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
if (bPendingDelete || bDeleteMe) return;
|
if (bPendingDelete || bDeleteMe) return;
|
||||||
|
|
||||||
Super.PostBeginPlay();
|
Super.PostBeginPlay();
|
||||||
|
|
||||||
PostInit();
|
PostInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
private function PreInit()
|
private function PreInit()
|
||||||
{
|
{
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
if (Version == `NO_CONFIG)
|
if (Version == `NO_CONFIG)
|
||||||
{
|
{
|
||||||
LogLevel = LL_Info;
|
LogLevel = LL_Info;
|
||||||
SaveConfig();
|
SaveConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
CfgRemoveItems.static.InitConfig(Version, LatestVersion);
|
CfgRemoveItems.static.InitConfig(Version, LatestVersion);
|
||||||
|
|
||||||
switch (Version)
|
switch (Version)
|
||||||
{
|
{
|
||||||
case `NO_CONFIG:
|
case `NO_CONFIG:
|
||||||
`Log_Info("Config created");
|
`Log_Info("Config created");
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
|
|
||||||
case MaxInt:
|
case MaxInt:
|
||||||
`Log_Info("Config updated to version" @ LatestVersion);
|
`Log_Info("Config updated to version" @ LatestVersion);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LatestVersion:
|
case LatestVersion:
|
||||||
`Log_Info("Config is up-to-date");
|
`Log_Info("Config is up-to-date");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
|
`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
|
||||||
`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
|
`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
|
||||||
`Log_Warn("The config version will be changed to" @ LatestVersion);
|
`Log_Warn("The config version will be changed to" @ LatestVersion);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
|
CfgOfficialWeapons.static.Update(bOfficialWeaponsList);
|
||||||
|
|
||||||
if (LatestVersion != Version)
|
if (LatestVersion != Version)
|
||||||
{
|
{
|
||||||
Version = LatestVersion;
|
Version = LatestVersion;
|
||||||
SaveConfig();
|
SaveConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LogLevel == LL_WrongLevel)
|
if (LogLevel == LL_WrongLevel)
|
||||||
{
|
{
|
||||||
LogLevel = LL_Info;
|
LogLevel = LL_Info;
|
||||||
`Log_Warn("Wrong 'LogLevel', return to default value");
|
`Log_Warn("Wrong 'LogLevel', return to default value");
|
||||||
SaveConfig();
|
SaveConfig();
|
||||||
}
|
}
|
||||||
`Log_Base("LogLevel:" @ LogLevel);
|
`Log_Base("LogLevel:" @ LogLevel);
|
||||||
|
|
||||||
RemoveItems = CfgRemoveItems.static.Load(LogLevel);
|
RemoveItems = CfgRemoveItems.static.Load(LogLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function PostInit()
|
private function PostInit()
|
||||||
{
|
{
|
||||||
local LTI_RepInfo RepInfo;
|
local LTI_RepInfo RepInfo;
|
||||||
|
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
if (WorldInfo == None || WorldInfo.Game == None)
|
if (WorldInfo == None || WorldInfo.Game == None)
|
||||||
{
|
{
|
||||||
SetTimer(1.0f, false, nameof(PostInit));
|
SetTimer(1.0f, false, nameof(PostInit));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
KFGI = KFGameInfo(WorldInfo.Game);
|
KFGI = KFGameInfo(WorldInfo.Game);
|
||||||
if (KFGI == None)
|
if (KFGI == None)
|
||||||
{
|
{
|
||||||
`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
|
`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game);
|
||||||
SafeDestroy();
|
SafeDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (KFGI.GameReplicationInfo == None)
|
if (KFGI.GameReplicationInfo == None)
|
||||||
{
|
{
|
||||||
SetTimer(1.0f, false, nameof(PostInit));
|
SetTimer(1.0f, false, nameof(PostInit));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
|
KFGRI = KFGameReplicationInfo(KFGI.GameReplicationInfo);
|
||||||
if (KFGRI == None)
|
if (KFGRI == None)
|
||||||
{
|
{
|
||||||
`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
|
`Log_Fatal("Incompatible Replication info:" @ KFGI.GameReplicationInfo);
|
||||||
SafeDestroy();
|
SafeDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Trader.static.ModifyTrader(
|
Trader.static.ModifyTrader(
|
||||||
KFGRI,
|
KFGRI,
|
||||||
RemoveItems,
|
RemoveItems,
|
||||||
CfgRemoveItems.default.bAll,
|
CfgRemoveItems.default.bAll,
|
||||||
CfgRemoveItems.default.bHRG,
|
CfgRemoveItems.default.bHRG,
|
||||||
CfgRemoveItems.default.bDLC,
|
CfgRemoveItems.default.bDLC,
|
||||||
LogLevel);
|
LogLevel);
|
||||||
|
|
||||||
ReadyToSync = true;
|
ReadyToSync = true;
|
||||||
|
|
||||||
foreach RepInfos(RepInfo)
|
foreach RepInfos(RepInfo)
|
||||||
{
|
{
|
||||||
if (RepInfo.PendingSync)
|
if (RepInfo.PendingSync)
|
||||||
{
|
{
|
||||||
RepInfo.ServerSync();
|
RepInfo.ServerSync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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 LTI_RepInfo RepInfo;
|
local LTI_RepInfo RepInfo;
|
||||||
|
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
if (C == None) return false;
|
if (C == None) return false;
|
||||||
|
|
||||||
RepInfo = Spawn(class'LTI_RepInfo', C);
|
RepInfo = Spawn(class'LTI_RepInfo', C);
|
||||||
|
|
||||||
if (RepInfo == None) return false;
|
if (RepInfo == None) return false;
|
||||||
|
|
||||||
RepInfo.PrepareSync(
|
RepInfo.PrepareSync(
|
||||||
Self,
|
Self,
|
||||||
LogLevel,
|
LogLevel,
|
||||||
RemoveItems,
|
RemoveItems,
|
||||||
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 LTI_RepInfo RepInfo;
|
local LTI_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
|
||||||
}
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
[Flags]
|
[Flags]
|
||||||
AllowDownload=True
|
AllowDownload=True
|
||||||
ClientOptional=False
|
ClientOptional=False
|
||||||
ServerSideOnly=False
|
ServerSideOnly=False
|
||||||
|
|||||||
@ -1,60 +1,60 @@
|
|||||||
class LTIMut extends KFMutator;
|
class LTIMut extends KFMutator;
|
||||||
|
|
||||||
var private LTI LTI;
|
var private LTI LTI;
|
||||||
|
|
||||||
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'LTI', LTI)
|
foreach WorldInfo.DynamicActors(class'LTI', LTI)
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LTI == None)
|
if (LTI == None)
|
||||||
{
|
{
|
||||||
LTI = WorldInfo.Spawn(class'LTI');
|
LTI = WorldInfo.Spawn(class'LTI');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LTI == None)
|
if (LTI == None)
|
||||||
{
|
{
|
||||||
`Log_Base("FATAL: Can't Spawn 'LTI'");
|
`Log_Base("FATAL: Can't Spawn 'LTI'");
|
||||||
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)
|
||||||
LTIMut(Mut).SafeDestroy();
|
LTIMut(Mut).SafeDestroy();
|
||||||
else
|
else
|
||||||
Super.AddMutator(Mut);
|
Super.AddMutator(Mut);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function NotifyLogin(Controller C)
|
public function NotifyLogin(Controller C)
|
||||||
{
|
{
|
||||||
LTI.NotifyLogin(C);
|
LTI.NotifyLogin(C);
|
||||||
|
|
||||||
Super.NotifyLogin(C);
|
Super.NotifyLogin(C);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function NotifyLogout(Controller C)
|
public function NotifyLogout(Controller C)
|
||||||
{
|
{
|
||||||
LTI.NotifyLogout(C);
|
LTI.NotifyLogout(C);
|
||||||
|
|
||||||
Super.NotifyLogout(C);
|
Super.NotifyLogout(C);
|
||||||
}
|
}
|
||||||
|
|
||||||
DefaultProperties
|
DefaultProperties
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,73 +1,73 @@
|
|||||||
class LTI_LocalMessage extends Object
|
class LTI_LocalMessage extends Object
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
var const String SyncItemsDefault;
|
var const String SyncItemsDefault;
|
||||||
var private localized String SyncItems;
|
var private localized String SyncItems;
|
||||||
|
|
||||||
var const String 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_LTI_LocalMessageType
|
enum E_LTI_LocalMessageType
|
||||||
{
|
{
|
||||||
LTI_SyncItems,
|
LTI_SyncItems,
|
||||||
LTI_SyncFinished,
|
LTI_SyncFinished,
|
||||||
LTI_WaitingGRI,
|
LTI_WaitingGRI,
|
||||||
LTI_IncompatibleGRI,
|
LTI_IncompatibleGRI,
|
||||||
LTI_Disconnect,
|
LTI_Disconnect,
|
||||||
LTI_SecondsShort
|
LTI_SecondsShort
|
||||||
};
|
};
|
||||||
|
|
||||||
public static function String GetLocalizedString(
|
public static function String GetLocalizedString(
|
||||||
E_LogLevel LogLevel,
|
E_LogLevel LogLevel,
|
||||||
E_LTI_LocalMessageType LMT,
|
E_LTI_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 LTI_SyncItems:
|
case LTI_SyncItems:
|
||||||
return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
|
return (default.SyncItems != "" ? default.SyncItems : default.SyncItemsDefault);
|
||||||
|
|
||||||
case LTI_SyncFinished:
|
case LTI_SyncFinished:
|
||||||
return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
|
return (default.SyncFinished != "" ? default.SyncFinished : default.SyncFinishedDefault);
|
||||||
|
|
||||||
case LTI_WaitingGRI:
|
case LTI_WaitingGRI:
|
||||||
return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
|
return (default.WaitingGRI != "" ? default.WaitingGRI : default.WaitingGRIDefault);
|
||||||
|
|
||||||
case LTI_IncompatibleGRI:
|
case LTI_IncompatibleGRI:
|
||||||
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
|
return (default.IncompatibleGRI != "" ? default.IncompatibleGRI : default.IncompatibleGRIDefault);
|
||||||
|
|
||||||
case LTI_Disconnect:
|
case LTI_Disconnect:
|
||||||
return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
|
return (default.Disconnect != "" ? default.Disconnect : default.DisconnectDefault);
|
||||||
|
|
||||||
case LTI_SecondsShort:
|
case LTI_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"
|
||||||
}
|
}
|
||||||
@ -1,282 +1,282 @@
|
|||||||
class LTI_RepInfo extends ReplicationInfo;
|
class LTI_RepInfo extends ReplicationInfo;
|
||||||
|
|
||||||
const Trader = class'Trader';
|
const Trader = class'Trader';
|
||||||
const LocalMessage = class'LTI_LocalMessage';
|
const LocalMessage = class'LTI_LocalMessage';
|
||||||
|
|
||||||
var public bool PendingSync;
|
var public bool PendingSync;
|
||||||
|
|
||||||
var private LTI LTI;
|
var private LTI LTI;
|
||||||
var private E_LogLevel LogLevel;
|
var private E_LogLevel LogLevel;
|
||||||
var private Array<class<KFWeaponDefinition> > RemoveItems;
|
var private Array<class<KFWeaponDefinition> > RemoveItems;
|
||||||
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 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(
|
||||||
LTI _LTI,
|
LTI _LTI,
|
||||||
E_LogLevel _LogLevel,
|
E_LogLevel _LogLevel,
|
||||||
Array<class<KFWeaponDefinition> > _RemoveItems,
|
Array<class<KFWeaponDefinition> > _RemoveItems,
|
||||||
bool _ReplaceMode,
|
bool _ReplaceMode,
|
||||||
bool _RemoveHRG,
|
bool _RemoveHRG,
|
||||||
bool _RemoveDLC)
|
bool _RemoveDLC)
|
||||||
{
|
{
|
||||||
`Log_Trace();
|
`Log_Trace();
|
||||||
|
|
||||||
LTI = _LTI;
|
LTI = _LTI;
|
||||||
LogLevel = _LogLevel;
|
LogLevel = _LogLevel;
|
||||||
RemoveItems = _RemoveItems;
|
RemoveItems = _RemoveItems;
|
||||||
ReplaceMode = _ReplaceMode;
|
ReplaceMode = _ReplaceMode;
|
||||||
RemoveHRG = _RemoveHRG;
|
RemoveHRG = _RemoveHRG;
|
||||||
RemoveDLC = _RemoveDLC;
|
RemoveDLC = _RemoveDLC;
|
||||||
SyncSize = RemoveItems.Length;
|
SyncSize = RemoveItems.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)
|
private reliable client function ClientSync(class<KFWeaponDefinition> WeapDef)
|
||||||
{
|
{
|
||||||
`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));
|
||||||
}
|
}
|
||||||
|
|
||||||
RemoveItems.AddItem(WeapDef);
|
RemoveItems.AddItem(WeapDef);
|
||||||
|
|
||||||
Recieved = RemoveItems.Length;
|
Recieved = RemoveItems.Length;
|
||||||
|
|
||||||
NotificationHeaderText = "-" @ WeapDef.static.GetItemName();
|
NotificationHeaderText = "-" @ WeapDef.static.GetItemName();
|
||||||
NotificationLeftText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncItems);
|
NotificationLeftText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_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: -" @ String(WeapDef) @ NotificationRightText);
|
`Log_Debug("ClientSync: -" @ 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, LTI_WaitingGRI);
|
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_WaitingGRI);
|
||||||
NotificationLeftText = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_SecondsShort);
|
NotificationLeftText = String(++WaitingGRI) $ LocalMessage.static.GetLocalizedString(LogLevel, LTI_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, LTI_IncompatibleGRI) @ String(WorldInfo.GRI),
|
LocalMessage.static.GetLocalizedString(LogLevel, LTI_IncompatibleGRI) @ String(WorldInfo.GRI),
|
||||||
LocalMessage.static.GetLocalizedString(LogLevel, LTI_Disconnect), "", 0);
|
LocalMessage.static.GetLocalizedString(LogLevel, LTI_Disconnect), "", 0);
|
||||||
Cleanup();
|
Cleanup();
|
||||||
ConsoleCommand("Disconnect");
|
ConsoleCommand("Disconnect");
|
||||||
SafeDestroy();
|
SafeDestroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncFinished);
|
NotificationHeaderText = LocalMessage.static.GetLocalizedString(LogLevel, LTI_SyncFinished);
|
||||||
NotificationLeftText = "";
|
NotificationLeftText = "";
|
||||||
NotificationRightText = "";
|
NotificationRightText = "";
|
||||||
NotificationPercent = 0;
|
NotificationPercent = 0;
|
||||||
|
|
||||||
Trader.static.ModifyTrader(KFGRI, RemoveItems, ReplaceMode, RemoveHRG, RemoveDLC, LogLevel);
|
Trader.static.ModifyTrader(KFGRI, RemoveItems, 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 (!LTI.DestroyRepInfo(Controller(Owner)))
|
if (!LTI.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++]);
|
ClientSync(RemoveItems[Recieved++]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,43 +1,43 @@
|
|||||||
class OfficialWeapons extends Object
|
class OfficialWeapons extends Object
|
||||||
config(LTI);
|
config(LTI);
|
||||||
|
|
||||||
const Trader = class'Trader';
|
const Trader = class'Trader';
|
||||||
const DefaultComment = "Auto-generated list of official weapons for your convenience, copy-paste ready";
|
const DefaultComment = "Auto-generated list of official weapons for your convenience, copy-paste ready";
|
||||||
|
|
||||||
var private config String Comment;
|
var private config String Comment;
|
||||||
var private config Array<String> Item;
|
var private config Array<String> Item;
|
||||||
|
|
||||||
private delegate int ByName(String A, String B)
|
private delegate int ByName(String A, String B)
|
||||||
{
|
{
|
||||||
return A > B ? -1 : 0;
|
return A > B ? -1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function Update(bool Enabled)
|
public static function Update(bool Enabled)
|
||||||
{
|
{
|
||||||
local Array<class<KFWeaponDefinition> > KFWeapDefs;
|
local Array<class<KFWeaponDefinition> > KFWeapDefs;
|
||||||
local class<KFWeaponDefinition> KFWeapDef;
|
local class<KFWeaponDefinition> KFWeapDef;
|
||||||
|
|
||||||
if (!Enabled) return;
|
if (!Enabled) return;
|
||||||
|
|
||||||
KFWeapDefs = Trader.static.GetTraderWeapDefs();
|
KFWeapDefs = Trader.static.GetTraderWeapDefs();
|
||||||
|
|
||||||
if (default.Item.Length != KFWeapDefs.Length || default.Comment != DefaultComment)
|
if (default.Item.Length != KFWeapDefs.Length || default.Comment != DefaultComment)
|
||||||
{
|
{
|
||||||
default.Comment = DefaultComment;
|
default.Comment = DefaultComment;
|
||||||
default.Item.Length = 0;
|
default.Item.Length = 0;
|
||||||
|
|
||||||
foreach KFWeapDefs(KFWeapDef)
|
foreach KFWeapDefs(KFWeapDef)
|
||||||
{
|
{
|
||||||
default.Item.AddItem(KFWeapDef.GetPackageName() $ "." $ KFWeapDef);
|
default.Item.AddItem(KFWeapDef.GetPackageName() $ "." $ KFWeapDef);
|
||||||
}
|
}
|
||||||
|
|
||||||
default.Item.Sort(ByName);
|
default.Item.Sort(ByName);
|
||||||
|
|
||||||
StaticSaveConfig();
|
StaticSaveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,105 +1,105 @@
|
|||||||
class RemoveItems extends Object
|
class RemoveItems extends Object
|
||||||
dependson(LTI)
|
dependson(LTI)
|
||||||
config(LTI);
|
config(LTI);
|
||||||
|
|
||||||
var public config bool bAll;
|
var public config bool bAll;
|
||||||
var public config bool bHRG;
|
var public config bool bHRG;
|
||||||
var public config bool bDLC;
|
var public config bool bDLC;
|
||||||
var private config Array<String> Item;
|
var private config Array<String> Item;
|
||||||
|
|
||||||
public static function InitConfig(int Version, int LatestVersion)
|
public static function InitConfig(int Version, int LatestVersion)
|
||||||
{
|
{
|
||||||
switch (Version)
|
switch (Version)
|
||||||
{
|
{
|
||||||
case `NO_CONFIG:
|
case `NO_CONFIG:
|
||||||
ApplyDefault();
|
ApplyDefault();
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
default.bHRG = false;
|
default.bHRG = false;
|
||||||
default.bDLC = false;
|
default.bDLC = false;
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LatestVersion != Version)
|
if (LatestVersion != Version)
|
||||||
{
|
{
|
||||||
StaticSaveConfig();
|
StaticSaveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function ApplyDefault()
|
private static function ApplyDefault()
|
||||||
{
|
{
|
||||||
default.bAll = false;
|
default.bAll = false;
|
||||||
default.bHRG = false;
|
default.bHRG = false;
|
||||||
default.bDLC = false;
|
default.bDLC = false;
|
||||||
default.Item.Length = 0;
|
default.Item.Length = 0;
|
||||||
default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
|
default.Item.AddItem("KFGame.KFWeapDef_9mmDual");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
|
public static function Array<class<KFWeaponDefinition> > Load(E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
local Array<class<KFWeaponDefinition> > ItemList;
|
local Array<class<KFWeaponDefinition> > ItemList;
|
||||||
local class<KFWeaponDefinition> ItemWeapDef;
|
local class<KFWeaponDefinition> ItemWeapDef;
|
||||||
local class<KFWeapon> ItemWeapon;
|
local class<KFWeapon> ItemWeapon;
|
||||||
local String ItemRaw;
|
local String ItemRaw;
|
||||||
local int Line;
|
local int Line;
|
||||||
|
|
||||||
`Log_Info("Load items to remove:");
|
`Log_Info("Load items to remove:");
|
||||||
if (default.bAll)
|
if (default.bAll)
|
||||||
{
|
{
|
||||||
`Log_Info("Remove all default items");
|
`Log_Info("Remove all default items");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (default.bHRG)
|
if (default.bHRG)
|
||||||
{
|
{
|
||||||
`Log_Info("Remove all HRG items");
|
`Log_Info("Remove all HRG items");
|
||||||
}
|
}
|
||||||
if (default.bDLC)
|
if (default.bDLC)
|
||||||
{
|
{
|
||||||
`Log_Info("Remove all DLC items");
|
`Log_Info("Remove all DLC items");
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach default.Item(ItemRaw, Line)
|
foreach default.Item(ItemRaw, Line)
|
||||||
{
|
{
|
||||||
ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
|
ItemWeapDef = class<KFWeaponDefinition>(DynamicLoadObject(ItemRaw, class'Class'));
|
||||||
if (ItemWeapDef == None)
|
if (ItemWeapDef == None)
|
||||||
{
|
{
|
||||||
`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
|
`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon definition:" @ ItemRaw);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
|
ItemWeapon = class<KFWeapon>(DynamicLoadObject(ItemWeapDef.default.WeaponClassPath, class'Class'));
|
||||||
if (ItemWeapon == None)
|
if (ItemWeapon == None)
|
||||||
{
|
{
|
||||||
`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
|
`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load weapon:" @ ItemWeapDef.default.WeaponClassPath);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
|
if (ItemList.Find(ItemWeapDef) != INDEX_NONE)
|
||||||
{
|
{
|
||||||
`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
|
`Log_Warn("[" $ Line + 1 $ "]" @ "Duplicate item:" @ ItemRaw @ "(skip)");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemList.AddItem(ItemWeapDef);
|
ItemList.AddItem(ItemWeapDef);
|
||||||
`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
|
`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ItemRaw);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ItemList.Length == default.Item.Length)
|
if (ItemList.Length == default.Item.Length)
|
||||||
{
|
{
|
||||||
`Log_Info("Items to remove list loaded successfully (" $ ItemList.Length @ "entries)");
|
`Log_Info("Items to remove list loaded successfully (" $ ItemList.Length @ "entries)");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
`Log_Info("Items to remove list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
|
`Log_Info("Items to remove list: loaded" @ ItemList.Length @ "of" @ default.Item.Length @ "entries");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ItemList;
|
return ItemList;
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,119 +1,119 @@
|
|||||||
class Trader extends Object
|
class Trader extends Object
|
||||||
abstract;
|
abstract;
|
||||||
|
|
||||||
private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
|
private delegate int ByPrice(class<KFWeaponDefinition> A, class<KFWeaponDefinition> B)
|
||||||
{
|
{
|
||||||
return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
|
return A.default.BuyPrice > B.default.BuyPrice ? -1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
|
public static function KFGFxObject_TraderItems GetTraderItems(optional KFGameReplicationInfo KFGRI = None, optional E_LogLevel LogLevel = LL_Trace)
|
||||||
{
|
{
|
||||||
local String TraderItemsPath;
|
local String TraderItemsPath;
|
||||||
|
|
||||||
if (KFGRI == None)
|
if (KFGRI == None)
|
||||||
{
|
{
|
||||||
TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
|
TraderItemsPath = class'KFGameReplicationInfo'.default.TraderItemsPath;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
TraderItemsPath = KFGRI.TraderItemsPath;
|
TraderItemsPath = KFGRI.TraderItemsPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
|
return KFGFxObject_TraderItems(DynamicLoadObject(TraderItemsPath, class'KFGFxObject_TraderItems'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
|
public static function Array<class<KFWeaponDefinition> > GetTraderWeapDefs(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
|
||||||
{
|
{
|
||||||
local Array<class<KFWeaponDefinition> > KFWeapDefs;
|
local Array<class<KFWeaponDefinition> > KFWeapDefs;
|
||||||
local KFGFxObject_TraderItems TraderItems;
|
local KFGFxObject_TraderItems TraderItems;
|
||||||
local STraderItem Item;
|
local STraderItem Item;
|
||||||
|
|
||||||
TraderItems = GetTraderItems(KFGRI, LogLevel);
|
TraderItems = GetTraderItems(KFGRI, LogLevel);
|
||||||
|
|
||||||
foreach TraderItems.SaleItems(Item)
|
foreach TraderItems.SaleItems(Item)
|
||||||
{
|
{
|
||||||
if (Item.WeaponDef != None)
|
if (Item.WeaponDef != None)
|
||||||
{
|
{
|
||||||
KFWeapDefs.AddItem(Item.WeaponDef);
|
KFWeapDefs.AddItem(Item.WeaponDef);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return KFWeapDefs;
|
return KFWeapDefs;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
|
public static function Array<class<KFWeapon> > GetTraderWeapons(optional KFGameReplicationInfo KFGRI = None,optional E_LogLevel LogLevel = LL_Trace)
|
||||||
{
|
{
|
||||||
local Array<class<KFWeapon> > KFWeapons;
|
local Array<class<KFWeapon> > KFWeapons;
|
||||||
local class<KFWeapon> KFWeapon;
|
local class<KFWeapon> KFWeapon;
|
||||||
local KFGFxObject_TraderItems TraderItems;
|
local KFGFxObject_TraderItems TraderItems;
|
||||||
local STraderItem Item;
|
local STraderItem Item;
|
||||||
|
|
||||||
TraderItems = GetTraderItems(KFGRI, LogLevel);
|
TraderItems = GetTraderItems(KFGRI, LogLevel);
|
||||||
|
|
||||||
foreach TraderItems.SaleItems(Item)
|
foreach TraderItems.SaleItems(Item)
|
||||||
{
|
{
|
||||||
if (Item.WeaponDef != None)
|
if (Item.WeaponDef != None)
|
||||||
{
|
{
|
||||||
KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
|
KFWeapon = class<KFWeapon> (DynamicLoadObject(Item.WeaponDef.default.WeaponClassPath, class'Class'));
|
||||||
if (KFWeapon != None)
|
if (KFWeapon != None)
|
||||||
{
|
{
|
||||||
KFWeapons.AddItem(KFWeapon);
|
KFWeapons.AddItem(KFWeapon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return KFWeapons;
|
return KFWeapons;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static simulated function ModifyTrader(
|
public static simulated function ModifyTrader(
|
||||||
KFGameReplicationInfo KFGRI,
|
KFGameReplicationInfo KFGRI,
|
||||||
Array<class<KFWeaponDefinition> > RemoveItems,
|
Array<class<KFWeaponDefinition> > RemoveItems,
|
||||||
bool ReplaceMode,
|
bool ReplaceMode,
|
||||||
bool RemoveHRG,
|
bool RemoveHRG,
|
||||||
bool RemoveDLC,
|
bool RemoveDLC,
|
||||||
E_LogLevel LogLevel)
|
E_LogLevel LogLevel)
|
||||||
{
|
{
|
||||||
local KFGFxObject_TraderItems TraderItems;
|
local KFGFxObject_TraderItems TraderItems;
|
||||||
local STraderItem Item;
|
local STraderItem Item;
|
||||||
local class<KFWeaponDefinition> WeapDef;
|
local class<KFWeaponDefinition> WeapDef;
|
||||||
local Array<class<KFWeaponDefinition> > WeapDefs;
|
local Array<class<KFWeaponDefinition> > WeapDefs;
|
||||||
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)))
|
||||||
{
|
{
|
||||||
WeapDefs.AddItem(Item.WeaponDef);
|
WeapDefs.AddItem(Item.WeaponDef);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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 'LTI'
|
`define Log_Tag 'LTI'
|
||||||
|
|
||||||
`define LocationStatic "`{ClassName}::" $ GetFuncName()
|
`define LocationStatic "`{ClassName}::" $ GetFuncName()
|
||||||
|
|
||||||
`define Log_Base(msg, cond) `log(`msg `if(`cond), `cond`{endif}, `Log_Tag)
|
`define Log_Base(msg, cond) `log(`msg `if(`cond), `cond`{endif}, `Log_Tag)
|
||||||
|
|
||||||
`define Log_Fatal(msg) `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal), `Log_Tag)
|
`define Log_Fatal(msg) `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal), `Log_Tag)
|
||||||
`define Log_Error(msg) `log("ERROR:" @ `msg, (LogLevel >= LL_Error), `Log_Tag)
|
`define Log_Error(msg) `log("ERROR:" @ `msg, (LogLevel >= LL_Error), `Log_Tag)
|
||||||
`define Log_Warn(msg) `log("WARN:" @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
|
`define Log_Warn(msg) `log("WARN:" @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
|
||||||
`define Log_Info(msg) `log("INFO:" @ `msg, (LogLevel >= LL_Info), `Log_Tag)
|
`define Log_Info(msg) `log("INFO:" @ `msg, (LogLevel >= LL_Info), `Log_Tag)
|
||||||
`define Log_Debug(msg) `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug), `Log_Tag)
|
`define Log_Debug(msg) `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug), `Log_Tag)
|
||||||
|
|
||||||
`define Log_Trace(msg) `log("TRACE:" @ `Location `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
|
`define Log_Trace(msg) `log("TRACE:" @ `Location `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
|
||||||
`define Log_TraceStatic(msg) `log("TRACE:" @ `LocationStatic `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
|
`define Log_TraceStatic(msg) `log("TRACE:" @ `LocationStatic `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@ -19,7 +19,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
|
|||||||
[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=LTI.LTIMut[/b]
|
[b]open KF-BioticsLab?Mutator=LTI.LTIMut[/b]
|
||||||
(replace the map and add the parameters you need)
|
(replace the map and add the parameters you need)
|
||||||
|
|||||||
@ -7,7 +7,7 @@ StripSource="True"
|
|||||||
|
|
||||||
# Mutators to be compiled
|
# Mutators to be compiled
|
||||||
# Specify them with a space as a separator,
|
# Specify them with a space as a separator,
|
||||||
# Mutators will be compiled in the specified order
|
# Mutators will be compiled in the specified order
|
||||||
PackageBuildOrder="LTI"
|
PackageBuildOrder="LTI"
|
||||||
|
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ PackageBuildOrder="LTI"
|
|||||||
# Packages you want to brew using @peelz's patched KFEditor.
|
# Packages you want to brew using @peelz's patched KFEditor.
|
||||||
# Useful for cases where regular brew doesn't put *.upk inside the package.
|
# Useful for cases where regular brew doesn't put *.upk inside the package.
|
||||||
# Specify them with a space as a separator,
|
# Specify them with a space as a separator,
|
||||||
# The order doesn't matter
|
# The order doesn't matter
|
||||||
PackagePeelzBrew=""
|
PackagePeelzBrew=""
|
||||||
|
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ PackagePeelzBrew=""
|
|||||||
|
|
||||||
# Mutators that will be uploaded to the workshop
|
# Mutators that will be uploaded to the workshop
|
||||||
# Specify them with a space as a separator,
|
# Specify them with a space as a separator,
|
||||||
# The order doesn't matter
|
# The order doesn't matter
|
||||||
PackageUpload="LTI"
|
PackageUpload="LTI"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user