fix

Author: moddedmcplayer

AdvancedHints/Components/HudManager.cs

@@ -8,6 +8,7 @@
 namespace AdvancedHints.Components
 {
     using System.Collections.Generic;
+    using System.IO;
     using System.Linq;
     using AdvancedHints.Enums;
     using AdvancedHints.Models;
@@ -95,10 +96,10 @@ private void OnDestroy()
 
         private void UpdateHints()
         {
-            toFormat = Displays.Values.Select(display => FormatStringForHud(display.Content ?? string.Empty, 6)).ToArray<object>();
+            toFormat = Displays.Values.Select(display => FormatStringForHud(display.Content ?? string.Empty, Plugin.Singleton.Config.LinesPerPosition)).ToArray<object>();
             hint = string.Format(Plugin.Singleton.Config.HudTemplate, toFormat);
 
-            player.ShowHint(hint, Plugin.Singleton.Config.HintDuration);
+            player.ShowHint(Plugin.HintPrefix + hint, Plugin.Singleton.Config.HintDuration);
         }
 
         private string FormatStringForHud(string text, int needNewLine)

AdvancedHints/Config.cs

@@ -30,15 +30,24 @@ public class Config : IConfig
         [Description("The duration of a single hint, in seconds.")]
         public float HintDuration { get; set; } = 2f;
 
-        [Description("Whether or not to enable plugin overrides (see below).")]
-        public bool EnablePluginOverrides { get; set; } = true;
-
         // ReSharper disable once CollectionNeverUpdated.Global
         [Description("Messages that will appear if nothing else is quened for the display.")]
         public Dictionary<DisplayLocation, string> DefaultMessages { get; set; } = new ()
         {
         };
 
+        [Description("Whether or not to enable message overrides (see below).")]
+        public bool EnableMessageStartsWithOverrides { get; set; } = true;
+
+        [Description("Message overrides for specific hint positions.")]
+        public Dictionary<string, DisplayLocation> MessageStartsWithOverrides { get; set; } = new ()
+        {
+            { "You will respawn in", DisplayLocation.Middle },
+        };
+
+        [Description("Whether or not to enable plugin overrides (see below).")]
+        public bool EnablePluginOverrides { get; set; } = true;
+
         [Description("Plugin overrides for specific hint positions.")]
         public Dictionary<string, DisplayLocation> PluginOverrides { get; set; } = new ()
         {
@@ -47,6 +56,9 @@ public class Config : IConfig
 
         [Description("The template for the hint display.")]
         public string HudTemplate { get; set; } =
-            "\"<line-height=95%><voffset=8.5em><alpha=#ff>\\n\\n\\n<align=center>{0}{1}{2}{3}{4}</align>\"";
+            "<line-height=95%><voffset=8.5em><alpha=#ff>\\n\\n\\n<align=center>{0}{1}{2}{3}{4}</align>";
+
+        [Description("Newlines per position, edit with template.")]
+        public int LinesPerPosition { get; set; } = 6;
     }
 }

AdvancedHints/Models/HudDisplay.cs

@@ -35,7 +35,12 @@ public HudDisplay()
         public string DefaultText
         {
             get => defaultText;
-            set => defaultText = value ?? string.Empty;
+            set
+            {
+                defaultText = value ?? string.Empty;
+                if (string.IsNullOrEmpty(Content))
+                    Content = defaultText;
+            }
         }
 
         /// <summary>

AdvancedHints/Patches/ShowHint.cs

@@ -17,21 +17,33 @@ namespace AdvancedHints.Patches
     using HarmonyLib;
 
     /// <summary>
-    /// Hijacks <see cref="Player.ShowHint"/> and directs it towards <see cref="ShowHint"/>.
+    /// Hijacks <see cref="Player.ShowHint(string, float)"/> and directs it towards <see cref="ShowHint"/>.
     /// </summary>
     [HarmonyPatch(typeof(Player), nameof(Player.ShowHint), typeof(string), typeof(float))]
     internal static class ShowHint
     {
-        private static bool Prefix(Player __instance, string message, float duration = 3f)
+        private static bool Prefix(Player __instance, ref string message, float duration = 3f)
         {
-            if (message.Contains("You will respawn in"))
+            if (message.StartsWith(Plugin.HintPrefix))
             {
-                HudManager.ShowHint(__instance, "\n" + message, duration, displayLocation: DisplayLocation.Middle);
-                return false;
+                message = message.Substring(Plugin.HintPrefix.Length);
+                return true;
             }
 
             DisplayLocation displayLocation = DisplayLocation.MiddleBottom;
 
+            if (Plugin.Singleton.Config.EnableMessageStartsWithOverrides)
+            {
+                foreach (var kvp in Plugin.Singleton.Config.MessageStartsWithOverrides)
+                {
+                    if (message.Contains(kvp.Key))
+                    {
+                        displayLocation = kvp.Value;
+                        break;
+                    }
+                }
+            }
+
             if (Plugin.Singleton.Config.EnablePluginOverrides)
             {
                 try

AdvancedHints/Plugin.cs

@@ -18,6 +18,10 @@ namespace AdvancedHints
     /// </summary>
     public class Plugin : Plugin<Config>
     {
+        /// <summary>
+        /// The prefix that makes the patch ignore the hint.
+        /// </summary>
+        public const string HintPrefix = "ADVHINTS";
         private EventHandlers eventHandlers;
         private Harmony harmony;