From 5b5698c85eabab64aa436e1db2f6266d36b6522f Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Mar 2022 21:24:55 -0400 Subject: [PATCH] Make no map marker = no display name --- NewHorizons/Builder/General/BaseBuilder.cs | 3 ++- NewHorizons/Builder/General/HeavenlyBodyBuilder.cs | 4 ++-- ...{ParameterizedAstroObject.cs => NHAstroObject.cs} | 3 ++- NewHorizons/Tools/TranslationPatches.cs | 12 +++++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) rename NewHorizons/Components/Orbital/{ParameterizedAstroObject.cs => NHAstroObject.cs} (95%) diff --git a/NewHorizons/Builder/General/BaseBuilder.cs b/NewHorizons/Builder/General/BaseBuilder.cs index aa2dd635..c9e8d65b 100644 --- a/NewHorizons/Builder/General/BaseBuilder.cs +++ b/NewHorizons/Builder/General/BaseBuilder.cs @@ -38,7 +38,8 @@ namespace NewHorizons.Builder.General owRigidBody.EnableKinematicSimulation(); owRigidBody.MakeKinematic(); - ParameterizedAstroObject astroObject = body.AddComponent(); + NHAstroObject astroObject = body.AddComponent(); + astroObject.HideDisplayName = !config.Base.HasMapMarker; if (config.Orbit != null) astroObject.SetKeplerCoordinatesFromOrbitModule(config.Orbit); diff --git a/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs b/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs index 99d90ac9..6d0b41ad 100644 --- a/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs +++ b/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs @@ -186,8 +186,8 @@ namespace NewHorizons.Builder.General float r1 = r.magnitude * m2 / (m1 + m2); float r2 = r.magnitude * m1 / (m1 + m2); - ParameterizedAstroObject primaryAO = Position.AstroLookup[primaryHB].Invoke() as ParameterizedAstroObject; - ParameterizedAstroObject secondaryAO = Position.AstroLookup[secondaryHB].Invoke() as ParameterizedAstroObject; + NHAstroObject primaryAO = Position.AstroLookup[primaryHB].Invoke() as NHAstroObject; + NHAstroObject secondaryAO = Position.AstroLookup[secondaryHB].Invoke() as NHAstroObject; float ecc = primaryAO.Eccentricity; float i = primaryAO.Inclination; diff --git a/NewHorizons/Components/Orbital/ParameterizedAstroObject.cs b/NewHorizons/Components/Orbital/NHAstroObject.cs similarity index 95% rename from NewHorizons/Components/Orbital/ParameterizedAstroObject.cs rename to NewHorizons/Components/Orbital/NHAstroObject.cs index aff7f1cb..431ff08a 100644 --- a/NewHorizons/Components/Orbital/ParameterizedAstroObject.cs +++ b/NewHorizons/Components/Orbital/NHAstroObject.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace NewHorizons.Components.Orbital { - public class ParameterizedAstroObject : AstroObject, IKeplerCoordinates + public class NHAstroObject : AstroObject, IKeplerCoordinates { public float Inclination { get; set; } public int SemiMajorAxis { get; set; } @@ -17,6 +17,7 @@ namespace NewHorizons.Components.Orbital public float Eccentricity { get; set; } public float ArgumentOfPeriapsis { get; set; } public float TrueAnomaly { get; set; } + public bool HideDisplayName { get; set; } public void SetKeplerCoordinatesFromOrbitModule(OrbitModule orbit) { diff --git a/NewHorizons/Tools/TranslationPatches.cs b/NewHorizons/Tools/TranslationPatches.cs index 4c6695b5..72012687 100644 --- a/NewHorizons/Tools/TranslationPatches.cs +++ b/NewHorizons/Tools/TranslationPatches.cs @@ -1,4 +1,5 @@ -using NewHorizons.Handlers; +using NewHorizons.Components.Orbital; +using NewHorizons.Handlers; using System; using System.Collections.Generic; using System.Linq; @@ -25,11 +26,16 @@ namespace NewHorizons.Tools public static bool GetHUDDisplayName(ReferenceFrame __instance, ref string __result) { var ao = __instance.GetAstroObject(); - if (ao != null && ao.GetAstroObjectName() == AstroObject.Name.CustomString) + + if (ao == null) return true; + + if(ao is NHAstroObject) { - __result = TranslationHandler.GetTranslation(ao.GetCustomName(), TranslationHandler.TextType.UI); + if((ao as NHAstroObject).HideDisplayName) __result = ""; + else __result = TranslationHandler.GetTranslation(ao.GetCustomName(), TranslationHandler.TextType.UI); return false; } + return true; }