[Refactor] #2208 魔道具屋の日英表記をまとめた

diff --git a/src/store/store-owners.cpp b/src/store/store-owners.cpp
index f499485..c9241e1 100644 (file)
--- a/src/store/store-owners.cpp
+++ b/src/store/store-owners.cpp
@@ -165,59 +165,31 @@ const std::unordered_map<StoreSaleType, std::vector<owner_type>> owners = {
             { _("ティルバ", "Tilba"), 30000, 116, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
             { _("金持ちミリルドリック", "Myrildric the Wealthy"), 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
         } },
-    /* Magic Shop - 23 unique names */
-    {
-        StoreSaleType::MAGIC,
+    { StoreSaleType::MAGIC,
         {
-#ifdef JP
-            { "ソーサラーのロ=パン", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "偉大なるブガービイ", 30000, 113, PlayerRaceType::GNOME, STORE_OBJ_STD_LEVEL },
-            { "イェンダーの魔法使い", 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "死霊使いリャク", 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
-            { "魔術師スキドゥニー", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "幻術師キリア", 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "死霊術師ニッキ", 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "ソロストラン", 30000, 110, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
-            { "烏賊口アチシェ", 30000, 113, PlayerRaceType::MIND_FLAYER, STORE_OBJ_STD_LEVEL },
-            { "貴族のカザ", 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
-            { "暗きファジル", 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "偉大なるケルドーン", 30000, 110, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "フィランスロプス", 30000, 113, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
-            { "魔女のアグナー", 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "死霊術師ビュリアンス", 30000, 110, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "ハイメイジのヴイラク", 30000, 110, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "知恵者マディッシュ", 30000, 113, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "ファレブリンボール", 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
-            { "陰険フェリル=ガンド", 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "呪術師サレゴード", 30000, 110, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
-            { "神秘家クトゥアロス", 30000, 113, PlayerRaceType::MIND_FLAYER, STORE_OBJ_STD_LEVEL },
-            { "幻術師イベリ", 30000, 110, PlayerRaceType::SKELETON, STORE_OBJ_STD_LEVEL },
-            { "死霊術師ヘトー", 30000, 110, PlayerRaceType::YEEK, STORE_OBJ_STD_LEVEL },
-#else
-            { "Lo Pan the Sorcerer", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "Buggerby the Great", 30000, 113, PlayerRaceType::GNOME, STORE_OBJ_STD_LEVEL },
-            { "The Wizard of Yendor", 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Rjak the Necromancer", 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "Skidney the Sorcerer", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "Kyria the Illusionist", 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Nikki the Necromancer", 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "Solostoran", 30000, 110, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
-            { "Achshe the Tentacled", 30000, 113, PlayerRaceType::MIND_FLAYER, STORE_OBJ_STD_LEVEL },
-            { "Kaza the Noble", 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
-            { "Fazzil the Dark", 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "Keldorn the Grand", 30000, 110, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "Philanthropus", 30000, 113, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
-            { "Agnar the Enchantress", 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Buliance the Necromancer", 30000, 110, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "Vuirak the High-Mage", 30000, 110, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "Madish the Smart", 30000, 113, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "Falebrimbor", 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
-            { "Felil-Gand the Subtle", 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "Thalegord the Shaman", 30000, 110, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
-            { "Cthoaloth the Mystic", 30000, 113, PlayerRaceType::MIND_FLAYER, STORE_OBJ_STD_LEVEL },
-            { "Ibeli the Illusionist", 30000, 110, PlayerRaceType::SKELETON, STORE_OBJ_STD_LEVEL },
-            { "Heto the Necromancer", 30000, 110, PlayerRaceType::YEEK, STORE_OBJ_STD_LEVEL },
-#endif
+            { _("ソーサラーのロ=パン", "Lo Pan the Sorcerer"), 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
+            { _("偉大なるブガービイ", "Buggerby the Great"), 30000, 113, PlayerRaceType::GNOME, STORE_OBJ_STD_LEVEL },
+            { _("イェンダーの魔法使い", "The Wizard of Yendor"), 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("死霊使いリャク", "Rjak the Necromancer"), 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
+            { _("魔術師スキドゥニー", "Skidney the Sorcerer"), 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
+            { _("幻術師キリア", "Kyria the Illusionist"), 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("死霊術師ニッキ", "Nikki the Necromancer"), 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
+            { _("ソロストラン", "Solostoran"), 30000, 110, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
+            { _("烏賊口アチシェ", "Achshe the Tentacled"), 30000, 113, PlayerRaceType::MIND_FLAYER, STORE_OBJ_STD_LEVEL },
+            { _("貴族のカザ", "Kaza the Noble"), 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
+            { _("暗きファジル", "Fazzil the Dark"), 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
+            { _("偉大なるケルドーン", "Keldorn the Grand"), 30000, 110, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
+            { _("フィランスロプス", "Philanthropus"), 30000, 113, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
+            { _("魔女のアグナー", "Agnar the Enchantress"), 30000, 110, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("死霊術師ビュリアンス", "Buliance the Necromancer"), 30000, 110, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
+            { _("ハイメイジのヴイラク", "Vuirak the High-Mage"), 30000, 110, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
+            { _("知恵者マディッシュ", "Madish the Smart"), 30000, 113, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
+            { _("ファレブリンボール", "Falebrimbor"), 30000, 110, PlayerRaceType::HIGH_ELF, STORE_OBJ_STD_LEVEL },
+            { _("陰険フェリル=ガンド", "Felil-Gand the Subtle"), 30000, 110, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
+            { _("呪術師サレゴード", "Thalegord the Shaman"), 30000, 110, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
+            { _("神秘家クトゥアロス", "Cthoaloth the Mystic"), 30000, 113, PlayerRaceType::MIND_FLAYER, STORE_OBJ_STD_LEVEL },
+            { _("幻術師イベリ", "Ibeli the Illusionist"), 30000, 110, PlayerRaceType::SKELETON, STORE_OBJ_STD_LEVEL },
+            { _("死霊術師ヘトー", "Heto the Necromancer"), 30000, 110, PlayerRaceType::YEEK, STORE_OBJ_STD_LEVEL },
         } },
     { StoreSaleType::BLACK,
         {