OSDN Git Service

既に忘れた何かの理由によって、長い事tabをスペース8文字にする設定で
[hengband/hengband.git] / src / tables.c
index d3bea6a..22ac928 100644 (file)
@@ -1210,11 +1210,11 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
  */
 
 #ifdef JP
-                { "¥Õ¥ì¥ó¥É¥ê¡¼¤Ê¥Ó¥ë¥Ü",       200,    170,  108,   5,  15,  RACE_HOBBIT},
+               { "¥Õ¥ì¥ó¥É¥ê¡¼¤Ê¥Ó¥ë¥Ü",       200,    170,  108,   5,  15,  RACE_HOBBIT},
 /*                { "²±É¼ԥ饹¥È¥ê¥ó",       200,    175,  108,   4,  12,  RACE_HUMAN},  */
-                { "²±É¼ԥê¥ó¥¹¥¦¥£¥ó¥É",       200,    175,  108,   4,  12,  RACE_HUMAN}, 
-                { "ÇؤÎÄ㤤¥µ¥ë¥¿¥ó",             300,    170,  107,   5,  15,  RACE_GNOME},
-                { "¥Ï¥ó¥µ¥à¤Ê¥é¥¤¥¢=¥¨¥ë",      300,    165,  107,   6,  18,  RACE_ELF},
+               { "²±É¼ԥê¥ó¥¹¥¦¥£¥ó¥É",       200,    175,  108,   4,  12,  RACE_HUMAN}, 
+               { "ÇؤÎÄ㤤¥µ¥ë¥¿¥ó",             300,    170,  107,   5,  15,  RACE_GNOME},
+               { "¥Ï¥ó¥µ¥à¤Ê¥é¥¤¥¢=¥¨¥ë",      300,    165,  107,   6,  18,  RACE_ELF},
 #else
                { "Bilbo the Friendly",         200,    170, 108,  5, 15, RACE_HOBBIT},
 /*             { "Raistlin the Chicken",       200,    175, 108,  4, 12, RACE_HUMAN}, */
