diff --git a/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs b/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs index 9ce59fc24b..169c09f71f 100644 --- a/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs +++ b/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs @@ -986,7 +986,7 @@ private void ResponseRapidCombination( NotificationSystem.CancelReserve(result.itemUsable.ItemId); NotificationSystem.Push( - result.itemUsable is Equipment e && e.IconId != 0 && e.Id != e.IconId + result.itemUsable is Equipment { ByCustomCraft: true } ? MailType.CustomCraft : MailType.Workshop, L10nManager.Localize(formatKey, result.itemUsable.GetLocalizedName()), diff --git a/nekoyume/Assets/_Scripts/Extensions/LocalizationExtensions.cs b/nekoyume/Assets/_Scripts/Extensions/LocalizationExtensions.cs index 4564a271c9..2fd25732ce 100644 --- a/nekoyume/Assets/_Scripts/Extensions/LocalizationExtensions.cs +++ b/nekoyume/Assets/_Scripts/Extensions/LocalizationExtensions.cs @@ -519,11 +519,24 @@ public static string GetLocalizedFavName(string ticker) public static string GetLocalizedNonColoredName(this ItemBase item, bool useElementalIcon = true) { - var equipmentId = item is Equipment equipment ? equipment.IconId : item.Id; + int equipmentId; + bool byCustomCraft; + if (item is Equipment equipment) + { + equipmentId = equipment.IconId; + byCustomCraft = equipment.ByCustomCraft; + } + else + { + equipmentId = item.Id; + byCustomCraft = false; + } + return GetLocalizedNonColoredName( item.ElementalType, equipmentId, - useElementalIcon && item.ItemType.HasElementType()); + useElementalIcon && item.ItemType.HasElementType(), + byCustomCraft); } public static string GetLocalizedName(this EquipmentItemSheet.Row equipmentRow, int level, @@ -550,10 +563,12 @@ public static string GetLocalizedName(this ConsumableItemSheet.Row consumableRow } public static string GetLocalizedNonColoredName(ElementalType elementalType, - int equipmentId, bool useElementalIcon) + int equipmentId, bool useElementalIcon, bool byCustomCraft = false) { var elemental = useElementalIcon ? GetElementalIcon(elementalType) : string.Empty; - var name = L10nManager.Localize($"ITEM_NAME_{equipmentId}"); + var name = L10nManager.Localize(byCustomCraft + ? $"ITEM_NAME_CUSTOM_{equipmentId}" + : $"ITEM_NAME_{equipmentId}"); return $"{name}{elemental}"; }