diff --git a/Assets/BuildProfile.asset b/Assets/BuildProfile.asset index bd553e7..922ddad 100644 --- a/Assets/BuildProfile.asset +++ b/Assets/BuildProfile.asset @@ -26,5 +26,5 @@ MonoBehaviour: ApplyHarmonyPatches: 1 BuildItems: - {fileID: 11400000, guid: ccaff18373cd99848b344316974e6d46, type: 2} - BuildAction: 2 + BuildAction: 1 OutputProfile: C:/Users/Alex/AppData/Roaming/r2modmanPlus-local/H3VR/profiles/dev diff --git a/Assets/MeatKit/MeatKitPlugin.cs b/Assets/MeatKit/MeatKitPlugin.cs index 947f81b..7d48654 100644 --- a/Assets/MeatKit/MeatKitPlugin.cs +++ b/Assets/MeatKit/MeatKitPlugin.cs @@ -85,24 +85,8 @@ public static AssetBundle bundle; private void SceneChanged(Scene from, Scene to) { - StartCoroutine("SceneChangedCoRoutine"); - } - - private IEnumerator SceneChangedCoRoutine() - { - // grab H3VR objects - playerCamera = null; - hpDisplay = null; - while (playerCamera == null) - { - playerCamera = GameObject.FindGameObjectWithTag("MainCamera"); - hpDisplay = FindObjectOfType(); - yield return null; - } - - // ---- MAINCAMERA FOUND SIGNIFIES THAT ESSENTIAL GAME OBJECTS HAVE LOADED IN ---- // - - // find Agency font + playerCamera = GameObject.FindGameObjectWithTag("MainCamera"); + hpDisplay = FindObjectOfType(); GetFonts(); // apply health counter tweaks globally @@ -120,17 +104,34 @@ public static AssetBundle bundle; WristMenuAPI.Buttons.Remove(wmbHPToggle); } - if (GameObject.Find("_GameManager") != null || FindObjectOfType() != null) + StartCoroutine("TryTNH"); + } + + private IEnumerator TryTNH() + { + for (int i = 0; i < 11; ++i) { - Logger.LogInfo("We are in a TNH game!"); - instance = new GameObject().AddComponent(); + // TNH patches + if (GameObject.Find("_GameManager") != null || FindObjectOfType() != null) + { + Logger.LogInfo("We are in a TNH game!"); + instance = new GameObject().AddComponent(); + break; + } + else + { + Logger.LogInfo(String.Format("Couldn't find a TNH game. Trying again...({0}/10)", i)); + yield return new WaitForEndOfFrame(); + } } - else + + // destroy self only if we are FOR SURE not in a TNH game + if (GameObject.Find("_GameManager") == null || FindObjectOfType() == null) { Logger.LogInfo("We are NOT in a TNH game!"); Destroy(instance); } - } + } // called on scene change, find fonts from game if they're not set private void GetFonts() diff --git a/Assets/README.md b/Assets/README.md index ba7b0ac..82a8067 100644 --- a/Assets/README.md +++ b/Assets/README.md @@ -21,10 +21,6 @@ Toggle and customize these features in your mod manager's *Config editor*. For any issues/ideas, please create an issue at the GitHub repository (linked on Thunderstore page). ## Changelog -1.2.4 -* [TNH] Fix errors occurring in Atlas-based maps -* Update MeatKit (now on Unity 5.6.7f1!) - 1.2.3 * Added button in wrist menu to toggle HP counter (thanks PutterMyBancakes for the suggestion!) * [TNH] Made the search time for deprecated Leaderboard mod based on day of year as an input of the sin() diff --git a/Assets/_Scripts/InPlay.cs b/Assets/_Scripts/InPlay.cs index 5fb50c6..3acec19 100644 --- a/Assets/_Scripts/InPlay.cs +++ b/Assets/_Scripts/InPlay.cs @@ -58,10 +58,5 @@ namespace TNHQoLImprovements tnhInfo = Instantiate(MeatKitPlugin.bundle.LoadAsset("TNHInfo"), FindObjectOfType().transform.GetChild(3)); tnhInfo.transform.localScale = new Vector3(0.002f, 0.002f, 0.002f); } - - void OnDestroy() - { - tnhManager = null; - } } } \ No newline at end of file diff --git a/Assets/_Scripts/ShopTokenPatch.cs b/Assets/_Scripts/ShopTokenPatch.cs index 3c185dd..200b8f9 100644 --- a/Assets/_Scripts/ShopTokenPatch.cs +++ b/Assets/_Scripts/ShopTokenPatch.cs @@ -1,5 +1,4 @@ -using System.Collections; -using HarmonyLib; +using HarmonyLib; using System.Reflection; using UnityEngine; using UnityEngine.UI; @@ -27,7 +26,7 @@ namespace TNHQoLImprovements { private Text text; - private IEnumerator Start() + private void Start() { var gObjText = new GameObject("TokenCounter"); gObjText.transform.SetParent(transform, false); @@ -38,26 +37,11 @@ namespace TNHQoLImprovements text.font = MeatKitPlugin.fontBombardier; text.fontSize = 55; text.color = new Color(0.1307786f, 0.2461715f, 0.359f); - - while (InPlay.tnhManager == null) - { - Debug.Log("[ShopTokenNumber] tnhManager is null!"); - yield return null; - } - - InPlay.tnhManager.TokenCountChangeEvent += UpdateText; - UpdateText(); - } - - private void UpdateText(int _ = 0) + } + private void Update() { int tokens = InPlay.tnhManager.GetNumTokens(); text.text = tokens.ToString(); } - - private void OnDestroy() - { - InPlay.tnhManager.TokenCountChangeEvent -= UpdateText; - } } } \ No newline at end of file diff --git a/Assets/_Scripts/TNHInfo.cs b/Assets/_Scripts/TNHInfo.cs index e8141d3..45f07a0 100644 --- a/Assets/_Scripts/TNHInfo.cs +++ b/Assets/_Scripts/TNHInfo.cs @@ -62,8 +62,8 @@ namespace TNHQoLImprovements public void Update() { - // game over area; do not update anything else - if (InPlay.tnhManager.Phase == TNH_Phase.Dead || InPlay.tnhManager.Phase == TNH_Phase.Completed) + // game over area; do not update anything else + if (InPlay.tnhManager.Phase == TNH_Phase.Dead || InPlay.tnhManager.Phase == TNH_Phase.Completed) { if (tokenCounter != null) tokenCounter.SetActive(true); diff --git a/preview/aimhide.png b/preview/aimhide.png deleted file mode 100644 index 540b31a..0000000 Binary files a/preview/aimhide.png and /dev/null differ diff --git a/preview/hp.png b/preview/hp.png deleted file mode 100644 index 5f37280..0000000 Binary files a/preview/hp.png and /dev/null differ diff --git a/preview/item station.png b/preview/item station.png deleted file mode 100644 index 3546e24..0000000 Binary files a/preview/item station.png and /dev/null differ diff --git a/preview/leaderboard.png b/preview/leaderboard.png deleted file mode 100644 index 8f5b1b8..0000000 Binary files a/preview/leaderboard.png and /dev/null differ diff --git a/preview/stats.png b/preview/stats.png deleted file mode 100644 index 496db0a..0000000 Binary files a/preview/stats.png and /dev/null differ diff --git a/preview/stats_new.png b/preview/stats_new.png deleted file mode 100644 index a3b4a99..0000000 Binary files a/preview/stats_new.png and /dev/null differ