From f8e9c7587e3116a947412a29a78900574d611fb4 Mon Sep 17 00:00:00 2001 From: Aleksandr Trubin Date: Thu, 16 Jan 2020 17:58:50 +0500 Subject: [PATCH] some fixes to TAIcheat MenuTries now produce a menu (that doesn't actually work) --- ControllerFix/ControllerFix.csproj | 14 +-- ControllerFix/packages.config | 2 +- MenuTries/MenuTries.cs | 153 +++++++++++------------------ MenuTries/MenuTries.csproj | 20 ++-- MenuTries/packages.config | 2 +- SmoothThrust/SmoothThrust.csproj | 14 +-- SmoothThrust/packages.config | 2 +- TAIcheat/TAIcheat.cs | 92 ++++++++--------- TAIcheat/TAIcheat.csproj | 20 ++-- TAIcheat/packages.config | 2 +- 10 files changed, 136 insertions(+), 185 deletions(-) diff --git a/ControllerFix/ControllerFix.csproj b/ControllerFix/ControllerFix.csproj index de0d2e0..fdc97ed 100644 --- a/ControllerFix/ControllerFix.csproj +++ b/ControllerFix/ControllerFix.csproj @@ -46,28 +46,28 @@ False - ..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll + ..\packages\OWML.0.3.19\lib\net35\NAudio-Unity.dll ..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.Common.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Assets.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Events.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Menus.dll diff --git a/ControllerFix/packages.config b/ControllerFix/packages.config index a4d996e..150f9d1 100644 --- a/ControllerFix/packages.config +++ b/ControllerFix/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/MenuTries/MenuTries.cs b/MenuTries/MenuTries.cs index 80af1f1..d65e457 100644 --- a/MenuTries/MenuTries.cs +++ b/MenuTries/MenuTries.cs @@ -6,121 +6,82 @@ using UnityEngine.UI; using UnityEngine.EventSystems; using UnityEngine.SceneManagement; +using System; namespace MenuTries { - /*class MenuPatch - { - public static void Menu_Prefix(TitleScreenManager __instance) - { - GameObject mainmenu = GameObject.Find("MainMenuLayoutGroup"); - if (mainmenu) - { - MenuTries.console.WriteLine("Menu " + mainmenu.name); - MenuTries.setbut = mainmenu.transform.Find("Button-Options").gameObject; - if (MenuTries.setbut) - { - MenuTries.console.WriteLine("Button acquired"); - MenuTries.setbut.GetComponentInChildren().text = "newsettings"; - if (mainmenu.name == "MainMenuLayoutGroup") - { - - MenuTries.extrabut = GameObject.Instantiate(MenuTries.setbut); - MenuTries.extrabut.transform.SetParent(mainmenu.transform, false); - MenuTries.extrabut.transform.position = MenuTries.setbut.transform.position; - MenuTries.extrabut.GetComponentInChildren().text = "newtext"; - MenuTries.extrabut.SetActive(true); - mainmenu.GetComponent().CalculateLayoutInputHorizontal(); - mainmenu.GetComponent().SetLayoutHorizontal(); - MenuTries.console.WriteLine("Button added!"); - } - } - } - } - }*/ public class MenuTries : ModBehaviour { public static IModConsole console; - public static GameObject extramenu, mainmenu, setbut; + public static GameObject extramenu, canvas, toggle, rebinder; + public static Transform content; public static Button menubutton; public static Menu cusMenu; private void Start() { + Application.logMessageReceived += OnLogMessageReceived; console = ModHelper.Console; - //ModHelper.HarmonyHelper.AddPrefix("SetUpMenu", typeof(MenuPatch), "Menu_Prefix"); - menubutton = ModHelper.Menus.MainMenu.AddButton("sample menu", 4); + + menubutton = ModHelper.Menus.MainMenu.AddButton("Custom Menu", 4); menubutton.onClick.AddListener(OnEvent); - mainmenu = GameObject.Find("KeyboardRebindingCanvas"); - mainmenu = mainmenu.transform.GetChild(0).gameObject; - extramenu = GameObject.Instantiate(mainmenu); - GameObject.Destroy(extramenu.transform.Find("HeaderPanel").GetComponentInChildren()); - extramenu.transform.Find("HeaderPanel").GetComponentInChildren().text = "custom menu"; - cusMenu = extramenu.GetComponent();// this doesn't open :( - //cusMenu = mainmenu.GetComponent(); // this opens - ModHelper.Console.WriteLine("MenuTry ready!"); - - //mainmenu = GameObject.Find("MainMenuLayoutGroup"); - /*GameObject setbut = GameObject.Find("Button-Options"); - extrabut = Object.Instantiate(setbut); - extrabut.transform.SetParent(mainmenu.transform,false); - extrabut.GetComponentInChildren().text = "newtext"; - mainmenu.GetComponentInChildren().SetLayoutVertical(); - ModHelper.Console.WriteLine("New button added!");*/ - } - private void OnEvent() - { - ModHelper.Console.WriteLine("trying to open menu"); - cusMenu.EnableMenu(true); - ModHelper.Console.WriteLine("trying to open menu (end)"); - /* - GameObject cobj = behaviour.gameObject; - if (cobj.name == "PauseMenuItems") - cobj = cobj.transform.GetChild(0).gameObject; - if (cobj.name == "MainMenuLayoutGroup" || cobj.name == "PauseMenuItemsLayout") - { - mainmenu = cobj; - GameObject setbut = mainmenu.transform.Find("Button-Options").gameObject; - if (setbut) - { - setbut.GetComponentInChildren().text = "newtext"; - if (extrabut) - { - extrabut.GetComponentInChildren().text = "newtext"; - if (!extrabut.activeSelf) - { - extrabut.SetActive(true); - mainmenu.GetComponent().CalculateLayoutInputVertical(); - mainmenu.GetComponent().SetLayoutVertical(); - } - } - else - { - if (mainmenu) - { - extrabut = GameObject.Instantiate(setbut); - extrabut.transform.SetParent(mainmenu.transform, false); - extrabut.transform.position = setbut.transform.position; - extrabut.GetComponentInChildren().text = "newtext"; - mainmenu.GetComponent().CalculateLayoutInputHorizontal(); - mainmenu.GetComponent().SetLayoutHorizontal(); - ModHelper.Console.WriteLine("New button re-added!"); - } - } - } - } - ModHelper.Console.WriteLine("Behaviour name: " + behaviour.name); - if (behaviour.GetType() == typeof(Flashlight) && ev == Events.AfterStart) + ModHelper.Console.WriteLine("copying menu"); + canvas = GameObject.Find("KeyboardRebindingCanvas"); + extramenu = canvas.transform.GetChild(0).gameObject; + extramenu = GameObject.Instantiate(extramenu,canvas.transform); + cusMenu = extramenu.GetComponent(); + + ModHelper.Console.WriteLine("setting up controls"); + content = extramenu.transform.Find("DetailsPanel").GetChild(2).GetChild(0).GetChild(0).GetChild(0); + GameObject.Destroy(extramenu.transform.Find("DetailsPanel").GetChild(1).gameObject); + rebinder = content.GetChild(0).gameObject; + toggle = GameObject.Find("OptionsCanvas").transform.GetChild(0).GetChild(4).GetChild(3).GetChild(0).GetChild(0).GetChild(0).GetChild(2).gameObject; + toggle = Instantiate(toggle, content); + toggle.SetActive(false); + + ModHelper.Console.WriteLine("setting up text"); + var ltext = extramenu.GetComponentsInChildren(); + for (int i = 0; i < ltext.Length; i++) + GameObject.Destroy(ltext[i]); + GameObject.Destroy(toggle.GetComponentInChildren()); + + content.GetChild(0).gameObject.SetActive(false); + + extramenu.transform.Find("HeaderPanel").GetComponentInChildren().text = "Custom Menu"; + var rtext = extramenu.transform.Find("FooterPanel").GetComponentsInChildren(); + rtext[0].text = "Cancel and Exit"; + rtext[1].text = "Default settings"; + rtext[2].text = "Save and Exit"; + rtext[3].text = "Discard changes"; + + GameObject newins; + + for (int i = 1; i <= 5; i++) { - ModHelper.Console.WriteLine("Flashlight has started!"); + newins = GameObject.Instantiate(toggle, content); + newins.GetComponentInChildren().text = $"mod #{i}"; + newins.SetActive(true); + var temp = newins.transform.GetChild(1).GetChild(1); + //temp.GetChild(0).GetComponentInChildren().text = "Enabled"; + //temp.GetChild(1).GetComponentInChildren().text = "Disabled"; //probably should rather somehow keep the LocalizedText being destroyed from those two } - */ + + ModHelper.Console.WriteLine("MenuTry done!"); } - private void OnGUI() + private void OnLogMessageReceived(string message, string stackTrace, LogType type) { + if (stackTrace != null) + ModHelper.Logger.Log($"\t{type}: {message}; {stackTrace}"); + else + ModHelper.Logger.Log($"\t{type}: {message}"); } - + private void OnEvent() + { + ModHelper.Console.WriteLine("trying to open menu"); + cusMenu.EnableMenu(true); + ModHelper.Console.WriteLine("trying to open menu (end)"); + } } } diff --git a/MenuTries/MenuTries.csproj b/MenuTries/MenuTries.csproj index 5382cfd..47a5b17 100644 --- a/MenuTries/MenuTries.csproj +++ b/MenuTries/MenuTries.csproj @@ -44,35 +44,29 @@ False - ..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll - True + ..\packages\OWML.0.3.19\lib\net35\NAudio-Unity.dll ..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll True - ..\packages\OWML.0.3.13\lib\net35\OWML.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.Common.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Assets.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Events.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Menus.dll False diff --git a/MenuTries/packages.config b/MenuTries/packages.config index a4d996e..150f9d1 100644 --- a/MenuTries/packages.config +++ b/MenuTries/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/SmoothThrust/SmoothThrust.csproj b/SmoothThrust/SmoothThrust.csproj index 7001664..b724680 100644 --- a/SmoothThrust/SmoothThrust.csproj +++ b/SmoothThrust/SmoothThrust.csproj @@ -45,28 +45,28 @@ False - ..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll + ..\packages\OWML.0.3.19\lib\net35\NAudio-Unity.dll ..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.Common.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Assets.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Events.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Menus.dll diff --git a/SmoothThrust/packages.config b/SmoothThrust/packages.config index a4d996e..150f9d1 100644 --- a/SmoothThrust/packages.config +++ b/SmoothThrust/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/TAIcheat/TAIcheat.cs b/TAIcheat/TAIcheat.cs index 668fb26..90f47b4 100644 --- a/TAIcheat/TAIcheat.cs +++ b/TAIcheat/TAIcheat.cs @@ -41,7 +41,7 @@ private RelativeLocationData relconstr(Vector3 body_position, Quaternion body_ro public static IModConsole console; public static GameObject player; - public static PlayerCharacterController playerchar; + public static PlayerSpacesuit playersuit; private void Start() { @@ -207,13 +207,14 @@ private void Update() AudioSource.PlayClipAtPoint(Locator.GetAudioManager().GetAudioClipArray(global::AudioType.NomaiPowerOff)[0], Locator.GetActiveCamera().transform.position); } - if (Locator.GetPlayerController() == null) + if (playersuit == null) + playersuit = Locator.GetPlayerSuit(); + if (playersuit == null) return; - else - playerchar = Locator.GetPlayerController(); - if (!playerchar.enabled) + if (!playersuit.enabled) + playersuit = Locator.GetPlayerSuit(); + if (playersuit == null || !playersuit.enabled) return; - if (DebugInput.cheatsOn) { if (global::Input.GetKeyDown(DebugKeyCode.setWarpPoint)) @@ -304,30 +305,7 @@ private void Update() this._gotoWarpPointNextFrame = true; } } - if (global::Input.GetKey(KeyCode.E) && global::Input.GetKey(KeyCode.U)) - { - GlobalMessenger.FireEvent("DebugWarpVessel"); - this.COn = true; - } - if (global::Input.GetKeyDown(KeyCode.Delete)) - { - if (this.altPressed) - { - this.COn = true; - FragmentIntegrity[] array2 = UnityEngine.Object.FindObjectsOfType(); - for (int j = 0; j < array2.Length; j++) - { - array2[j].AddDamage(10000f); - } - } - else - { - this.COn = true; - GlobalMessenger.FireEvent("TriggerSupernova"); - } - } - /* - if (global::Input.GetKeyDown(DebugKeyCode.destroyTimeline)) + /*if (global::Input.GetKeyDown(DebugKeyCode.destroyTimeline)) { Debug.Log("Try DestroyTimeline (Requires NomaiExperimentBlackHole)"); GlobalMessenger.FireEvent("DebugTimelineDestroyed"); @@ -339,23 +317,16 @@ private void Update() if (global::Input.GetKeyUp(DebugKeyCode.uiTestAndSuicide)) { Locator.GetPlayerTransform().GetComponent().SetDebugKillResources(false); - } - - */ - if (global::Input.GetKeyDown(DebugKeyCode.timeLapse)) - { - Time.timeScale = 10f; - } - else if (global::Input.GetKeyUp(DebugKeyCode.timeLapse)) - { - Time.timeScale = 1f; - } + }*/ if (global::Input.GetKeyDown(KeyCode.G)) { if (this.altPressed) { - PlayerData.LearnLaunchCodes(); - this.COn = true; + if (PlayerData.IsLoaded()) + { + PlayerData.LearnLaunchCodes(); + this.COn = true; + } } else if (!Locator.GetPlayerSuit().IsWearingSuit(true)) { @@ -654,16 +625,47 @@ private void Update() } } } + if (global::Input.GetKeyDown(KeyCode.Delete)) + { + if (this.altPressed) + { + this.COn = true; + FragmentIntegrity[] array2 = UnityEngine.Object.FindObjectsOfType(); + for (int j = 0; j < array2.Length; j++) + { + array2[j].AddDamage(10000f); + } + } + else + { + this.COn = true; + GlobalMessenger.FireEvent("TriggerSupernova"); + } + } + if (global::Input.GetKey(KeyCode.E) && global::Input.GetKey(KeyCode.U)) + { + GlobalMessenger.FireEvent("DebugWarpVessel"); + this.COn = true; + } + if (global::Input.GetKeyDown(DebugKeyCode.timeLapse)) + { + Time.timeScale = 10f; + } + else if (global::Input.GetKeyUp(DebugKeyCode.timeLapse)) + { + Time.timeScale = 1f; + } + if (this.COn) { AudioClip[] audioClipArray = Locator.GetAudioManager().GetAudioClipArray(global::AudioType.Menu_Confirm); - AudioSource.PlayClipAtPoint(audioClipArray[UnityEngine.Random.Range(0, audioClipArray.Length)], Locator.GetPlayerBody().transform.position); + AudioSource.PlayClipAtPoint(audioClipArray[UnityEngine.Random.Range(0, audioClipArray.Length)], Locator.GetActiveCamera().transform.position); this.COn = false; } if (this.COff) { AudioClip[] audioClipArray2 = Locator.GetAudioManager().GetAudioClipArray(global::AudioType.Menu_Cancel); - AudioSource.PlayClipAtPoint(audioClipArray2[UnityEngine.Random.Range(0, audioClipArray2.Length)], Locator.GetPlayerBody().transform.position); + AudioSource.PlayClipAtPoint(audioClipArray2[UnityEngine.Random.Range(0, audioClipArray2.Length)], Locator.GetActiveCamera().transform.position); this.COff = false; } } diff --git a/TAIcheat/TAIcheat.csproj b/TAIcheat/TAIcheat.csproj index ea7edff..db4b457 100644 --- a/TAIcheat/TAIcheat.csproj +++ b/TAIcheat/TAIcheat.csproj @@ -41,35 +41,29 @@ False - ..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll - True + ..\packages\OWML.0.3.19\lib\net35\NAudio-Unity.dll ..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll True - ..\packages\OWML.0.3.13\lib\net35\OWML.dll + ..\packages\OWML.0.3.19\lib\net35\OWML.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.Common.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Assets.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Events.dll - ..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll - True + ..\packages\OWML.0.3.19\lib\net35\OWML.ModHelper.Menus.dll False diff --git a/TAIcheat/packages.config b/TAIcheat/packages.config index a4d996e..150f9d1 100644 --- a/TAIcheat/packages.config +++ b/TAIcheat/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file