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

diff --git a/src/store/store-owners.cpp b/src/store/store-owners.cpp
index 3feba4a..0992faa 100644 (file)
--- a/src/store/store-owners.cpp
+++ b/src/store/store-owners.cpp
@@ -80,69 +80,36 @@ const std::unordered_map<StoreSaleType, std::vector<owner_type>> owners = {
             { _("ずる屋のエルベレリス", "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 */
-    {
-        StoreSaleType::WEAPON,
+    { StoreSaleType::WEAPON,
         {
-#ifdef JP
-            { "残忍なるアーノルド", 30000, 115, PlayerRaceType::HALF_TROLL, STORE_OBJ_STD_LEVEL },
-            { "獣殺しのアーンダル", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "獣マスターのエディー", 30000, 115, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
-            { "竜殺しのオグライン", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "熟練者ドリュー", 30000, 115, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "龍の子オラックス", 30000, 110, PlayerRaceType::DRACONIAN, STORE_OBJ_STD_LEVEL },
-            { "病気持ちのアンスラックス", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "頑丈者アルコス", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "腐れ者のサリアス", 30000, 115, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
-            { "晒し骨のトゥエシク", 30000, 110, PlayerRaceType::SKELETON, STORE_OBJ_STD_LEVEL },
-            { "ビリオス", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "ファスガル", 30000, 112, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
-            { "パラディンのエレフリス", 30000, 115, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
-            { "キ'トリッ'ク", 30000, 110, PlayerRaceType::KLACKON, STORE_OBJ_STD_LEVEL },
-            { "蜘蛛の友ドゥロカス", 30000, 115, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "巨人殺しのフングス", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "デランサ", 30000, 115, PlayerRaceType::ELF, STORE_OBJ_STD_LEVEL },
-            { "レンジャーのソルビスタニ", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "ノロマのゾリル", 30000, 115, PlayerRaceType::GOLEM, STORE_OBJ_STD_LEVEL },
-            { "イーオン・フラックス", 30000, 112, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "強者ナドック", 30000, 115, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
-            { "弱虫エラモグ", 30000, 110, PlayerRaceType::KOBOLD, STORE_OBJ_STD_LEVEL },
-            { "公正なエオウィリス", 30000, 115, PlayerRaceType::VAMPIRE, STORE_OBJ_STD_LEVEL },
-            { "バルログ殺しのヒュイモグ", 30000, 112, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "冷酷ピーダス", 30000, 115, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "ヴァモグ スレイヤー", 30000, 110, PlayerRaceType::HALF_OGRE, STORE_OBJ_STD_LEVEL },
-            { "性悪フーシュナク", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "舞闘バレン", 30000, 112, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
-#else
-            { "Arnold the Beastly", 30000, 115, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
-            { "Arndal Beast-Slayer", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "Eddie Beast-Master", 30000, 115, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "Oglign Dragon-Slayer", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "Drew the Skilled", 30000, 115, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Orrax Dragonson", 30000, 110, PlayerRaceType::DRACONIAN, STORE_OBJ_STD_LEVEL },
-            { "Anthrax Disease-Carrier", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "Arkhoth the Stout", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "Sarlyas the Rotten", 30000, 115, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
-            { "Tuethic Bare-Bones", 30000, 110, PlayerRaceType::SKELETON, STORE_OBJ_STD_LEVEL },
-            { "Bilious", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "Fasgul", 30000, 112, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
-            { "Ellefris the Paladin", 30000, 115, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
-            { "K'trrik'k", 30000, 110, PlayerRaceType::KLACKON, STORE_OBJ_STD_LEVEL },
-            { "Drocus Spiderfriend", 30000, 115, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
-            { "Fungus Giant-Slayer", 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
-            { "Delantha", 30000, 115, PlayerRaceType::ELF, STORE_OBJ_STD_LEVEL },
-            { "Solvistani the Ranger", 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "Xoril the Slow", 30000, 115, PlayerRaceType::GOLEM, STORE_OBJ_STD_LEVEL },
-            { "Aeon Flux", 30000, 112, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
-            { "Nadoc the Strong", 30000, 115, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
-            { "Eramog the Weak", 30000, 110, PlayerRaceType::KOBOLD, STORE_OBJ_STD_LEVEL },
-            { "Eowilith the Fair", 30000, 115, PlayerRaceType::VAMPIRE, STORE_OBJ_STD_LEVEL },
-            { "Huimog Balrog-Slayer", 30000, 112, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
-            { "Peadus the Cruel", 30000, 115, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
-            { "Vamog Slayer", 30000, 110, PlayerRaceType::HALF_OGRE, STORE_OBJ_STD_LEVEL },
-            { "Hooshnak the Vicious", 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
-            { "Balenn War-Dancer", 30000, 112, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
-#endif
+            { _("残忍なるアーノルド", "Arnold the Beastly"), 30000, 115, PlayerRaceType::HALF_TROLL, STORE_OBJ_STD_LEVEL },
+            { _("獣殺しのアーンダル", "Arndal the Beast-Slayer"), 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
+            { _("獣マスターのエディー", "Eddie the Beast-Master"), 30000, 115, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
+            { _("竜殺しのオグライン", "Oglign the Dragon-Slayer"), 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
+            { _("熟練者ドリュー", "Drew the Skilled"), 30000, 115, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("龍の子オラックス", "Orrax the Dragonson"), 30000, 110, PlayerRaceType::DRACONIAN, STORE_OBJ_STD_LEVEL },
+            { _("病気持ちのアンスラックス", "Anthrax the Disease-Carrier"), 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
+            { _("頑丈者アルコス", "Arkhoth the Stout"), 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
+            { _("腐れ者のサリアス", "Sarlyas the Rotten"), 30000, 115, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
+            { _("晒し骨のトゥエシク", "Tuethic the Bare-Bones"), 30000, 110, PlayerRaceType::SKELETON, STORE_OBJ_STD_LEVEL },
+            { _("ビリオス", "Bilious"), 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
+            { _("ファスガル", "Fasgul"), 30000, 112, PlayerRaceType::ZOMBIE, STORE_OBJ_STD_LEVEL },
+            { _("パラディンのエレフリス", "Ellefris the Paladin"), 30000, 115, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
+            { _("キ'トリッ'ク", "K'trrik'k"), 30000, 110, PlayerRaceType::KLACKON, STORE_OBJ_STD_LEVEL },
+            { _("蜘蛛の友ドゥロカス", "Drocus the Spiderfriend"), 30000, 115, PlayerRaceType::DARK_ELF, STORE_OBJ_STD_LEVEL },
+            { _("巨人殺しのフングス", "Fungus the Giant-Slayer"), 30000, 112, PlayerRaceType::DWARF, STORE_OBJ_STD_LEVEL },
+            { _("デランサ", "Delantha"), 30000, 115, PlayerRaceType::ELF, STORE_OBJ_STD_LEVEL },
+            { _("レンジャーのソルビスタニ", "Solvistani the Ranger"), 30000, 110, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
+            { _("ノロマのゾリル", "Xoril the Slow"), 30000, 115, PlayerRaceType::GOLEM, STORE_OBJ_STD_LEVEL },
+            { _("イーオン・フラックス", "Aeon Flux"), 30000, 112, PlayerRaceType::HALF_ELF, STORE_OBJ_STD_LEVEL },
+            { _("強者ナドック", "Nadoc the Strong"), 30000, 115, PlayerRaceType::HOBBIT, STORE_OBJ_STD_LEVEL },
+            { _("弱虫エラモグ", "Eramog the Weak"), 30000, 110, PlayerRaceType::KOBOLD, STORE_OBJ_STD_LEVEL },
+            { _("公正なエオウィリス", "Eowilith the Fair"), 30000, 115, PlayerRaceType::VAMPIRE, STORE_OBJ_STD_LEVEL },
+            { _("バルログ殺しのヒュイモグ", "Huimog the Balrog-Slayer"), 30000, 112, PlayerRaceType::HALF_ORC, STORE_OBJ_STD_LEVEL },
+            { _("冷酷ピーダス", "Peadus the Cruel"), 30000, 115, PlayerRaceType::HUMAN, STORE_OBJ_STD_LEVEL },
+            { _("殺し屋ヴァモグ", "Vamog the Slayer"), 30000, 110, PlayerRaceType::HALF_OGRE, STORE_OBJ_STD_LEVEL },
+            { _("性悪フーシュナク", "Hooshnak the Vicious"), 30000, 115, PlayerRaceType::BEASTMAN, STORE_OBJ_STD_LEVEL },
+            { _("舞闘家バレン", "Balenn the War-Dancer"), 30000, 112, PlayerRaceType::BARBARIAN, STORE_OBJ_STD_LEVEL },
         } },
     /* Temple - 22 unique names */
     {