From 7a457b8bb1ee12fe8fa95ce4f23f4e7d81c20850 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Fri, 2 Sep 2022 14:38:28 -0400 Subject: [PATCH 1/6] I guess I forgot to instantiate inactive --- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index 7743d754..06a32eed 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -99,7 +99,7 @@ namespace NewHorizons.Builder.Props _preCrashRecorderPrefab.name = "Prefab_NOM_Recorder_Vessel"; _preCrashRecorderPrefab.transform.rotation = Quaternion.identity; - _trailmarkerPrefab = SearchUtilities.Find("BrittleHollow_Body/Sector_BH/Sector_NorthHemisphere/Sector_NorthPole/Sector_HangingCity/Sector_HangingCity_District2/Interactables_HangingCity_District2/Prefab_NOM_Sign"); + _trailmarkerPrefab = SearchUtilities.Find("BrittleHollow_Body/Sector_BH/Sector_NorthHemisphere/Sector_NorthPole/Sector_HangingCity/Sector_HangingCity_District2/Interactables_HangingCity_District2/Prefab_NOM_Sign").InstantiateInactive(); _trailmarkerPrefab.name = "Prefab_NOM_Trailmarker"; _trailmarkerPrefab.transform.rotation = Quaternion.identity; } @@ -491,6 +491,7 @@ namespace NewHorizons.Builder.Props } trailmarkerObject.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero); + trailmarkerObject.transform.localScale = Vector3.one * 0.75f; if (info.rotation != null) { From af89532c4ef1b0c985027808d976e4236f9faffb Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Fri, 2 Sep 2022 15:45:01 -0400 Subject: [PATCH 2/6] Don't do funny entry name prepend for modded facts --- NewHorizons/Patches/ShipLogPatches.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/NewHorizons/Patches/ShipLogPatches.cs b/NewHorizons/Patches/ShipLogPatches.cs index ba588f12..96a89c01 100644 --- a/NewHorizons/Patches/ShipLogPatches.cs +++ b/NewHorizons/Patches/ShipLogPatches.cs @@ -230,5 +230,20 @@ namespace NewHorizons.Patches AchievementHandler.OnRevealFact(); } + + [HarmonyPrefix] + [HarmonyPatch(typeof(ShipLogFact), nameof(ShipLogFact.GetText))] + public static bool ShipLogFact_GetText(ShipLogFact __instance, ref string __result) + { + if (ShipLogHandler.IsModdedFact(__instance.GetID())) + { + __result = TranslationHandler.GetTranslation(__instance._text, TranslationHandler.TextType.SHIPLOG); + return false; + } + else + { + return true; + } + } } } \ No newline at end of file From 680314645d868d49769f5a12adb8a37112af9e53 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 2 Sep 2022 21:21:40 -0700 Subject: [PATCH 3/6] fix find again by not including prefabs --- NewHorizons/Utility/SearchUtilities.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Utility/SearchUtilities.cs b/NewHorizons/Utility/SearchUtilities.cs index 6f4d1be5..7ecee7fe 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -119,9 +119,9 @@ 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 - // also includes prefabs but hopefully thats okay - go = FindResourceOfTypeAndName(name); + // 3: find resource to include inactive objects (but skip prefabs + go = Resources.FindObjectsOfTypeAll() + .FirstOrDefault(x => x.scene.name != null && x.name == name); if (go) { CachedGameObjects.Add(path, go); From 5cf4150deb75f5c093cef7bd25b51aa5c8921ac8 Mon Sep 17 00:00:00 2001 From: Will Corby Date: Fri, 2 Sep 2022 21:27:05 -0700 Subject: [PATCH 4/6] Update SearchUtilities.cs --- 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 7ecee7fe..8346077b 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -121,7 +121,7 @@ namespace NewHorizons.Utility 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 go = Resources.FindObjectsOfTypeAll() - .FirstOrDefault(x => x.scene.name != null && x.name == name); + .FirstOrDefault(x.name == name && x => x.scene.name != null); if (go) { CachedGameObjects.Add(path, go); From 7f801039badb7ac80b0f6ac7a66ee335196b3719 Mon Sep 17 00:00:00 2001 From: Will Corby Date: Fri, 2 Sep 2022 21:27:30 -0700 Subject: [PATCH 5/6] Update SearchUtilities.cs --- 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 8346077b..97cb4a5e 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -121,7 +121,7 @@ namespace NewHorizons.Utility 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 go = Resources.FindObjectsOfTypeAll() - .FirstOrDefault(x.name == name && x => x.scene.name != null); + .FirstOrDefault(x => x.name == name && x.scene.name != null); if (go) { CachedGameObjects.Add(path, go); From c3019cafcfc9aa16a91cf67d8250e644be382ae1 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sat, 3 Sep 2022 10:17:16 -0400 Subject: [PATCH 6/6] Comment --- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index 06a32eed..f0e093d2 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -491,6 +491,8 @@ namespace NewHorizons.Builder.Props } trailmarkerObject.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero); + + // shrink because that is what mobius does on all trailmarkers or else they are the size of the player trailmarkerObject.transform.localScale = Vector3.one * 0.75f; if (info.rotation != null)