1.19.0

NewHorizons/External/Configs/StarSystemConfig.cs

@@ -117,6 +117,11 @@ public class StarSystemConfig
         /// </summary>
         public string[] initialReveal;
 
+        /// <summary>
+        /// The planet to focus on when entering the ship log for the first time in a loop. If not set this will be the planet at navtigation position (1, 0)
+        /// </summary>
+        public string shipLogStartingPlanetID;
+
         /// <summary>
         /// List colors of curiosity entries
         /// </summary>

NewHorizons/Handlers/TranslationHandler.cs

@@ -1,8 +1,10 @@
 using NewHorizons.External.Configs;
+using NewHorizons.Utility;
 using NewHorizons.Utility.OWML;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace NewHorizons.Handlers
 {
@@ -49,8 +51,17 @@ public static string GetTranslation(string text, TextType type, bool warn)
 
             // Get the translated text
             if (dictionary.TryGetValue(language, out var table))
+            {
                 if (table.TryGetValue(text, out var translatedText))
+                {
+                    return translatedText;
+                }
+                // Try without whitespace if its missing
+                else if (table.TryGetValue(text.TruncateWhitespace(), out translatedText))
+                {
                     return translatedText;
+                }
+            }
 
             if (warn) NHLogger.LogVerbose($"Defaulting to english for {text}");
 
@@ -85,8 +96,11 @@ public static void RegisterTranslation(TextTranslation.Language language, Transl
                 if (!_dialogueTranslationDictionary.ContainsKey(language)) _dialogueTranslationDictionary.Add(language, new Dictionary<string, string>());
                 foreach (var originalKey in config.DialogueDictionary.Keys)
                 {
-                    var key = originalKey.Replace("&lt;", "<").Replace("&gt;", ">").Replace("<![CDATA[", "").Replace("]]>", "");
-                    var value = config.DialogueDictionary[originalKey].Replace("&lt;", "<").Replace("&gt;", ">").Replace("<![CDATA[", "").Replace("]]>", "");
+                    // Fix new lines in dialogue translations, remove whitespace from keys else if the dialogue has weird whitespace and line breaks it gets really annoying
+                    // to write translation keys for (can't just copy paste out of xml, have to start adding \\n and \\r and stuff
+                    // If any of these issues become relevant to other dictionaries we can bring this code over, but for now why fix what isnt broke
+                    var key = originalKey.Replace("\\n", "\n").TruncateWhitespace().Replace("&lt;", "<").Replace("&gt;", ">").Replace("<![CDATA[", "").Replace("]]>", "");
+                    var value = config.DialogueDictionary[originalKey].Replace("\\n", "\n").Replace("&lt;", "<").Replace("&gt;", ">").Replace("<![CDATA[", "").Replace("]]>", "");
 
                     if (!_dialogueTranslationDictionary[language].ContainsKey(key)) _dialogueTranslationDictionary[language].Add(key, value);
                     else _dialogueTranslationDictionary[language][key] = value;

NewHorizons/Patches/ShipLogPatches/ShipLogMapModePatches.cs

@@ -26,7 +26,7 @@ public static void ShipLogMapMode_Initialize(ShipLogMapMode __instance)
             else
             {
                 __instance._astroObjects = navMatrix;
-                __instance._startingAstroObjectID = navMatrix[1][0].GetID();
+                __instance._startingAstroObjectID = Main.SystemDict[Main.Instance.CurrentStarSystem].Config.shipLogStartingPlanetID ?? navMatrix[1][0].GetID();
                 if (Main.Instance.CurrentStarSystem != "SolarSystem")
                 {
                     List<GameObject> delete = panRoot.GetAllChildren().Where(g => g.name.Contains("_ShipLog") == false).ToList();

NewHorizons/Schemas/star_system_schema.json

@@ -81,6 +81,10 @@
         "type": "string"
       }
     },
+    "shipLogStartingPlanetID": {
+      "type": "string",
+      "description": "The planet to focus on when entering the ship log for the first time in a loop. If not set this will be the planet at navtigation position (1, 0)"
+    },
     "curiosities": {
       "type": "array",
       "description": "List colors of curiosity entries",

NewHorizons/Utility/NewHorizonExtensions.cs

@@ -350,5 +350,11 @@ public static XmlNode GetChildNode(this XmlNode parentNode, string tagName)
         {
             return parentNode.ChildNodes.Cast<XmlNode>().First(node => node.LocalName == tagName);
         }
+
+        public static string TruncateWhitespace(this string text)
+        {
+            // return Regex.Replace(text.Trim(), @"[^\S\r\n]+", "GUH");
+            return Regex.Replace(text.Trim(), @"\s+", " ").ToLowerInvariant();
+        }
     }
 }

NewHorizons/manifest.json

@@ -4,7 +4,7 @@
   "author": "xen, Bwc9876, JohnCorby, MegaPiggy, Clay, Trifid, and friends",
   "name": "New Horizons",
   "uniqueName": "xen.NewHorizons",
-  "version": "1.18.9",
+  "version": "1.18.10",
   "owmlVersion": "2.9.8",
   "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
   "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],