OSDN Git Service

Add some Heavy Crossbow Artifacts.
[hengband/hengband.git] / src / tables.c
index fb282b9..06bddfa 100644 (file)
@@ -1119,13 +1119,15 @@ byte adj_chr_chm[] =
  * Rogue         num = 5; mul = 3; div = MAX(40, weapon_weight);
  * Ranger        num = 5; mul = 4; div = MAX(70, weapon_weight);
  * Paladin       num = 5; mul = 4; div = MAX(70, weapon_weight);
- * Kaji          num = 5; mul = 5; div = MAX(150, weapon_weight);
+ * Weaponsmith   num = 5; mul = 5; div = MAX(150, weapon_weight);
  * Warrior-Mage  num = 5; mul = 3; div = MAX(70, weapon_weight);
  * Chaos Warrior num = 5; mul = 4; div = MAX(70, weapon_weight);
  * Monk          num = 5; mul = 3; div = MAX(60, weapon_weight);
  * Tourist       num = 4; mul = 3; div = MAX(100, weapon_weight);
  * Imitator      num = 5; mul = 4; div = MAX(70, weapon_weight);
  * Beastmaster   num = 5; mul = 3; div = MAX(70, weapon_weight);
+ * Cavalry(Ride) num = 5; mul = 4; div = MAX(70, weapon_weight);
+ * Cavalry(Walk) num = 5; mul = 3; div = MAX(100, weapon_weight);
  * Sorcerer      num = 1; mul = 1; div = MAX(1, weapon_weight);
  * Archer        num = 4; mul = 2; div = MAX(70, weapon_weight);
  * Magic eater   num = 4; mul = 2; div = MAX(70, weapon_weight);
@@ -1166,44 +1168,47 @@ byte blows_table[12][12] =
 
 arena_type arena_info[MAX_ARENA_MONS + 2] =
 {
-       { MON_NOBORTA,       0,         0                             },
-       { MON_MORI_TROLL,    0,         0                             },
-       { MON_TIGER,         0,         0                             },
-       { MON_DRUID,         0,         0                             },
-       { MON_HILL_GIANT,    TV_POTION, SV_POTION_SPEED               },
-       { MON_WERERAT,       0,         0                             },
-       { MON_ORC_CAPTAIN,   0,         0                             },
-       { MON_BERSERKER,     0,         0                             },
-       { MON_STONE_GIANT,   0,         0                             },
-       { MON_D_ELF_LORD,    TV_POTION, SV_POTION_HEALING             },
-       { MON_IRON_GOLEM,    0,         0                             },
-       { MON_C_CRAWLER,     0,         0                             },
-       { MON_XICLOTLAN,     0,         0                             },
-       { MON_TROLL_PRIEST,  0,         0                             },
-       { MON_ANGEL,         TV_ROD,    SV_ROD_STONE_TO_MUD           },
-       { MON_SPIRIT_NAGA,   0,         0                             },
-       { MON_BASILISK,      0,         0                             },
-       { MON_MITHRIL_GOLEM, 0,         0                             },
-       { MON_SHADOW_DRAKE,  0,         0                             },
-       { MON_OGRE_SHAMAN,   TV_SCROLL, SV_SCROLL_ACQUIREMENT         },
-       { MON_BICLOPS,       0,         0                             },
-       { MON_ETHER_DRAKE,   TV_SCROLL, SV_SCROLL_RUNE_OF_PROTECTION  },
-       { MON_HALFLING_S,    0,         0                             },
-       { MON_ELDER_THING,   TV_ROD,    SV_ROD_DRAIN_LIFE             },
-       { MON_M_MH_DRAGON,   0,         0                             },
-       { MON_ETTIN,         TV_SCROLL, SV_SCROLL_STAR_ENCHANT_WEAPON },
-       { MON_VAMPIRE_LORD,  0,         0                             },
-       { MON_BARNEY,        TV_SCROLL, SV_SCROLL_GENOCIDE            },
-       { MON_GROO,          0,         0                             },
-       { MON_D_ELF_SORC,    TV_WAND,   SV_WAND_STRIKING              },
-       { MON_IRON_LICH,     0,         0                             },
-       { MON_G_TITAN,       TV_POTION, SV_POTION_STAR_ENLIGHTENMENT  },
-       { MON_G_BALROG,      0,         0                             },
-       { MON_NIGHTWALKER,   TV_ROD,    SV_ROD_IDENTIFY               },
-       { MON_SHAMBLER,      TV_STAFF,  SV_STAFF_HOLINESS             },
-       { MON_BLACK_REAVER,  TV_SCROLL, SV_SCROLL_STAR_ACQUIREMENT    },
+       { MON_NOBORTA,       TV_AMULET, SV_AMULET_ADORNMENT           },
+       { MON_MORI_TROLL,    TV_FOOD,   SV_FOOD_PINT_OF_WINE          },
+       { MON_IMP,           TV_POTION, SV_POTION_SPEED               },
+       { MON_LION_HEART,    0,         0                             },
+       { MON_MASTER_YEEK,   TV_POTION, SV_POTION_CURING              },
+       { MON_SABRE_TIGER,   TV_WAND,   SV_WAND_STONE_TO_MUD          },
+       { MON_LIZARD_KING,   TV_POTION, SV_POTION_RESISTANCE          },
+       { MON_WYVERN,        TV_POTION, SV_POTION_HEALING             },
+       { MON_ARCH_VILE,     TV_SCROLL, SV_SCROLL_GENOCIDE            },
+       { MON_ELF_LORD   ,   TV_POTION, SV_POTION_ENLIGHTENMENT       },
+       { MON_GHOUL_KING,    TV_FOOD,   SV_FOOD_RESTORING             },
+       { MON_COLBRAN,       TV_RING,   SV_RING_ELEC                  },
+       { MON_BICLOPS,       TV_WAND,   SV_WAND_ACID_BALL             },
+       { MON_M_MINDCRAFTER, TV_POTION, SV_POTION_SELF_KNOWLEDGE      },
+       { MON_GROO,          TV_SCROLL, SV_SCROLL_ACQUIREMENT         },
+       { MON_RAAL,          TV_SCROLL, SV_SCROLL_STAR_DESTRUCTION    },
+       { MON_DREADMASTER,   TV_WAND,   SV_WAND_DRAIN_LIFE            },
+       { MON_ULTRA_PALADIN, TV_STAFF,  SV_STAFF_DISPEL_EVIL          },
+       { MON_BARNEY,        TV_RING,   SV_RING_RES_CHAOS             },
+       { MON_TROLL_KING,    TV_SCROLL, SV_SCROLL_MASS_GENOCIDE       },
+       { MON_BARON_HELL,    TV_POTION, SV_POTION_AUGMENTATION        },
+       { MON_F_ANGEL,       TV_SCROLL, SV_SCROLL_RUNE_OF_PROTECTION  },
+       { MON_G_C_DRAKE,     TV_WAND,   SV_WAND_DRAGON_FIRE           },
+       { MON_IRON_LICH,     TV_STAFF,  SV_STAFF_DESTRUCTION          },
+       { MON_DROLEM,        TV_POTION, SV_POTION_STAR_HEALING        },
+       { MON_G_TITAN,       TV_WAND,   SV_WAND_GENOCIDE              },
+       { MON_G_BALROG,      TV_POTION, SV_POTION_EXPERIENCE          },
+       { MON_ELDER_VAMPIRE, TV_RING,   SV_RING_SUSTAIN               },
+       { MON_NIGHTWALKER,   TV_WAND,   SV_WAND_STRIKING              },
+       { MON_S_TYRANNO,     TV_SCROLL, SV_SCROLL_STAR_ACQUIREMENT    },
+       { MON_G_MASTER_MYS,  TV_ROD,    SV_ROD_IDENTIFY               },
+       { MON_LORD_CHAOS,    TV_POTION, SV_POTION_LIFE                },
+       { MON_SHADOWLORD,    TV_POTION, SV_POTION_STAR_ENLIGHTENMENT  },
+       { MON_ULT_BEHOLDER,  TV_AMULET, SV_AMULET_REFLECTION          },
+       { MON_JABBERWOCK,    TV_ROD,    SV_ROD_HEALING                },
+       { MON_LOCKE_CLONE,   TV_WAND,   SV_WAND_DISINTEGRATE          },
+       { MON_WYRM_SPACE,    TV_ROD,    SV_ROD_RESTORATION            },
+       { MON_SHAMBLER,      TV_SCROLL, SV_SCROLL_STAR_ACQUIREMENT    },
+       { MON_BLACK_REAVER,  TV_RING,   SV_RING_LORDLY                },
        { MON_FENGHUANG,     TV_STAFF,  SV_STAFF_THE_MAGI             },
-       { MON_WYRM_POWER,    TV_ROD,    SV_ROD_HEALING                },
+       { MON_WYRM_POWER,    TV_SCROLL, SV_SCROLL_ARTIFACT            },
        { 0,                 0,         0                             }, /* Victory prizing */
        { MON_HAGURE,        TV_SCROLL, SV_SCROLL_ARTIFACT            },
 };
