diff --git a/DevourClient/Helpers/Map.cs b/DevourClient/Helpers/Map.cs index bb920ee..563e6d2 100644 --- a/DevourClient/Helpers/Map.cs +++ b/DevourClient/Helpers/Map.cs @@ -28,5 +28,19 @@ { return Helpers.Entities.Azazels[0].gameObject; } + + public static void LoadMap(string mapName) + { + if (Il2CppPhoton.Bolt.BoltNetwork.IsServer) + { + Il2CppPhoton.Bolt.BoltNetwork.LoadScene(mapName); + + MelonLoader.MelonLogger.Warning("Please press the button only once, it may take some time for the map to load."); + } + else + { + MelonLoader.MelonLogger.Warning("You must be the host to use this command!"); + } + } } } diff --git a/DevourClient/Helpers/StateHelper.cs b/DevourClient/Helpers/StateHelper.cs index d75d941..51f33be 100644 --- a/DevourClient/Helpers/StateHelper.cs +++ b/DevourClient/Helpers/StateHelper.cs @@ -50,7 +50,6 @@ namespace DevourClient.Helpers return; } - /* Il2Cpp.SurvivalAzazelBehaviour sab = Il2Cpp.SurvivalAzazelBehaviour.FindObjectOfType(); if (sab == null) @@ -59,12 +58,13 @@ namespace DevourClient.Helpers } sab.OnPickedUpPlayer(sab.gameObject, p_GameObject, false); - */ + /* MelonLogger.Msg(Name); Il2Cpp.JumpScare _jumpscare = UnityEngine.Object.FindObjectOfType(); _jumpscare.player = p_GameObject; _jumpscare.Activate(p_GameObject.GetComponent()); + */ } public void LockInCage() diff --git a/DevourClient/MelonMain.cs b/DevourClient/MelonMain.cs index 7d20d70..1bc5c42 100644 --- a/DevourClient/MelonMain.cs +++ b/DevourClient/MelonMain.cs @@ -523,6 +523,7 @@ namespace DevourClient i += 30; } } + switch (Helpers.Map.GetActiveScene()) { case "Menu": @@ -531,7 +532,7 @@ namespace DevourClient Il2CppHorror.Menu menu = UnityEngine.Object.FindObjectOfType(); menu.OnLobbyStartButtonClick(); } - return; + break; case "Devour": if (GUI.Button(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 430, 120, 20), "Burn One Goat")) @@ -563,7 +564,7 @@ namespace DevourClient Hacks.Misc.DespawnDemons(); } - return; + break; case "Molly": if (GUI.Button(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 430, 120, 20), "Burn One Rat")) @@ -595,7 +596,7 @@ namespace DevourClient Hacks.Misc.DespawnDemons(); } - return; + break; case "Inn": if (GUI.Button(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 430, 120, 20), "Burn One Egg")) @@ -631,7 +632,7 @@ namespace DevourClient { Hacks.Misc.DespawnSpiders(); } - return; + break; case "Town": if (GUI.Button(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 430, 120, 20), "Burn One Book")) @@ -662,10 +663,67 @@ namespace DevourClient { Hacks.Misc.DespawnGhosts(); } - return; + break; default: - return; + break; + } + + // load map + switch (Helpers.Map.GetActiveScene()) + { + case "Menu": + GUI.Label(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 470, 100, 30), $"Load Map"); + + + if (GUI.Button(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 500, 100, 20), "Farmhouse")) + { + Helpers.Map.LoadMap("Devour"); + } + + if (GUI.Button(new Rect(Settings.Settings.x + 120, Settings.Settings.y + 500, 100, 20), "Asylum")) + { + Helpers.Map.LoadMap("Molly"); + } + + if (GUI.Button(new Rect(Settings.Settings.x + 230, Settings.Settings.y + 500, 100, 20), "Inn")) + { + Helpers.Map.LoadMap("Inn"); + } + + if (GUI.Button(new Rect(Settings.Settings.x + 340, Settings.Settings.y + 500, 100, 20), "Town")) + { + Helpers.Map.LoadMap("Town"); + } + break; + case "Devour": + case "Molly": + case "Inn": + case "Town": + GUI.Label(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 490, 100, 30), "Load Map"); + + if (GUI.Button(new Rect(Settings.Settings.x + 10, Settings.Settings.y + 520, 100, 20), "Farmhouse")) + { + Helpers.Map.LoadMap("Devour"); + } + + if (GUI.Button(new Rect(Settings.Settings.x + 120, Settings.Settings.y + 520, 100, 20), "Asylum")) + { + Helpers.Map.LoadMap("Molly"); + } + + if (GUI.Button(new Rect(Settings.Settings.x + 230, Settings.Settings.y + 520, 100, 20), "Inn")) + { + Helpers.Map.LoadMap("Inn"); + } + + if (GUI.Button(new Rect(Settings.Settings.x + 340, Settings.Settings.y + 520, 100, 20), "Town")) + { + Helpers.Map.LoadMap("Town"); + } + break; + default: + break; } } }