added player list and Players are now BasePlayer

This commit is contained in:
2023-01-09 17:45:32 +01:00
parent 2676c89989
commit 64c6b4129a
2 changed files with 27 additions and 11 deletions

View File

@@ -56,9 +56,11 @@ namespace DevourClient.Helpers
public class Entities public class Entities
{ {
public const int MAX_PLAYERS = 4; //can change with new updates/new hacks
public static BasePlayer LocalPlayer_ = new BasePlayer(); public static BasePlayer LocalPlayer_ = new BasePlayer();
//public static BasePlayer[] Players = new BasePlayer[4]; public static BasePlayer[] Players = new BasePlayer[MAX_PLAYERS];
public static GameObject[] Players = default!; //public static GameObject[] Players = default!;
public static Il2Cpp.GoatBehaviour[] GoatsAndRats = default!; public static Il2Cpp.GoatBehaviour[] GoatsAndRats = default!;
public static Il2Cpp.SurvivalInteractable[] SurvivalInteractables = default!; public static Il2Cpp.SurvivalInteractable[] SurvivalInteractables = default!;
public static Il2Cpp.KeyBehaviour[] Keys = default!; public static Il2Cpp.KeyBehaviour[] Keys = default!;
@@ -91,10 +93,10 @@ namespace DevourClient.Helpers
{ {
for (;;) for (;;)
{ {
Players = GameObject.FindGameObjectsWithTag("Player"); GameObject[] players = GameObject.FindGameObjectsWithTag("Player");
/*
int i = 0; int i = 0;
foreach (GameObject p in GameObject.FindGameObjectsWithTag("Player")) foreach (GameObject p in players)
{ {
string player_name = ""; string player_name = "";
string player_id = "-1"; string player_id = "-1";
@@ -106,13 +108,18 @@ namespace DevourClient.Helpers
player_id = dpt.state.PlayerId; player_id = dpt.state.PlayerId;
} }
if (Players[i] == null)
{
Players[i] = new BasePlayer();
}
Players[i].Id = player_id; Players[i].Id = player_id;
Players[i].Name = player_name; Players[i].Name = player_name;
Players[i].p_GameObject = p; Players[i].p_GameObject = p;
i++; i++;
} }
*/
// Wait 5 seconds before caching objects again. // Wait 5 seconds before caching objects again.
yield return new WaitForSeconds(5f); yield return new WaitForSeconds(5f);

View File

@@ -155,9 +155,14 @@ namespace DevourClient
{ {
if (this.player_esp || this.player_snapline) if (this.player_esp || this.player_snapline)
{ {
foreach (GameObject player in Helpers.Entities.Players) foreach (Helpers.BasePlayer p in Helpers.Entities.Players)
{ {
//GameObject player = Bplayer.p_GameObject; if (p == null)
{
continue;
}
GameObject player = p.p_GameObject;
if (player != null) if (player != null)
{ {
@@ -632,18 +637,22 @@ namespace DevourClient
if (Helpers.Map.GetActiveScene() != "") if (Helpers.Map.GetActiveScene() != "")
{ {
GUI.Label(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 400, 200, 30), $"Functions for the map: {Helpers.Map.GetMapName(Helpers.Map.GetActiveScene())}"); GUI.Label(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 400, 200, 30), $"Functions for the map: {Helpers.Map.GetMapName(Helpers.Map.GetActiveScene())}");
/*
if (Helpers.Map.GetActiveScene() != "Menu") if (Helpers.Map.GetActiveScene() != "Menu")
{ {
GUI.Label(new Rect(Settings.Settings.x + 580, Settings.Settings.y + 400, 150, 30), "Player list:"); GUI.Label(new Rect(Settings.Settings.x + 580, Settings.Settings.y + 400, 150, 30), "Player list:");
int i = 0; int i = 0;
foreach (BasePlayer bp in Entities.Players) foreach (BasePlayer bp in Entities.Players)
{ {
if (bp == null)
{
continue;
}
GUI.Label(new Rect(Settings.Settings.x + 580, Settings.Settings.y + 430 + i, 150, 30), bp.Name); GUI.Label(new Rect(Settings.Settings.x + 580, Settings.Settings.y + 430 + i, 150, 30), bp.Name);
i += 30; i += 30;
} }
} }
*/
switch (Helpers.Map.GetActiveScene()) switch (Helpers.Map.GetActiveScene())
{ {
case "Menu": case "Menu":