[HS-1476] Merchants: display name does not always function correctly

hybrasyl · Sep 22, 2024 · 60eb0eb · 60eb0eb
1 parent 29a7d46
commit 60eb0eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/hybrasyl/Interfaces/IPursuitable.cs b/hybrasyl/Interfaces/IPursuitable.cs
@@ -172,7 +172,7 @@ public sealed void DisplayPursuits(User invoker)
             Tile2 = (ushort)(0x4000 + Sprite),
             Color2 = 0,
             PortraitType = 1,
-            Name = Name,
+            Name = string.IsNullOrWhiteSpace(DisplayName) ? Name : DisplayName,
             Text = merchant.GetLocalString("greeting"),
             Options = options
         };

diff --git a/hybrasyl/Objects/MapObject.cs b/hybrasyl/Objects/MapObject.cs
@@ -254,7 +254,7 @@ public void LoadXml(Map newMap)
                 Y = npcElement.Y,
                 Name = npcElement.Name,
                 Direction = npcElement.Direction,
-                DisplayName = string.IsNullOrWhiteSpace(npcElement.DisplayName) ? npcTemplate.DisplayName : npcElement.DisplayName
+                DisplayName = string.IsNullOrWhiteSpace(npcElement.DisplayName) ? npcTemplate.Name : npcElement.DisplayName
             };
             InsertNpc(merchant);
             // Keep the actual spawned object around in the index for later use

diff --git a/hybrasyl/Objects/Merchant.cs b/hybrasyl/Objects/Merchant.cs
@@ -191,7 +191,7 @@ public void OnSpawn()
         }
 
         // Do we have a script? If so, get it and run OnSpawn.
-        if (World.ScriptProcessor.TryGetScript(Name, out var script))
+        if (World.ScriptProcessor.TryGetScript(Name, out Script script) || World.ScriptProcessor.TryGetScript(DisplayName, out script))
         {
             DialogSequences.Clear();
             Script = script;