From 57e5eb69743c511eeee4d375b307770b257cc500 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Mon, 9 Jun 2025 23:43:27 -0700
Subject: [PATCH] Restore letter macro expansion for names

---
 Assets/Scripts/Game/Items/ItemHelper.cs    | 15 +---
 Assets/Scripts/Utility/QuestMacroHelper.cs | 97 +++++++++++++++++++++-
 2 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/Assets/Scripts/Game/Items/ItemHelper.cs b/Assets/Scripts/Game/Items/ItemHelper.cs
index a021ccfa1e..2bfc7eaf60 100644
--- a/Assets/Scripts/Game/Items/ItemHelper.cs
+++ b/Assets/Scripts/Game/Items/ItemHelper.cs
@@ -343,19 +343,8 @@ public string ResolveItemLongName(DaggerfallUnityItem item, bool differentiatePl
                     {
                         Message msg = quest.GetMessage(questItem.UsedMessageID);
                         TextFile.Token[] tokens = msg.GetTextTokens(expandMacros:false);
-                        string signoff = "";
-                        int lines = 0;
-                        for (int i = tokens.Length-1; i >= 0; i--)
-                        {
-                            TextFile.Token token = tokens[i];
-                            if (!string.IsNullOrEmpty(token.text))
-                            {
-                                signoff = token.text.Trim() + " " + signoff;
-                                lines++;
-                            }
-                            if (lines >= 1)
-                                return TextManager.Instance.GetLocalizedText("letterPrefix") + signoff;
-                        }
+                        QuestMacroHelper macroHelper = new QuestMacroHelper();
+                        return macroHelper.ExpandLetterSignoff(quest, tokens);
                     }
                 }
             }
diff --git a/Assets/Scripts/Utility/QuestMacroHelper.cs b/Assets/Scripts/Utility/QuestMacroHelper.cs
index 9381bf00e7..308ecef0f6 100644
--- a/Assets/Scripts/Utility/QuestMacroHelper.cs
+++ b/Assets/Scripts/Utility/QuestMacroHelper.cs
@@ -167,6 +167,101 @@ public void ExpandQuestString(Quest parentQuest, ref string questString)
             }
         }
 
+        /// <summary>
+        /// Expands name macros found inside letter message tokens and returns signoff.
+        /// </summary>
+        /// <param name="parentQuest">Parent quest of message.</param>
+        /// <param name="tokens">Array of message tokens to expand macros inside of.</param>
+        public string ExpandLetterSignoff(Quest parentQuest, TextFile.Token[] tokens)
+        {
+            string signoff = "";
+            int lines = 0;
+            for (int t = tokens.Length - 1; t >= 0; t--)
+            {
+                string[] words = GetWords(tokens[t].text);
+
+                for (int w = 0; w < words.Length; w++)
+                {
+                    Macro macro = GetMacro(words[w]);
+
+                    switch (macro.type)
+                    {
+                        // Expand simple name and other macros
+                        case MacroTypes.NameMacro1:
+                        case MacroTypes.DetailsMacro:
+                        case MacroTypes.FactionMacro:
+                        case MacroTypes.ContextMacro:
+                        case MacroTypes.BindingMacro:
+                        {
+                            if (macro.type == MacroTypes.ContextMacro)
+                            {
+                                words[w] = words[w].Replace(macro.token, MacroHelper.GetValue(macro.token, parentQuest, parentQuest.ExternalMCP));
+                            }
+                            else
+                            {
+                                QuestResource resource = parentQuest.GetResource(macro.symbol);
+                                if (resource != null)
+                                {
+                                    string result;
+                                    if (resource.ExpandMacro(macro.type, out result))
+                                    {
+                                        words[w] = words[w].Replace(macro.token, result);
+                                    }
+
+                                    if (macro.type == MacroTypes.NameMacro1)
+                                    {
+                                        // reveal dialog linked resources in talk window
+                                        System.Type type = resource.GetType();
+                                        if (type.Equals(typeof(DaggerfallWorkshop.Game.Questing.Place)))
+                                        {
+                                                GameManager.Instance.TalkManager.AddDialogForQuestInfoResource(parentQuest.UID, macro.symbol, TalkManager.QuestInfoResourceType.Location);
+                                        }
+                                        else if (type.Equals(typeof(DaggerfallWorkshop.Game.Questing.Person)))
+                                        {
+                                                GameManager.Instance.TalkManager.AddDialogForQuestInfoResource(parentQuest.UID, macro.symbol, TalkManager.QuestInfoResourceType.Person);
+                                        }
+                                        else if (type.Equals(typeof(DaggerfallWorkshop.Game.Questing.Item)))
+                                        {
+                                                GameManager.Instance.TalkManager.AddDialogForQuestInfoResource(parentQuest.UID, macro.symbol, TalkManager.QuestInfoResourceType.Thing);
+                                        }
+                                    }
+                                }
+                            }
+
+                            break;
+                        }
+
+                        // Replace location name macros with "..."
+                        case MacroTypes.NameMacro2:
+                        case MacroTypes.NameMacro3:
+                        case MacroTypes.NameMacro4:
+                            words[w] = "...";
+                            break;
+                    }
+                }
+
+                // Reassemble words and expanded macros back into final token text
+                string final = string.Empty;
+                for (int i = 0; i < words.Length; i++)
+                {
+                    final += words[i];
+                    if (i != words.Length - 1)
+                        final += " ";
+                }
+
+                // Construct signoff
+                if (!string.IsNullOrEmpty(final))
+                {
+                    signoff = final.Trim() + " " + signoff;
+                    lines++;
+                }
+                if (lines >= 1)
+                    break;
+            }
+
+            return TextManager.Instance.GetLocalizedText("letterPrefix") + signoff;
+        }
+
         #endregion
 
         #region Private Methods
@@ -282,4 +377,4 @@ Macro GetMacro(string word)
 
         #endregion
     }
-}
\ No newline at end of file
+}