@@ -1367,10 +1367,10 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
        {
                /* Armoury - 28 unique names */
 #ifdef JP
-                { "½¹°­¥³¥ó=¥À¡¼",      5000,   210,  115,   5,   7,  RACE_HALF_ORC},
-                { "´è¸Ç¼Ô¥À¡¼¥°=¥í¥¦",  10000,  190,  111,   4,   9,  RACE_HUMAN},
-                { "¸­¼Ô¥Ç¥«¥É",                 25000,  200,  112,   4,  10,  RACE_DUNADAN},
-                { "ÃÃÌê²°¤Î¥¦¥£¡¼¥é¥ó¥É",   30000,  200,  112,   4,   5,  RACE_DWARF},
+               { "½¹°­¥³¥ó=¥À¡¼",      5000,   210,  115,   5,   7,  RACE_HALF_ORC},
+               { "´è¸Ç¼Ô¥À¡¼¥°=¥í¥¦",  10000,  190,  111,   4,   9,  RACE_HUMAN},
+               { "¸­¼Ô¥Ç¥«¥É",                 25000,  200,  112,   4,  10,  RACE_DUNADAN},
+               { "ÃÃÌê²°¤Î¥¦¥£¡¼¥é¥ó¥É",   30000,  200,  112,   4,   5,  RACE_DWARF},
 #else
                { "Kon-Dar the Ugly",           5000,   210, 115,  5,  7, RACE_HALF_ORC},
                { "Darg-Low the Grim",          10000,  190, 111,  4,  9, RACE_HUMAN},
@@ -1394,9 +1394,9 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Decado the Handsome",            25000,  200, 112,  4, 10, RACE_AMBERITE},
 #endif
 #ifdef JP
-        { "¥¨¥í¡¼¡¦¥É¥é¥´¥ó¥¹¥±¥¤¥ë",          30000,  200, 112,  4,  5, RACE_ELF},
+       { "¥¨¥í¡¼¡¦¥É¥é¥´¥ó¥¹¥±¥¤¥ë",          30000,  200, 112,  4,  5, RACE_ELF},
 #else
-        { "Elo Dragonscale",          30000,  200, 112,  4,  5, RACE_ELF},
+       { "Elo Dragonscale",          30000,  200, 112,  4,  5, RACE_ELF},
 #endif
 #ifdef JP
 { "¥Ç¥ê¥«¥È¥¹",           10000,   210, 115,  5,  7, RACE_SPRITE},
@@ -1414,9 +1414,9 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Animus",            25000,  200, 112,  4, 10, RACE_GOLEM},
 #endif
 #ifdef JP
-        { "¥Þ¥ë¥ô¥¡¥¹",          30000,  200, 112,  4,  5, RACE_HALF_TITAN},
+       { "¥Þ¥ë¥ô¥¡¥¹",          30000,  200, 112,  4,  5, RACE_HALF_TITAN},
 #else
-        { "Malvus",          30000,  200, 112,  4,  5, RACE_HALF_TITAN},
+       { "Malvus",          30000,  200, 112,  4,  5, RACE_HALF_TITAN},
 #endif
 #ifdef JP
 { "¥»¥é¥¯¥·¥¹",           10000,   210, 115,  5,  7, RACE_ZOMBIE},
@@ -1434,9 +1434,9 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Drios the Faint",            25000,  200, 112,  4, 10, RACE_SPECTRE},
 #endif
 #ifdef JP
-        { "Î䤿¤¤¥Ð¥¹¥ê¥Ã¥¯",          30000,  200, 112,  4,  5, RACE_VAMPIRE},
+       { "Î䤿¤¤¥Ð¥¹¥ê¥Ã¥¯",          30000,  200, 112,  4,  5, RACE_VAMPIRE},
 #else
-        { "Bathric the Cold",          30000,  200, 112,  4,  5, RACE_VAMPIRE},
+       { "Bathric the Cold",          30000,  200, 112,  4,  5, RACE_VAMPIRE},
 #endif
 #ifdef JP
 { "Îä¹ó¥ô¥§¥ó¥¸¥§¥é",           10000,   210, 115,  5,  7, RACE_HALF_TROLL},
@@ -1454,9 +1454,9 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Yojo II",            25000,  200, 112,  4, 10, RACE_DWARF},
 #endif
 #ifdef JP
-        { "Í¥¤·¤¤¥é¥Ê¥é¡¼",          30000,  200, 112,  4,  5, RACE_AMBERITE},
+       { "Í¥¤·¤¤¥é¥Ê¥é¡¼",          30000,  200, 112,  4,  5, RACE_AMBERITE},
 #else
-        { "Ranalar the Sweet",          30000,  200, 112,  4,  5, RACE_AMBERITE},
+       { "Ranalar the Sweet",          30000,  200, 112,  4,  5, RACE_AMBERITE},
 #endif
 #ifdef JP
 { "ÉÔ¾ô¤Î¥Û¥ë¥Ð¥°",           5000,   210, 115,  5,  7, RACE_HALF_ORC},
@@ -1474,9 +1474,9 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Isedrelias",            25000,  200, 112,  4, 10, RACE_SPRITE},
 #endif
 #ifdef JP
-        { "°ì¤ÄÌÜ¥ô¥§¥°¥Ê¡¼",          5000,  200, 112,  4,  5, RACE_CYCLOPS},
+       { "°ì¤ÄÌÜ¥ô¥§¥°¥Ê¡¼",          5000,  200, 112,  4,  5, RACE_CYCLOPS},
 #else
-        { "Vegnar One-eye",          5000,  200, 112,  4,  5, RACE_CYCLOPS},
+       { "Vegnar One-eye",          5000,  200, 112,  4,  5, RACE_CYCLOPS},
 #endif
 #ifdef JP
 { "º®Æ٤Υí¥Ç¥£¥Ã¥·¥å",           10000,   210, 115,  5,  7, RACE_BEASTMAN},
@@ -1494,9 +1494,9 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Elvererith the Cheat",           10000,  200, 112,  4, 10, RACE_DARK_ELF},
 #endif
 #ifdef JP
-        { "¥¤¥ó¥×¤Î¥¶¥µ¥¹",          30000,  200, 112,  4,  5, RACE_IMP},
+       { "¥¤¥ó¥×¤Î¥¶¥µ¥¹",          30000,  200, 112,  4,  5, RACE_IMP},
 #else
-        { "Zzathath the Imp",          30000,  200, 112,  4,  5, RACE_IMP},
+       { "Zzathath the Imp",          30000,  200, 112,  4,  5, RACE_IMP},
 #endif
 #ifdef JP
 { "½¹°­¥³¥ó=¥À¡¼",           5000,   210, 115,  5,  7, RACE_HALF_ORC},
@@ -1522,10 +1522,10 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
        {
                /* Weapon Smith - 28 unique names */
 #ifdef JP
-                { "»ÄǦ¤Ê¤ë¥¢¡¼¥Î¥ë¥É",        5000,   210,  115,   6,   6,  RACE_HALF_TROLL},
-                { "½Ã»¦¤·¤Î¥¢¡¼¥ó¥À¥ë", 10000,  185,  110,   5,   9,  RACE_HALF_ELF},
-                { "½Ã¥Þ¥¹¥¿¡¼¤Î¥¨¥Ç¥£¡¼", 25000,  190,  115,   5,   7,  RACE_HOBBIT},
-                { "廦¤·¤Î¥ª¥°¥é¥¤¥ó", 30000,  195,  112,   4,   8,  RACE_DWARF},
+               { "»ÄǦ¤Ê¤ë¥¢¡¼¥Î¥ë¥É",        5000,   210,  115,   6,   6,  RACE_HALF_TROLL},
+               { "½Ã»¦¤·¤Î¥¢¡¼¥ó¥À¥ë", 10000,  185,  110,   5,   9,  RACE_HALF_ELF},
+               { "½Ã¥Þ¥¹¥¿¡¼¤Î¥¨¥Ç¥£¡¼", 25000,  190,  115,   5,   7,  RACE_HOBBIT},
+               { "廦¤·¤Î¥ª¥°¥é¥¤¥ó", 30000,  195,  112,   4,   8,  RACE_DWARF},
 #else
                { "Arnold the Beastly",      5000,   210, 115,  6,  6, RACE_BARBARIAN},
                { "Arndal Beast-Slayer",        10000,  185, 110,  5,  9, RACE_HALF_ELF},
@@ -1677,10 +1677,10 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
        {
                /* Temple - 22 unique names */
 #ifdef JP
-                { "¼ÁÁǤʥ롼¥É¥ô¥£¥Ò",         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},
+               { "¼ÁÁǤʥ롼¥É¥ô¥£¥Ò",         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},
 #else
                { "Ludwig the Humble",          5000,   175, 109,  6, 15, RACE_DWARF},
                { "Gunnar the Paladin",         10000,  185, 110,  5, 23, RACE_HALF_TROLL},
@@ -1832,10 +1832,10 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
        {
                /* Alchemist - 26 unique names */
 #ifdef JP
-                { "²½³Ø¼Ô¥Þ¥¦¥¶¡¼",             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},/*FIRST*/
+               { "²½³Ø¼Ô¥Þ¥¦¥¶¡¼",             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},/*FIRST*/
 #else
                { "Mauser the Chemist",         10000,  190, 111,  5,  8, RACE_HALF_ELF},
                { "Wizzle the Chaotic",         10000,  190, 110,  6,  8, RACE_HOBBIT},
@@ -1844,14 +1844,14 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
 #endif
 
 #ifdef JP
-        { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
+       { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
 #else
-        { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
+       { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
 #endif
 #ifdef JP
-        { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
+       { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
 #else
-        { "Jal-Eth the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
+       { "Jal-Eth the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
 #endif
 #ifdef JP
 { "ÍÑ¿´¿¼¤¤¥Õ¥¡¥Í¥é¥¹",         10000,  190, 111,  5,  8, RACE_DWARF},
@@ -1864,14 +1864,14 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Runcie the Insane",         10000,  190, 110,  6,  8, RACE_HUMAN},
 #endif
 #ifdef JP
-        { "¥°¥é¥ó¥Ö¥ë¥ï¡¼¥¹",           15000,  200, 116,  6,  9, RACE_GNOME},
+       { "¥°¥é¥ó¥Ö¥ë¥ï¡¼¥¹",           15000,  200, 116,  6,  9, RACE_GNOME},
 #else
-        { "Grumbleworth",           15000,  200, 116,  6,  9, RACE_GNOME},
+       { "Grumbleworth",           15000,  200, 116,  6,  9, RACE_GNOME},
 #endif
 #ifdef JP
-        { "¥Õ¥ê¥Ã¥¿¡¼",       15000,  220, 111,  4,  9, RACE_SPRITE},
+       { "¥Õ¥ê¥Ã¥¿¡¼",       15000,  220, 111,  4,  9, RACE_SPRITE},
 #else
-        { "Flitter",       15000,  220, 111,  4,  9, RACE_SPRITE},
+       { "Flitter",       15000,  220, 111,  4,  9, RACE_SPRITE},
 #endif
 #ifdef JP
 { "¥¶¥ê¥ë¥¹",         10000,  190, 111,  5,  8, RACE_HUMAN},
@@ -1884,14 +1884,14 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Egbert the Old",         10000,  190, 110,  6,  8, RACE_DWARF},
 #endif
 #ifdef JP
-        { "¸Ø¤ê¹â¤­¥ô¥¡¥ê¥ó¥É¥é",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
+       { "¸Ø¤ê¹â¤­¥ô¥¡¥ê¥ó¥É¥é",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
 #else
-        { "Valindra the Proud",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
+       { "Valindra the Proud",           15000,  200, 116,  6,  9, RACE_HIGH_ELF},
 #endif
 #ifdef JP
-        { "Ï£¶â½Ñ»Õ¥¿¥¨¥ó",       15000,  220, 111,  4,  9, RACE_HUMAN},
+       { "Ï£¶â½Ñ»Õ¥¿¥¨¥ó",       15000,  220, 111,  4,  9, RACE_HUMAN},
 #else
-        { "Taen the Alchemist",       15000,  220, 111,  4,  9, RACE_HUMAN},
+       { "Taen the Alchemist",       15000,  220, 111,  4,  9, RACE_HUMAN},
 #endif
 #ifdef JP
 { "¹ª¸À¥«¥¤¥É",         10000,  190, 111,  5,  8, RACE_VAMPIRE},
@@ -1904,14 +1904,14 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Fulir the Dark",         10000,  190, 110,  6,  8, RACE_NIBELUNG},
 #endif
 #ifdef JP
-        { "¼ÁÁǤʥɥà¥ê",           15000,  200, 116,  6,  9, RACE_DWARF},
+       { "¼ÁÁǤʥɥà¥ê",           15000,  200, 116,  6,  9, RACE_DWARF},
 #else
-        { "Domli the Humble",           15000,  200, 116,  6,  9, RACE_DWARF},
+       { "Domli the Humble",           15000,  200, 116,  6,  9, RACE_DWARF},
 #endif
 #ifdef JP
-        { "Ëâ¤Î»Ò¥ä¥¡¥¸¥å¥Ã¥«",       15000,  220, 111,  4,  9, RACE_IMP},
+       { "Ëâ¤Î»Ò¥ä¥¡¥¸¥å¥Ã¥«",       15000,  220, 111,  4,  9, RACE_IMP},
 #else
-        { "Yaarjukka Demonspawn",       15000,  220, 111,  4,  9, RACE_IMP},
+       { "Yaarjukka Demonspawn",       15000,  220, 111,  4,  9, RACE_IMP},
 #endif
 #ifdef JP
 { "ÌôÁð»Õ¥¸¥§¥é¥é¥ë¥É¡¼¥ë",         10000,  190, 111,  5,  8, RACE_HIGH_ELF},
@@ -1924,14 +1924,14 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Olelaldan the Wise",         10000,  190, 110,  6,  8, RACE_BARBARIAN},
 #endif
 #ifdef JP
-        { "¥Ç¥â¥Ë¥·¥¹¥È¤Î¥Õ¥¾¥°¥í",           15000,  200, 116,  6,  9, RACE_IMP},
+       { "¥Ç¥â¥Ë¥·¥¹¥È¤Î¥Õ¥¾¥°¥í",           15000,  200, 116,  6,  9, RACE_IMP},
 #else
-        { "Fthoglo the Demonicist",           15000,  200, 116,  6,  9, RACE_IMP},
+       { "Fthoglo the Demonicist",           15000,  200, 116,  6,  9, RACE_IMP},
 #endif
 #ifdef JP
-        { "Ï£¶â½Ñ»Õ¥É¥¥¥ê¥¢¥·¥å",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
+       { "Ï£¶â½Ñ»Õ¥É¥¥¥ê¥¢¥·¥å",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
 #else
-        { "Dridash the Alchemist",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
+       { "Dridash the Alchemist",       15000,  220, 111,  4,  9, RACE_HALF_ORC},
 #endif
 #ifdef JP
 { "¶¯¼Ô¥Í¥ê¥¢",         10000,  190, 111,  5,  8, RACE_CYCLOPS},
@@ -1944,14 +1944,14 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Lignus the Pungent",         10000,  190, 110,  6,  8, RACE_HALF_ORC},
 #endif
 #ifdef JP
-        { "¥Æ¥£¥ë¥Ð",           15000,  200, 116,  6,  9, RACE_HOBBIT},
+       { "¥Æ¥£¥ë¥Ð",           15000,  200, 116,  6,  9, RACE_HOBBIT},
 #else
-        { "Tilba",           15000,  200, 116,  6,  9, RACE_HOBBIT},
+       { "Tilba",           15000,  200, 116,  6,  9, RACE_HOBBIT},
 #endif
 #ifdef JP
-        { "¶â»ý¤Á¥ß¥ê¥ë¥É¥ê¥Ã¥¯",       15000,  220, 111,  4,  9, RACE_HUMAN},
+       { "¶â»ý¤Á¥ß¥ê¥ë¥É¥ê¥Ã¥¯",       15000,  220, 111,  4,  9, RACE_HUMAN},
 #else
-        { "Myrildric the Wealthy",       15000,  220, 111,  4,  9, RACE_HUMAN},
+       { "Myrildric the Wealthy",       15000,  220, 111,  4,  9, RACE_HUMAN},
 #endif
 #ifdef JP
 { "²Ê³Ø¼Ô¥Þ¥¦¥¶¡¼",         10000,  190, 111,  5,  8, RACE_HALF_ELF},
@@ -1974,23 +1974,23 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Ja-Far the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
 #endif
 #ifdef JP
-        { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
+       { "¥«¥«¥ë¥é¥«¥«¥ë",           15000,  200, 116,  6,  9, RACE_KLACKON},
 #else
-        { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
+       { "Kakalrakakal",           15000,  200, 116,  6,  9, RACE_KLACKON},
 #endif
 #ifdef JP
-        { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
+       { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹",       15000,  220, 111,  4,  9, RACE_ELF},
 #else
-        { "Jal-Eth the Alchemist",       15000,  220, 111,  4,  9, RACE_ELF},
+       { "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},
-                { "°ÎÂç¤Ê¤ë¥Ö¥¬¡¼¥Ó¥¤",         20000,  215,  113,   6,  10,  RACE_GNOME},
-                { "¥¤¥§¥ó¥À¡¼¤ÎËâË¡»È¤¤",     30000,  200,  110,   7,  10,  RACE_HUMAN},
-                { "»àÎî»È¤¤¥ê¥ã¥¯",30000,      175,  110,   5,  11,  RACE_HIGH_ELF},
+               { "¥½¡¼¥µ¥é¡¼¤Î¥í=¥Ñ¥ó",       20000,  200,  110,   7,   8,  RACE_HALF_ELF},
+               { "°ÎÂç¤Ê¤ë¥Ö¥¬¡¼¥Ó¥¤",         20000,  215,  113,   6,  10,  RACE_GNOME},
+               { "¥¤¥§¥ó¥À¡¼¤ÎËâË¡»È¤¤",     30000,  200,  110,   7,  10,  RACE_HUMAN},
+               { "»àÎî»È¤¤¥ê¥ã¥¯",30000,      175,  110,   5,  11,  RACE_HIGH_ELF},
 #else
                { "Lo Pan the Sorcerer",        20000,  200, 110,  7,  8, RACE_HALF_ELF},
                { "Buggerby the Great",         20000,  215, 113,  6, 10, RACE_GNOME},
@@ -1999,24 +1999,24 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
 #endif
 
 #ifdef JP
-        { "Ëâ½Ñ»Õ¥¹¥­¥É¥¥¥Ë¡¼",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
+       { "Ëâ½Ñ»Õ¥¹¥­¥É¥¥¥Ë¡¼",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
 #else
-        { "Skidney the Sorcerer",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
+       { "Skidney the Sorcerer",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
 #endif
 #ifdef JP
-        { "¸¸½Ñ»Õ¥­¥ê¥¢",       30000,  200, 110,  7, 10, RACE_HUMAN},
+       { "¸¸½Ñ»Õ¥­¥ê¥¢",       30000,  200, 110,  7, 10, RACE_HUMAN},
 #else
-        { "Kyria the Illusionist",       30000,  200, 110,  7, 10, RACE_HUMAN},
+       { "Kyria the Illusionist",       30000,  200, 110,  7, 10, RACE_HUMAN},
 #endif
 #ifdef JP
-        { "»àÎî½Ñ»Õ¥Ë¥Ã¥­",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "»àÎî½Ñ»Õ¥Ë¥Ã¥­",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #else
-        { "Nikki the Necromancer",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "Nikki the Necromancer",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #endif
 #ifdef JP
-        { "¥½¥í¥¹¥È¥é¥ó",        15000,  200, 110,  7,  8, RACE_SPRITE},
+       { "¥½¥í¥¹¥È¥é¥ó",        15000,  200, 110,  7,  8, RACE_SPRITE},
 #else
-        { "Solostoran",        15000,  200, 110,  7,  8, RACE_SPRITE},
+       { "Solostoran",        15000,  200, 110,  7,  8, RACE_SPRITE},
 #endif
 #ifdef JP
 { "±¨Â±¸ý¥¢¥Á¥·¥§",         20000,  215, 113,  6, 10, RACE_MIND_FLAYER},
@@ -2024,19 +2024,19 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Achshe the Tentacled",         20000,  215, 113,  6, 10, RACE_MIND_FLAYER},
 #endif
 #ifdef JP
-        { "µ®Â²¤Î¥«¥¶",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
+       { "µ®Â²¤Î¥«¥¶",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
 #else
-        { "Kaza the Noble",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
+       { "Kaza the Noble",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
 #endif
 #ifdef JP
-        { "°Å¤­¥Õ¥¡¥¸¥ë",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "°Å¤­¥Õ¥¡¥¸¥ë",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #else
-        { "Fazzil the Dark",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "Fazzil the Dark",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #endif
 #ifdef JP
-        { "°ÎÂç¤Ê¤ë¥±¥ë¥É¡¼¥ó",        15000,  200, 110,  7,  8, RACE_DWARF},
+       { "°ÎÂç¤Ê¤ë¥±¥ë¥É¡¼¥ó",        15000,  200, 110,  7,  8, RACE_DWARF},
 #else
-        { "Keldorn the Grand",        15000,  200, 110,  7,  8, RACE_DWARF},
+       { "Keldorn the Grand",        15000,  200, 110,  7,  8, RACE_DWARF},
 #endif
 #ifdef JP
 { "¥Õ¥£¥é¥ó¥¹¥í¥×¥¹",         20000,  215, 113,  6, 10, RACE_HOBBIT},
@@ -2044,19 +2044,19 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Philanthropus",         20000,  215, 113,  6, 10, RACE_HOBBIT},
 #endif
 #ifdef JP
-        { "Ëâ½÷¤Î¥¢¥°¥Ê¡¼",       30000,  200, 110,  7, 10, RACE_HUMAN},
+       { "Ëâ½÷¤Î¥¢¥°¥Ê¡¼",       30000,  200, 110,  7, 10, RACE_HUMAN},
 #else
-        { "Agnar the Enchantress",       30000,  200, 110,  7, 10, RACE_HUMAN},
+       { "Agnar the Enchantress",       30000,  200, 110,  7, 10, RACE_HUMAN},
 #endif
 #ifdef JP
-        { "»àÎî½Ñ»Õ¥Ó¥å¥ê¥¢¥ó¥¹",       30000,  175, 110,  5, 11, RACE_BEASTMAN},
+       { "»àÎî½Ñ»Õ¥Ó¥å¥ê¥¢¥ó¥¹",       30000,  175, 110,  5, 11, RACE_BEASTMAN},
 #else
-        { "Buliance the Necromancer",       30000,  175, 110,  5, 11, RACE_BEASTMAN},
+       { "Buliance the Necromancer",       30000,  175, 110,  5, 11, RACE_BEASTMAN},
 #endif
 #ifdef JP
-        { "¥Ï¥¤¥á¥¤¥¸¤Î¥ô¥¤¥é¥¯",        15000,  200, 110,  7,  8, RACE_BEASTMAN},
+       { "¥Ï¥¤¥á¥¤¥¸¤Î¥ô¥¤¥é¥¯",        15000,  200, 110,  7,  8, RACE_BEASTMAN},
 #else
-        { "Vuirak the High-Mage",        15000,  200, 110,  7,  8, RACE_BEASTMAN},
+       { "Vuirak the High-Mage",        15000,  200, 110,  7,  8, RACE_BEASTMAN},
 #endif
 #ifdef JP
 { "Ãηüԥޥǥ£¥Ã¥·¥å",         20000,  215, 113,  6, 10, RACE_BEASTMAN},
@@ -2064,19 +2064,19 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Madish the Smart",         20000,  215, 113,  6, 10, RACE_BEASTMAN},
 #endif
 #ifdef JP
-        { "¥Õ¥¡¥ì¥Ö¥ê¥ó¥Ü¡¼¥ë",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
+       { "¥Õ¥¡¥ì¥Ö¥ê¥ó¥Ü¡¼¥ë",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
 #else
-        { "Falebrimbor",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
+       { "Falebrimbor",       30000,  200, 110,  7, 10, RACE_HIGH_ELF},
 #endif
 #ifdef JP
-        { "±¢¸±¥Õ¥§¥ê¥ë=¥¬¥ó¥É",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "±¢¸±¥Õ¥§¥ê¥ë=¥¬¥ó¥É",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #else
-        { "Felil-Gand the Subtle",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "Felil-Gand the Subtle",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #endif
 #ifdef JP
-        { "¼ö½Ñ»Õ¥µ¥ì¥´¡¼¥É",        15000,  200, 110,  7,  8, RACE_BARBARIAN},
+       { "¼ö½Ñ»Õ¥µ¥ì¥´¡¼¥É",        15000,  200, 110,  7,  8, RACE_BARBARIAN},
 #else
-        { "Thalegord the Shaman",        15000,  200, 110,  7,  8, RACE_BARBARIAN},
+       { "Thalegord the Shaman",        15000,  200, 110,  7,  8, RACE_BARBARIAN},
 #endif
 #ifdef JP
 { "¿ÀÈë²È¥¯¥È¥¥¥¢¥í¥¹",         20000,  215, 113,  6, 10, RACE_MIND_FLAYER},
@@ -2084,14 +2084,14 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Cthoaloth the Mystic",         20000,  215, 113,  6, 10, RACE_MIND_FLAYER},
 #endif
 #ifdef JP
-        { "¸¸½Ñ»Õ¥¤¥Ù¥ê",       30000,  200, 110,  7, 10, RACE_SKELETON},
+       { "¸¸½Ñ»Õ¥¤¥Ù¥ê",       30000,  200, 110,  7, 10, RACE_SKELETON},
 #else
-        { "Ibeli the Illusionist",       30000,  200, 110,  7, 10, RACE_SKELETON},
+       { "Ibeli the Illusionist",       30000,  200, 110,  7, 10, RACE_SKELETON},
 #endif
 #ifdef JP
-        { "»àÎî½Ñ»Õ¥Ø¥È¡¼",       30000,  175, 110,  5, 11, RACE_YEEK},
+       { "»àÎî½Ñ»Õ¥Ø¥È¡¼",       30000,  175, 110,  5, 11, RACE_YEEK},
 #else
-        { "Heto the Necromancer",       30000,  175, 110,  5, 11, RACE_YEEK},
+       { "Heto the Necromancer",       30000,  175, 110,  5, 11, RACE_YEEK},
 #endif
 #ifdef JP
 { "Ëâ½Ñ»Õ¥í=¥Ñ¥ó",        20000,  200, 110,  7,  8, RACE_HALF_ELF},
@@ -2114,24 +2114,24 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Rjak the Necromancer",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #endif
 #ifdef JP
-        { "Ëâ½Ñ»Õ¥¹¥­¥É¥¥¥Ë¡¼",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
+       { "Ëâ½Ñ»Õ¥¹¥­¥É¥¥¥Ë¡¼",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
 #else
-        { "Skidney the Sorcerer",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
+       { "Skidney the Sorcerer",        15000,  200, 110,  7,  8, RACE_HALF_ELF},
 #endif
 #ifdef JP
-        { "¸¸½Ñ»Õ¥­¥ê¥¢",       30000,  200, 110,  7, 10, RACE_HUMAN},
+       { "¸¸½Ñ»Õ¥­¥ê¥¢",       30000,  200, 110,  7, 10, RACE_HUMAN},
 #else
-        { "Kyria the Illusionist",       30000,  200, 110,  7, 10, RACE_HUMAN},
+       { "Kyria the Illusionist",       30000,  200, 110,  7, 10, RACE_HUMAN},
 #endif
 #ifdef JP
-        { "»àÎî½Ñ»Õ¥Ë¥Ã¥­",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "»àÎî½Ñ»Õ¥Ë¥Ã¥­",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #else
-        { "Nikki the Necromancer",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
+       { "Nikki the Necromancer",       30000,  175, 110,  5, 11, RACE_DARK_ELF},
 #endif
 #ifdef JP
-        { "¥½¥í¥¹¥È¥é¥ó",        15000,  200, 110,  7,  8, RACE_SPRITE},
+       { "¥½¥í¥¹¥È¥é¥ó",        15000,  200, 110,  7,  8, RACE_SPRITE},
 #else
-        { "Solostoran",        15000,  200, 110,  7,  8, RACE_SPRITE},
+       { "Solostoran",        15000,  200, 110,  7,  8, RACE_SPRITE},
 #endif
 #ifdef JP
 { "±¨Â±¸ý¥¢¥Á¥·¥§",         20000,  215, 113,  6, 10, RACE_MIND_FLAYER},
@@ -2142,10 +2142,10 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
        {
                /* Black Market - 32 unique names */
 #ifdef JP
-                { "¥¬¥ê¡¼=¥®¥¬¥º",            20000,  250,  150,  10,   5,  RACE_HALF_TROLL},
-                { "¥´¥Ö¥ê¥ó¤Î¥Ò¥¹¥È¡¼¥¢",       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_HALF_TROLL},
+               { "¥´¥Ö¥ê¥ó¤Î¥Ò¥¹¥È¡¼¥¢",       20000,  250,  150,  10,   5,  RACE_HALF_ORC},
+               { "¥Õ¥§¥ì¥ó¥®¿Í¥¯¥¢¡¼¥¯",           30000,  250,  150,  10,   5,  RACE_HUMAN},
+               { "¸øÀµ¤Ê¤ë(?)¥È¥Ã¥Ô",                     30000,  250,  150,  10,   5,  RACE_ELF},
 #else
                { "Gary Gygaz",                 20000,  250, 150, 10,  5, RACE_HALF_TROLL},
                { "Histor the Goblin",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
@@ -2772,16 +2772,16 @@ player_sex sex_info[MAX_SEXES] =
 {
        {
 #ifdef JP
-                "½÷À­",
-                "¥¯¥¤¡¼¥ó",
+               "½÷À­",
+               "¥¯¥¤¡¼¥ó",
 #endif
                "Female",
                "Queen"
        },
        {
 #ifdef JP
-                "ÃËÀ­",
-                "¥­¥ó¥°",
+               "ÃËÀ­",
+               "¥­¥ó¥°",
 #endif
                "Male",
                "King"
@@ -2817,11 +2817,11 @@ player_race race_info[MAX_RACES] =
                72,  6, 180, 25,
                66,  4, 150, 20,
                0,
-                0x7FFFFFF,
+               0x7FFFFFF,
        },
        {
 #ifdef JP
-               "¥Ï¡¼¥Õ¥¨¥ë¥Õ",
+               "¥Ï¡¼¥Õ¥¨¥ë¥Õ",
 #endif
                "Half-Elf",
 
@@ -2832,11 +2832,11 @@ player_race race_info[MAX_RACES] =
                66,  6, 130, 15,
                62,  6, 100, 10,
                2,
-                0x677E7FF,
+               0x677E7FF,
        },
        {
 #ifdef JP
-               "¥¨¥ë¥Õ",
+               "¥¨¥ë¥Õ",
 #endif
                "Elf",
 
@@ -2847,7 +2847,7 @@ player_race race_info[MAX_RACES] =
                60,  4, 100,  6,
                54,  4, 80,  6,
                3,
-                0x677E75B,
+               0x677E75B,
 
        },
        {
@@ -2863,7 +2863,7 @@ player_race race_info[MAX_RACES] =
                36,  3, 60,  3,
                33,  3, 50,  3,
                4,
-                0x76FFC0B,
+               0x76FFC0B,
        },
        {
 #ifdef JP
@@ -2878,7 +2878,7 @@ player_race race_info[MAX_RACES] =
                42,  3, 90,  6,
                39,  3, 75,  3,
                4,
-                0x767D60F,
+               0x767D60F,
        },
        {
 #ifdef JP
@@ -2893,7 +2893,7 @@ player_race race_info[MAX_RACES] =
                48,  3, 150, 10,
                46,  3, 120, 10,
                5,
-                0x1890005,
+               0x1890005,
        },
        {
 #ifdef JP
@@ -2908,7 +2908,7 @@ player_race race_info[MAX_RACES] =
                66,  1, 150,  5,
                62,  1, 120,  5,
                3,
-                0x5D8818D,
+               0x5D8818D,
        },
        {
 #ifdef JP
@@ -2923,11 +2923,11 @@ player_race race_info[MAX_RACES] =
                96, 10, 250, 50,
                84,  8, 225, 40,
                3,
-                0x0880005,
+               0x0880005,
        },
        {
 #ifdef JP
-                "¥¢¥ó¥Ð¥é¥¤¥È",
+               "¥¢¥ó¥Ð¥é¥¤¥È",
 #endif
                "Amberite",
 
@@ -2938,11 +2938,11 @@ player_race race_info[MAX_RACES] =
                82, 5, 190, 20,
                78,  6, 180, 15,
                0,
-                0x7FFF7FF,
+               0x7FFF7FF,
        },
        {
 #ifdef JP
-                "¥Ï¥¤¥¨¥ë¥Õ",
+               "¥Ï¥¤¥¨¥ë¥Õ",
 #endif
                "High-Elf",
 
@@ -3218,7 +3218,7 @@ player_race race_info[MAX_RACES] =
 
                { -5, 4, -1, 2, 0, -3 },
                10, 15, 12, 5, 5, 14, -15, -5,
-               7, 180,
+               7, 210,
                100, 30,
                72, 6, 100, 25,
                66, 4, 100, 20,
@@ -3267,11 +3267,11 @@ player_race race_info[MAX_RACES] =
                111, 11, 255, 50,
                99, 11, 250, 45,
                  0,
-                0x0010005,
+               0x0010005,
        },
        {
 #ifdef JP
-                "¥¢¥ë¥³¥ó",
+               "¥¢¥ë¥³¥ó",
 #endif
                "Archon",
 
@@ -3282,11 +3282,11 @@ player_race race_info[MAX_RACES] =
                82, 5, 190, 20,
                78,  6, 180, 15,
                3,
-                0x779F777,
+               0x779F777,
        },
        {
 #ifdef JP
-                "¥Ð¥ë¥í¥°",
+               "¥Ð¥ë¥í¥°",
                "Balrog",
 #else
                "Balrog",
@@ -3299,11 +3299,11 @@ player_race race_info[MAX_RACES] =
                100,10, 255, 65,
                80, 10, 240, 64,
                5,
-                0x7EDC4DB,
+               0x7EDC4DB,
        },
        {
 #ifdef JP
-                "¥É¥¥¥Ê¥À¥ó",
+               "¥É¥¥¥Ê¥À¥ó",
 #endif
                "Dunadan",
 
@@ -3314,7 +3314,7 @@ player_race race_info[MAX_RACES] =
                82, 5, 190, 20,
                78,  6, 180, 15,
                0,
-                0x7FFF7FF,
+               0x7FFF7FF,
        },
        {
 #ifdef JP
@@ -3343,7 +3343,7 @@ player_race race_info[MAX_RACES] =
                48,  6, 150, 25,
                44,  4, 130, 20,
                0,
-                0x418B7AD,
+               0x418B7AD,
        },
        {
 #ifdef JP
@@ -3579,11 +3579,11 @@ player_class class_info[MAX_CLASS] =
 #ifdef JP
                "¶ãÍ·»í¿Í",
 #endif
-                "Bard",              /* Note : spell stat is Charisma */
-                {-2, 1, 2, -1, -2, 4},
-                20, 33, 34, -5, 16, 20, 34, 20,
-                8,  13, 11, 0,  0,  0,  10, 8,
-                2, 40, 25
+               "Bard",              /* Note : spell stat is Charisma */
+               {-2, 1, 2, -1, -2, 4},
+               20, 33, 34, -5, 16, 20, 34, 20,
+               8,  13, 11, 0,  0,  0,  10, 8,
+               2, 40, 25
        },
 
        {
@@ -3832,7 +3832,7 @@ player_race mimic_info[] =
                0,  0, 0, 0,
                0,  0, 0, 0,
                0,
-                0x000000,
+               0x000000,
        },
        {
 #ifdef JP
@@ -3847,7 +3847,7 @@ player_race mimic_info[] =
                0,  0, 0, 0,
                0,  0, 0, 0,
                5,
-                0x000003,
+               0x000003,
        },
        {
 #ifdef JP
@@ -3862,7 +3862,7 @@ player_race mimic_info[] =
                0,  0, 0, 0,
                0,  0, 0, 0,
                20,
-                0x000003,
+               0x000003,
        },
        {
 #ifdef JP
@@ -3877,7 +3877,7 @@ player_race mimic_info[] =
                0,  0, 0, 0,
                0,  0, 0, 0,
                5,
-                0x000005,
+               0x000005,
        },
 };
 
@@ -3978,17 +3978,19 @@ u32b fake_spell_flags[4]=
 };
 
 
-s32b realm_choices1[] =
+s32b realm_choices1[MAX_CLASS] =
 {
        (CH_NONE),                              /* Warrior */
        (CH_LIFE | CH_SORCERY | CH_NATURE |
         CH_CHAOS | CH_DEATH | CH_TRUMP |
-        CH_ARCANE | CH_ENCHANT | CH_DAEMON),   /* Mage */
-       (CH_LIFE | CH_DEATH | CH_DAEMON),       /* Priest */
+        CH_ARCANE | CH_ENCHANT | CH_DAEMON |
+        CH_CRUSADE),                              /* Mage */
+       (CH_LIFE | CH_DEATH | CH_DAEMON |
+        CH_CRUSADE),                              /* Priest */
        (CH_SORCERY | CH_DEATH | CH_TRUMP |
         CH_ARCANE | CH_ENCHANT),               /* Rogue */
        (CH_NATURE),                            /* Ranger */
-       (CH_LIFE | CH_DEATH),                   /* Paladin */
+       (CH_CRUSADE | CH_DEATH),                   /* Paladin */
        (CH_ARCANE),                            /* Warrior-Mage */
        (CH_CHAOS | CH_DAEMON),                 /* Chaos-Warrior */
        (CH_LIFE | CH_NATURE | CH_DEATH |
@@ -3996,7 +3998,8 @@ s32b realm_choices1[] =
        (CH_NONE),                              /* Mindcrafter */
        (CH_LIFE | CH_SORCERY | CH_NATURE |
         CH_CHAOS | CH_DEATH | CH_TRUMP |
-        CH_ARCANE | CH_ENCHANT | CH_DAEMON),   /* High-Mage */
+        CH_ARCANE | CH_ENCHANT | CH_DAEMON |
+        CH_CRUSADE),                              /* High-Mage */
        (CH_ARCANE),                            /* Tourist */
        (CH_NONE),                              /* Imitation */
        (CH_TRUMP),                             /* Beastmaster */
@@ -4007,31 +4010,35 @@ s32b realm_choices1[] =
        (CH_NONE),                              /* Red Mage */
        (CH_HISSATSU),                          /* Samurai */
        (CH_LIFE | CH_NATURE | CH_DEATH |
-        CH_ENCHANT),                           /* ForceTrainer */
+        CH_ENCHANT | CH_CRUSADE),                 /* ForceTrainer */
        (CH_NONE),                              /* Blue Mage */
        (CH_NONE),                              /* Kihei */
        (CH_NONE),                              /* Berserker */
        (CH_NONE),                              /* Kaji */
        (CH_NONE),                              /* Mirror-master */
+       (CH_NONE),                              /* Ninja */
 };
 
 
-s32b realm_choices2[] =
+s32b realm_choices2[MAX_CLASS] =
 {
        (CH_NONE),                              /* Warrior */
        (CH_LIFE | CH_SORCERY | CH_NATURE |
         CH_CHAOS | CH_DEATH | CH_TRUMP |
-        CH_ARCANE | CH_ENCHANT | CH_DAEMON),   /* Mage */
+        CH_ARCANE | CH_ENCHANT | CH_DAEMON |
+        CH_CRUSADE),                              /* Mage */
        (CH_LIFE | CH_SORCERY | CH_NATURE |
         CH_CHAOS | CH_DEATH | CH_TRUMP |
-        CH_ARCANE | CH_ENCHANT | CH_DAEMON),   /* Priest */
+        CH_ARCANE | CH_ENCHANT | CH_DAEMON |
+        CH_CRUSADE),                              /* Priest */
        (CH_NONE),                              /* Rogue */
        (CH_SORCERY | CH_CHAOS | CH_DEATH |
         CH_TRUMP | CH_ARCANE | CH_DAEMON),     /* Ranger */
        (CH_NONE),                              /* Paladin */
        (CH_LIFE | CH_NATURE | CH_CHAOS |
         CH_DEATH | CH_TRUMP | CH_ARCANE |
-        CH_SORCERY | CH_ENCHANT | CH_DAEMON),  /* Warrior-Mage */
+        CH_SORCERY | CH_ENCHANT | CH_DAEMON |
+        CH_CRUSADE),                              /* Warrior-Mage */
        (CH_NONE),                              /* Chaos-Warrior */
        (CH_NONE),                              /* Monk */
        (CH_NONE),                              /* Mindcrafter */
@@ -4051,6 +4058,7 @@ s32b realm_choices2[] =
        (CH_NONE),                              /* Berserker */
        (CH_NONE),                              /* Kaji */
        (CH_NONE),                              /* Mirror-master */
+       (CH_NONE),                              /* Ninja */
 };
 
 
@@ -4067,7 +4075,7 @@ cptr realm_names[] =
        "Èë½Ñ",
        "¾¢",
        "°­Ëâ",
-       "ÉÔÌÀ",
+       "Ç˼Ù",
        "ÉÔÌÀ",
        "ÉÔÌÀ",
        "ÉÔÌÀ",
@@ -4085,7 +4093,7 @@ cptr E_realm_names[]
 cptr realm_names[]
 #endif
 = {
-       "no magic",
+       "none",
        "Life",
        "Sorcery",
        "Nature",
@@ -4095,7 +4103,7 @@ cptr realm_names[]
        "Arcane",
        "Craft",
        "Daemon",
-       "unknown",
+       "Crusade",
        "unknown",
        "unknown",
        "unknown",
@@ -4115,41 +4123,41 @@ cptr spell_names[VALID_REALM][32] =
        /*** Life Spells ***/
        {
                /* Common Life Spellbooks */
-"¼Ù°­Â¸ºß´¶ÃÎ",
 "·Ú½ý¤Î¼£Ìþ",
 "½ËÊ¡",
-"¶²Éݽüµî",
+"·Ú½ý",
 "¸÷¤Î¾¤´­",
 "æ« & ±£¤·Èâ´¶ÃÎ",
 "½Å½ý¤Î¼£Ìþ",
+"²òÆÇ",
 "¶õÊ¢½¼Â­",
 
 "²ò¼ö",
-"²òÆÇ",
+"½Å½ý",
 "Ã×Ì¿½ý¤Î¼£Ìþ",
-"Æ©ÌÀ»ëǧ",
-"À»¤Ê¤ë¸÷µå",
-"Âмٰ­·ë³¦",
+"ÂÑÇ®ÂÑ´¨",
+"¼þÊÕ´¶ÃÎ",
+"¥Ñ¥Ë¥Ã¥¯¡¦¥¢¥ó¥Ç¥Ã¥É",
 "ÂÎÎϲóÉü",
 "·ë³¦¤ÎÌæ¾Ï",
 
                /* Rare Life Spellbooks */
-"°­Ëâʧ¤¤",
 "*²ò¼ö*",
-"¥¢¥ó¥Ç¥Ã¥É & °­ËâÂ໶",
+"´Õ¼±",
+"¥¢¥ó¥Ç¥Ã¥ÉÂ໶",
 "Æä¤Î¹ï",
-"¼Ù°­Â໶",
-"¼Ù°­ÄÉÊü",
-"À»¤Ê¤ë¸æ¸ÀÍÕ",
+"Ã×Ì¿½ý",
+"µ¢´Ô¤Î¾Û",
+"¿¿¼Â¤Îº×ÃÅ",
 "¿¿¡¦·ë³¦",
 
-"»Îµ¤¹âÍÈ",
-"µ§¤ê",
+"ÉÔÌÓ²½",
+"Á´´¶ÃÎ",
 "¥¢¥ó¥Ç¥Ã¥É¾ÃÌÇ",
+"ÀéΤ´ã",
 "Á´Éü³è",
 "*ÂÎÎϲóÉü*",
 "À»¤Ê¤ë¥Ó¥¸¥ç¥ó",
-"¿À°Ò",
 "µæ¶Ë¤ÎÂÑÀ­"
        },
 
@@ -4495,6 +4503,49 @@ cptr spell_names[VALID_REALM][32] =
 
        },
 
+       /*** Crusade Spells ***/
+
+       {
+               /* Common Crusade Spellbooks */
+"Ĩȳ",
+"¼Ù°­Â¸ºß´¶ÃÎ",
+"¶²Éݽüµî",
+"°Ò°µ",
+"À»°è",
+"Æþ¸ý",
+"¥¹¥¿¡¼¥À¥¹¥È",
+"¿ÈÂξô²½",
+
+"¼Ù°­Èô¤Ð¤·",
+"À»¤Ê¤ë¸÷µå",
+"°­Ëâʧ¤¤",
+"²ò¼ö",
+"Æ©ÌÀ»ëǧ",
+"Âмٰ­·ë³¦",
+"ºÛ¤­¤ÎÍë",
+"À»¤Ê¤ë¸æ¸ÀÍÕ",
+
+               /* Rare Crusade Spellbooks */
+"³«¤«¤ì¤¿Æ»",
+"ÉõËâ",
+"À»¤Ê¤ë¥ª¡¼¥é",
+"¥¢¥ó¥Ç¥Ã¥É&°­ËâÂ໶",
+"¼Ù°­Â໶",
+"À»¤Ê¤ë¿Ï",
+"¥¹¥¿¡¼¥Ð¡¼¥¹¥È",
+"Å·»È¾¤´­",
+
+"»Îµ¤¹âÍÈ",
+"¼ö¤¤Â໶",
+"¼Ù°­ÄÉÊü",
+"¥Ï¥ë¥Þ¥²¥É¥ó",
+"ÌܤˤÏÌܤò",
+"¿À¤ÎÅܤê",
+"¿À°Ò",
+"À»Àï",
+
+       },
+
        /*** Music Spells ***/
 
        /* Ìõ¸ì
@@ -4590,41 +4641,41 @@ cptr spell_names[VALID_REALM][32] =
        /*** Life Spells ***/
        {
                /* Common Life Spellbooks */
-               "Detect Evil",
                "Cure Light Wounds",
                "Bless",
-               "Remove Fear",
+               "Cause Light Wounds",
                "Call Light",
                "Detect Doors & Traps",
                "Cure Medium Wounds",
+               "Cure Poison",   
                "Satisfy Hunger",
 
                "Remove Curse",
-               "Cure Poison",   
+               "Cause Medium Wounds",
                "Cure Critical Wounds",
-               "Sense Unseen",
-               "Holy Orb",
-               "Protection from Evil",
+               "Resist Heat and Cold",
+               "Sense Surroundings",
+               "Turn Undead",
                "Healing",
                "Glyph of Warding",
 
                /* Rare Life Spellbooks */
-               "Exorcism",
                "Dispel Curse",
-               "Dispel Undead & Demons",
+               "Perception",
+               "Dispel Undead",
                "Day of the Dove",
-               "Dispel Evil",
-               "Banishment",
-               "Holy Word",
+               "Cause Critical Wounds",
+               "Word of Recall",
+               "Alter Reality",
                "Warding True",
 
-               "Heroism",
-               "Prayer",
-               "Turn Undead",
+               "Sterilization",
+               "Detection",
+               "Annihilate Undead",
+               "Clairvoyance",
                "Restoration",
                "Healing True",
                "Holy Vision",
-               "Divine Intervention",
                "Ultimate Resistance",
        },
 
@@ -4906,7 +4957,7 @@ cptr spell_names[VALID_REALM][32] =
                "Resistance",
                "Haste Self",
                "Walk through Wall",
-               "Pulish Shield",
+               "Polish Shield",
                "Create Golem",
                "Magical armor",
 
@@ -4949,7 +5000,7 @@ cptr spell_names[VALID_REALM][32] =
                "Plasma Ball",
                "Polymorph Demon",
                "Nather Wave",
-               "Kiss of Saccubus",
+               "Kiss of Succubus",
                "Doom Hand",
 
                "Raise the Morale",
@@ -4962,6 +5013,48 @@ cptr spell_names[VALID_REALM][32] =
                "Polymorph Demonlord",
        },
 
+       /*** Crusade Spells ***/
+
+       {
+               /* Common Crusade Spellbooks */
+               "Punishment",
+               "Detect Evil",
+               "Remove Fear",
+               "Scare Monster",
+               "Sanctuary",
+               "Portal",
+               "Star Dust",
+               "Purify",
+
+               "Scatter Evil",
+               "Holy Orb",
+               "Exorcism",
+               "Remove Curse",
+               "Sense Unseen",
+               "Protection from Evil",
+               "Judgment Thunder",
+               "Holy Word",
+
+               /* Rare Crusade Spellbooks */
+               "Unbarring Ways",
+               "Arrest",
+               "Holy Aura",
+               "Dispel Undead & Demons",
+               "Dispel Evil",
+               "Holy Blade",
+               "Star Burst",
+               "Summon Angel",
+
+               "Heroism",
+               "Dispel Curse",
+               "Banish Evil",
+               "Armageddon",
+               "An Eye for an Eye",
+               "Wrath of the God",
+               "Divine Intervention",
+               "Crusade",
+       },
+
        /*** Music Spells ***/
 
        {
@@ -4990,7 +5083,7 @@ cptr spell_names[VALID_REALM][32] =
                "Finrod's Resistance", /* ¸µÁÇÂÑÀ­ */
                "Hobbit Melodies", /* ¥Û¥Ó¥Ã¥È¤Î¥á¥í¥Ç¥£ */
                "World Contortion", /* ÏĤó¤ÀÀ¤³¦ */
-               "Dispeling chant", /* Â໶¤Î²Î */
+               "Dispelling chant", /* Â໶¤Î²Î */
                "The Voice of Saruman", /* ¥µ¥ë¥Þ¥ó¤Î´Å¸À */
                "Song of the Tempest", /* Íò¤Î²»¿§ */
                "Ambarkanta", /* ¤â¤¦°ì¤Ä¤ÎÀ¤³¦ */
@@ -4999,7 +5092,7 @@ cptr spell_names[VALID_REALM][32] =
                "Wrecking Pattern", /* Ç˲õ¤ÎÀûΧ */
                "Stationary Shriek", /* ÄäÂڤβΠ*/
                "Endurance", /* ¼é¤ê¤Î²Î */
-               "The Helo's Poem", /* ±Ñͺ¤Î»í */
+               "The Hero's Poem", /* ±Ñͺ¤Î»í */
                "Relief of Yavanna", /* "¥ä¥ô¥¡¥ó¥Ê¤Î½õ¤±" */
                "Goddess' rebirth", /* "ºÆÀ¸¤Î²Î" */
                "Wizardry of Sauron", /* "¥µ¥¦¥í¥ó¤ÎËâ½Ñ", */
@@ -5063,8 +5156,8 @@ int chest_traps[64] =
        (CHEST_LOSE_STR),
        (CHEST_LOSE_CON),                       /* 5 == best small wooden */
        0,
-       (CHEST_POISON),
-       (CHEST_POISON),
+       (CHEST_ALARM),
+       (CHEST_ALARM),
        (CHEST_LOSE_STR),
        (CHEST_LOSE_CON),
        (CHEST_POISON),
@@ -5073,7 +5166,7 @@ int chest_traps[64] =
        (CHEST_LOSE_STR | CHEST_LOSE_CON),
        (CHEST_SUMMON),                 /* 15 == best large wooden */
        0,
-       (CHEST_LOSE_STR),
+       (CHEST_ALARM),
        (CHEST_SCATTER),
        (CHEST_PARALYZE),
        (CHEST_LOSE_STR | CHEST_LOSE_CON),
@@ -5089,28 +5182,28 @@ int chest_traps[64] =
        (CHEST_EXPLODE | CHEST_SUMMON),
        (CHEST_BIRD_STORM),
        (CHEST_POISON | CHEST_SUMMON),
-       (CHEST_E_SUMMON),
+       (CHEST_E_SUMMON | CHEST_ALARM),
        (CHEST_EXPLODE),
        (CHEST_EXPLODE | CHEST_SUMMON), /* 35 == best large iron */
        0,
-       (CHEST_SUMMON),
+       (CHEST_SUMMON | CHEST_ALARM),
        (CHEST_EXPLODE),
        (CHEST_EXPLODE | CHEST_SUMMON),
        (CHEST_EXPLODE | CHEST_SUMMON),
        (CHEST_POISON | CHEST_PARALYZE),
        (CHEST_EXPLODE),
        (CHEST_BIRD_STORM),
-       (CHEST_EXPLODE | CHEST_E_SUMMON),
+       (CHEST_EXPLODE | CHEST_E_SUMMON | CHEST_ALARM),
        (CHEST_H_SUMMON),        /* 45 == best small steel */
        0,
-       (CHEST_EXPLODE | CHEST_SUMMON),
+       (CHEST_EXPLODE | CHEST_SUMMON | CHEST_ALARM),
        (CHEST_BIRD_STORM),
        (CHEST_RUNES_OF_EVIL),
-       (CHEST_EXPLODE | CHEST_SUMMON),
-       (CHEST_BIRD_STORM),
-       (CHEST_H_SUMMON),
+       (CHEST_EXPLODE | CHEST_SUMMON | CHEST_ALARM),
+       (CHEST_BIRD_STORM | CHEST_ALARM),
+       (CHEST_H_SUMMON | CHEST_ALARM),
        (CHEST_RUNES_OF_EVIL),
-       (CHEST_H_SUMMON | CHEST_SCATTER),
+       (CHEST_H_SUMMON | CHEST_SCATTER | CHEST_ALARM),
        (CHEST_RUNES_OF_EVIL | CHEST_EXPLODE),  /* 55 == best large steel */
        (CHEST_EXPLODE | CHEST_SUMMON),
        (CHEST_EXPLODE | CHEST_SUMMON),
@@ -5134,88 +5227,88 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 {
        /* Warrior */
        {
-                "¿·»²Ê¼",
-                "ʼ»Î",
-                "ÍÃʼ",
-                "¸Å»²Ê¼",
-                "·õ»Î",
-                "Æ®»Î",
-                "±Ñͺ",
-                "Ã˼ß",
-                "Çì¼ß",
-                "Îμç",
+               "¿·»²Ê¼",
+               "ʼ»Î",
+               "ÍÃʼ",
+               "¸Å»²Ê¼",
+               "·õ»Î",
+               "Æ®»Î",
+               "±Ñͺ",
+               "Ã˼ß",
+               "Çì¼ß",
+               "Îμç",
        },
 
        /* Mage */
        {
                                /*"¸«½¬¤¤",*/
-                "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
-                "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
-                "¸¸½Ñ»Õ",
-                "¼ö½Ñ»Õ",
-                "¾¤Îî»Õ",
-                "¾¤Ëâ»Õ",
-                "Ëâ½Ñ»Õ",
-                "ËâÆ»»Õ",
-                "¥¤¥×¥·¥·¥Þ¥¹",
-                "ÂçËâÆ»»Õ",
+               "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
+               "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+               "¸¸½Ñ»Õ",
+               "¼ö½Ñ»Õ",
+               "¾¤Îî»Õ",
+               "¾¤Ëâ»Õ",
+               "Ëâ½Ñ»Õ",
+               "ËâÆ»»Õ",
+               "¥¤¥×¥·¥·¥Þ¥¹",
+               "ÂçËâÆ»»Õ",
        },
 
        /* Priest */
        {
-                "¿®¼Ô",                 /*¿®ÅÌ */
-                "»øÁÎ",             /*¶µ²ñÊô»Å¼Ô¡¢¸«½¬¤¤ÁΡ¢È¼ÁΡ¢½¾¼Ô */
-                "½ÏÎýÁÎ",
-                "À»¿¦¼Ô",                 /*À»¿¦¼Ô */
-                "ÅÁÆ»»Õ",               /*»Êº×ɾµÄ°÷¡¢½¤Æ»²ñ²ñ°÷ */
-                "ËÒ»Õ",               /*¥é¥Þ¶µ¤ÎÁΠ*/
-                "À»¿Í",               /*Âç»Ê¶µ¡¢Áí¼ç¶µ¡¢ÁíÂç»Ê¶µ */
-                "º×»Ê",                 /*º×»Ê¡¢»Êº× */
-                "º×»ÊĹ",               /*Âçº×»Ê¡¢º×»ÊĹ */
-                "¶µ¹Ä",
+               "¿®¼Ô",                 /*¿®ÅÌ */
+               "»øÁÎ",             /*¶µ²ñÊô»Å¼Ô¡¢¸«½¬¤¤ÁΡ¢È¼ÁΡ¢½¾¼Ô */
+               "½ÏÎýÁÎ",
+               "À»¿¦¼Ô",                 /*À»¿¦¼Ô */
+               "ÅÁÆ»»Õ",               /*»Êº×ɾµÄ°÷¡¢½¤Æ»²ñ²ñ°÷ */
+               "ËÒ»Õ",               /*¥é¥Þ¶µ¤ÎÁΠ*/
+               "À»¿Í",               /*Âç»Ê¶µ¡¢Áí¼ç¶µ¡¢ÁíÂç»Ê¶µ */
+               "º×»Ê",                 /*º×»Ê¡¢»Êº× */
+               "º×»ÊĹ",               /*Âçº×»Ê¡¢º×»ÊĹ */
+               "¶µ¹Ä",
        },
 
        /* Rogues */
        {
                /* "¤´¤í¤Ä¤­",*/                     /*¤´¤í¤Ä¤­¡¢É÷ÍèË·¡¢Éâϲ¼Ô */
-                "¤¹¤ê",
-                "Äɤ¤¤Ï¤®",                     /*Äɤ¤Çí¤®¡¢¶¯Åð¡¢Å¥ËÀ */
-                "ÌëÅð",                         /*¶¯Åð¡¢ÌëÅð¡¢Å¥ËÀ */
-                "¤³¤½Å¥",                       /*¤³¤½Å¥¡¢¾®Å¥ËÀ */
-                "¥Ú¥Æ¥ó»Õ",                     /*ÇîÅÌ¡¢¥Ú¥Æ¥ó»Õ¡¢º¾µ½»Õ */
-                "¥í¥¦¥·¡¼¥Õ",
-                "¥Ï¥¤¥·¡¼¥Õ",
-                "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ",
-                "¥¢¥µ¥·¥ó",                                            /* °Å»¦¼Ô */
-                "¥®¥ë¥É¥Þ¥¹¥¿¡¼",
+               "¤¹¤ê",
+               "Äɤ¤¤Ï¤®",                     /*Äɤ¤Çí¤®¡¢¶¯Åð¡¢Å¥ËÀ */
+               "ÌëÅð",                         /*¶¯Åð¡¢ÌëÅð¡¢Å¥ËÀ */
+               "¤³¤½Å¥",                       /*¤³¤½Å¥¡¢¾®Å¥ËÀ */
+               "¥Ú¥Æ¥ó»Õ",                     /*ÇîÅÌ¡¢¥Ú¥Æ¥ó»Õ¡¢º¾µ½»Õ */
+               "¥í¥¦¥·¡¼¥Õ",
+               "¥Ï¥¤¥·¡¼¥Õ",
+               "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ",
+               "¥¢¥µ¥·¥ó",                                             /* °Å»¦¼Ô */
+               "¥®¥ë¥É¥Þ¥¹¥¿¡¼",
        },
 
        /* Rangers */
        {
-                "»È¤¤Áö¤ê",
-                "ÃÚÉ×",
-                "À͸õ",                         /*À͸õ¡¢¸«Ä¥¤ê¡¢Ä廡ʼ */
-                "¼í¿Í",
-                "ÄÉÀ×¼Ô",
-                "ÀèƳ¼Ô",
-                "õ¸±¼Ô",                       /*³«Âó¼Ô¡¢Ãµ¸±¼Ô */
-                "ÌîÉú",
-                "ÌîÉúƬ",
-                "ÌîÉú¤ÎÁíÎÎ",
+               "»È¤¤Áö¤ê",
+               "ÃÚÉ×",
+               "À͸õ",                         /*À͸õ¡¢¸«Ä¥¤ê¡¢Ä廡ʼ */
+               "¼í¿Í",
+               "ÄÉÀ×¼Ô",
+               "ÀèƳ¼Ô",
+               "õ¸±¼Ô",                       /*³«Âó¼Ô¡¢Ãµ¸±¼Ô */
+               "ÌîÉú",
+               "ÌîÉúƬ",
+               "ÌîÉú¤ÎÁíÎÎ",
        },
 
        /* Paladins */
        {
-                "ͦ»Î",                 /*¿§ÃË¡¢°¦¿Í¡¢¤·¤ã¤ì¼Ô¡¢Í¦´º¤Ê¿Í */
-                "±Ò»Î",
-                "Êݸî¼Ô",
-                "ËɱҼÔ",
-                "¸î±Ò¼Ô",
-                "µ³»Î",
-                "½Åµ³»Î",
-                "À»µ³»Î",
-                "¾åµéÀ»µ³»Î",
-                "À»µ³»ÎĹ",
+               "ͦ»Î",                 /*¿§ÃË¡¢°¦¿Í¡¢¤·¤ã¤ì¼Ô¡¢Í¦´º¤Ê¿Í */
+               "±Ò»Î",
+               "Êݸî¼Ô",
+               "ËɱҼÔ",
+               "¸î±Ò¼Ô",
+               "µ³»Î",
+               "½Åµ³»Î",
+               "À»µ³»Î",
+               "¾åµéÀ»µ³»Î",
+               "À»µ³»ÎĹ",
        },
 
        /* Warrior-Mage */
@@ -5235,16 +5328,16 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 
        /* Chaos Warrior */
        {
-                "¿·»²Ê¼",
-                "ʼ»Î",
-                "ÍÃʼ",
-                "¸Å»²Ê¼",
-                "·õ»Î",
-                "Æ®»Î",
-                "º®Æ٤αÑͺ",
-                "º®ÆÙ¤ÎÃ˼ß",
-                "º®Æ٤θø¼ß",
-                "º®Æ٤β¦¼Ô",
+               "¿·»²Ê¼",
+               "ʼ»Î",
+               "ÍÃʼ",
+               "¸Å»²Ê¼",
+               "·õ»Î",
+               "Æ®»Î",
+               "º®Æ٤αÑͺ",
+               "º®ÆÙ¤ÎÃ˼ß",
+               "º®Æ٤θø¼ß",
+               "º®Æ٤β¦¼Ô",
        },
 
        /* Monk */
@@ -5278,16 +5371,16 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
        /* High Mage; same as Mage */
        {
                                /*"¸«½¬¤¤",*/
-                "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
-                "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
-                "¸¸½Ñ»Õ",
-                "¼ö½Ñ»Õ",
-                "¾¤Îî»Õ",
-                "¾¤Ëâ»Õ",
-                "Ëâ½Ñ»Õ",
-                "ËâÆ»»Õ",
-                "¥¤¥×¥·¥·¥Þ¥¹",
-                "ÂçËâÆ»»Õ",
+               "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
+               "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+               "¸¸½Ñ»Õ",
+               "¼ö½Ñ»Õ",
+               "¾¤Îî»Õ",
+               "¾¤Ëâ»Õ",
+               "Ëâ½Ñ»Õ",
+               "ËâÆ»»Õ",
+               "¥¤¥×¥·¥·¥Þ¥¹",
+               "ÂçËâÆ»»Õ",
        },
 
        /* Tourist */
@@ -5335,58 +5428,58 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
        /* Sorcerer; same as Mage */
        {
                                /*"¸«½¬¤¤",*/
-                "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
-                "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
-                "¸¸½Ñ»Õ",
-                "¼ö½Ñ»Õ",
-                "¾¤Îî»Õ",
-                "¾¤Ëâ»Õ",
-                "Ëâ½Ñ»Õ",
-                "ËâÆ»»Õ",
-                "¥¤¥×¥·¥·¥Þ¥¹",
-                "ÂçËâÆ»»Õ",
+               "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
+               "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+               "¸¸½Ñ»Õ",
+               "¼ö½Ñ»Õ",
+               "¾¤Îî»Õ",
+               "¾¤Ëâ»Õ",
+               "Ëâ½Ñ»Õ",
+               "ËâÆ»»Õ",
+               "¥¤¥×¥·¥·¥Þ¥¹",
+               "ÂçËâÆ»»Õ",
        },
 
        /* Archer */
        {
-                "¿·»²Ê¼",
-                "ʼ»Î",
-                "ÍÃʼ",
-                "¸Å»²Ê¼",
-                "·õ»Î",
-                "Æ®»Î",
-                "±Ñͺ",
-                "Ã˼ß",
-                "Çì¼ß",
-                "Îμç",
+               "¿·»²Ê¼",
+               "ʼ»Î",
+               "ÍÃʼ",
+               "¸Å»²Ê¼",
+               "·õ»Î",
+               "Æ®»Î",
+               "±Ñͺ",
+               "Ã˼ß",
+               "Çì¼ß",
+               "Îμç",
        },
 
        /* Magic eater */
        {
-                "̵ÃΤʤë¼Ô",
-                "ÆþÌç¼Ô",
-                "´ñ½Ñ»Õ",
-                "Èë½Ñ»Õ",
-                "Èë½Ñ»Õ",
-                "½ÏÎý¼Ô",
-                "ã¿Í",
-                "ã¿Í",
-                "ËâÆ»»Õ",
-                "Á´¤Æ¤òÃΤë¼Ô",
-       },
-
-        /* Harper */
-       {
-                "¸«½¬¤¤",      /*"Apprentice"*/
-                "ºî¶Ê²È",      /*"Songsmith"*/
-                "¶ãÍ·»í¿Í",    /*"Bard"*/
-                "¥³¥ó¥Ñ¥Ë¥ª¥ó",        /*"Companion"*/
-                "¿´¤ÎÌþ¤·¼ê",  /*"Minstrel"*/
-                "è¶×»Õ",      /*"Harper"*/
-                "ÅÁ¾µ¤Îˤ®¼ê",        /*"Loreweaver"*/
-                "»í¿À¤Î¿½¤·»Ò",        /*"Muse"*/
-                "̴ˤ®",      /*"Dreamweaver"*/
-                "¥Þ¥¹¥¿¡¼",    /*"Master Harper"*/
+               "̵ÃΤʤë¼Ô",
+               "ÆþÌç¼Ô",
+               "´ñ½Ñ»Õ",
+               "Èë½Ñ»Õ",
+               "Èë½Ñ»Õ",
+               "½ÏÎý¼Ô",
+               "ã¿Í",
+               "ã¿Í",
+               "ËâÆ»»Õ",
+               "Á´¤Æ¤òÃΤë¼Ô",
+       },
+
+       /* Harper */
+       {
+               "¸«½¬¤¤",       /*"Apprentice"*/
+               "ºî¶Ê²È",       /*"Songsmith"*/
+               "¶ãÍ·»í¿Í",     /*"Bard"*/
+               "¥³¥ó¥Ñ¥Ë¥ª¥ó", /*"Companion"*/
+               "¿´¤ÎÌþ¤·¼ê",   /*"Minstrel"*/
+               "è¶×»Õ",       /*"Harper"*/
+               "ÅÁ¾µ¤Îˤ®¼ê", /*"Loreweaver"*/
+               "»í¿À¤Î¿½¤·»Ò", /*"Muse"*/
+               "̴ˤ®",       /*"Dreamweaver"*/
+               "¥Þ¥¹¥¿¡¼",     /*"Master Harper"*/
        },
 
        /* Red Mage; same as Warrior-Mage */
@@ -5435,30 +5528,30 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
        /* Blue Mage; same as Mage */
        {
                                /*"¸«½¬¤¤",*/
-                "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
-                "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
-                "¸¸½Ñ»Õ",
-                "¼ö½Ñ»Õ",
-                "¾¤Îî»Õ",
-                "¾¤Ëâ»Õ",
-                "Ëâ½Ñ»Õ",
-                "ËâÆ»»Õ",
-                "¥¤¥×¥·¥·¥Þ¥¹",
-                "ÂçËâÆ»»Õ",
+               "Îý½¬À¸",                 /*ÃúÃÕ¡¢Îý½¬À¸ */
+               "´ñ½Ñ»Õ",               /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+               "¸¸½Ñ»Õ",
+               "¼ö½Ñ»Õ",
+               "¾¤Îî»Õ",
+               "¾¤Ëâ»Õ",
+               "Ëâ½Ñ»Õ",
+               "ËâÆ»»Õ",
+               "¥¤¥×¥·¥·¥Þ¥¹",
+               "ÂçËâÆ»»Õ",
        },
 
        /* Kihei */
        {
-                "¿·»²Ê¼",
-                "ʼ»Î",
-                "ÍÃʼ",
-                "¸Å»²Ê¼",
-                "·õ»Î",
-                "Æ®»Î",
-                "±Ñͺ",
-                "Ã˼ß",
-                "Çì¼ß",
-                "Îμç",
+               "¿·»²Ê¼",
+               "ʼ»Î",
+               "ÍÃʼ",
+               "¸Å»²Ê¼",
+               "·õ»Î",
+               "Æ®»Î",
+               "±Ñͺ",
+               "Ã˼ß",
+               "Çì¼ß",
+               "Îμç",
        },
 
        /* Berserker */
@@ -5746,30 +5839,30 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 
        /* Magic eater */
        {
-                "Apprentice",
-                "Beginner",
-                "Jagguler",
-                "Skilled",
-                "Conjurer",
-                "Magician",
-                "Master",
-                "Master",
-                "Wizard",
-                "Almighty",
+               "Apprentice",
+               "Beginner",
+               "Jagguler",
+               "Skilled",
+               "Conjurer",
+               "Magician",
+               "Master",
+               "Master",
+               "Wizard",
+               "Almighty",
        },
 
-        /* Harper */
+       /* Harper */
        {
-                "Apprentice",  /*"Apprentice"*/
-                "Songsmith",   /*"Songsmith"*/
-                "Bard",        /*"Bard"*/
-                "Companion",   /*"Companion"*/
-                "Minstrel",    /*"Minstrel"*/
-                "Harper",      /*"Harper"*/
-                "Loreweaver",  /*"Loreweaver"*/
-                "Muse",        /*"Muse"*/
-                "Dreamweaver", /*"Dreamweaver"*/
-                "Master Harper",       /*"Master Harper"*/
+               "Apprentice",   /*"Apprentice"*/
+               "Songsmith",    /*"Songsmith"*/
+               "Bard", /*"Bard"*/
+               "Companion",    /*"Companion"*/
+               "Minstrel",     /*"Minstrel"*/
+               "Harper",       /*"Harper"*/
+               "Loreweaver",   /*"Loreweaver"*/
+               "Muse", /*"Muse"*/
+               "Dreamweaver",  /*"Dreamweaver"*/
+               "Master Harper",        /*"Master Harper"*/
        },
 
        /* Red Mage */
@@ -5858,16 +5951,16 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 
        /* Kaji */
        {
-                "Copper smith",
-                "Iron smith",
-                "Steel smith",
-                "Silver smith",
-                "Dragon smith",
-                "Spirit smith",
-                "Magic smith",
-                "Soul smith",
-                "God smith",
-                "AlmightySmith",
+               "Copper smith",
+               "Iron smith",
+               "Steel smith",
+               "Silver smith",
+               "Dragon smith",
+               "Spirit smith",
+               "Magic smith",
+               "Soul smith",
+               "God smith",
+               "AlmightySmith",
        },
 
        /* Mirror Master */
@@ -5908,10 +6001,10 @@ monster_power monster_powers[MAX_MONSPELLS] =
 { 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},
 { 40,  35,  85,    0,  40, A_INT,  "ËâÎϾõî"},
 { 35,  30,  80,  800,  70, A_STR,  "¥í¥±¥Ã¥È"},
-{  2,   1,  15,   10,  15, A_DEX,  "Ìð"},
-{  5,   2,  20,   18,  20, A_DEX,  "¶¯ÎϤÊÌð"},
-{ 12,   3,  25,   30,  25, A_DEX,  "¥Ü¥ë¥È"},
-{ 16,   4,  30,   42,  30, A_DEX,  "¶¯ÎϤʥܥë¥È"},
+{  5,   1,  20,   18,  15, A_DEX,  "¼Í·â"},
+{ 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},
+{ 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},
+{ 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},
 { 20,  15,  55, 1600,  95, A_CON,  "»À¤Î¥Ö¥ì¥¹"},
 { 20,  15,  55, 1600,  95, A_CON,  "ÅÅ·â¤Î¥Ö¥ì¥¹"},
 { 20,  15,  55, 1600,  95, A_CON,  "±ê¤Î¥Ö¥ì¥¹"},
@@ -5998,7 +6091,7 @@ monster_power monster_powers[MAX_MONSPELLS] =
 { 39,  70,  80,    0,  40, A_INT,  "¥É¥é¥´¥ó¤Î¾¤´­"},
 { 43,  85,  85,    0,  45, A_INT,  "¾åµé¥¢¥ó¥Ç¥Ã¥É¤Î¾¤´­"},
 { 46,  90,  85,    0,  45, A_INT,  "¸ÅÂå¥É¥é¥´¥ó¤Î¾¤´­"},
-{ 48, 120,  90,    0,  50, A_INT,  "¥¢¥ó¥Ð¡¼¤Î²¦¤Î¾¤´­"},
+{ 48, 120,  90,    0,  50, A_INT,  "¥¢¥ó¥Ð¡¼¤Î²¦²¤Î¾¤´­"},
 { 50, 150,  95,    0,  50, A_INT,  "¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤Î¾¤´­"},
 #else
 {  1,   1,  10,    0,  15, A_CON,  "shriek"},
@@ -6090,7 +6183,7 @@ monster_power monster_powers[MAX_MONSPELLS] =
 { 35,  26,  75,    0,  40, A_INT,  "summon hounds"},
 { 30,  23,  70,    0,  35, A_INT,  "summon hydras"},
 { 40,  50,  85,    0,  40, A_INT,  "summon an angel"},
-{ 35,  50,  80,    0,  35, A_INT,  "summon a deamon"},
+{ 35,  50,  80,    0,  35, A_INT,  "summon a daemon"},
 { 30,  30,  75,    0,  35, A_INT,  "summon an undead"},
 { 39,  70,  80,    0,  40, A_INT,  "summon a dragon"},
 { 43,  85,  85,    0,  45, A_INT,  "summon Greater Undead"},
@@ -6109,22 +6202,22 @@ monster_power monster_powers[MAX_MONSPELLS] =
 cptr color_names[16] =
 {
 #ifdef JP
-        "¹õ",
-        "Çò",
-        "Àij¥¿§",
-        "¥ª¥ì¥ó¥¸",
-        "ÀÖ",
-        "ÎÐ",
-        "ÀÄ",
-        "àèàῧ",
-        "³¥¿§",
-        "ÌÀÀij¥¿§",
-        "»ç",
-        "²«",
-        "ÌÀ¤ë¤¤ÀÖ",
-        "ÌÀ¤ë¤¤ÎÐ",
-        "ÌÀ¤ë¤¤ÀÄ",
-        "ÌÀàèàῧ",
+       "¹õ",
+       "Çò",
+       "Àij¥¿§",
+       "¥ª¥ì¥ó¥¸",
+       "ÀÖ",
+       "ÎÐ",
+       "ÀÄ",
+       "àèàῧ",
+       "³¥¿§",
+       "ÌÀÀij¥¿§",
+       "»ç",
+       "²«",
+       "ÌÀ¤ë¤¤ÀÖ",
+       "ÌÀ¤ë¤¤ÎÐ",
+       "ÌÀ¤ë¤¤ÀÄ",
+       "ÌÀàèàῧ",
 #else
        "Dark",
        "White",
@@ -6153,9 +6246,9 @@ cptr color_names[16] =
 cptr stat_names[6] =
 {
 #ifdef JP
-        "ÏÓÎÏ :", "ÃÎǽ :", "¸­¤µ :", "´ïÍÑ :", "Âѵנ:", "Ì¥ÎÏ :"
+       "ÏÓÎÏ :", "ÃÎǽ :", "¸­¤µ :", "´ïÍÑ :", "Âѵנ:", "Ì¥ÎÏ :"
 #else
-       "STR: ", "INT: ", "WIS: ", "DEX: ", "CON: ", "CHR: "
+       "STR : ", "INT : ", "WIS : ", "DEX : ", "CON : ", "CHR : "
 #endif
 
 };
@@ -6166,9 +6259,9 @@ cptr stat_names[6] =
 cptr stat_names_reduced[6] =
 {
 #ifdef JP
-        "ÏÓÎÏx:", "ÃÎǽx:", "¸­¤µx:", "´ïÍÑx:", "Âѵ×x:", "Ì¥ÎÏx:"
+       "ÏÓÎÏx:", "ÃÎǽx:", "¸­¤µx:", "´ïÍÑx:", "Âѵ×x:", "Ì¥ÎÏx:"
 #else
-       "Str: ", "Int: ", "Wis: ", "Dex: ", "Con: ", "Chr: "
+       "Str : ", "Int : ", "Wis : ", "Dex : ", "Con : ", "Chr : "
 #endif
 
 };
@@ -6191,25 +6284,25 @@ cptr stat_names_reduced[6] =
 cptr window_flag_desc[32] =
 {
 #ifdef JP
-        "»ý¤Áʪ/ÁõÈ÷°ìÍ÷",
+       "»ý¤Áʪ/ÁõÈ÷°ìÍ÷",
 #else
        "Display inven/equip",
 #endif
 
 #ifdef JP
-        "ÁõÈ÷/»ý¤Áʪ°ìÍ÷",
+       "ÁõÈ÷/»ý¤Áʪ°ìÍ÷",
 #else
        "Display equip/inven",
 #endif
 
 #ifdef JP
-        "¼öʸ°ìÍ÷",
+       "¼öʸ°ìÍ÷",
 #else
        "Display spell list",
 #endif
 
 #ifdef JP
-        "¥­¥ã¥é¥¯¥¿¾ðÊó",
+       "¥­¥ã¥é¥¯¥¿¾ðÊó",
 #else
        "Display character",
 #endif
@@ -6217,37 +6310,37 @@ cptr window_flag_desc[32] =
        NULL,
        NULL,
 #ifdef JP
-        "¥á¥Ã¥»¡¼¥¸",
+       "¥á¥Ã¥»¡¼¥¸",
 #else
        "Display messages",
 #endif
 
 #ifdef JP
-        "¥À¥ó¥¸¥ç¥óÁ´ÂοÞ",
+       "¥À¥ó¥¸¥ç¥óÁ´ÂοÞ",
 #else
        "Display overhead view",
 #endif
 
 #ifdef JP
-        "¥â¥ó¥¹¥¿¡¼¤Î»×¤¤½Ð",
+       "¥â¥ó¥¹¥¿¡¼¤Î»×¤¤½Ð",
 #else
        "Display monster recall",
 #endif
 
 #ifdef JP
-        "¥¢¥¤¥Æ¥à¤Î¾ÜºÙ",
+       "¥¢¥¤¥Æ¥à¤Î¾ÜºÙ",
 #else
        "Display object recall",
 #endif
 
 #ifdef JP
-        "¼«Ê¬¤Î¼þ°Ï¤òɽ¼¨", 
+       "¼«Ê¬¤Î¼þ°Ï¤òɽ¼¨", 
 #else
        "Display dungeon view",
 #endif
 
 #ifdef JP
-        "µ­Ç°»£±Æ",
+       "µ­Ç°»£±Æ",
 #else
        "Display snap-shot",
 #endif
@@ -6255,13 +6348,13 @@ cptr window_flag_desc[32] =
        NULL,
        NULL,
 #ifdef JP
-        "¥Ü¡¼¥°¡¦¥á¥Ã¥»¡¼¥¸",
+       "¥Ü¡¼¥°¡¦¥á¥Ã¥»¡¼¥¸",
 #else
        "Display borg messages",
 #endif
 
 #ifdef JP
-        "¥Ü¡¼¥°¡¦¥¹¥Æ¡¼¥¿¥¹",
+       "¥Ü¡¼¥°¡¦¥¹¥Æ¡¼¥¿¥¹",
 #else
        "Display borg status",
 #endif
@@ -6295,7 +6388,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &rogue_like_commands,         FALSE, 1, 0, 0,
-        "rogue_like_commands",          "¥í¡¼¥°É÷¥­¡¼ÇÛÃÖ¤ò»ÈÍѤ¹¤ë" },
+       "rogue_like_commands",          "¥í¡¼¥°É÷¥­¡¼ÇÛÃÖ¤ò»ÈÍѤ¹¤ë" },
 #else
        { &rogue_like_commands,         FALSE, 1, 0, 0,
        "rogue_like_commands",          "Rogue-like commands" },
@@ -6304,7 +6397,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &always_pickup,               FALSE, 1, 0, 5,
-        "always_pickup",                "¾ï¤Ë¥¢¥¤¥Æ¥à¤ò½¦¤¦" },
+       "always_pickup",                "¾ï¤Ë¥¢¥¤¥Æ¥à¤ò½¦¤¦" },
 #else
        { &always_pickup,               FALSE,  1, 0, 5,
        "always_pickup",                "Pick things up by default" },
@@ -6331,7 +6424,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &auto_more,                   FALSE, 1, 2, 6,
-        "auto_more",                    "¥­¡¼ÂÔ¤Á¤·¤Ê¤¤¤ÇϢ³¤Ç¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë" },
+       "auto_more",                    "¥­¡¼ÂÔ¤Á¤·¤Ê¤¤¤ÇϢ³¤Ç¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë" },
 #else
        { &auto_more,                   FALSE, 1, 2, 6,
        "auto_more",                    "Automatically clear '-more-' prompts" },
@@ -6340,7 +6433,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &command_menu,                TRUE,  1, 2, 7,
-        "command_menu",                 "¥á¥Ë¥å¡¼¤Ë¤è¤ê¥³¥Þ¥ó¥ÉÁªÂò¤òÍ­¸ú¤Ë¤¹¤ë" },
+       "command_menu",                 "¥á¥Ë¥å¡¼¤Ë¤è¤ê¥³¥Þ¥ó¥ÉÁªÂò¤òÍ­¸ú¤Ë¤¹¤ë" },
 #else
        { &command_menu,                TRUE,  1, 2, 7,
        "command_menu",                 "Enable command selection menu" },
@@ -6367,7 +6460,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &always_repeat,               TRUE,  1, 0, 6,
-        "always_repeat",                "¥³¥Þ¥ó¥É¼«Æ°·«¤êÊÖ¤·" },
+       "always_repeat",                "¥³¥Þ¥ó¥É¼«Æ°·«¤êÊÖ¤·" },
 #else
        { &always_repeat,               TRUE,  1, 0, 6,
        "always_repeat",                "Repeat obvious commands" },
@@ -6384,10 +6477,10 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &wear_confirm,                TRUE, 1, 5, 4,
+       { &confirm_wear,                TRUE, 1, 5, 4,
        "confirm_wear",                 "¼ö¤ï¤ì¤¿Êª¤òÁõÈ÷¤¹¤ë»þ³Îǧ¤¹¤ë" },
 #else
-       { &wear_confirm,                TRUE, 1, 5, 4,
+       { &confirm_wear,                TRUE, 1, 5, 4,
        "confirm_wear",                 "Confirm to wear/wield known cursed items" },
 #endif
 
@@ -6402,19 +6495,70 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &target_pet,                  TRUE,  1, 2, 5,
-        "target_pet",                   "¥Ú¥Ã¥È¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤¹¤ë" },
+       { &target_pet,                  FALSE,  1, 2, 5,
+       "target_pet",                   "¥Ú¥Ã¥È¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤¹¤ë" },
 #else
-       { &target_pet,                  TRUE,  1, 2, 5,
+       { &target_pet,                  FALSE,  1, 2, 5,
        "target_pet",                   "Allow targetting pets" },
 #endif
 
 
+#ifdef ALLOW_EASY_OPEN
+#ifdef JP
+       { &easy_open,                   TRUE,  1, 5, 7,
+       "easy_open",                    "¼«Æ°Åª¤Ë¥É¥¢¤ò³«¤±¤ë" },
+#else
+       { &easy_open,                   TRUE,  1, 5, 7,
+       "easy_open",                    "Automatically open doors" },
+#endif
+#endif /* ALLOW_EASY_OPEN */
+
+
+#ifdef ALLOW_EASY_DISARM
+#ifdef JP
+       { &easy_disarm,                 TRUE,  1, 5, 8,
+       "easy_disarm",                  "¼«Æ°Åª¤Ë櫤ò²ò½ü¤¹¤ë" },
+#else
+       { &easy_disarm,                 TRUE,  1, 5, 8,
+       "easy_disarm",                  "Automatically disarm traps" },
+#endif
+#endif /* ALLOW_EASY_DISARM */
+
+
+#ifdef ALLOW_EASY_FLOOR /* TNB */
+#ifdef JP
+       { &easy_floor,                  FALSE, 1, 5, 9,
+       "easy_floor",                   "¾²¾å¤Ç½Å¤Ê¤Ã¤¿¥¢¥¤¥Æ¥à¤ò¥ê¥¹¥È¤¹¤ë" },
+#else
+       { &easy_floor,                  FALSE, 1, 5, 9,
+       "easy_floor",                   "Display floor stacks in a list" },
+#endif
+#endif /* ALLOW_EASY_FLOOR -- TNB */
+
+
+#ifdef JP
+       { &use_command,                 FALSE, 1, 5, 10,
+       "use_command",                  "¡Ö»È¤¦(a)¡×¥³¥Þ¥ó¥É¤Ç¥¢¥¤¥Æ¥à¤ò²¿¤Ç¤â»È¤¨¤ë" },
+#else
+       { &use_command,                 FALSE, 1, 5, 10,
+       "use_command",                  "Allow unified use command" },
+#endif
+
+
+#ifdef JP
+       { &over_exert,                  FALSE,  1, 0, 29,
+       "over_exert",                   "MP¤¬Â­¤ê¤Ê¤¯¤Æ¤âËâË¡¤ËÄ©À魯¤ë" },
+#else
+       { &over_exert,                  FALSE,  1, 0, 29,
+       "over_exert",                   "Allow casting spells when short of mana" },
+#endif
+
+
        /*** Output Options ***/
 
 #ifdef JP
        { &depth_in_feet,               FALSE, 2, 0, 7,
-        "depth_in_feet",                "¥À¥ó¥¸¥ç¥ó¤Î¿¼¤µ¤ò¥Õ¥£¡¼¥È¤Çɽ¼¨¤¹¤ë" },
+       "depth_in_feet",                "¥À¥ó¥¸¥ç¥ó¤Î¿¼¤µ¤ò¥Õ¥£¡¼¥È¤Çɽ¼¨¤¹¤ë" },
 #else
        { &depth_in_feet,               FALSE, 2, 0, 7,
        "depth_in_feet",                "Show dungeon level in feet" },
@@ -6423,7 +6567,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &show_labels,                 TRUE,  2, 0, 10,
-        "show_labels",                  "ÁõÈ÷°ìÍ÷¤ÇÁõÈ÷¾ì½ê¤òɽ¼¨¤¹¤ë" },
+       "show_labels",                  "ÁõÈ÷°ìÍ÷¤ÇÁõÈ÷¾ì½ê¤òɽ¼¨¤¹¤ë" },
 #else
        { &show_labels,                 TRUE,  2, 0, 10,
        "show_labels",                  "Show labels in object listings" },
@@ -6432,7 +6576,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &show_weights,                TRUE,  2, 0, 11,
-        "show_weights",                 "¥¢¥¤¥Æ¥à°ìÍ÷¤Ç½ÅÎ̤òɽ¼¨¤¹¤ë" },
+       "show_weights",                 "¥¢¥¤¥Æ¥à°ìÍ÷¤Ç½ÅÎ̤òɽ¼¨¤¹¤ë" },
 #else
        { &show_weights,                TRUE,  2, 0, 11,
        "show_weights",                 "Show weights in object listings" },
@@ -6450,7 +6594,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &show_choices,                TRUE,  2, 0, 12,
-        "show_choices",                 "»ý¤Áʪ/ÁõÈ÷¥¦¥£¥ó¥É¥¦¤ËÁªÂò¥¢¥¤¥Æ¥àɽ¼¨" },
+       "show_choices",                 "»ý¤Áʪ/ÁõÈ÷¥¦¥£¥ó¥É¥¦¤ËÁªÂò¥¢¥¤¥Æ¥àɽ¼¨" },
 #else
        { &show_choices,                TRUE,  2, 0, 12,
        "show_choices",                 "Show choices in certain sub-windows" },
@@ -6459,7 +6603,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &plain_pickup,                FALSE, 2, 6, 6,
-        "plain_pickup",                 "¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë" },
+       "plain_pickup",                 "¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë" },
 #else
        { &plain_pickup,                FALSE,99, 6, 6,
        "plain_pickup",                 "Plain pickup messages(japanese only)" },
@@ -6485,11 +6629,11 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &skip_mutations,              FALSE, 2, 5, 0,
-       "skip_mutations",               "'C'¥³¥Þ¥ó¥É¤ÇÆÍÁ³ÊÑ°Û¤òɽ¼¨¤¹¤ë" },
+       { &display_mutations,              FALSE, 2, 5, 0,
+       "display_mutations",               "'C'¥³¥Þ¥ó¥É¤ÇÆÍÁ³ÊÑ°Û¤òɽ¼¨¤¹¤ë" },
 #else
-       { &skip_mutations,              FALSE, 2, 5, 0,
-       "skip_mutations",               "Display mutations in 'C'haracter Display" },
+       { &display_mutations,              FALSE, 2, 5, 0,
+       "display_mutations",               "Display mutations in 'C'haracter Display" },
 #endif
 
 
@@ -6503,8 +6647,8 @@ option_type option_info[] =
 
 
 #ifdef JP
-        { &center_player,               FALSE, 2, 5, 11,
-        "center_player",                "¾ï¤Ë¥×¥ì¥¤¥ä¡¼¤òÃæ¿´¤ËÃÖ¤¯(*ÃÙ¤¤*)" },
+       { &center_player,               FALSE, 2, 5, 11,
+       "center_player",                "¾ï¤Ë¥×¥ì¥¤¥ä¡¼¤òÃæ¿´¤ËÃÖ¤¯(*ÃÙ¤¤*)" },
 #else
        { &center_player,               FALSE, 2, 5, 11,
        "center_player",                "Center map while walking (*slow*)" },
@@ -6512,8 +6656,8 @@ option_type option_info[] =
 
 
 #ifdef JP
-        { &center_running,              TRUE,  2, 5, 12,
-        "center_running",               "Áö¤Ã¤Æ¤¤¤ë»þ¤Ç¤âÃæ¿´¤ËÃÖ¤¯" },
+       { &center_running,              TRUE,  2, 5, 12,
+       "center_running",               "Áö¤Ã¤Æ¤¤¤ë»þ¤Ç¤âÃæ¿´¤ËÃÖ¤¯" },
 #else
        { &center_running,              TRUE,  2, 5, 12,
        "center_running",               "Centering even while running" },
@@ -6522,7 +6666,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &view_yellow_lite,            TRUE,  2, 1, 28,
-        "view_yellow_lite",              "ÌÀ¤«¤ê¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
+       "view_yellow_lite",              "ÌÀ¤«¤ê¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
 #else
        { &view_yellow_lite,            TRUE,  2, 1, 28,
        "view_yellow_lite",             "Use special colors for torch-lit grids" },
@@ -6531,7 +6675,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &view_bright_lite,            TRUE,  2, 1, 29,
-        "view_bright_lite",             "»ë³¦¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
+       "view_bright_lite",             "»ë³¦¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
 #else
        { &view_bright_lite,            TRUE,  2, 1, 29,
        "view_bright_lite",             "Use special colors for 'viewable' grids" },
@@ -6540,7 +6684,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &view_granite_lite,           TRUE,  2, 1, 30,
-        "view_granite_lite",            "ÊɤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
+       "view_granite_lite",            "ÊɤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
 #else
        { &view_granite_lite,           TRUE,  2, 1, 30,
        "view_granite_lite",            "Use special colors for wall grids (slow)" },
@@ -6549,7 +6693,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &view_special_lite,           TRUE,  2, 1, 31,
-        "view_special_lite",            "¾²¤òÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
+       "view_special_lite",            "¾²¤òÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
 #else
        { &view_special_lite,           TRUE,  2, 1, 31,
        "view_special_lite",            "Use special colors for floor grids (slow)" },
@@ -6557,7 +6701,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &new_ascii_graphics,          FALSE, 2, 2, 4,
-        "new_ascii_graphics",           "ÃÏ·Á¤ÎÌÀ°Å¤ò¤Ï¤Ã¤­¤ê¤Èɽ¼¨¤¹¤ë" },
+       "new_ascii_graphics",           "ÃÏ·Á¤ÎÌÀ°Å¤ò¤Ï¤Ã¤­¤ê¤Èɽ¼¨¤¹¤ë" },
 #else
        { &new_ascii_graphics,          FALSE, 2, 2, 4,
        "new_ascii_graphics",           "Show a clear contrast between light and dark" },
@@ -6565,7 +6709,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &display_path,                FALSE, 2, 2, 8,
-        "display_path",                 "ËâË¡¤äÌð¤Îµ°Àפòɽ¼¨¤¹¤ë" },
+       "display_path",                 "ËâË¡¤äÌð¤Îµ°Àפòɽ¼¨¤¹¤ë" },
 #else
        { &display_path,                FALSE, 2, 2, 8,
        "display_path",                 "Display actual path before shooting" },
@@ -6574,36 +6718,27 @@ option_type option_info[] =
 
 #ifdef JP
        { &always_show_list,            TRUE,  2, 4, 0,
-        "always_show_list",             "ÁªÂò»þ¤Ë¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë" },
+       "always_show_list",             "ÁªÂò»þ¤Ë¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë" },
 #else
        { &always_show_list,            TRUE,  2, 4, 0,
-        "always_show_list",             "Always show list at first when select items" },
+       "always_show_list",             "Always show list at first when select items" },
 #endif
 
 
 #ifdef JP
-       { &old_way_of_kaz,              TRUE,  2, 4, 5,
-        "old_way_of_kaz",               "¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë" },
+       { &change_numeral,              TRUE,  2, 4, 5,
+       "change_numeral",               "¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë" },
 #else
-       { &old_way_of_kaz,              TRUE,  99, 4, 5,
-        "old_way_of_kaz",               "Change a way to counting (japanese only)" },
+       { &change_numeral,              TRUE,  99, 4, 5,
+       "change_numeral",               "Change a way to counting (japanese only)" },
 #endif
 
 
        /*** Game-Play ***/
 
 #ifdef JP
-       { &manual_haggle,               FALSE, 3, 1, 0,
-        "manual_haggle",                "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
-#else
-       { &manual_haggle,               FALSE, 3, 1, 0,
-       "manual_haggle",                "Manualy haggle in stores" },
-#endif
-
-
-#ifdef JP
        { &auto_scum,                   FALSE, 3, 1, 1,
-        "auto_scum",                    "³¬¤ÎÊ·°Ïµ¤¼«Æ°Áª¤ê¹¥¤ß" },
+       "auto_scum",                    "³¬¤ÎÊ·°Ïµ¤¼«Æ°Áª¤ê¹¥¤ß" },
 #else
        { &auto_scum,                   FALSE, 3, 1, 1,
        "auto_scum",                    "Auto-scum for good levels" },
@@ -6612,7 +6747,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &stack_force_notes,           TRUE,  3, 0, 8,
-        "stack_force_notes",            "°Û¤Ê¤ëÌäΥ¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
+       "stack_force_notes",            "°Û¤Ê¤ëÌäΥ¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
 #else
        { &stack_force_notes,           TRUE,  3, 0, 8,
        "stack_force_notes",            "Merge inscriptions when stacking" },
@@ -6621,7 +6756,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &stack_force_costs,           FALSE, 3, 0, 9,
-        "stack_force_costs",            "°Û¤Ê¤ë³ä°úɽ¼¨¤Î¥¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
+       "stack_force_costs",            "°Û¤Ê¤ë³ä°úɽ¼¨¤Î¥¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
 #else
        { &stack_force_costs,           FALSE, 3, 0, 9,
        "stack_force_costs",            "Merge discounts when stacking" },
@@ -6638,17 +6773,8 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &stack_allow_wands,           TRUE,  3, 1, 3,
-       "stack_allow_wands",            "Ʊ¼ï¤Î¥í¥Ã¥É/¾ó/ËâË¡ËÀ¤ò¤Þ¤È¤á¤ë" },
-#else
-       { &stack_allow_wands,           TRUE,  3, 1, 3,
-       "stack_allow_wands",            "Allow wands/staffs/rods to stack" },
-#endif
-
-
-#ifdef JP
        { &expand_look,                 TRUE,  3, 1, 4,
-        "expand_look",                  "¡Ö²ó¤ê¤òÄ´¤Ù¤ë¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
+       "expand_look",                  "¡Ö²ó¤ê¤òÄ´¤Ù¤ë¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
 #else
        { &expand_look,                 TRUE,  3, 1, 4,
        "expand_look",                  "Expand the power of the look command" },
@@ -6657,7 +6783,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &expand_list,                 TRUE,  3, 1, 5,
-        "expand_list",                  "¡Ö°ìÍ÷¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
+       "expand_list",                  "¡Ö°ìÍ÷¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
 #else
        { &expand_list,                 TRUE,  3, 1, 5,
        "expand_list",                  "Expand the power of the list commands" },
@@ -6666,7 +6792,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &view_perma_grids,            TRUE,  3, 1, 6,
-        "view_perma_grids",             "ÌÀ¤ë¤¤¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
+       "view_perma_grids",             "ÌÀ¤ë¤¤¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
 #else
        { &view_perma_grids,            TRUE,  3, 1, 6,
        "view_perma_grids",             "Map remembers all perma-lit grids" },
@@ -6675,7 +6801,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &view_torch_grids,            FALSE, 3, 1, 7,
-        "view_torch_grids",             "ÌÀ¤«¤ê¤Ç¾È¤é¤·¤¿¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
+       "view_torch_grids",             "ÌÀ¤«¤ê¤Ç¾È¤é¤·¤¿¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
 #else
        { &view_torch_grids,            FALSE, 3, 1, 7,
        "view_torch_grids",             "Map remembers all torch-lit grids" },
@@ -6683,8 +6809,17 @@ option_type option_info[] =
 
 
 #ifdef JP
+       { &view_unsafe_grids,            FALSE, 3, 1, 8,
+       "view_unsafe_grids",             "¥È¥é¥Ã¥×´¶ÃκѤߤǤʤ¤¾ì½ê¤òɽ¼¨¤¹¤ë" },
+#else
+       { &view_unsafe_grids,            FALSE, 3, 1, 8,
+       "view_unsafe_grids",             "Map marked by detect traps" },
+#endif
+
+
+#ifdef JP
        { &dungeon_stair,               TRUE,  3, 1, 9,
-        "dungeon_stair",                "³¬Ãʤò¤Ä¤Ê¤²¤Æ¥À¥ó¥¸¥ç¥ó¤òÀ¸À®¤¹¤ë" },
+       "dungeon_stair",                "³¬Ãʤò¤Ä¤Ê¤²¤Æ¥À¥ó¥¸¥ç¥ó¤òÀ¸À®¤¹¤ë" },
 #else
        { &dungeon_stair,               TRUE,  3, 1, 9,
        "dungeon_stair",                "Generate dungeons with connected stairs" },
@@ -6711,82 +6846,42 @@ option_type option_info[] =
 
 #ifdef JP
        { &empty_levels,                TRUE,  3, 0, 31,
-        "empty_levels",                 "¶õ¤Ã¤Ý¤Î¡Ö¥¢¥ê¡¼¥Ê¡×¥ì¥Ù¥ë¤ÎÀ¸À®¤ò²Äǽ¤Ë¤¹¤ë" },
+       "empty_levels",                 "¶õ¤Ã¤Ý¤Î¡Ö¥¢¥ê¡¼¥Ê¡×¥ì¥Ù¥ë¤ÎÀ¸À®¤ò²Äǽ¤Ë¤¹¤ë" },
 #else
        { &empty_levels,                TRUE,  3, 0, 31,
        "empty_levels",                 "Allow empty 'arena' levels" },
 #endif
 
 
-#ifdef ALLOW_EASY_OPEN
-#ifdef JP
-       { &easy_open,                   TRUE,  3, 5, 7,
-       "easy_open",                    "¼«Æ°Åª¤Ë¥É¥¢¤ò³«¤±¤ë" },
-#else
-       { &easy_open,                   TRUE,  3, 5, 7,
-       "easy_open",                    "Automatically open doors" },
-#endif
-#endif /* ALLOW_EASY_OPEN */
-
-
-#ifdef ALLOW_EASY_DISARM
 #ifdef JP
-       { &easy_disarm,                 TRUE,  3, 5, 8,
-       "easy_disarm",                  "¼«Æ°Åª¤Ë櫤ò²ò½ü¤¹¤ë" },
-#else
-       { &easy_disarm,                 TRUE,  3, 5, 8,
-       "easy_disarm",                  "Automatically disarm traps" },
-#endif
-#endif /* ALLOW_EASY_DISARM */
-
-
-#ifdef ALLOW_EASY_FLOOR /* TNB */
-#ifdef JP
-       { &easy_floor,                  FALSE, 3, 5, 9,
-       "easy_floor",                   "¾²¾å¤Ç½Å¤Ê¤Ã¤¿¥¢¥¤¥Æ¥à¤ò¥ê¥¹¥È¤¹¤ë" },
+       { &last_words,                  TRUE, 3, 0, 28,
+       "last_words",                   "¥­¥ã¥é¥¯¥¿¡¼¤¬»à¤ó¤À»þ°ä¸À¤ò¤Î¤³¤¹" },
 #else
-       { &easy_floor,                  FALSE, 3, 5, 9,
-       "easy_floor",                   "Display floor stacks in a list" },
+       { &last_words,                  TRUE, 3, 0, 28,
+       "last_words",                   "Leave last words when your character dies" },
 #endif
-#endif /* ALLOW_EASY_FLOOR -- TNB */
 
 
+#ifdef WORLD_SCORE
 #ifdef JP
-       { &use_command,                 FALSE, 3, 5, 10,
-       "use_command",                  "¡Ö»È¤¦(a)¡×¥³¥Þ¥ó¥É¤Ç¥¢¥¤¥Æ¥à¤ò²¿¤Ç¤â»È¤¨¤ë" },
+       { &send_score,                  TRUE,  3, 4, 6,
+       "send_score",                   "¥¹¥³¥¢¥µ¡¼¥Ð¤Ë¥¹¥³¥¢¤òÁ÷¤ë" },
 #else
-       { &use_command,                 FALSE, 3, 5, 10,
-       "use_command",                  "Allow unified use command" },
+       { &send_score,                  TRUE,  3, 4, 6,
+       "send_score",                   "Send score dump to the world score server" },
 #endif
-
-
-#ifdef JP
-       { &last_words,                  FALSE, 3, 0, 28,
-       "last_words",                   "¥­¥ã¥é¥¯¥¿¡¼¤¬»à¤ó¤À»þ°ä¸À¤ò¤Î¤³¤¹" },
-#else
-       { &last_words,                  FALSE, 3, 0, 28,
-       "last_words",                   "Leave last words when your character dies" },
 #endif
 
 
 #ifdef JP
-       { &over_exert,                  TRUE,  3, 0, 29,
-       "over_exert",                   "MP¤¬Â­¤ê¤Ê¤¯¤Æ¤âËâË¡¤ËÄ©À魯¤ë" },
+       { &allow_debug_opts,            FALSE, 3, 6, 11,
+       "allow_debug_opts",             "¥Ç¥Ð¥Ã¥°/º¾µ½¥ª¥×¥·¥ç¥ó¤òµö²Ä¤¹¤ë" },
 #else
-       { &over_exert,                  TRUE,  3, 0, 29,
-       "over_exert",                   "Allow casting spells when short of mana" },
+       { &allow_debug_opts,            FALSE, 3, 6, 11,
+       "allow_debug_opts",             "Allow use of debug/cheat options" },
 #endif
 
 
-#ifdef WORLD_SCORE
-#ifdef JP
-       { &send_score,                  TRUE,  3, 4, 6,
-        "send_score",                   "¥¹¥³¥¢¥µ¡¼¥Ð¤Ë¥¹¥³¥¢¤òÁ÷¤ë" },
-#else
-       { &send_score,                  TRUE,  3, 4, 6,
-        "send_score",                   "Send score dump to the world score server" },
-#endif
-#endif
 
 
        /*** Disturbance ***/
@@ -6811,7 +6906,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &find_cut,                    FALSE, 4, 0, 18,
-       "find_cut",                     "´ûÃΤζʤê³Ñ¤ÏÄ̲᤹¤ë" },
+       "find_cut",                     "¶Ê¤ê³Ñ¤ò¼Ð¤á¤ËºÇûµ÷Î¥¤ÇÄ̲᤹¤ë" },
 #else
        { &find_cut,                    FALSE, 4, 0, 18,
        "find_cut",                     "Run past known corners" },
@@ -6820,7 +6915,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &find_examine,                TRUE,  4, 0, 19,
-       "find_examine",                 "¶Ê¤ê³Ñ¤«¤â¤·¤ì¤Ê¤¤¾ì¹çÄ̲᤹¤ë" },
+       "find_examine",                 "ÄÌÏ©¤¬°Å¤¤»þ¤Ë¤Ê¤ë¤Ù¤¯¶Ê¤ê³Ñ¤È²¾Äꤷ¤ÆÄ̲᤹¤ë" },
 #else
        { &find_examine,                TRUE,  4, 0, 19,
        "find_examine",                 "Run into potential corners" },
@@ -6828,17 +6923,26 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &disturb_move,                TRUE,  4, 0, 20,
-        "disturb_move",                 "¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+       { &disturb_move,                FALSE,  4, 0, 20,
+       "disturb_move",                 "¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
 #else
-       { &disturb_move,                TRUE,  4, 0, 20,
+       { &disturb_move,                FALSE,  4, 0, 20,
        "disturb_move",                 "Disturb whenever any monster moves" },
 #endif
 
 
 #ifdef JP
+       { &disturb_high,                FALSE,  4, 1, 3,
+       "disturb_high",                 "¥ì¥Ù¥ë¤Î¹â¤¤¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤¿¤é¹ÔÆ°¤òÃæ»ß¤¹¤ë"},
+#else
+       { &disturb_high,                FALSE,  4, 1, 3,
+       "disturb_high",                 "Disturb whenever high-level monster moves" },
+#endif
+
+
+#ifdef JP
        { &disturb_near,                TRUE,  4, 0, 21,
-        "disturb_near",                 "»ë³¦Æâ¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤¿¤é¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+       "disturb_near",                 "»ë³¦Æâ¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤¿¤é¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
 #else
        { &disturb_near,                TRUE,  4, 0, 21,
        "disturb_near",                 "Disturb whenever viewable monster moves" },
@@ -6856,7 +6960,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &disturb_panel,               TRUE,  4, 0, 22,
-        "disturb_panel",                "²èÌÌ¥¹¥¯¥í¡¼¥ë»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+       "disturb_panel",                "²èÌÌ¥¹¥¯¥í¡¼¥ë»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
 #else
        { &disturb_panel,               TRUE,  4, 0, 22,
        "disturb_panel",                "Disturb whenever map panel changes" },
@@ -6865,7 +6969,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &disturb_state,               TRUE,  4, 0, 23,
-        "disturb_state",                "¼«Ê¬¤Î¥¹¥Æ¡¼¥¿¥¹ÊѲ½»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+       "disturb_state",                "¼«Ê¬¤Î¥¹¥Æ¡¼¥¿¥¹ÊѲ½»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
 #else
        { &disturb_state,               TRUE,  4, 0, 23,
        "disturb_state",                "Disturb whenever player state changes" },
@@ -6874,7 +6978,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &disturb_minor,               TRUE,  4, 0, 24,
-        "disturb_minor",                "º³ºÙ¤Ê¤³¤È¤¬µ¯¤­¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+       "disturb_minor",                "º³ºÙ¤Ê¤³¤È¤¬µ¯¤­¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
 #else
        { &disturb_minor,               TRUE,  4, 0, 24,
        "disturb_minor",                "Disturb whenever boring things happen" },
@@ -6883,7 +6987,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &ring_bell,                   FALSE, 4, 0, 14,
-        "ring_bell",                    "¥¨¥é¡¼»þ¤Ë¥Ó¡¼¥×²»¤òÌĤ餹" },
+       "ring_bell",                    "¥¨¥é¡¼»þ¤Ë¥Ó¡¼¥×²»¤òÌĤ餹" },
 #else
        { &ring_bell,                   FALSE, 4, 0, 14,
        "ring_bell",                    "Audible bell (on errors, etc)" },
@@ -6891,14 +6995,31 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &alert_hitpoint,              FALSE, 4, 0, 26,
-        "alert_hitpoint",               "Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤Î·Ù¹ð»þ¤Ë¥Ó¡¼¥×¤òÌĤ餹" },
+       { &alert_hitpoint,              TRUE, 4, 0, 26,
+       "alert_hitpoint",               "Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤Î·Ù¹ð»þ¤Ë¥Ó¡¼¥×¤òÌĤ餹" },
 #else
-       { &alert_hitpoint,              FALSE, 4, 0, 26,
+       { &alert_hitpoint,              TRUE, 4, 0, 26,
        "alert_hitpoint",               "Alert user to critical hitpoints" },
 #endif
 
 
+#ifdef JP
+       { &disturb_trap_detect,         TRUE, 4, 0, 27,
+       "disturb_trap_detect",          "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+#else
+       { &disturb_trap_detect,         TRUE, 4, 0, 27,
+       "disturb_trap_detect",          "Disturb when leaving trap detected area"},
+#endif
+
+#ifdef JP
+       { &alert_trap_detect,           FALSE, 4, 0, 25,
+       "alert_trap_detect",            "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë·Ù¹ð¤¹¤ë" },
+#else
+       { &alert_trap_detect,           FALSE, 4, 0, 25,
+       "alert_trap_detect",            "Alert when leaving trap detected area"},
+#endif
+
+
        /*** Efficiency ***/
 
 #ifdef JP
@@ -6920,17 +7041,17 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &avoid_abort,                 TRUE,  5, 1, 18,
-        "avoid_abort",                  "Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
+       { &check_abort,                 TRUE,  5, 1, 18,
+       "check_abort",                  "Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
 #else
-       { &avoid_abort,                 TRUE,  5, 1, 18,
-       "avoid_abort",                  "Check for user abort while continuous command" },
+       { &check_abort,                 TRUE,  5, 1, 18,
+       "check_abort",                  "Check for user abort while continuous command" },
 #endif
 
 
 #ifdef JP
        { &flush_failure,               TRUE,  5, 1, 20,
-        "flush_failure",                "ÍÍ¡¹¤Ê¥ß¥¹È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
+       "flush_failure",                "ÍÍ¡¹¤Ê¥ß¥¹È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
 #else
        { &flush_failure,               TRUE,  5, 1, 20,
        "flush_failure",                "Flush input on various failures" },
@@ -6939,7 +7060,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &flush_disturb,               FALSE, 5, 1, 21,
-        "flush_disturb",                "¾ã³²È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
+       "flush_disturb",                "¾ã³²È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
 #else
        { &flush_disturb,               FALSE, 5, 1, 21,
        "flush_disturb",                "Flush input whenever disturbed" },
@@ -6948,16 +7069,16 @@ option_type option_info[] =
 
 #ifdef JP
        { &fresh_before,                TRUE,  5, 1, 23,
-        "fresh_before",                 "Ϣ³¥³¥Þ¥ó¥ÉÃæ¤Ë²èÌ̤òºÆÉÁ²è¤·Â³¤±¤ë" },
+       "fresh_before",                 "Ϣ³¥³¥Þ¥ó¥ÉÃæ¤Ë²èÌ̤òºÆÉÁ²è¤·Â³¤±¤ë" },
 #else
        { &fresh_before,                TRUE,  5, 1, 23,
-        "fresh_before",                 "Flush output while continuous command" },
+       "fresh_before",                 "Flush output while continuous command" },
 #endif
 
 
 #ifdef JP
        { &fresh_after,                 FALSE, 5, 1, 24,
-        "fresh_after",                  "¥³¥Þ¥ó¥É¸å¤Ë²èÌ̤ò¾ï¤ËºÆÉÁ²è¤·Â³¤±¤ë" },
+       "fresh_after",                  "¥³¥Þ¥ó¥É¸å¤Ë²èÌ̤ò¾ï¤ËºÆÉÁ²è¤·Â³¤±¤ë" },
 #else
        { &fresh_after,                 FALSE, 5, 1, 24,
        "fresh_after",                  "Flush output after monster's move" },
@@ -6975,7 +7096,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &compress_savefile,           FALSE, 5, 1, 26,
-        "compress_savefile",            "¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ëÃæ¤Î¥á¥Ã¥»¡¼¥¸¤ò°µ½Ì¤¹¤ë" },
+       "compress_savefile",            "¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ëÃæ¤Î¥á¥Ã¥»¡¼¥¸¤ò°µ½Ì¤¹¤ë" },
 #else
        { &compress_savefile,           FALSE, 5, 1, 26,
        "compress_savefile",            "Compress messages in savefiles" },
@@ -6983,10 +7104,10 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &hilite_player,               TRUE,  5, 1, 27,
+       { &hilite_player,               FALSE,  5, 1, 27,
        "hilite_player",                "¥×¥ì¥¤¥ä¡¼¤Ë¥«¡¼¥½¥ë¤ò¹ç¤ï¤»¤ë" },
 #else
-       { &hilite_player,               TRUE,  5, 1, 27,
+       { &hilite_player,               FALSE,  5, 1, 27,
        "hilite_player",                "Hilite the player with the cursor" },
 #endif
 
@@ -6994,8 +7115,17 @@ option_type option_info[] =
        /*** Birth Options ***/
 
 #ifdef JP
+       { &manual_haggle,               FALSE, 6, 1, 0,
+       "manual_haggle",                "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
+#else
+       { &manual_haggle,               FALSE, 6, 1, 0,
+       "manual_haggle",                "Manually haggle in stores" },
+#endif
+
+
+#ifdef JP
        { &easy_band,                   FALSE, 6, 6, 31,
-        "easy_band",                    "½é¿´¼ÔÍÑ´Êñ¥â¡¼¥É(*)" },
+       "easy_band",                    "½é¿´¼ÔÍÑ´Êñ¥â¡¼¥É(*)" },
 #else
        { &easy_band,                   FALSE, 6, 6, 31,
        "easy_band",                    "Easy Mode (*)" },
@@ -7004,7 +7134,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &smart_learn,                 TRUE,  6, 1, 14,
-        "smart_learn",                  "¥â¥ó¥¹¥¿¡¼¤Ï¼ºÇÔ¤ò³Ø½¬¤¹¤ë(*)" },
+       "smart_learn",                  "¥â¥ó¥¹¥¿¡¼¤Ï¼ºÇÔ¤ò³Ø½¬¤¹¤ë(*)" },
 #else
        { &smart_learn,                 TRUE,  6, 1, 14,
        "smart_learn",                  "Monsters learn from their mistakes (*)" },
@@ -7013,7 +7143,7 @@ option_type option_info[] =
 
 #ifdef JP
        { &smart_cheat,                 FALSE, 6, 1, 15,
-        "smart_cheat",                  "¥â¥ó¥¹¥¿¡¼¤Ï¥×¥ì¥¤¥ä¡¼¤Î¼å¤ß¤òÆͤ¯(*)" },
+       "smart_cheat",                  "¥â¥ó¥¹¥¿¡¼¤Ï¥×¥ì¥¤¥ä¡¼¤Î¼å¤ß¤òÆͤ¯(*)" },
 #else
        { &smart_cheat,                 FALSE, 6, 1, 15,
        "smart_cheat",                  "Monsters exploit players weaknesses (*)" },
@@ -7021,16 +7151,6 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &stupid_monsters,             FALSE, 6, 5, 2,
-       "stupid_monsters",              "¥â¥ó¥¹¥¿¡¼¤¬´ÖÈ´¤±¤Ê¹ÔÆ°¤ò¤È¤ë(*)" },
-#else
-       { &stupid_monsters,             FALSE, 6, 5, 2,
-       "stupid_monsters",              "Monsters behave stupidly (*)" },
-#endif
-
-
-
-#ifdef JP
        { &vanilla_town,                FALSE, 6, 6, 0,
        "vanilla_town",                 "¸µÁĤγ¹/¥¯¥¨¥¹¥È¤È¹ÓÌî¤Ê¤·" },
 #else
@@ -7094,24 +7214,6 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &terrain_streams,              TRUE,  6, 6, 9,
-       "terrain_streams",               "Àî¤ä¿¹¤Ê¤É¤ò¥À¥ó¥¸¥ç¥ó¤ËÀ¸À®(*)" },
-#else
-       { &terrain_streams,              TRUE,  6, 6, 9,
-       "terrain_streams",               "Create terrain 'streamers' in the dungeon (*)" },
-#endif
-
-
-#ifdef JP
-       { &munchkin_death,               FALSE, 6, 6, 11,
-       "munchkin_death",                "¡Ê¤¤¤ó¤Á¤­¡Ë»à¤ó¤À»þ¥»¡¼¥Ö¤¹¤ë¤«³Îǧ¤¹¤ë(*)" },
-#else
-       { &munchkin_death,              FALSE, 6, 6, 11,
-       "munchkin_death",               "(Cheating) Ask for death saves (*)" },
-#endif
-
-
-#ifdef JP
        { &ironman_rooms,                FALSE, 6, 6, 12,
        "ironman_rooms",                 "¡ÊÅ´¿ÍÍѡ˾ï¤ËÉáÄ̤Ǥʤ¤Éô²°¤òÀ¸À®¤¹¤ë(*)" },
 #else
@@ -7122,15 +7224,15 @@ option_type option_info[] =
 
 #ifdef JP
        { &ironman_nightmare,           FALSE, 6, 6, 18,
-        "ironman_nightmare",           "¡ÊÅ´¿ÍÍÑ¡Ë°­Ì´¥â¡¼¥É(¤³¤ì¤ÏÁ´¤¯ÉÔ¾òÍý¤Ç¤¹¡ª)(*)" },
+       "ironman_nightmare",            "¡ÊÅ´¿ÍÍÑ¡Ë°­Ì´¥â¡¼¥É(¤³¤ì¤ÏÁ´¤¯ÉÔ¾òÍý¤Ç¤¹¡ª)(*)" },
 #else
        { &ironman_nightmare,           FALSE, 6, 6, 18,
-        "ironman_nightmare",           "Nightmare mode(it isn't even remotely fair!)(*)" },
+       "ironman_nightmare",            "Nightmare mode(it isn't even remotely fair!)(*)" },
 #endif
 
 #ifdef JP
-        { &left_hander,                 FALSE, 6, 6, 13,
-        "left_hander",                  "º¸Íø¤­¤Ç¤¢¤ë" },
+       { &left_hander,                 FALSE, 6, 6, 13,
+       "left_hander",                  "º¸Íø¤­¤Ç¤¢¤ë" },
 #else
        { &left_hander,                 FALSE, 6, 6, 13,
        "left_hander",                  "Left-Hander" },
@@ -7138,8 +7240,8 @@ option_type option_info[] =
 
 
 #ifdef JP
-        { &preserve_mode,               TRUE,  6, 6, 14,
-        "preserve_mode",                "ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤ò¼è¤êƨ¤·¤Æ¤âºÆÀ¸À®¤µ¤ì¤ë(*)" },
+       { &preserve_mode,               TRUE,  6, 6, 14,
+       "preserve_mode",                "ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤ò¼è¤êƨ¤·¤Æ¤âºÆÀ¸À®¤µ¤ì¤ë(*)" },
 #else
        { &preserve_mode,               TRUE,  6, 6, 14,
        "preserve_mode",                "Preserve artifacts (*)" },
@@ -7147,8 +7249,8 @@ option_type option_info[] =
 
 
 #ifdef JP
-        { &autoroller,                  TRUE,  6, 6, 15,
-        "autoroller",                   "ǽÎÏÃͤ˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ(*)" },
+       { &autoroller,                  TRUE,  6, 6, 15,
+       "autoroller",                   "ǽÎÏÃͤ˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ(*)" },
 #else
        { &autoroller,                  TRUE,  6, 6, 15,
        "autoroller",                   "Allow use of autoroller for stats (*)" },
@@ -7156,187 +7258,203 @@ option_type option_info[] =
 
 
 #ifdef JP
-        { &autochara,                   FALSE, 6, 6, 16,
-        "autochara",                   "ÂγÊ/Ãϰ̤˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ" },
+       { &autochara,                   FALSE, 6, 6, 16,
+       "autochara",                   "ÂγÊ/Ãϰ̤˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ" },
 #else
        { &autochara,                   FALSE, 6, 6, 16,
-       "autochara",                    "Autorole for weight, height and social status" },
+       "autochara",                    "Autoroll for weight, height and social status" },
 #endif
 
 
 #ifdef JP
        { &powerup_home,                TRUE,  6, 4, 3,
-        "powerup_home",                 "²æ¤¬²È¤ò³ÈÄ¥¤¹¤ë(*)" },
+       "powerup_home",                 "²æ¤¬²È¤ò³ÈÄ¥¤¹¤ë(*)" },
 
 #else
        { &powerup_home,                TRUE,  6, 4, 3,
-        "powerup_home",                 "Increase capacity of your home (*)" },
+       "powerup_home",                 "Increase capacity of your home (*)" },
 #endif
 
 
        /*** Easy Object Auto-Destroyer ***/
 
 #ifdef JP
-        { &destroy_items,               FALSE, 7, 7, 0,
-        "destroy_items",                "¥¢¥¤¥Æ¥à¤Î´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë" },
+       { &destroy_items,               FALSE, 7, 7, 0,
+       "destroy_items",                "¥¢¥¤¥Æ¥à¤Î´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë" },
+#else
+       { &destroy_items,               FALSE, 7, 7, 0,
+       "destroy_items",                "Use easy auto-destroyer" },
+#endif
+
+#ifdef JP
+       { &destroy_feeling,               FALSE, 7, 7, 8,
+       "destroy_feeling",                "´Ê°×´ÕÄꤷ¤¿¤È¤­¼«Æ°Ç˲õ¤òŬÍѤ¹¤ë" },
+#else
+       { &destroy_feeling,               FALSE, 7, 7, 8,
+       "destroy_feeling",                "Apply auto-destroy as sense feeling" },
+#endif
+
+#ifdef JP
+       { &destroy_identify,               FALSE, 7, 7, 9,
+       "destroy_identify",                "´ÕÄꤷ¤¿¤È¤­¼«Æ°Ç˲õ¤òŬÍѤ¹¤ë" },
 #else
-        { &destroy_items,               FALSE, 7, 7, 0,
-        "destroy_items",                "Use easy auto-destroyer" },
+       { &destroy_identify,               FALSE, 7, 7, 9,
+       "destroy_identify",                "Apply auto-destroy as identify an item" },
 #endif
 
 #ifdef JP
-        { &leave_worth,                 FALSE, 7, 7, 2,
-        "leave_worth",                  "²ÁÃͤ¬¤¢¤ë¥¢¥¤¥Æ¥à¤Ï²õ¤µ¤Ê¤¤" },
+       { &leave_worth,                 TRUE, 7, 7, 2,
+       "leave_worth",                  "²ÁÃͤ¬¤¢¤ë¥¢¥¤¥Æ¥à¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_worth,                 FALSE, 7, 7, 2,
-        "leave_worth",                  "Auto-destroyer leaves known worthy items" },
+       { &leave_worth,                 TRUE, 7, 7, 2,
+       "leave_worth",                  "Auto-destroyer leaves known worthy items" },
 #endif
 
 #ifdef JP
-        { &leave_equip,                 FALSE, 7, 7, 3,
-        "leave_equip",                  "Éð´ï/Ëɶñ¤Ï²õ¤µ¤Ê¤¤" },
+       { &leave_equip,                 FALSE, 7, 7, 3,
+       "leave_equip",                  "Éð´ï/Ëɶñ¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_equip,                 FALSE, 7, 7, 3,
-        "leave_equip",                  "Auto-destroyer leaves weapons and armour" },
+       { &leave_equip,                 FALSE, 7, 7, 3,
+       "leave_equip",                  "Auto-destroyer leaves weapons and armour" },
 #endif
 
 #ifdef JP
-        { &leave_chest,                 FALSE, 7, 7, 7,
-        "leave_chest",                  "³«Éõ¤µ¤ì¤Æ¤¤¤Ê¤¤È¢¤Ï²õ¤µ¤Ê¤¤" },
+       { &leave_chest,                 TRUE, 7, 7, 7,
+       "leave_chest",                  "³«Éõ¤µ¤ì¤Æ¤¤¤Ê¤¤È¢¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_chest,                 FALSE, 7, 7, 7,
-        "leave_chest",                  "Auto-destroyer leaves closed chests" },
+       { &leave_chest,                 TRUE, 7, 7, 7,
+       "leave_chest",                  "Auto-destroyer leaves closed chests" },
 #endif
 
 #ifdef JP
-        { &leave_wanted,                FALSE, 7, 7, 4,
-        "leave_wanted",                 "¾Þ¶â¼ó¤Î»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
+       { &leave_wanted,                TRUE, 7, 7, 4,
+       "leave_wanted",                 "¾Þ¶â¼ó¤Î»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_wanted,                FALSE, 7, 7, 4,
-        "leave_wanted",                 "Auto-destroyer leaves wanted corpses" },
+       { &leave_wanted,                TRUE, 7, 7, 4,
+       "leave_wanted",                 "Auto-destroyer leaves wanted corpses" },
 #endif
 
 #ifdef JP
-        { &leave_corpse,                FALSE, 7, 7, 5,
-        "leave_corpse",                 "»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
+       { &leave_corpse,                FALSE, 7, 7, 5,
+       "leave_corpse",                 "»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_corpse,                FALSE, 7, 7, 5,
-        "leave_corpse",                 "Auto-destroyer leaves corpses and skeletons" },
+       { &leave_corpse,                FALSE, 7, 7, 5,
+       "leave_corpse",                 "Auto-destroyer leaves corpses and skeletons" },
 #endif
 
 #ifdef JP
-        { &leave_junk,                  FALSE, 7, 7, 6,
-        "leave_junk",                   "¤¬¤é¤¯¤¿¤Ï²õ¤µ¤Ê¤¤" },
+       { &leave_junk,                  FALSE, 7, 7, 6,
+       "leave_junk",                   "¤¬¤é¤¯¤¿¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_junk,                  FALSE, 7, 7, 6,
-        "leave_junk",                   "Auto-destroyer leaves junks" },
+       { &leave_junk,                  FALSE, 7, 7, 6,
+       "leave_junk",                   "Auto-destroyer leaves junk" },
 #endif
 
 
        /*** Play-record Options ***/
 
 #ifdef JP
-        { &record_fix_art,              TRUE, 10, 4, 11,
-        "record_fix_art",               "¸ÇÄꥢ¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµ­Ï¿¤¹¤ë" },
+       { &record_fix_art,              TRUE, 10, 4, 11,
+       "record_fix_art",               "¸ÇÄꥢ¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_fix_art,              TRUE, 10, 4, 11,
-        "record_fix_art",               "Record fixed artifacts" },
+       { &record_fix_art,              TRUE, 10, 4, 11,
+       "record_fix_art",               "Record fixed artifacts" },
 #endif
 
 #ifdef JP
-        { &record_rand_art,             TRUE, 10, 4, 12,
-        "record_rand_art",              "¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµ­Ï¿¤¹¤ë" },
+       { &record_rand_art,             TRUE, 10, 4, 12,
+       "record_rand_art",              "¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_rand_art,             TRUE, 10, 4, 12,
-        "record_rand_art",              "Record random artifacts" },
+       { &record_rand_art,             TRUE, 10, 4, 12,
+       "record_rand_art",              "Record random artifacts" },
 #endif
 
 #ifdef JP
-        { &record_destroy_uniq,         TRUE, 10, 4, 13,
-        "record_destroy_uniq",          "¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤òÅݤ·¤¿¤È¤­¤òµ­Ï¿¤¹¤ë" },
+       { &record_destroy_uniq,         TRUE, 10, 4, 13,
+       "record_destroy_uniq",          "¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤òÅݤ·¤¿¤È¤­¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_destroy_uniq,         TRUE, 10, 4, 13,
-        "record_destroy_uniq",          "Record when destroy unique monster" },
+       { &record_destroy_uniq,         TRUE, 10, 4, 13,
+       "record_destroy_uniq",          "Record when destroy unique monster" },
 #endif
 
 #ifdef JP
-        { &record_fix_quest,            TRUE, 10, 4, 14,
-        "record_fix_quest",             "¸ÇÄꥯ¥¨¥¹¥È¤ÎãÀ®¤òµ­Ï¿¤¹¤ë" },
+       { &record_fix_quest,            TRUE, 10, 4, 14,
+       "record_fix_quest",             "¸ÇÄꥯ¥¨¥¹¥È¤ÎãÀ®¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_fix_quest,            TRUE, 10, 4, 14,
-        "record_fix_quest",             "Record fixed quests" },
+       { &record_fix_quest,            TRUE, 10, 4, 14,
+       "record_fix_quest",             "Record fixed quests" },
 #endif
 
 #ifdef JP
-        { &record_rand_quest,           TRUE, 10, 4, 15,
-        "record_rand_quest",            "¥é¥ó¥À¥à¥¯¥¨¥¹¥È¤ÎãÀ®¤òµ­Ï¿¤¹¤ë" },
+       { &record_rand_quest,           TRUE, 10, 4, 15,
+       "record_rand_quest",            "¥é¥ó¥À¥à¥¯¥¨¥¹¥È¤ÎãÀ®¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_rand_quest,           TRUE, 10, 4, 15,
-        "record_rand_quest",            "Record random quests" },
+       { &record_rand_quest,           TRUE, 10, 4, 15,
+       "record_rand_quest",            "Record random quests" },
 #endif
 
 #ifdef JP
-        { &record_maxdeapth,            TRUE, 10, 4, 16,
-        "record_maxdeapth",             "ºÇ¿¼³¬¤ò¹¹¿·¤·¤¿¤È¤­¤Ëµ­Ï¿¤¹¤ë" },
+       { &record_maxdeapth,            TRUE, 10, 4, 16,
+       "record_maxdeapth",             "ºÇ¿¼³¬¤ò¹¹¿·¤·¤¿¤È¤­¤Ëµ­Ï¿¤¹¤ë" },
 #else
-        { &record_maxdeapth,            TRUE, 10, 4, 16,
-        "record_maxdeapth",             "Record movements to deepest level" },
+       { &record_maxdeapth,            TRUE, 10, 4, 16,
+       "record_maxdeapth",             "Record movements to deepest level" },
 #endif
 
 #ifdef JP
-        { &record_stair,                TRUE, 10, 4, 17,
-        "record_stair",                 "³¬¤Î°ÜÆ°¤òµ­Ï¿¤¹¤ë" },
+       { &record_stair,                TRUE, 10, 4, 17,
+       "record_stair",                 "³¬¤Î°ÜÆ°¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_stair,                TRUE, 10, 4, 17,
-        "record_stair",                 "Record recall and stair movements" },
+       { &record_stair,                TRUE, 10, 4, 17,
+       "record_stair",                 "Record recall and stair movements" },
 #endif
 
 #ifdef JP
-        { &record_buy,                  TRUE, 10, 4, 18,
-        "record_buy",                   "¥¢¥¤¥Æ¥à¤Î¹ØÆþ¤òµ­Ï¿¤¹¤ë" },
+       { &record_buy,                  TRUE, 10, 4, 18,
+       "record_buy",                   "¥¢¥¤¥Æ¥à¤Î¹ØÆþ¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_buy,                  TRUE, 10, 4, 18,
-        "record_buy",                   "Record purchased items" },
+       { &record_buy,                  TRUE, 10, 4, 18,
+       "record_buy",                   "Record purchased items" },
 #endif
 
 #ifdef JP
-        { &record_sell,                 FALSE, 10, 4, 19,
-        "record_sell",                  "¥¢¥¤¥Æ¥à¤ÎÇäµÑ¤òµ­Ï¿¤¹¤ë" },
+       { &record_sell,                 FALSE, 10, 4, 19,
+       "record_sell",                  "¥¢¥¤¥Æ¥à¤ÎÇäµÑ¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_sell,                 FALSE, 10, 4, 19,
-        "record_sell",                  "Record sold items" },
+       { &record_sell,                 FALSE, 10, 4, 19,
+       "record_sell",                  "Record sold items" },
 #endif
 
 #ifdef JP
-        { &record_danger,               TRUE, 10, 4, 20,
-        "record_danger",                "¥Ô¥ó¥Á¤Ë¤Ê¤Ã¤¿¤È¤­¤òµ­Ï¿¤¹¤ë" },
+       { &record_danger,               TRUE, 10, 4, 20,
+       "record_danger",                "¥Ô¥ó¥Á¤Ë¤Ê¤Ã¤¿¤È¤­¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_danger,               TRUE, 10, 4, 20,
-        "record_danger",                "Record hitpoint warning" },
+       { &record_danger,               TRUE, 10, 4, 20,
+       "record_danger",                "Record hitpoint warning" },
 #endif
 
 #ifdef JP
-        { &record_arena,                TRUE, 10, 4, 21,
-        "record_arena",                 "¥¢¥ê¡¼¥Ê¤Ç¤Î¾¡Íø¤òµ­Ï¿¤¹¤ë" },
+       { &record_arena,                TRUE, 10, 4, 21,
+       "record_arena",                 "¥¢¥ê¡¼¥Ê¤Ç¤Î¾¡Íø¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_arena,                TRUE, 10, 4, 21,
-        "record_arena",                 "Record arena victories" },
+       { &record_arena,                TRUE, 10, 4, 21,
+       "record_arena",                 "Record arena victories" },
 #endif
 
 #ifdef JP
-        { &record_ident,                TRUE, 10, 4, 22,
-        "record_ident",                 "̤ȽÌÀ¤Î¥¢¥¤¥Æ¥à¤Î¼±Ê̤òµ­Ï¿¤¹¤ë" },
+       { &record_ident,                TRUE, 10, 4, 22,
+       "record_ident",                 "̤ȽÌÀ¤Î¥¢¥¤¥Æ¥à¤Î¼±Ê̤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_ident,                TRUE, 10, 4, 22,
-        "record_ident",                 "Record first identified items" },
+       { &record_ident,                TRUE, 10, 4, 22,
+       "record_ident",                 "Record first identified items" },
 #endif
 
 #ifdef JP
-        { &record_named_pet,            FALSE, 10, 4, 23,
-        "record_named_pet",             "̾Á°¤Ä¤­¥Ú¥Ã¥È¤Î¾ðÊó¤òµ­Ï¿¤¹¤ë" },
+       { &record_named_pet,            FALSE, 10, 4, 23,
+       "record_named_pet",             "̾Á°¤Ä¤­¥Ú¥Ã¥È¤Î¾ðÊó¤òµ­Ï¿¤¹¤ë" },
 #else
-        { &record_named_pet,            FALSE, 10, 4, 23,
-        "record_named_pet",             "Record infomations of named pets" },
+       { &record_named_pet,            FALSE, 10, 4, 23,
+       "record_named_pet",             "Record informations of named pets" },
 #endif
 
 
@@ -7663,7 +7781,7 @@ cptr game_inscriptions[] =
        "¶²¤í¤·¤¤",      /* FEEL_TERRIBLE */
        "̵²ÁÃÍ",        /* FEEL_WORTHLESS */
        "¼ö¤ï¤ì¤Æ¤¤¤ë",  /* FEEL_CURSED */
-       "¼ö¤¤¤Ê¤·",      /* FEEL_UNCURSED */
+       "¾å¼Á°Ê¾å",      /* FEEL_UNCURSED */
        "ÊÂ",            /* FEEL_AVERAGE */
        "¾å¼Á",          /* FEEL_GOOD */
        "¹âµéÉÊ",        /* FEEL_EXCELLENT */
@@ -7716,7 +7834,7 @@ cptr shougou_moji[5]=
 #ifdef JP
 {"[½é¿´¼Ô]", "[ÆþÌç¼Ô]", "[½ÏÎý¼Ô]", "[¥¨¥­¥¹¥Ñ¡¼¥È]", "[ã¿Í]"};
 #else
-{"[Unskilled]", "[Beginer]", "[Skilled]", "[Expert]", "[Master]"};
+{"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
 #endif
 
 byte conv_terrain2feat[MAX_WILDERNESS] =