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

diff --git a/src/store/store-owners.cpp b/src/store/store-owners.cpp
index 85cbe66..3feba4a 100644 (file)
--- a/src/store/store-owners.cpp
+++ b/src/store/store-owners.cpp
@@ -49,69 +49,36 @@ const std::unordered_map<StoreSaleType, std::vector<owner_type>> owners = {
             { _("みじめなソアリン", "Soalin the Wretched"), 30000, 107, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
             { _("質素なメルラ", "Merulla the Humble"), 30000, 107, PlayerRaceType::ELF, STORE_OBJ_STD_LEVEL },
         } },
-    /* Armoury - 28 unique names */
-    {
-        StoreSaleType::ARMOURY,
+    { StoreSaleType::ARMOURY,
         {
-#ifdef JP
-            { "醜悪コン=ダー", 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "頑固者ダーグ=ロウ", 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "賢者デカド", 30000, 112, PlayerRaceType::DUNADAN, STORE_OBJ_STD_LEVEL },
-            { "鍛冶屋のウィーランド", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "醜悪コン=ダー", 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "頑固者ダーグ=ロウ", 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "ハンサムなデカド", 30000, 112, PlayerRaceType::AMBERITE, STORE_OBJ_STD_LEVEL },
-            { "エロー・ドラゴンスケイル", 30000, 112, PlayerRaceType::ELF, STORE_OBJ_STD_LEVEL },
-            { "デリカトス", 30000, 115, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
-            { "巨大なグルース", 30000, 111, PlayerRaceType::HALF_GIANT, STORE_OBJ_STD_LEVEL },
-            { "アニムス", 30000, 112, PlayerRaceType::GOLEM, STORE_OBJ_STD_LEVEL },
-            { "マルヴァス", 30000, 112, PlayerRaceType::HALF_TITAN, STORE_OBJ_STD_LEVEL },
-            { "セラクシス", 30000, 115, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
-            { "デス・チル", 30000, 111, PlayerRaceType::SPECTRE, STORE_OBJ_STD_LEVEL },
-            { "微かなドリオス", 30000, 112, PlayerRaceType::SPECTRE, STORE_OBJ_STD_LEVEL },
-            { "冷たいバスリック", 30000, 112, PlayerRaceType::VAMPIRE, STORE_OBJ_STD_LEVEL },
-            { "冷酷ヴェンジェラ", 30000, 115, PlayerRaceType::HALF_TROLL, STORE_OBJ_STD_LEVEL },
-            { "強者ウィラナ", 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "ヨジョ二世", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "優しいラナラー", 30000, 112, PlayerRaceType::AMBERITE, STORE_OBJ_STD_LEVEL },
-            { "不浄のホルバグ", 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "テレパスのエレレン", 30000, 111, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "イスドリリアス", 30000, 112, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
-            { "一つ目ヴェグナー", 30000, 112, PlayerRaceType::CYCLOPS, STORE_OBJ_STD_LEVEL },
-            { "混沌のロディッシュ", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "剣豪ヘジン", 30000, 111, PlayerRaceType::NIBELUNG, STORE_OBJ_STD_LEVEL },
-            { "ずる屋のエルベレリス", 30000, 112, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "インプのザサス", 30000, 112, PlayerRaceType::IMP, STORE_OBJ_STD_LEVEL },
-#else
-            { "Kon-Dar the Ugly", 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "Darg-Low the Grim", 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Decado the Handsome", 30000, 112, PlayerRaceType::DUNADAN, STORE_OBJ_STD_LEVEL },
-            { "Wieland the Smith", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "Kon-Dar the Ugly", 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "Darg-Low the Grim", 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Decado the Handsome", 30000, 112, PlayerRaceType::AMBERITE, STORE_OBJ_STD_LEVEL },
-            { "Elo Dragonscale", 30000, 112, PlayerRaceType::ELF, STORE_OBJ_STD_LEVEL },
-            { "Delicatus", 30000, 115, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
-            { "Gruce the Huge", 30000, 111, PlayerRaceType::HALF_GIANT, STORE_OBJ_STD_LEVEL },
-            { "Animus", 30000, 112, PlayerRaceType::GOLEM, STORE_OBJ_STD_LEVEL },
-            { "Malvus", 30000, 112, PlayerRaceType::HALF_TITAN, STORE_OBJ_STD_LEVEL },
-            { "Selaxis", 30000, 115, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
-            { "Deathchill", 30000, 111, PlayerRaceType::SPECTRE, STORE_OBJ_STD_LEVEL },
-            { "Drios the Faint", 30000, 112, PlayerRaceType::SPECTRE, STORE_OBJ_STD_LEVEL },
-            { "Bathric the Cold", 30000, 112, PlayerRaceType::VAMPIRE, STORE_OBJ_STD_LEVEL },
-            { "Vengella the Cruel", 30000, 115, PlayerRaceType::HALF_TROLL, STORE_OBJ_STD_LEVEL },
-            { "Wyrana the Mighty", 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Yojo II", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "Ranalar the Sweet", 30000, 112, PlayerRaceType::AMBERITE, STORE_OBJ_STD_LEVEL },
-            { "Horbag the Unclean", 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "Elelen the Telepath", 30000, 111, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "Isedrelias", 30000, 112, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
-            { "Vegnar One-eye", 30000, 112, PlayerRaceType::CYCLOPS, STORE_OBJ_STD_LEVEL },
-            { "Rodish the Chaotic", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "Hesin Swordmaster", 30000, 111, PlayerRaceType::NIBELUNG, STORE_OBJ_STD_LEVEL },
-            { "Elvererith the Cheat", 30000, 112, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "Zzathath the Imp", 30000, 112, PlayerRaceType::IMP, STORE_OBJ_STD_LEVEL },
-#endif
+            { _("醜悪コン=ダー", "Kon-Dar the Ugly"), 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
+            { _("頑固者ダーグ=ロウ", "Darg-Low the Grim"), 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("賢者デカド", "Decado the Handsome"), 30000, 112, PlayerRaceType::DUNADAN, STORE_OBJ_STD_LEVEL },
+            { _("鍛冶屋のウィーランド", "Wieland the Smith"), 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
+            { _("醜悪コン=ダー", "Kon-Dar the Ugly"), 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL }, // @todo 重複.
+            { _("頑固者ダーグ=ロウ", "Darg-Low the Grim"), 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("ハンサムなデカド", "Decado the Handsome"), 30000, 112, PlayerRaceType::AMBERITE, STORE_OBJ_STD_LEVEL },
+            { _("エロー・ドラゴンスケイル", "Elo Dragonscale"), 30000, 112, PlayerRaceType::ELF, STORE_OBJ_STD_LEVEL },
+            { _("デリカトス", "Delicatus"), 30000, 115, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
+            { _("巨大なグルース", "Gruce the Huge"), 30000, 111, PlayerRaceType::HALF_GIANT, STORE_OBJ_STD_LEVEL },
+            { _("アニムス", "Animus"), 30000, 112, PlayerRaceType::GOLEM, STORE_OBJ_STD_LEVEL },
+            { _("マルヴァス", "Malvus"), 30000, 112, PlayerRaceType::HALF_TITAN, STORE_OBJ_STD_LEVEL },
+            { _("セラクシス", "Selaxis"), 30000, 115, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
+            { _("デス・チル", "Deathchill"), 30000, 111, PlayerRaceType::SPECTRE, STORE_OBJ_STD_LEVEL },
+            { _("微かなドリオス", "Drios the Faint"), 30000, 112, PlayerRaceType::SPECTRE, STORE_OBJ_STD_LEVEL },
+            { _("冷たいバスリック", "Bathric the Cold"), 30000, 112, PlayerRaceType::VAMPIRE, STORE_OBJ_STD_LEVEL },
+            { _("冷酷ヴェンジェラ", "Vengella the Cruel"), 30000, 115, PlayerRaceType::HALF_TROLL, STORE_OBJ_STD_LEVEL },
+            { _("強者ウィラナ", "Wyrana the Mighty"), 30000, 111, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("ヨジョ二世", "Yojo II"), 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
+            { _("優しいラナラー", "Ranalar the Sweet"), 30000, 112, PlayerRaceType::AMBERITE, STORE_OBJ_STD_LEVEL },
+            { _("不浄のホルバグ", "Horbag the Unclean"), 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
+            { _("テレパスのエレレン", "Elelen the Telepath"), 30000, 111, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
+            { _("イスドリリアス", "Isedrelias"), 30000, 112, PlayerRaceType::SPRITE, STORE_OBJ_STD_LEVEL },
+            { _("一つ目ヴェグナー", "Vegnar One-eye"), 30000, 112, PlayerRaceType::CYCLOPS, STORE_OBJ_STD_LEVEL },
+            { _("混沌のロディッシュ", "Rodish the Chaotic"), 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
+            { _("剣豪ヘジン", "Hesin Swordmaster"), 30000, 111, PlayerRaceType::NIBELUNG, STORE_OBJ_STD_LEVEL },
+            { _("ずる屋のエルベレリス", "Elvererith the Cheat"), 30000, 112, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
+            { _("インプのザサス", "Zzathath the Imp"), 30000, 112, PlayerRaceType::IMP, STORE_OBJ_STD_LEVEL },
         } },
     /* Weapon Smith - 28 unique names */
     {