@@ -1703,151 +1708,66 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "¥Ñ¥é¥Ç¥£¥ó¤Î¥¬¥ó¥Ê¡¼",       10000,  185,  110,   5,  23,  RACE_HUMAN},
                { "Áª¤Ð¤ì¤·¥È¥ê¥ó",                     25000,  180,  107,   6,  20,  RACE_ELF},
                { "¸­ÌÀ¤Ê¤ë¥µ¥é¥¹¥È¥í",                     30000,  185,  109,   5,  15,  RACE_DWARF},
+               { "¥Ñ¡¼¥·¥ô¥¡¥ë¶ª",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
+               { "¿ÀÀ»¤Ê¤ë¥¢¥»¥Ê¥¹",          30000,  185, 109,  5, 15, RACE_HUMAN},
+               { "¥Þ¥Ã¥­¥Î¥ó",         10000,   175, 109,  6, 15, RACE_HUMAN},
+               { "¶à¤ßÉØ¿Í",         15000,  185, 110,  5, 23, RACE_HIGH_ELF},
+               { "¥É¥ë¥¤¥É¤Î¥Ï¥·¥å¥Ë¥Ã¥¯",           25000,  180, 107,  6, 20, RACE_HOBBIT},
+               { "¥Õ¥£¥Ê¥¯",          30000,  185, 109,  5, 15, RACE_YEEK},
+               { "¥¯¥ê¥­¥Ã¥¯",         10000,   175, 109,  6, 15, RACE_KLACKON},
+               { "¹Ó¤¯¤ì¼Ô¥â¥ê¥ô¥¡¥ë",         15000,  185, 110,  5, 23, RACE_ELF},
+               { "°Å¤­¥Û¥·¥ã¥Ã¥¯",           25000,  180, 107,  6, 20, RACE_IMP},
+               { "¸­¼Ô¥¢¥¿¡¼¥ë",          30000,  185, 109,  5, 15, RACE_HUMAN},
+               { "À¶¤­¥¤¥Ù¥Ë¥Ã¥É",         10000,   175, 109,  6, 15, RACE_HUMAN},
+               { "¥¨¥ê¥Ç¥£¥·¥å",         15000,  185, 110,  5, 23, RACE_HALF_TROLL},
+               { "¼ö½Ñ»Õ¥ô¥ë¥É¥¥¥·¥å",           25000,  180, 107,  6, 20, RACE_HALF_OGRE},
+               { "¶¸Àï»Î¥Ï¥ª¥Ö",          30000,  185, 109,  5, 15, RACE_BARBARIAN},
+               { "¼ã¤­¥×¥ë¡¼¥°¥Ç¥£¥·¥å",         10000,   175, 109,  6, 15, RACE_HALF_OGRE},
+               { "¤­¤Á¤¬¤¤¥é¥à¥ï¥¤¥º",         15000,  185, 110,  5, 23, RACE_YEEK},
+               { "Í­ÆÁ¼Ô¥à¥ï¡¼¥È",           25000,  180, 107,  6, 20, RACE_KOBOLD},
+               { "¼åÃî¥À¡¼¥É¥Ð¡¼¥É",          30000,  185, 109,  5, 15, RACE_SPECTRE},
+               { "¼ÁÁǤʥ롼¥É¥ô¥£¥Ò",         5000,   175,  109,   6,  15,  RACE_HUMAN},
+               { "¥Ñ¥é¥Ç¥£¥ó¤Î¥¬¥ó¥Ê¡¼",       10000,  185,  110,   5,  23,  RACE_HUMAN},
+               { "Áª¤Ð¤ì¤·¥È¥ê¥ó",                     25000,  180,  107,   6,  20,  RACE_ELF},
+               { "¸­ÌÀ¤Ê¤ë¥µ¥é¥¹¥È¥í",                     30000,  185,  109,   5,  15,  RACE_DWARF},
+               { "¥Ñ¡¼¥·¥ô¥¡¥ë¶ª",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
+               { "¿ÀÀ»¤Ê¤ë¥¢¥»¥Ê¥¹",          30000,  185, 109,  5, 15, RACE_HUMAN},
+               { "¥Þ¥Ã¥­¥Î¥ó",         10000,   175, 109,  6, 15, RACE_HUMAN},
+               { "¶à¤ßÉØ¿Í",         15000,  185, 110,  5, 23, RACE_HIGH_ELF},
+               { "¥É¥ë¥¤¥É¤Î¥Ï¥·¥å¥Ë¥Ã¥¯",           25000,  180, 107,  6, 20, RACE_HOBBIT},
+               { "¥Õ¥£¥Ê¥¯",          30000,  185, 109,  5, 15, RACE_YEEK},
 #else
                { "Ludwig the Humble",          5000,   175, 109,  6, 15, RACE_DWARF},
                { "Gunnar the Paladin",         10000,  185, 110,  5, 23, RACE_HALF_TROLL},
                { "Torin the Chosen",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
                { "Sarastro the Wise",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#endif
-
-#ifdef JP
-{ "¥Ñ¡¼¥·¥ô¥¡¥ë¶ª",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
-#else
                { "Sir Parsival the Pure",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
-#endif
-#ifdef JP
-{ "¿ÀÀ»¤Ê¤ë¥¢¥»¥Ê¥¹",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#else
                { "Asenath the Holy",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¥Þ¥Ã¥­¥Î¥ó",         10000,   175, 109,  6, 15, RACE_HUMAN},
-#else
                { "McKinnon",         10000,   175, 109,  6, 15, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¶à¤ßÉØ¿Í",         15000,  185, 110,  5, 23, RACE_HIGH_ELF},
-#else
                { "Mistress Chastity",         15000,  185, 110,  5, 23, RACE_HIGH_ELF},
-#endif
-#ifdef JP
-{ "¥É¥ë¥¤¥É¤Î¥Ï¥·¥å¥Ë¥Ã¥¯",           25000,  180, 107,  6, 20, RACE_HOBBIT},
-#else
                { "Hashnik the Druid",           25000,  180, 107,  6, 20, RACE_HOBBIT},
-#endif
-#ifdef JP
-{ "¥Õ¥£¥Ê¥¯",          30000,  185, 109,  5, 15, RACE_YEEK},
-#else
                { "Finak",          30000,  185, 109,  5, 15, RACE_YEEK},
-#endif
-#ifdef JP
-{ "¥¯¥ê¥­¥Ã¥¯",         10000,   175, 109,  6, 15, RACE_KLACKON},
-#else
                { "Krikkik",         10000,   175, 109,  6, 15, RACE_KLACKON},
-#endif
-#ifdef JP
-{ "¹Ó¤¯¤ì¼Ô¥â¥ê¥ô¥¡¥ë",         15000,  185, 110,  5, 23, RACE_ELF},
-#else
                { "Morival the Wild",         15000,  185, 110,  5, 23, RACE_ELF},
-#endif
-#ifdef JP
-{ "°Å¤­¥Û¥·¥ã¥Ã¥¯",           25000,  180, 107,  6, 20, RACE_IMP},
-#else
                { "Hoshak the Dark",           25000,  180, 107,  6, 20, RACE_IMP},
-#endif
-#ifdef JP
-{ "¸­¼Ô¥¢¥¿¡¼¥ë",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#else
                { "Atal the Wise",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "À¶¤­¥¤¥Ù¥Ë¥Ã¥É",         10000,   175, 109,  6, 15, RACE_HUMAN},
-#else
                { "Ibenidd the Chaste",         10000,   175, 109,  6, 15, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¥¨¥ê¥Ç¥£¥·¥å",         15000,  185, 110,  5, 23, RACE_HALF_TROLL},
-#else
                { "Eridish",         15000,  185, 110,  5, 23, RACE_HALF_TROLL},
-#endif
-#ifdef JP
-{ "¼ö½Ñ»Õ¥ô¥ë¥É¥¥¥·¥å",           25000,  180, 107,  6, 20, RACE_HALF_OGRE},
-#else
                { "Vrudush the Shaman",           25000,  180, 107,  6, 20, RACE_HALF_OGRE},
-#endif
-#ifdef JP
-{ "¶¸Àï»Î¥Ï¥ª¥Ö",          30000,  185, 109,  5, 15, RACE_BARBARIAN},
-#else
                { "Haob the Berserker",          30000,  185, 109,  5, 15, RACE_BARBARIAN},
-#endif
-#ifdef JP
-{ "¼ã¤­¥×¥ë¡¼¥°¥Ç¥£¥·¥å",         10000,   175, 109,  6, 15, RACE_HALF_OGRE},
-#else
                { "Proogdish the Youthfull",         10000,   175, 109,  6, 15, RACE_HALF_OGRE},
-#endif
-#ifdef JP
-{ "¤­¤Á¤¬¤¤¥é¥à¥ï¥¤¥º",         15000,  185, 110,  5, 23, RACE_YEEK},
-#else
                { "Lumwise the Mad",         15000,  185, 110,  5, 23, RACE_YEEK},
-#endif
-#ifdef JP
-{ "Í­ÆÁ¼Ô¥à¥ï¡¼¥È",           25000,  180, 107,  6, 20, RACE_KOBOLD},
-#else
                { "Muirt the Virtuous",           25000,  180, 107,  6, 20, RACE_KOBOLD},
-#endif
-#ifdef JP
-{ "¼åÃî¥À¡¼¥É¥Ð¡¼¥É",          30000,  185, 109,  5, 15, RACE_SPECTRE},
-#else
                { "Dardobard the Weak",          30000,  185, 109,  5, 15, RACE_SPECTRE},
-#endif
-#ifdef JP
-{ "¼ÁÁǤʥ롼¥É¥ô¥£¥Ò",          5000,   175, 109,  6, 15, RACE_DWARF},
-#else
                { "Ludwig the Humble",          5000,   175, 109,  6, 15, RACE_DWARF},
-#endif
-#ifdef JP
-{ "¥Ñ¥é¥Ç¥£¥ó¤Î¥¬¥ó¥Ê¡¼",         10000,  185, 110,  5, 23, RACE_HALF_TROLL},
-#else
                { "Gunnar the Paladin",         10000,  185, 110,  5, 23, RACE_HALF_TROLL},
-#endif
-#ifdef JP
-{ "Áª¤Ð¤ì¤·¥È¥ê¥ó",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
-#else
                { "Torin the Chosen",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
-#endif
-#ifdef JP
-{ "¸­ÌÀ¤Ê¤ë¥µ¥é¥¹¥È¥í",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#else
                { "Sarastro the Wise",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "À¶¤­¥Ñ¡¼¥·¥ô¥¡¥ë¶ª",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
-#else
                { "Sir Parsival the Pure",           25000,  180, 107,  6, 20, RACE_HIGH_ELF},
-#endif
-#ifdef JP
-{ "¿ÀÀ»¤Ê¤ë¥¢¥»¥Ê¥¹",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#else
                { "Asenath the Holy",          30000,  185, 109,  5, 15, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¥Þ¥Ã¥­¥Î¥ó",         10000,   175, 109,  6, 15, RACE_HUMAN},
-#else
                { "McKinnon",         10000,   175, 109,  6, 15, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¶à¤ßÉØ¿Í",         15000,  185, 110,  5, 23, RACE_HIGH_ELF},
-#else
                { "Mistress Chastity",         15000,  185, 110,  5, 23, RACE_HIGH_ELF},
-#endif
-#ifdef JP
-{ "¥É¥ë¥¤¥É ¥Ï¥·¥å¥Ë¥Ã¥¯",           25000,  180, 107,  6, 20, RACE_HOBBIT},
-#else
                { "Hashnik the Druid",           25000,  180, 107,  6, 20, RACE_HOBBIT},
-#endif
-#ifdef JP
-{ "¥Õ¥£¥Ê¥¯",        15000,  200, 110,  7,  8, RACE_BARBARIAN},
-#else
                { "Finak",          30000,  185, 109,  5, 15, RACE_YEEK},
 #endif
        },
@@ -1858,155 +1778,73 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "¥«¥ª¥¹¤Î¥¦¥£¥º¥ë",   10000,  190,  110,   6,   8,  RACE_HOBBIT},
                { "¶¯ÍߥߥÀ¥¹",              15000,  200,  116,   6,   9,  RACE_GNOME},
                { "Éϼ奸¥ã=¥Õ¥¡¡¼",                   15000,  220,  111,   4,   9,  RACE_ELF},/*FIRST*/
+               { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
+               { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
+               { "ÍÑ¿´¿¼¤¤¥Õ¥¡¥Í¥é¥¹",         10000,  190, 111,  5,  8, RACE_DWARF},
+               { "¥­¥Á¥¬¥¤¤Î¥ë¥ó¥·¡¼",         10000,  190, 110,  6,  8, RACE_HUMAN},
+               { "¥°¥é¥ó¥Ö¥ë¥ï¡¼¥¹",           15000,  200, 116,  6,  9, RACE_GNOME},
+               { "¥Õ¥ê¥Ã¥¿¡¼",       15000,  220, 111,  4,  9, RACE_SPRITE},
+               { "¥¶¥ê¥ë¥¹",         10000,  190, 111,  5,  8, RACE_HUMAN},
+               { "¸Å¤­¥¨¥°¥Ð¡¼¥È",         10000,  190, 110,  6,  8, RACE_DWARF},
+               { "¸Ø¤ê¹â¤­¥ô¥¡¥ê¥ó¥É¥é",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
+               { "Ï£¶â½Ñ»Õ¥¿¥¨¥ó",       15000,  220, 111,  4,  9, RACE_HUMAN},
+               { "¹ª¸À¥«¥¤¥É",         10000,  190, 111,  5,  8, RACE_VAMPIRE},
+               { "°Å¤­¥Õ¥ê¥¢",         10000,  190, 110,  6,  8, RACE_NIBELUNG},
+               { "¼ÁÁǤʥɥà¥ê",           15000,  200, 116,  6,  9, RACE_DWARF},
+               { "Ëâ¤Î»Ò¥ä¥¡¥¸¥å¥Ã¥«",       15000,  220, 111,  4,  9, RACE_IMP},
+               { "ÌôÁð»Õ¥¸¥§¥é¥é¥ë¥É¡¼¥ë",         10000,  190, 111,  5,  8, RACE_HIGH_ELF},
+               { "¸­¼Ô¥ª¥ì¥é¥ë¥À¥ó",         10000,  190, 110,  6,  8, RACE_BARBARIAN},
+               { "¥Ç¥â¥Ë¥·¥¹¥È¤Î¥Õ¥¾¥°¥í",           15000,  200, 116,  6,  9, RACE_IMP},
+               { "Ï£¶â½Ñ»Õ¥É¥¥¥ê¥¢¥·¥å",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
+               { "¶¯¼Ô¥Í¥ê¥¢",         10000,  190, 111,  5,  8, RACE_CYCLOPS},
+               { "¿É¸ý¥ê¥°¥Ê¥¹",         10000,  190, 110,  6,  8, RACE_HALF_ORC},
+               { "¥Æ¥£¥ë¥Ð",           15000,  200, 116,  6,  9, RACE_HOBBIT},
+               { "¶â»ý¤Á¥ß¥ê¥ë¥É¥ê¥Ã¥¯",       15000,  220, 111,  4,  9, RACE_HUMAN},
+
+               { "²Ê³Ø¼Ô¥Þ¥¦¥¶¡¼",         10000,  190, 111,  5,  8, RACE_HALF_ELF},
+               { "¥«¥ª¥¹¤Î¥¦¥£¥º¥ë",         10000,  190, 110,  6,  8, RACE_HOBBIT},
+               { "¶¯ÍߥߥÀ¥¹",           15000,  200, 116,  6,  9, RACE_GNOME},
+               { "Ï£¶â½Ñ»Õ¥¸¥ã=¥Õ¥¡¡¼",       15000,  220, 111,  4,  9, RACE_ELF},
+               { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
+               { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
 #else
                { "Mauser the Chemist",         10000,  190, 111,  5,  8, RACE_HALF_ELF},
                { "Wizzle the Chaotic",         10000,  190, 110,  6,  8, RACE_HOBBIT},
                { "Midas the Greedy",           15000,  200, 116,  6,  9, RACE_GNOME},
                { "Ja-Far the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
-#endif
-
-#ifdef JP
-       { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
-#else
-       { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
-#endif
-#ifdef JP
-       { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
-#else
-       { "Jal-Eth the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
-#endif
-#ifdef JP
-{ "ÍÑ¿´¿¼¤¤¥Õ¥¡¥Í¥é¥¹",         10000,  190, 111,  5,  8, RACE_DWARF},
-#else
+               { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
+               { "Jal-Eth the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
                { "Fanelath the Cautious",         10000,  190, 111,  5,  8, RACE_DWARF},
-#endif
-#ifdef JP
-{ "¥­¥Á¥¬¥¤¤Î¥ë¥ó¥·¡¼",         10000,  190, 110,  6,  8, RACE_HUMAN},
-#else
                { "Runcie the Insane",         10000,  190, 110,  6,  8, RACE_HUMAN},
-#endif
-#ifdef JP
-       { "¥°¥é¥ó¥Ö¥ë¥ï¡¼¥¹",           15000,  200, 116,  6,  9, RACE_GNOME},
-#else
-       { "Grumbleworth",           15000,  200, 116,  6,  9, RACE_GNOME},
-#endif
-#ifdef JP
-       { "¥Õ¥ê¥Ã¥¿¡¼",       15000,  220, 111,  4,  9, RACE_SPRITE},
-#else
-       { "Flitter",       15000,  220, 111,  4,  9, RACE_SPRITE},
-#endif
-#ifdef JP
-{ "¥¶¥ê¥ë¥¹",         10000,  190, 111,  5,  8, RACE_HUMAN},
-#else
+               { "Grumbleworth",           15000,  200, 116,  6,  9, RACE_GNOME},
+               { "Flitter",       15000,  220, 111,  4,  9, RACE_SPRITE},
                { "Xarillus",         10000,  190, 111,  5,  8, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¸Å¤­¥¨¥°¥Ð¡¼¥È",         10000,  190, 110,  6,  8, RACE_DWARF},
-#else
                { "Egbert the Old",         10000,  190, 110,  6,  8, RACE_DWARF},
-#endif
-#ifdef JP
-       { "¸Ø¤ê¹â¤­¥ô¥¡¥ê¥ó¥É¥é",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
-#else
-       { "Valindra the Proud",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
-#endif
-#ifdef JP
-       { "Ï£¶â½Ñ»Õ¥¿¥¨¥ó",       15000,  220, 111,  4,  9, RACE_HUMAN},
-#else
-       { "Taen the Alchemist",       15000,  220, 111,  4,  9, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¹ª¸À¥«¥¤¥É",         10000,  190, 111,  5,  8, RACE_VAMPIRE},
-#else
+               { "Valindra the Proud",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
+               { "Taen the Alchemist",       15000,  220, 111,  4,  9, RACE_HUMAN},
                { "Cayd the Sweet",         10000,  190, 111,  5,  8, RACE_VAMPIRE},
-#endif
-#ifdef JP
-{ "°Å¤­¥Õ¥ê¥¢",         10000,  190, 110,  6,  8, RACE_NIBELUNG},
-#else
                { "Fulir the Dark",         10000,  190, 110,  6,  8, RACE_NIBELUNG},
-#endif
-#ifdef JP
-       { "¼ÁÁǤʥɥà¥ê",           15000,  200, 116,  6,  9, RACE_DWARF},
-#else
-       { "Domli the Humble",           15000,  200, 116,  6,  9, RACE_DWARF},
-#endif
-#ifdef JP
-       { "Ëâ¤Î»Ò¥ä¥¡¥¸¥å¥Ã¥«",       15000,  220, 111,  4,  9, RACE_IMP},
-#else
-       { "Yaarjukka Demonspawn",       15000,  220, 111,  4,  9, RACE_IMP},
-#endif
-#ifdef JP
-{ "ÌôÁð»Õ¥¸¥§¥é¥é¥ë¥É¡¼¥ë",         10000,  190, 111,  5,  8, RACE_HIGH_ELF},
-#else
+               { "Domli the Humble",           15000,  200, 116,  6,  9, RACE_DWARF},
+               { "Yaarjukka Demonspawn",       15000,  220, 111,  4,  9, RACE_IMP},
                { "Gelaraldor the Herbmaster",         10000,  190, 111,  5,  8, RACE_HIGH_ELF},
-#endif
-#ifdef JP
-{ "¸­¼Ô¥ª¥ì¥é¥ë¥À¥ó",         10000,  190, 110,  6,  8, RACE_BARBARIAN},
-#else
                { "Olelaldan the Wise",         10000,  190, 110,  6,  8, RACE_BARBARIAN},
-#endif
-#ifdef JP
-       { "¥Ç¥â¥Ë¥·¥¹¥È¤Î¥Õ¥¾¥°¥í",           15000,  200, 116,  6,  9, RACE_IMP},
-#else
-       { "Fthoglo the Demonicist",           15000,  200, 116,  6,  9, RACE_IMP},
-#endif
-#ifdef JP
-       { "Ï£¶â½Ñ»Õ¥É¥¥¥ê¥¢¥·¥å",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
-#else
-       { "Dridash the Alchemist",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
-#endif
-#ifdef JP
-{ "¶¯¼Ô¥Í¥ê¥¢",         10000,  190, 111,  5,  8, RACE_CYCLOPS},
-#else
+               { "Fthoglo the Demonicist",           15000,  200, 116,  6,  9, RACE_IMP},
+               { "Dridash the Alchemist",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
                { "Nelir the Strong",         10000,  190, 111,  5,  8, RACE_CYCLOPS},
-#endif
-#ifdef JP
-{ "¿É¸ý¥ê¥°¥Ê¥¹",         10000,  190, 110,  6,  8, RACE_HALF_ORC},
-#else
                { "Lignus the Pungent",         10000,  190, 110,  6,  8, RACE_HALF_ORC},
-#endif
-#ifdef JP
-       { "¥Æ¥£¥ë¥Ð",           15000,  200, 116,  6,  9, RACE_HOBBIT},
-#else
-       { "Tilba",           15000,  200, 116,  6,  9, RACE_HOBBIT},
-#endif
-#ifdef JP
-       { "¶â»ý¤Á¥ß¥ê¥ë¥É¥ê¥Ã¥¯",       15000,  220, 111,  4,  9, RACE_HUMAN},
-#else
-       { "Myrildric the Wealthy",       15000,  220, 111,  4,  9, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "²Ê³Ø¼Ô¥Þ¥¦¥¶¡¼",         10000,  190, 111,  5,  8, RACE_HALF_ELF},
-#else
+               { "Tilba",           15000,  200, 116,  6,  9, RACE_HOBBIT},
+               { "Myrildric the Wealthy",       15000,  220, 111,  4,  9, RACE_HUMAN},
+
                { "Mauser the Chemist",         10000,  190, 111,  5,  8, RACE_HALF_ELF},
-#endif
-#ifdef JP
-{ "¥«¥ª¥¹¤Î¥¦¥£¥º¥ë",         10000,  190, 110,  6,  8, RACE_HOBBIT},
-#else
                { "Wizzle the Chaotic",         10000,  190, 110,  6,  8, RACE_HOBBIT},
-#endif
-#ifdef JP
-{ "¶¯ÍߥߥÀ¥¹",           15000,  200, 116,  6,  9, RACE_GNOME},
-#else
                { "Midas the Greedy",           15000,  200, 116,  6,  9, RACE_GNOME},
-#endif
-#ifdef JP
-{ "Ï£¶â½Ñ»Õ¥¸¥ã=¥Õ¥¡¡¼",       15000,  220, 111,  4,  9, RACE_ELF},
-#else
                { "Ja-Far the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
+               { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
+               { "Jal-Eth the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
 #endif
-#ifdef JP
-       { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
-#else
-       { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
-#endif
-#ifdef JP
-       { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
-#else
-       { "Jal-Eth the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
-#endif
-       },
-       {
+               },
+
+               {
                /* Magic Shop - 23 unique names */
 #ifdef JP
                { "¥½¡¼¥µ¥é¡¼¤Î¥í=¥Ñ¥ó",       20000,  200,  110,   7,   8,  RACE_HALF_ELF},
@@ -2168,151 +2006,66 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "¥´¥Ö¥ê¥ó¤Î¥Ò¥¹¥È¡¼¥¢",       20000,  250,  150,  10,   5,  RACE_HALF_ORC},
                { "¥Õ¥§¥ì¥ó¥®¿Í¥¯¥¢¡¼¥¯",           30000,  250,  150,  10,   5,  RACE_HUMAN},
                { "¸øÀµ¤Ê¤ë(?)¥È¥Ã¥Ô",                     30000,  250,  150,  10,   5,  RACE_ELF},
+               { "»à¿Í¥ô¥¡¥Ã¥µ",             20000,  250, 150, 10,  5, RACE_ZOMBIE},
+               { "΢ÀÚ¤ê¼Ô¥«¥¤¥ó",          20000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "¥Ö¥Ü¥Ë¥«¥¹",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
+               { "¥³¡¼¥×¥¹¥é¥¤¥È",           30000,  250, 150, 10,  5, RACE_SPECTRE},
+               { "·ì¤Ëµ²¤¨¤·¥Ñ¥ê¥Ã¥·¥å",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "¥ô¥¡¥¤¥ë",          20000,  250, 150, 10,  5, RACE_SKELETON},
+               { "¿®Íê¤Î¥×¥ì¥ó¥Æ¥£¥¹",          30000,  250, 150, 10,  5, RACE_SKELETON},
+               { "¿Í´Ö»¦¤·¤Î¥°¥ê¥¨¥é",           30000,  250, 150, 10,  5, RACE_IMP},
+               { "¥¨¥ó¥¸¥§¥ë",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "¿åËĤì¥Õ¥í¥Ä¥¡¥à",          20000,  250, 150, 10,  5, RACE_ZOMBIE},
+               { "¥Ë¡¼¥ô¥¡¥ë",          30000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "ÌÀ¤ë¤¤¥¢¥Ê¥¹¥¿¥·¥¢",           30000,  250, 150, 10,  5, RACE_SPECTRE},
+               { "»àÎî½Ñ»Õ¥Á¥ã¥ê¥Æ¥£¡¼", 20000,  250, 150, 10,  5, RACE_DARK_ELF},
+               { "¥Ü¥¯¥µ¡¼¤Î¥×¥°¥Ê¥·¥ª¥¹",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
+               { "¹¬±¿¤Ê¥Õ¥Ã¥È¥½¥¢",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
+               { "¸÷»Ø¤Î¥·¥É¥ê¥¢",           30000,  250, 150, 10,  5, RACE_HUMAN},
+               { "¼êÉʻեꥢ¥½¡¼",                 20000,  250, 150, 10,  5, RACE_HOBBIT},
+               { "¤ä¤ê¤¯¤ê¾å¼ê¤Î¥¸¥ã¥Ê¥Ã¥«",          20000,  250, 150, 10,  5, RACE_GNOME},
+               { "°­ÅÞ¥·¡¼¥Ê",          30000,  250, 150, 10,  5, RACE_GNOME},
+               { "ÂçÄÞ¥¢¥ë¥Ë¥Ã¥­",           30000,  250, 150, 10,  5, RACE_DRACONIAN},
+               { "ÉÏ˳¥Á¥ã¥¨¥¢¥ó¥É",                 20000,  250, 150, 10,  5, RACE_HUMAN},
+               { "»³Â±¥¢¥Õ¥¡¡¼¥É¡¼¥Õ",          20000,  250, 150, 10,  5, RACE_BARBARIAN},
+               { "¶¯Íߥ饶¥¯¥¹¥ë",          30000,  250, 150, 10,  5, RACE_MIND_FLAYER},
+               { "¥Õ¥¡¥é¥ì¥¦¥£¥ó",           30000,  250, 150, 10,  5, RACE_SPRITE},
+               { "¤·¤ï¤·¤ï¥ô¥©¥¹¡¼¥ë",                 20000,  250, 150, 10,  5, RACE_NIBELUNG},
+               { "¥Ï¥ó¥µ¥à¤Ê¥¢¥é¥ª¡¼¥É",          20000,  250, 150, 10,  5, RACE_AMBERITE},
+               { "É餱¸¤¥»¥é¥É¥Õ¥ê¥É",          30000,  250, 150, 10,  5, RACE_HUMAN},
+               { "ÊÒ­¤Î¥¨¥ë¡¼¥í",           30000,  250, 150, 10,  5, RACE_HALF_OGRE},
 #else
                { "Gary Gygaz",                 20000,  250, 150, 10,  5, RACE_HALF_TROLL},
                { "Histor the Goblin",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
                { "Quark the Ferengi",          30000,  250, 150, 10,  5, RACE_DWARF},
                { "Topi the Fair(?)",           30000,  250, 150, 10,  5, RACE_HUMAN},
-#endif
-
-#ifdef JP
-{ "»à¿Í¥ô¥¡¥Ã¥µ",             20000,  250, 150, 10,  5, RACE_ZOMBIE},
-#else
                { "Vhassa the Dead",             20000,  250, 150, 10,  5, RACE_ZOMBIE},
-#endif
-#ifdef JP
-{ "΢ÀÚ¤ê¼Ô¥«¥¤¥ó",          20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else
                { "Kyn the Treacherous",          20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#endif
-#ifdef JP
-{ "¥Ö¥Ü¥Ë¥«¥¹",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
-#else
                { "Bubonicus",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
-#endif
-#ifdef JP
-{ "¥³¡¼¥×¥¹¥é¥¤¥È",           30000,  250, 150, 10,  5, RACE_SPECTRE},
-#else
                { "Corpselight",           30000,  250, 150, 10,  5, RACE_SPECTRE},
-#endif
-#ifdef JP
-{ "·ì¤Ëµ²¤¨¤·¥Ñ¥ê¥Ã¥·¥å",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else
                { "Parrish the Bloodthirsty",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#endif
-#ifdef JP
-{ "¥ô¥¡¥¤¥ë",          20000,  250, 150, 10,  5, RACE_SKELETON},
-#else
                { "Vile",          20000,  250, 150, 10,  5, RACE_SKELETON},
-#endif
-#ifdef JP
-{ "¿®Íê¤Î¥×¥ì¥ó¥Æ¥£¥¹",          30000,  250, 150, 10,  5, RACE_SKELETON},
-#else
                { "Prentice the Trusted",          30000,  250, 150, 10,  5, RACE_SKELETON},
-#endif
-#ifdef JP
-{ "¿Í´Ö»¦¤·¤Î¥°¥ê¥¨¥é",           30000,  250, 150, 10,  5, RACE_IMP},
-#else
                { "Griella Humanslayer",           30000,  250, 150, 10,  5, RACE_IMP},
-#endif
-#ifdef JP
-{ "¥¨¥ó¥¸¥§¥ë",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else
                { "Angel",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#endif
-#ifdef JP
-{ "¿åËĤì¥Õ¥í¥Ä¥¡¥à",          20000,  250, 150, 10,  5, RACE_ZOMBIE},
-#else
                { "Flotsam the Bloated",          20000,  250, 150, 10,  5, RACE_ZOMBIE},
-#endif
-#ifdef JP
-{ "¥Ë¡¼¥ô¥¡¥ë",          30000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else
                { "Nieval",          30000,  250, 150, 10,  5, RACE_VAMPIRE},
-#endif
-#ifdef JP
-{ "ÌÀ¤ë¤¤¥¢¥Ê¥¹¥¿¥·¥¢",           30000,  250, 150, 10,  5, RACE_SPECTRE},
-#else
                { "Anastasia the Luminous",           30000,  250, 150, 10,  5, RACE_SPECTRE},
-#endif
-#ifdef JP
-{ "»àÎî½Ñ»Õ¥Á¥ã¥ê¥Æ¥£¡¼", 20000,  250, 150, 10,  5, RACE_DARK_ELF},
-#else
                { "Charity the Necromancer", 20000,  250, 150, 10,  5, RACE_DARK_ELF},
-#endif
-#ifdef JP
-{ "¥Ü¥¯¥µ¡¼¤Î¥×¥°¥Ê¥·¥ª¥¹",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
-#else
                { "Pugnacious the Pugilist",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
-#endif
-#ifdef JP
-{ "¹¬±¿¤Ê¥Õ¥Ã¥È¥½¥¢",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
-#else
                { "Footsore the Lucky",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
-#endif
-#ifdef JP
-{ "¸÷»Ø¤Î¥·¥É¥ê¥¢",           30000,  250, 150, 10,  5, RACE_HUMAN},
-#else
                { "Sidria Lighfingered",           30000,  250, 150, 10,  5, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "¼êÉʻեꥢ¥½¡¼",                 20000,  250, 150, 10,  5, RACE_HOBBIT},
-#else
                { "Riatho the Juggler",                 20000,  250, 150, 10,  5, RACE_HOBBIT},
-#endif
-#ifdef JP
-{ "¤ä¤ê¤¯¤ê¾å¼ê¤Î¥¸¥ã¥Ê¥Ã¥«",          20000,  250, 150, 10,  5, RACE_GNOME},
-#else
                { "Janaaka the Shifty",          20000,  250, 150, 10,  5, RACE_GNOME},
-#endif
-#ifdef JP
-{ "°­ÅÞ¥·¡¼¥Ê",          30000,  250, 150, 10,  5, RACE_GNOME},
-#else
                { "Cina the Rogue",          30000,  250, 150, 10,  5, RACE_GNOME},
-#endif
-#ifdef JP
-{ "ÂçÄÞ¥¢¥ë¥Ë¥Ã¥­",           30000,  250, 150, 10,  5, RACE_DRACONIAN},
-#else
                { "Arunikki Greatclaw",           30000,  250, 150, 10,  5, RACE_DRACONIAN},
-#endif
-#ifdef JP
-{ "ÉÏ˳¥Á¥ã¥¨¥¢¥ó¥É",                 20000,  250, 150, 10,  5, RACE_HUMAN},
-#else
                { "Chaeand the Poor",                 20000,  250, 150, 10,  5, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "»³Â±¥¢¥Õ¥¡¡¼¥É¡¼¥Õ",          20000,  250, 150, 10,  5, RACE_BARBARIAN},
-#else
                { "Afardorf the Brigand",          20000,  250, 150, 10,  5, RACE_BARBARIAN},
-#endif
-#ifdef JP
-{ "¶¯Íߥ饶¥¯¥¹¥ë",          30000,  250, 150, 10,  5, RACE_MIND_FLAYER},
-#else
                { "Lathaxl the Greedy",          30000,  250, 150, 10,  5, RACE_MIND_FLAYER},
-#endif
-#ifdef JP
-{ "¥Õ¥¡¥é¥ì¥¦¥£¥ó",           30000,  250, 150, 10,  5, RACE_SPRITE},
-#else
                { "Falarewyn",           30000,  250, 150, 10,  5, RACE_SPRITE},
-#endif
-#ifdef JP
-{ "¤·¤ï¤·¤ï¥ô¥©¥¹¡¼¥ë",                 20000,  250, 150, 10,  5, RACE_NIBELUNG},
-#else
                { "Vosur the Wrinkled",                 20000,  250, 150, 10,  5, RACE_NIBELUNG},
-#endif
-#ifdef JP
-{ "¥Ï¥ó¥µ¥à¤Ê¥¢¥é¥ª¡¼¥É",          20000,  250, 150, 10,  5, RACE_AMBERITE},
-#else
                { "Araord the Handsome",          20000,  250, 150, 10,  5, RACE_AMBERITE},
-#endif
-#ifdef JP
-{ "É餱¸¤¥»¥é¥É¥Õ¥ê¥É",          30000,  250, 150, 10,  5, RACE_HUMAN},
-#else
                { "Theradfrid the Loser",          30000,  250, 150, 10,  5, RACE_HUMAN},
-#endif
-#ifdef JP
-{ "ÊÒ­¤Î¥¨¥ë¡¼¥í",           30000,  250, 150, 10,  5, RACE_HALF_OGRE},
-#else
                { "One-Legged Eroolo",           30000,  250, 150, 10,  5, RACE_HALF_OGRE},
 #endif
        },
@@ -2839,7 +2592,7 @@ player_race race_info[MAX_RACES] =
                72,  6, 180, 25,
                66,  4, 150, 20,
                0,
-               0x7FFFFFF,
+               0xFFFFFFF,
        },
        {
 #ifdef JP
@@ -2854,7 +2607,7 @@ player_race race_info[MAX_RACES] =
                66,  6, 130, 15,
                62,  6, 100, 10,
                2,
-               0x677E7FF,
+               0xE77E7FF,
        },
        {
 #ifdef JP
@@ -2869,7 +2622,7 @@ player_race race_info[MAX_RACES] =
                60,  4, 100,  6,
                54,  4, 80,  6,
                3,
-               0x677E75B,
+               0xE77E75B,
 
        },
        {
@@ -2885,7 +2638,7 @@ player_race race_info[MAX_RACES] =
                36,  3, 60,  3,
                33,  3, 50,  3,
                4,
-               0x76FFC0B,
+               0xF6FFC0B,
        },
        {
 #ifdef JP
@@ -2900,7 +2653,7 @@ player_race race_info[MAX_RACES] =
                42,  3, 90,  6,
                39,  3, 75,  3,
                4,
-               0x767D60F,
+               0xF67D60F,
        },
        {
 #ifdef JP
@@ -2930,7 +2683,7 @@ player_race race_info[MAX_RACES] =
                66,  1, 150,  5,
                62,  1, 120,  5,
                3,
-               0x5D8818D,
+               0xDD8818D,
        },
        {
 #ifdef JP
@@ -2960,7 +2713,7 @@ player_race race_info[MAX_RACES] =
                82, 5, 190, 20,
                78,  6, 180, 15,
                0,
-               0x7FFF7FF,
+               0xFFFF7FF,
        },
        {
 #ifdef JP
@@ -2975,7 +2728,7 @@ player_race race_info[MAX_RACES] =
                90, 10, 190, 20,
                82, 10, 180, 15,
                4,
-               0x777E75B,
+               0xF77E75B,
        },
        {
 #ifdef JP
@@ -3020,7 +2773,7 @@ player_race race_info[MAX_RACES] =
                100,10, 255, 65,
                80, 10, 240, 64,
                3,
-               0x0880011,
+               0x8880011,
        },
        {
 #ifdef JP
@@ -3125,7 +2878,7 @@ player_race race_info[MAX_RACES] =
                60,  4, 100,  6,
                54,  4, 80,  6,
                5,
-               0x677C7DF,
+               0xE77C7DF,
        },
        {
 #ifdef JP
@@ -3170,7 +2923,7 @@ player_race race_info[MAX_RACES] =
                68,  1, 150,  5,
                64,  1, 120,  5,
                3,
-               0x6B537CB,
+               0xDB537CB,
        },
        {
 #ifdef JP
@@ -3336,7 +3089,7 @@ player_race race_info[MAX_RACES] =
                82, 5, 190, 20,
                78,  6, 180, 15,
                0,
-               0x7FFF7FF,
+               0xFFFF7FF,
        },
        {
 #ifdef JP
@@ -3350,7 +3103,7 @@ player_race race_info[MAX_RACES] =
                 80,  8, 90, 20,
                 73,  8, 80, 15,
                  4,
-               0x633C7DF,
+               0xE33C7DF,
        },
        {
 #ifdef JP
@@ -3365,7 +3118,7 @@ player_race race_info[MAX_RACES] =
                48,  6, 150, 25,
                44,  4, 130, 20,
                0,
-               0x418B7AD,
+               0xC18B7AD,
        },
        {
 #ifdef JP
@@ -3712,6 +3465,18 @@ player_class class_info[MAX_CLASS] =
                15, 10, 10, 0,  0,  0, 25,18,
                2,  20, 40
        },
+
+       {
+#ifdef JP
+               "¥¹¥Ê¥¤¥Ñ¡¼",
+#endif
+               "Sniper",
+
+               { 2, -1, -1, 2, 1, 0},
+               25, 24, 28, 5, 32, 18, 35,  72,
+               12, 10, 10, 0,  0,  0, 12,  28,
+               2, 20, 40,
+       },
 };
 
 player_seikaku seikaku_info[MAX_SEIKAKU] =
@@ -3984,6 +3749,45 @@ magic_type technic_info[NUM_TECHNIC][32] =
                { 45, 130,   0,   0},
                { 50, 255,   0,   0}
        },
+
+       {
+               /* Hex */
+               {  1,  2, 20,   2},
+               {  1,  2, 20,   2},
+               {  3,  2, 30,   3},
+               {  5,  3, 30,   4},
+               {  7,  3, 40,   6},
+               {  8, 10, 60,   8},
+               {  9,  3, 30,  10},
+               { 10,  5, 40,  12},
+
+               { 12,  8, 40,  15},
+               { 12,  9, 35,  15},
+               { 15, 10, 50,  20},
+               { 20, 12, 45,  35},
+               { 25, 15, 50,  50},
+               { 30, 12, 60,  70},
+               { 35, 10, 60,  80},
+               { 40, 16, 70, 100},
+
+               { 15,  8, 20,  20},
+               { 18, 15, 50,  20},
+               { 22, 10, 65,  35},
+               { 25, 28, 70,  50},
+               { 28, 10, 70,  60},
+               { 30, 20, 60,  60},
+               { 36, 22, 70,  80},
+               { 40, 28, 70, 100},
+
+               {  5,  6, 35,   5},
+               { 22, 24, 70,  40},
+               { 25,  2, 65,  50},
+               { 32, 20, 50,  70},
+               { 35, 35, 70,  80},
+               { 38, 32, 70,  90},
+               { 42, 24, 70, 120},
+               { 46, 45, 80, 200}
+       },
 };
 
 
@@ -4021,24 +3825,25 @@ s32b realm_choices1[MAX_CLASS] =
        (CH_LIFE | CH_SORCERY | CH_NATURE |
         CH_CHAOS | CH_DEATH | CH_TRUMP |
         CH_ARCANE | CH_ENCHANT | CH_DAEMON |
-        CH_CRUSADE),                              /* High-Mage */
+        CH_CRUSADE | CH_HEX),                  /* High-Mage */
        (CH_ARCANE),                            /* Tourist */
-       (CH_NONE),                              /* Imitation */
+       (CH_NONE),                              /* Imitator */
        (CH_TRUMP),                             /* Beastmaster */
        (CH_NONE),                              /* Sorcerer */
        (CH_NONE),                              /* Archer */
        (CH_NONE),                              /* Magic eater */
-       (CH_MUSIC),                             /* Harper */
+       (CH_MUSIC),                             /* Bard */
        (CH_NONE),                              /* Red Mage */
        (CH_HISSATSU),                          /* Samurai */
        (CH_LIFE | CH_NATURE | CH_DEATH |
         CH_ENCHANT | CH_CRUSADE),                 /* ForceTrainer */
        (CH_NONE),                              /* Blue Mage */
-       (CH_NONE),                              /* Kihei */
+       (CH_NONE),                              /* Cavalry */
        (CH_NONE),                              /* Berserker */
-       (CH_NONE),                              /* Kaji */
+       (CH_NONE),                              /* Weaponsmith */
        (CH_NONE),                              /* Mirror-master */
        (CH_NONE),                              /* Ninja */
+       (CH_NONE),                              /* Sniper */
 };
 
 
@@ -4066,21 +3871,22 @@ s32b realm_choices2[MAX_CLASS] =
        (CH_NONE),                              /* Mindcrafter */
        (CH_NONE),                              /* High-Mage */
        (CH_NONE),                              /* Tourist */
-       (CH_NONE),                              /* Imitation */
+       (CH_NONE),                              /* Imitator */
        (CH_NONE),                              /* Beastmanster */
        (CH_NONE),                              /* Sorcerer */
        (CH_NONE),                              /* Archer */
        (CH_NONE),                              /* Magic eater */
-       (CH_NONE),                              /* Harper */
+       (CH_NONE),                              /* Bard */
        (CH_NONE),                              /* Red Mage */
        (CH_NONE),                              /* Samurai */
        (CH_NONE),                              /* ForceTrainer */
        (CH_NONE),                              /* Blue Mage */
-       (CH_NONE),                              /* Kihei */
+       (CH_NONE),                              /* Cavalry */
        (CH_NONE),                              /* Berserker */
-       (CH_NONE),                              /* Kaji */
+       (CH_NONE),                              /* Weaponsmith */
        (CH_NONE),                              /* Mirror-master */
        (CH_NONE),                              /* Ninja */
+       (CH_NONE),                              /* Sniper */
 };
 
 
@@ -4105,6 +3911,7 @@ cptr realm_names[] =
        "ÉÔÌÀ",
        "²Î",
        "Éð·Ý",
+       "¼ö½Ñ",
        "ÉÔÌÀ"
 };
 #endif
@@ -4133,6 +3940,7 @@ cptr realm_names[]
        "unknown",
        "Music",
        "Kendo",
+       "Hex",
        "unknown"
 };
 
@@ -4233,7 +4041,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "±Ñͺ",
                "Ã˼ß",
                "Çì¼ß",
-               "Îμç",
+               "·¯¼ç",
        },
 
        /* Mage */
@@ -4275,9 +4083,9 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "¥Ú¥Æ¥ó»Õ",                     /*ÇîÅÌ¡¢¥Ú¥Æ¥ó»Õ¡¢º¾µ½»Õ */
                "¥í¥¦¥·¡¼¥Õ",
                "¥Ï¥¤¥·¡¼¥Õ",
-               "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ",
+               "¥Þ¥¹¥¿¡¼", /* "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ", */
                "¥¢¥µ¥·¥ó",                                             /* °Å»¦¼Ô */
-               "¥®¥ë¥É¥Þ¥¹¥¿¡¼",
+               "ƬÎÎ", /*"¥®¥ë¥É¥Þ¥¹¥¿¡¼",*/
        },
 
        /* Rangers */
@@ -4305,7 +4113,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "½Åµ³»Î",
                "À»µ³»Î",
                "¾åµéÀ»µ³»Î",
-               "À»µ³»ÎĹ",
+               "À»µ³»ÎÃÄĹ",
        },
 
        /* Warrior-Mage */
@@ -4320,7 +4128,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "ËâÃ˼ß",
                /* "Ëâ¸ø¼ß", */
                "ÀïÆ®Ëâ½Ñ»Î",
-               "¥¦¥£¥¶¡¼¥É¥í¡¼¥É",
+               "Ãμ±¤Î¼é¸î¼Ô", /* "¥¦¥£¥¶¡¼¥É¥í¡¼¥É", */
        },
 
        /* Chaos Warrior */
@@ -4362,7 +4170,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "¥µ¥¤¥­¥Ã¥¯",
                "¥µ¥¤¥ª¥Ë¥Ã¥¯",
                "ĶǽÎϼÔ",
-               "¥Þ¥¤¥ó¥É¥Þ¥¹¥¿¡¼",
+               "Àº¿À¤Î»ÙÇÛ¼Ô", /* "¥Þ¥¤¥ó¥É¥Þ¥¹¥¿¡¼", */
        },
 
        /* High Mage; same as Mage */
@@ -4465,7 +4273,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "Á´¤Æ¤òÃΤë¼Ô",
        },
 
-       /* Harper */
+       /* Bard */
        {
                "¸«½¬¤¤",       /*"Apprentice"*/
                "ºî¶Ê²È",       /*"Songsmith"*/
@@ -4491,7 +4299,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "ËâÃ˼ß",
                /* "Ëâ¸ø¼ß", */
                "ÀïÆ®Ëâ½Ñ»Î",
-               "¥¦¥£¥¶¡¼¥É¥í¡¼¥É",
+               "Ãμ±¤Î¼é¸î¼Ô", /* "¥¦¥£¥¶¡¼¥É¥í¡¼¥É", */
        },
 
        /* Samurai */
@@ -4537,7 +4345,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "ÂçËâÆ»»Õ",
        },
 
-       /* Kihei */
+       /* Cavalry */
        {
                "¿·»²Ê¼",
                "ʼ»Î",
@@ -4565,7 +4373,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "Åܤê¤Î²½¿È",
        },
 
-       /* Kaji */
+       /* Weaponsmith */
        {
                "Ƽ¤òÃ䨤·¼Ô",
                "Å´¤òÃ䨤·¼Ô",
@@ -4605,6 +4413,20 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "°Å»¦¼Ô",
                "»à¤ÎŤ­ÏÓ",
        },
+
+       /* Sniper */
+       {
+               "¿·»²Ê¼",
+               "ʼ»Î",
+               "ÍÃʼ",
+               "¸Å»²Ê¼",
+               "·õ»Î",
+               "Æ®»Î",
+               "±Ñͺ",
+               "Ã˼ß",
+               "Çì¼ß",
+               "Îμç",
+       },
 };
 
 #else
@@ -4826,7 +4648,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "Soldier",
                "Mercenary",
                "Veteran",
-               "Swordsman",
+               "Bowman",
                "Champion",
                "Hero",
                "Baron",
@@ -4848,7 +4670,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "Almighty",
        },
 
-       /* Harper */
+       /* Bard */
        {
                "Apprentice",   /*"Apprentice"*/
                "Songsmith",    /*"Songsmith"*/
@@ -4946,7 +4768,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                    "God of Rage",
        },
 
-       /* Kaji */
+       /* Weaponsmith */
        {
                "Copper smith",
                "Iron smith",
@@ -4963,14 +4785,14 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
        /* Mirror Master */
        {
                "Mirrorstarer",
-               "Mirrorpolisher",
+               "Mirrorcleaner",
                "Mirrormaker",
                "Mirrormagician",
-               "Guru of Mirror ",
+               "Mirror Guru",
                "Mirror Mage",
                "Mirror King",
-               "Mirror Emperror",
-               "Avatar of Mirror",
+               "Mirror Emperor",
+               "Mirror Avatar",
                "Ruffnor King",
        },
 
@@ -4987,6 +4809,20 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "Assassinator",
                "Death Lord",
        },
+
+       /* Sniper */
+       {
+               "Rookie",
+               "Soldier",
+               "Mercenary",
+               "Veteran",
+               "Swordsman",
+               "Champion",
+               "Hero",
+               "Baron",
+               "Duke",
+               "Lord",
+       },
 };
 #endif
 
@@ -6734,22 +6570,6 @@ cptr exp_level_str[5]=
 {"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
 #endif
 
-s16b conv_terrain2feat[MAX_WILDERNESS] =
-{
-  FEAT_PERM,
-  FEAT_TOWN,
-  FEAT_DEEP_WATER,
-  FEAT_SHAL_WATER,
-  FEAT_SWAMP,
-  FEAT_DIRT,
-  FEAT_GRASS,
-  FEAT_TREES,
-  FEAT_DIRT,
-  FEAT_SHAL_LAVA,
-  FEAT_DEEP_LAVA,
-  FEAT_MOUNTAIN
-};
-
 /* Weird melee attack types when hallucinating */
 #ifdef JP
 cptr silly_attacks[MAX_SILLY_ATTACK] =
@@ -7144,11 +6964,11 @@ byte feature_action_flags[FF_FLAG_MAX] =
        0, /* REMEMBER */
        0, /* OPEN */
        0, /* CLOSE */
-       0, /* BASH */
+       FAF_CRASH_GLASS, /* BASH */
        0, /* SPIKE */
        FAF_DESTROY, /* DISARM */
        0, /* STORE */
-       FAF_DESTROY, /* TUNNEL */
+       FAF_DESTROY | FAF_CRASH_GLASS, /* TUNNEL */
        0, /* MAY_HAVE_GOLD */
        0, /* HAS_GOLD */
        0, /* HAS_ITEM */
@@ -7179,7 +6999,7 @@ byte feature_action_flags[FF_FLAG_MAX] =
        0, /* SHALLOW */
        0, /* DEEP */
        0, /* FILLED */
-       FAF_DESTROY, /* HURT_ROCK */
+       FAF_DESTROY | FAF_CRASH_GLASS, /* HURT_ROCK */
        0, /* HURT_FIRE */
        0, /* HURT_COLD */
        0, /* HURT_ACID */
@@ -7234,7 +7054,7 @@ byte feature_action_flags[FF_FLAG_MAX] =
        0, /* SPREAD */
 
        0, /* SPECIAL */
-       FAF_DESTROY | FAF_NO_DROP, /* HURT_DISI */
+       FAF_DESTROY | FAF_NO_DROP | FAF_CRASH_GLASS, /* HURT_DISI */
        0, /* QUEST_ENTER */
        0, /* QUEST_EXIT */
        0, /* QUEST */
@@ -7246,4 +7066,8 @@ byte feature_action_flags[FF_FLAG_MAX] =
        0, /* TOWN */
        0, /* ENTRANCE */
        0, /* MIRROR */
+       0, /* UNPERM */
+       0, /* TELEPORTABLE */
+       0, /* CONVERT */
+       0, /* GLASS */
 };