Skip to content

Restore letter signoff macro expansion for names #2753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restore letter signoff macro expansion for names #2753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions Assets/Scripts/Game/Items/ItemHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
97 changes: 96 additions & 1 deletion Assets/Scripts/Utility/QuestMacroHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -282,4 +377,4 @@ Macro GetMacro(string word)

#endregion
}
}
}