From 129c9f594a1569d19d23177ed186164080bdd7af Mon Sep 17 00:00:00 2001 From: xen-42 Date: Wed, 5 Mar 2025 12:15:39 -0500 Subject: [PATCH 1/3] Fix backwards compat that was breaking Lonesome Lake --- NewHorizons/External/Configs/PlanetConfig.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/NewHorizons/External/Configs/PlanetConfig.cs b/NewHorizons/External/Configs/PlanetConfig.cs index 596ca54f..c4965f6a 100644 --- a/NewHorizons/External/Configs/PlanetConfig.cs +++ b/NewHorizons/External/Configs/PlanetConfig.cs @@ -669,14 +669,12 @@ namespace NewHorizons.External.Configs { if (!string.IsNullOrEmpty(volume.gameOverText)) { - if (volume.gameOver == null) - { - volume.gameOver = new(); - } + volume.gameOver ??= new(); volume.gameOver.text = volume.gameOverText; } if (volume.creditsType != null) { + volume.gameOver ??= new(); volume.gameOver.creditsType = (SerializableEnums.NHCreditsType)volume.creditsType; } } From 8e2e018f32893a4b6f928c6e92fe2988c96d2af2 Mon Sep 17 00:00:00 2001 From: xen-42 Date: Wed, 5 Mar 2025 12:15:58 -0500 Subject: [PATCH 2/3] Update manifest.json --- NewHorizons/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index f3408a21..61d2fdeb 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,7 +4,7 @@ "author": "xen, Bwc9876, JohnCorby, MegaPiggy, and friends", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.27.1", + "version": "1.27.2", "owmlVersion": "2.12.1", "dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "PacificEngine.OW_CommonResources" ], From 44e5ec32fd3da3f855166e260380eea4c279d05b Mon Sep 17 00:00:00 2001 From: xen-42 Date: Wed, 5 Mar 2025 12:23:55 -0500 Subject: [PATCH 3/3] Do not make all UI translations uppercase by default but instead only do it to map markers directly (Fixes #1062) --- NewHorizons/Builder/General/MarkerBuilder.cs | 3 ++- NewHorizons/Handlers/EyeSceneHandler.cs | 2 +- NewHorizons/Handlers/TranslationHandler.cs | 2 +- NewHorizons/Handlers/VesselWarpHandler.cs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NewHorizons/Builder/General/MarkerBuilder.cs b/NewHorizons/Builder/General/MarkerBuilder.cs index ad17b191..29626f7c 100644 --- a/NewHorizons/Builder/General/MarkerBuilder.cs +++ b/NewHorizons/Builder/General/MarkerBuilder.cs @@ -3,6 +3,7 @@ using NewHorizons.Components; using NewHorizons.External.Configs; using NewHorizons.Handlers; +using NewHorizons.Utility; using UnityEngine; #endregion @@ -15,7 +16,7 @@ namespace NewHorizons.Builder.General { var module = config.MapMarker; NHMapMarker mapMarker = body.AddComponent(); - mapMarker._labelID = (UITextType)TranslationHandler.AddUI(config.name); + mapMarker._labelID = (UITextType)TranslationHandler.AddUI(config.name.ToUpperFixed()); var markerType = MapMarker.MarkerType.Planet; diff --git a/NewHorizons/Handlers/EyeSceneHandler.cs b/NewHorizons/Handlers/EyeSceneHandler.cs index 233086e6..dadf34f8 100644 --- a/NewHorizons/Handlers/EyeSceneHandler.cs +++ b/NewHorizons/Handlers/EyeSceneHandler.cs @@ -96,7 +96,7 @@ namespace NewHorizons.Handlers vesselAO._type = AstroObject.Type.SpaceStation; vesselAO.Register(); vesselMapMarker._markerType = MapMarker.MarkerType.Moon; - vesselMapMarker._labelID = (UITextType)TranslationHandler.AddUI("Vessel"); + vesselMapMarker._labelID = (UITextType)TranslationHandler.AddUI("VESSEL"); RFVolumeBuilder.Make(vessel, vesselBody, 600, new External.Modules.ReferenceFrameModule { localPosition = new MVector3(0, 0, -207.375f) }); // Resize vessel sector so that the vessel is fully collidable. diff --git a/NewHorizons/Handlers/TranslationHandler.cs b/NewHorizons/Handlers/TranslationHandler.cs index 43f787a0..9ce24859 100644 --- a/NewHorizons/Handlers/TranslationHandler.cs +++ b/NewHorizons/Handlers/TranslationHandler.cs @@ -209,7 +209,7 @@ namespace NewHorizons.Handlers { var uiTable = TextTranslation.Get().m_table.theUITable; - var text = GetTranslation(rawText, TextType.UI).ToUpperFixed(); + var text = GetTranslation(rawText, TextType.UI); var key = uiTable.Keys.Max() + 1; try diff --git a/NewHorizons/Handlers/VesselWarpHandler.cs b/NewHorizons/Handlers/VesselWarpHandler.cs index c5e622eb..14c3d9c0 100644 --- a/NewHorizons/Handlers/VesselWarpHandler.cs +++ b/NewHorizons/Handlers/VesselWarpHandler.cs @@ -210,7 +210,7 @@ namespace NewHorizons.Handlers vesselWarpController._whiteHoleOneShot = vesselWarpController._whiteHole.transform.parent.Find("WhiteHoleAudio_OneShot").GetComponent(); vesselWarpController._whiteHole._startActive = true; - vesselObject.GetComponent()._labelID = (UITextType)TranslationHandler.AddUI("Vessel"); + vesselObject.GetComponent()._labelID = (UITextType)TranslationHandler.AddUI("VESSEL"); var hasParentBody = !string.IsNullOrEmpty(system.Config.Vessel?.vesselSpawn?.parentBody); var hasPhysics = system.Config.Vessel?.hasPhysics ?? !hasParentBody;