DrakiaXYZ/CWX-mods
DrakiaXYZ/CWX-mods
0
0
Fork 0
forked from CWX/CWX-mods
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix up botmonitor for 3.7.0

Browse Source
This commit is contained in:
CWX 2023-10-09 22:38:59 +01:00
parent c6694d5225
commit 8200256aff
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Live/CWX_DebuggingTool/BotmonClass.cs
View File

@ -29,7 +29,6 @@ namespace CWX_DebuggingTool
private BotmonClass() private BotmonClass()
{ {
} }
public int Mode { get; set; } public int Mode { get; set; }
@ -59,7 +58,6 @@ namespace CWX_DebuggingTool
~BotmonClass() ~BotmonClass()
{ {
ConsoleScreen.Log("BotMonitor Disabled on game end");
} }
public void Awake() public void Awake()
@ -140,7 +138,7 @@ namespace CWX_DebuggingTool
if (Mode >= 1) if (Mode >= 1)
{ {
_content = string.Empty; _content = string.Empty;
//_content += $"Total = {_gameWorld.AllPlayers.Count - 1}\n"; _content += $"Total = {_gameWorld.AllAlivePlayersList.Count - 1}\n";
} }
// If Mode Greater than or equal to 2 show total for each zone // If Mode Greater than or equal to 2 show total for each zone
@ -148,14 +146,14 @@ namespace CWX_DebuggingTool
{ {
foreach (var zone in _zoneAndPlayers) foreach (var zone in _zoneAndPlayers)
{ {
if (_zoneAndPlayers[zone.Key].FindAll(x => x.HealthController.IsAlive).Count <= 0) continue; if (_zoneAndPlayers[zone.Key].FindAll(x => x != null && x.HealthController != null && x.HealthController.IsAlive).Count <= 0) continue;
_content += $"{zone.Key} = {_zoneAndPlayers[zone.Key].FindAll(x => x.HealthController.IsAlive).Count}\n"; _content += $"{zone.Key} = {_zoneAndPlayers[zone.Key].FindAll(x => x != null && x.HealthController != null && x.HealthController.IsAlive).Count}\n";
// If Mode Greater than or equal to 3 show Bots individually also // If Mode Greater than or equal to 3 show Bots individually also
if (Mode < 3) continue; if (Mode < 3) continue;
foreach (var player in _zoneAndPlayers[zone.Key].Where(player => player.HealthController.IsAlive)) foreach (var player in _zoneAndPlayers[zone.Key].Where(player => player != null && player.HealthController != null && player.HealthController.IsAlive))
{ {
_distance = Vector3.Distance(player.Position, _player.Position); _distance = Vector3.Distance(player.Position, _player.Position);
_content += $"> [{_distance:n2}m] [{_playerRoleAndDiff.First(x => x.Key == player.ProfileId).Value.Role}] " + _content += $"> [{_distance:n2}m] [{_playerRoleAndDiff.First(x => x.Key == player.ProfileId).Value.Role}] " +
@ -163,7 +161,7 @@ namespace CWX_DebuggingTool
} }
} }
} }
_guiContent.text = _content; _guiContent.text = _content;
_guiSize = _textStyle.CalcSize(_guiContent); _guiSize = _textStyle.CalcSize(_guiContent);

9
Live/CWX_DebuggingTool/DebuggingTool.cs
View File

@ -42,15 +42,20 @@ namespace CWX_DebuggingTool
} }
} }
public static void DisableBotMonitor() private static void DisableBotMonitor()
{ {
BotmonClass.Instance.Dispose(); BotmonClass.Instance.Dispose();
} }
public static void EnableBotMonitor(int option) private static void EnableBotMonitor(int option)
{ {
var gameWorld = Singleton<GameWorld>.Instance; var gameWorld = Singleton<GameWorld>.Instance;
var checkExists = gameWorld.gameObject.GetComponentInChildren<BotmonClass>();
if (checkExists != null)
Destroy(checkExists);
var btmInstance = gameWorld.gameObject.AddComponent<BotmonClass>(); var btmInstance = gameWorld.gameObject.AddComponent<BotmonClass>();
btmInstance.Mode = option; btmInstance.Mode = option;