equippingWeapon string to use localized names

Interkarma · Interkarma · commit 244fce5373ed · 2023-10-08T08:47:36.000+10:00
This was using built-in item template name rather than displaying localized template name from Internal_Items.
Built-in template name is still used as a fallback.
diff --git a/Assets/Scripts/Game/UserInterfaceWindows/DaggerfallInventoryWindow.cs b/Assets/Scripts/Game/UserInterfaceWindows/DaggerfallInventoryWindow.cs
@@ -735,8 +735,9 @@ public override void OnPop()
                 DaggerfallUnityItem currentRightHandWeapon = player.ItemEquipTable.GetItem(EquipSlots.RightHand);
                 if (currentRightHandWeapon != null)
                 {
+                    string templateName = TextManager.Instance.GetLocalizedItemName(currentRightHandWeapon.ItemTemplate.index, currentRightHandWeapon.ItemTemplate.name);
                     string message = TextManager.Instance.GetLocalizedText("equippingWeapon");
-                    message = message.Replace("%s", currentRightHandWeapon.ItemTemplate.name);
+                    message = message.Replace("%s", templateName);
                     DaggerfallUI.Instance.PopupMessage(message);
                 }
             }
@@ -746,8 +747,9 @@ public override void OnPop()
                 DaggerfallUnityItem currentLeftHandWeapon = player.ItemEquipTable.GetItem(EquipSlots.LeftHand);
                 if (currentLeftHandWeapon != null)
                 {
+                    string templateName = TextManager.Instance.GetLocalizedItemName(currentLeftHandWeapon.ItemTemplate.index, currentLeftHandWeapon.ItemTemplate.name);
                     string message = TextManager.Instance.GetLocalizedText("equippingWeapon");
-                    message = message.Replace("%s", currentLeftHandWeapon.ItemTemplate.name);
+                    message = message.Replace("%s", templateName);
                     DaggerfallUI.Instance.PopupMessage(message);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -735,8 +735,9 @@ public override void OnPop()`
`735`	`735`	`DaggerfallUnityItem currentRightHandWeapon = player.ItemEquipTable.GetItem(EquipSlots.RightHand);`
`736`	`736`	`if (currentRightHandWeapon != null)`
`737`	`737`	`{`
	`738`	`+ string templateName = TextManager.Instance.GetLocalizedItemName(currentRightHandWeapon.ItemTemplate.index, currentRightHandWeapon.ItemTemplate.name);`
`738`	`739`	`string message = TextManager.Instance.GetLocalizedText("equippingWeapon");`
`739`		`- message = message.Replace("%s", currentRightHandWeapon.ItemTemplate.name);`
	`740`	`+ message = message.Replace("%s", templateName);`
`740`	`741`	`DaggerfallUI.Instance.PopupMessage(message);`
`741`	`742`	`}`
`742`	`743`	`}`
`@@ -746,8 +747,9 @@ public override void OnPop()`
`746`	`747`	`DaggerfallUnityItem currentLeftHandWeapon = player.ItemEquipTable.GetItem(EquipSlots.LeftHand);`
`747`	`748`	`if (currentLeftHandWeapon != null)`
`748`	`749`	`{`
	`750`	`+ string templateName = TextManager.Instance.GetLocalizedItemName(currentLeftHandWeapon.ItemTemplate.index, currentLeftHandWeapon.ItemTemplate.name);`
`749`	`751`	`string message = TextManager.Instance.GetLocalizedText("equippingWeapon");`
`750`		`- message = message.Replace("%s", currentLeftHandWeapon.ItemTemplate.name);`
	`752`	`+ message = message.Replace("%s", templateName);`
`751`	`753`	`DaggerfallUI.Instance.PopupMessage(message);`
`752`	`754`	`}`
`753`	`755`	`}`