From 6f55b8da3f64b7eddcce97a84259c24ff88c1214 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 30 Sep 2022 22:24:54 -0400 Subject: [PATCH 01/16] Backwards compat for certain mods broken by keepLoaded = false --- NewHorizons/Utility/NewHorizonBody.cs | 29 ++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/NewHorizons/Utility/NewHorizonBody.cs b/NewHorizons/Utility/NewHorizonBody.cs index fbbc7de6..7b5a7dc3 100644 --- a/NewHorizons/Utility/NewHorizonBody.cs +++ b/NewHorizons/Utility/NewHorizonBody.cs @@ -1,5 +1,6 @@ -using NewHorizons.External.Configs; +using NewHorizons.External.Configs; using OWML.Common; +using System.Linq; using UnityEngine; namespace NewHorizons.Utility { @@ -17,5 +18,31 @@ namespace NewHorizons.Utility public string RelativePath; public GameObject Object; + + #region Migration + private static readonly string[] _keepLoadedModsList = new string[] + { + "CreativeNameTxt.theirhomeworld", + "Roggsy.enterthewarioverse", + "Jammer.jammerlore", + "ErroneousCreationist.solarneighbourhood", + "ErroneousCreationist.incursionfinaldawn" + }; + + private void Migrate() + { + // Some old mods get really broken by this change in 1.6.1 + if (_keepLoadedModsList.Contains(Mod.ModHelper.Manifest.UniqueName)) + { + if (Config?.Props?.details != null) + { + foreach (var detail in Config.Props.details) + { + detail.keepLoaded = true; + } + } + } + } + #region Migration } } From d7730436d4347fcbb5988df41e8b28d1807c8e23 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 30 Sep 2022 22:30:13 -0400 Subject: [PATCH 02/16] Whoops --- NewHorizons/Utility/NewHorizonBody.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NewHorizons/Utility/NewHorizonBody.cs b/NewHorizons/Utility/NewHorizonBody.cs index 7b5a7dc3..03cf0085 100644 --- a/NewHorizons/Utility/NewHorizonBody.cs +++ b/NewHorizons/Utility/NewHorizonBody.cs @@ -11,6 +11,8 @@ namespace NewHorizons.Utility Config = config; Mod = mod; RelativePath = relativePath; + + Migrate(); } public PlanetConfig Config; @@ -43,6 +45,6 @@ namespace NewHorizons.Utility } } } - #region Migration + #endregion Migration } } From d1da5c3791e80f7d3c4fcb9355e8a26e68f46586 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 30 Sep 2022 22:30:26 -0400 Subject: [PATCH 03/16] Remove stupid null check, only set active at the end --- NewHorizons/Builder/Props/DetailBuilder.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 6cb415a2..4929dade 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -102,9 +102,6 @@ namespace NewHorizons.Builder.Props prop.transform.localScale = detail.stretch ?? (detail.scale != 0 ? Vector3.one * detail.scale : prefab.transform.localScale); if (!detail.keepLoaded) GroupsBuilder.Make(prop, sector); - prop.SetActive(true); - - if (prop == null) return null; if (detail.removeChildren != null) { @@ -161,6 +158,8 @@ namespace NewHorizons.Builder.Props } } + prop.SetActive(true); + return prop; } From 24eedc887addf67617d257e770a92f699291b978 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 19:31:31 -0700 Subject: [PATCH 04/16] you dont need it here HAHA --- NewHorizons/Utility/NewHorizonBody.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Utility/NewHorizonBody.cs b/NewHorizons/Utility/NewHorizonBody.cs index 03cf0085..fc9f53bd 100644 --- a/NewHorizons/Utility/NewHorizonBody.cs +++ b/NewHorizons/Utility/NewHorizonBody.cs @@ -45,6 +45,6 @@ namespace NewHorizons.Utility } } } - #endregion Migration + #endregion } } From db2d1aebcd1ba4c2539bf4c6f955738c3fbc4146 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 19:33:06 -0700 Subject: [PATCH 05/16] move group builder down here too --- NewHorizons/Builder/Props/DetailBuilder.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 4929dade..4aa2fc42 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -101,8 +101,6 @@ namespace NewHorizons.Builder.Props prop.transform.localScale = detail.stretch ?? (detail.scale != 0 ? Vector3.one * detail.scale : prefab.transform.localScale); - if (!detail.keepLoaded) GroupsBuilder.Make(prop, sector); - if (detail.removeChildren != null) { var detailPath = prop.transform.GetPath(); @@ -158,6 +156,7 @@ namespace NewHorizons.Builder.Props } } + if (!detail.keepLoaded) GroupsBuilder.Make(prop, sector); prop.SetActive(true); return prop; From 70467b76a1d375f4cef6ae0e07e55e8bce3561c1 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 30 Sep 2022 22:45:39 -0400 Subject: [PATCH 06/16] Fixed #393 --- .../Utility/DebugUtilities/DebugRaycaster.cs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs b/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs index 16f502e8..6f4e23fa 100644 --- a/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs +++ b/NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs @@ -19,24 +19,31 @@ namespace NewHorizons.Utility.DebugUtilities private ScreenPrompt _raycastPrompt; - private void Awake() + private void Start() { _rb = this.GetRequiredComponent(); - _raycastPrompt = new ScreenPrompt(TranslationHandler.GetTranslation("DEBUG_RAYCAST", TranslationHandler.TextType.UI) + " ", ImageUtilities.GetButtonSprite(KeyCode.P)); - - Locator.GetPromptManager().AddScreenPrompt(_raycastPrompt, PromptPosition.UpperRight, false); + if (_raycastPrompt == null) + { + _raycastPrompt = new ScreenPrompt(TranslationHandler.GetTranslation("DEBUG_RAYCAST", TranslationHandler.TextType.UI) + " ", ImageUtilities.GetButtonSprite(KeyCode.P)); + Locator.GetPromptManager().AddScreenPrompt(_raycastPrompt, PromptPosition.UpperRight, false); + } } private void OnDestroy() { - Locator.GetPromptManager()?.RemoveScreenPrompt(_raycastPrompt, PromptPosition.UpperRight); + if (_raycastPrompt != null) + { + Locator.GetPromptManager()?.RemoveScreenPrompt(_raycastPrompt, PromptPosition.UpperRight); + } } private void Update() { UpdatePromptVisibility(); + if (!Main.Debug) return; + if (Keyboard.current == null) return; if (Keyboard.current[Key.P].wasReleasedThisFrame) @@ -48,7 +55,10 @@ namespace NewHorizons.Utility.DebugUtilities public void UpdatePromptVisibility() { - _raycastPrompt.SetVisibility(!OWTime.IsPaused() && Main.Debug); + if (_raycastPrompt != null) + { + _raycastPrompt.SetVisibility(!OWTime.IsPaused() && Main.Debug); + } } From 63f87e4c6d3c3ed092a17ea7dc1137f6fefb864d Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 19:46:36 -0700 Subject: [PATCH 07/16] sort arcs by path to hopefully prevent future updates from breaking everything --- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index 981f447d..5528f6c9 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -48,7 +48,11 @@ namespace NewHorizons.Builder.Props private static void InitPrefabs() { // Just take every scroll and get the first arc - var existingArcs = GameObject.FindObjectsOfType().Select(x => x?._nomaiWallText?.gameObject?.transform?.Find("Arc 1")?.gameObject).Where(x => x != null).ToArray(); + var existingArcs = GameObject.FindObjectsOfType() + .Select(x => x?._nomaiWallText?.gameObject?.transform?.Find("Arc 1")?.gameObject) + .Where(x => x != null) + .OrderBy(x => x.transform.GetPath()) + .ToArray(); _arcPrefabs = new List(); _childArcPrefabs = new List(); foreach (var existingArc in existingArcs) @@ -67,7 +71,11 @@ namespace NewHorizons.Builder.Props } } - var existingGhostArcs = GameObject.FindObjectsOfType().Select(x => x?._textLine?.gameObject).Where(x => x != null).ToArray(); + var existingGhostArcs = GameObject.FindObjectsOfType() + .Select(x => x?._textLine?.gameObject) + .Where(x => x != null) + .OrderBy(x => x.transform.GetPath()) + .ToArray(); _ghostArcPrefabs = new List(); foreach (var existingArc in existingGhostArcs) { From ecc51a32f3325ce7dfd5711b3179117ce528a53f Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 19:49:04 -0700 Subject: [PATCH 08/16] add missing parenthesis here lol --- NewHorizons/Utility/SearchUtilities.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Utility/SearchUtilities.cs b/NewHorizons/Utility/SearchUtilities.cs index 97cb4a5e..99cd2cdb 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -119,7 +119,7 @@ namespace NewHorizons.Utility var name = names.Last(); if (warn) Logger.LogWarning($"Couldn't find object in path {path}, will look for potential matches for name {name}"); - // 3: find resource to include inactive objects (but skip prefabs + // 3: find resource to include inactive objects (but skip prefabs) go = Resources.FindObjectsOfTypeAll() .FirstOrDefault(x => x.name == name && x.scene.name != null); if (go) From 7ce78d2ed034471e2fa9eaf19f201d0b8a1dc031 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 19:51:59 -0700 Subject: [PATCH 09/16] comment --- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index 5528f6c9..84f15073 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -51,7 +51,7 @@ namespace NewHorizons.Builder.Props var existingArcs = GameObject.FindObjectsOfType() .Select(x => x?._nomaiWallText?.gameObject?.transform?.Find("Arc 1")?.gameObject) .Where(x => x != null) - .OrderBy(x => x.transform.GetPath()) + .OrderBy(x => x.transform.GetPath()) // order by path so game updates dont break things .ToArray(); _arcPrefabs = new List(); _childArcPrefabs = new List(); @@ -74,7 +74,7 @@ namespace NewHorizons.Builder.Props var existingGhostArcs = GameObject.FindObjectsOfType() .Select(x => x?._textLine?.gameObject) .Where(x => x != null) - .OrderBy(x => x.transform.GetPath()) + .OrderBy(x => x.transform.GetPath()) // order by path so game updates dont break things .ToArray(); _ghostArcPrefabs = new List(); foreach (var existingArc in existingGhostArcs) From 6c8d2ede891fc5f7cebd1aa4274cd8be5b026a39 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 20:45:39 -0700 Subject: [PATCH 10/16] use path.combine for linux --- NewHorizons/Builder/ShipLog/RumorModeBuilder.cs | 2 +- NewHorizons/Main.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs b/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs index 9e82ae8b..740731ec 100644 --- a/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs +++ b/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs @@ -206,7 +206,7 @@ namespace NewHorizons.Builder.ShipLog private static Sprite GetEntrySprite(string entryId, NewHorizonsBody body, bool logError) { - string relativePath = body.Config.ShipLog.spriteFolder + "/" + entryId + ".png"; + string relativePath = Path.Combine(body.Config.ShipLog.spriteFolder, entryId + ".png"); try { Texture2D newTexture = ImageUtilities.GetTexture(body.Mod, relativePath); diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 96e670d7..c33f4350 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -571,11 +571,11 @@ namespace NewHorizons } } // Has to go before translations for achievements - if (File.Exists(folder + "addon-manifest.json")) + if (File.Exists(Path.Combine(folder, "addon-manifest.json"))) { LoadAddonManifest("addon-manifest.json", mod); } - if (Directory.Exists(folder + @"translations\")) + if (Directory.Exists(Path.Combine(folder, "translations"))) { LoadTranslations(folder, mod); } @@ -603,15 +603,15 @@ namespace NewHorizons var foundFile = false; foreach (TextTranslation.Language language in Enum.GetValues(typeof(TextTranslation.Language))) { - if (language == TextTranslation.Language.UNKNOWN || language == TextTranslation.Language.TOTAL) continue; + if (language is TextTranslation.Language.UNKNOWN or TextTranslation.Language.TOTAL) continue; - var relativeFile = $"translations/{language.ToString().ToLower()}.json"; + var relativeFile = Path.Combine("translations", language.ToString().ToLower() + ".json"); - if (File.Exists($"{folder}{relativeFile}")) + if (File.Exists(Path.Combine(folder, relativeFile))) { Logger.LogVerbose($"Registering {language} translation from {mod.ModHelper.Manifest.Name} from {relativeFile}"); - var config = new TranslationConfig($"{folder}{relativeFile}"); + var config = new TranslationConfig(Path.Combine(folder, relativeFile)); foundFile = true; From b3a9a4690c31738552fc5108533956d1a232a2cb Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 20:50:45 -0700 Subject: [PATCH 11/16] use schema --- NewHorizons/Assets/addon-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/NewHorizons/Assets/addon-manifest.json b/NewHorizons/Assets/addon-manifest.json index 9d8fd2a8..da53675c 100644 --- a/NewHorizons/Assets/addon-manifest.json +++ b/NewHorizons/Assets/addon-manifest.json @@ -1,4 +1,5 @@ { + "$schema": "https://raw.githubusercontent.com/Outer-Wilds-New-Horizons/new-horizons/main/NewHorizons/Schemas/addon_manifest_schema.json", "credits": [ "xen#Mod Director\n#Programmer", "Bwc9876#Mod Manager\n#Programmer\n#Dev Ops", From 8c62b56bc07a6b19505ddcfc95786d2cc83a9b71 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 1 Oct 2022 00:50:31 -0400 Subject: [PATCH 12/16] Translate credits, popups, update OWML version --- NewHorizons/Main.cs | 16 +++++++++++++--- NewHorizons/NewHorizons.csproj | 2 +- NewHorizons/manifest.json | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index c33f4350..afa0b702 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -593,9 +593,19 @@ namespace NewHorizons var addonConfig = mod.ModHelper.Storage.Load(file); - if (addonConfig.achievements != null) AchievementHandler.RegisterAddon(addonConfig, mod as ModBehaviour); - if (addonConfig.credits != null) CreditsHandler.RegisterCredits(mod.ModHelper.Manifest.Name, addonConfig.credits); - if (!string.IsNullOrEmpty(addonConfig.popupMessage)) MenuHandler.RegisterOneTimePopup(mod, addonConfig.popupMessage); + if (addonConfig.achievements != null) + { + AchievementHandler.RegisterAddon(addonConfig, mod as ModBehaviour); + } + if (addonConfig.credits != null) + { + var translatedCredits = addonConfig.credits.Select(x => TranslationHandler.GetTranslation(x, TranslationHandler.TextType.UI)).ToArray(); + CreditsHandler.RegisterCredits(mod.ModHelper.Manifest.Name, translatedCredits); + } + if (!string.IsNullOrEmpty(addonConfig.popupMessage)) + { + MenuHandler.RegisterOneTimePopup(mod, TranslationHandler.GetTranslation(addonConfig.popupMessage, TranslationHandler.TextType.UI)); + } } private void LoadTranslations(string folder, IModBehaviour mod) diff --git a/NewHorizons/NewHorizons.csproj b/NewHorizons/NewHorizons.csproj index a4e7f6e4..e5db5dcc 100644 --- a/NewHorizons/NewHorizons.csproj +++ b/NewHorizons/NewHorizons.csproj @@ -16,7 +16,7 @@ - + diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 6fb4c0d4..ae3d41c3 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,8 +4,8 @@ "author": "xen, Bwc9876, clay, MegaPiggy, John, Hawkbar, Trifid, Book", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.6.1", - "owmlVersion": "2.6.0", + "version": "1.6.2", + "owmlVersion": "2.7.2", "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_Randomizer" ], "pathsToPreserve": [ "planets", "systems", "translations" ] From 971ffd34fa7750417c3f48d06282368c032341c9 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 1 Oct 2022 00:57:03 -0400 Subject: [PATCH 13/16] Remove HarmonyX reference (OWML handles this now) --- NewHorizons/NewHorizons.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/NewHorizons/NewHorizons.csproj b/NewHorizons/NewHorizons.csproj index e5db5dcc..d231d709 100644 --- a/NewHorizons/NewHorizons.csproj +++ b/NewHorizons/NewHorizons.csproj @@ -15,7 +15,6 @@ none - From 720ecede5da6b0400a003f5bb2c32da0717c2b53 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 2 Oct 2022 12:34:35 -0400 Subject: [PATCH 14/16] Check contains half as much --- NewHorizons/Builder/Props/SignalBuilder.cs | 22 ++++++++++++++++------ NewHorizons/Patches/AudioSignalPatches.cs | 9 ++++++--- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs index 72895387..7b9f8d95 100644 --- a/NewHorizons/Builder/Props/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/SignalBuilder.cs @@ -22,8 +22,8 @@ namespace NewHorizons.Builder.Props public static int NumberOfFrequencies; - public static List QMSignals { get; private set; } - public static List CloakedSignals { get; private set; } + private static List _qmSignals; + private static List _cloakedSignals; public static bool Initialized; @@ -77,12 +77,22 @@ namespace NewHorizons.Builder.Props _nextCustomFrequencyName = 256; NumberOfFrequencies = 8; - QMSignals = new List() { SignalName.Quantum_QM }; - CloakedSignals = new List(); + _qmSignals = new List() { SignalName.Quantum_QM }; + _cloakedSignals = new List(); Initialized = true; } + public static bool IsCloaked(SignalName signalName) + { + return _cloakedSignals.Contains(signalName); + } + + public static bool IsOnQuantumMoon(SignalName signalName) + { + return _qmSignals.Contains(signalName); + } + public static SignalFrequency AddFrequency(string str) { Logger.Log($"Registering new frequency name [{str}]"); @@ -220,8 +230,8 @@ namespace NewHorizons.Builder.Props signalGO.SetActive(true); // Track certain special signal things - if (planetGO.GetComponent()?.GetAstroObjectName() == AstroObject.Name.QuantumMoon) QMSignals.Add(name); - if (info.insideCloak) CloakedSignals.Add(name); + if (planetGO.GetComponent()?.GetAstroObjectName() == AstroObject.Name.QuantumMoon) _qmSignals.Add(name); + if (info.insideCloak) _cloakedSignals.Add(name); return signalGO; } diff --git a/NewHorizons/Patches/AudioSignalPatches.cs b/NewHorizons/Patches/AudioSignalPatches.cs index 18544af3..a5087919 100644 --- a/NewHorizons/Patches/AudioSignalPatches.cs +++ b/NewHorizons/Patches/AudioSignalPatches.cs @@ -119,7 +119,10 @@ namespace NewHorizons.Patches { if (!SignalBuilder.Initialized) return true; - if (!SignalBuilder.CloakedSignals.Contains(__instance._name) && !SignalBuilder.QMSignals.Contains(__instance._name)) return true; + var isCloaked = SignalBuilder.IsCloaked(__instance._name); + var isOnQuantumMoon = SignalBuilder.IsOnQuantumMoon(__instance._name); + + if (!isCloaked && !isOnQuantumMoon) return true; __instance._canBePickedUpByScope = false; if (__instance._sunController != null && __instance._sunController.IsPointInsideSupernova(__instance.transform.position)) @@ -130,7 +133,7 @@ namespace NewHorizons.Patches } // This part is modified from the original to include all QM signals - if (Locator.GetQuantumMoon() != null && Locator.GetQuantumMoon().IsPlayerInside() && !SignalBuilder.QMSignals.Contains(__instance._name)) + if (Locator.GetQuantumMoon() != null && Locator.GetQuantumMoon().IsPlayerInside() && !isOnQuantumMoon) { __instance._signalStrength = 0f; __instance._degreesFromScope = 180f; @@ -167,7 +170,7 @@ namespace NewHorizons.Patches } // If it's a cloaked signal we don't want to hear it outside the cloak field - if (SignalBuilder.CloakedSignals.Contains(__instance._name)) + if (isCloaked) { if (!PlayerState.InCloakingField()) { From 79b45c002b3f895044c7b62b9c956bf93bed1c99 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sun, 2 Oct 2022 12:57:53 -0400 Subject: [PATCH 15/16] Turn these into extension methods --- NewHorizons/Builder/Props/SignalBuilder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs index 7b9f8d95..86d0e391 100644 --- a/NewHorizons/Builder/Props/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/SignalBuilder.cs @@ -83,12 +83,12 @@ namespace NewHorizons.Builder.Props Initialized = true; } - public static bool IsCloaked(SignalName signalName) + public static bool IsCloaked(this SignalName signalName) { return _cloakedSignals.Contains(signalName); } - public static bool IsOnQuantumMoon(SignalName signalName) + public static bool IsOnQuantumMoon(this SignalName signalName) { return _qmSignals.Contains(signalName); } From d42185e5951b91daed028e222063e1b136364295 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 2 Oct 2022 17:23:53 -0400 Subject: [PATCH 16/16] Remove buildPriority (unused) --- NewHorizons/External/Configs/PlanetConfig.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/NewHorizons/External/Configs/PlanetConfig.cs b/NewHorizons/External/Configs/PlanetConfig.cs index 55c59231..af007f48 100644 --- a/NewHorizons/External/Configs/PlanetConfig.cs +++ b/NewHorizons/External/Configs/PlanetConfig.cs @@ -47,11 +47,6 @@ namespace NewHorizons.External.Configs /// public BrambleModule Bramble; - /// - /// Set to a higher number if you wish for this body to be built sooner - /// - [DefaultValue(-1)] public int buildPriority = -1; - /// /// Should this planet ever be shown on the title screen? ///