OSDN Git Service

- オプション名confirm_wear の変数名が wear_confirm だったので、オプション名に合わせた。
[hengband/hengband.git] / src / tables.c
index 42ec4c3..9158812 100644 (file)
@@ -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,
@@ -4085,7 +4085,7 @@ cptr E_realm_names[]
 cptr realm_names[]
 #endif
 = {
-       "no magic",
+       "none",
        "Life",
        "Sorcery",
        "Nature",
@@ -4906,7 +4906,7 @@ cptr spell_names[VALID_REALM][32] =
                "Resistance",
                "Haste Self",
                "Walk through Wall",
-               "Pulish Shield",
+               "Polish Shield",
                "Create Golem",
                "Magical armor",
 
@@ -4949,7 +4949,7 @@ cptr spell_names[VALID_REALM][32] =
                "Plasma Ball",
                "Polymorph Demon",
                "Nather Wave",
-               "Kiss of Saccubus",
+               "Kiss of Succubus",
                "Doom Hand",
 
                "Raise the Morale",
@@ -4990,7 +4990,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 +4999,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 +5063,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 +5073,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 +5089,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),
@@ -5908,10 +5908,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 +5998,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 +6090,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"},
@@ -6155,7 +6155,7 @@ cptr stat_names[6] =
 #ifdef JP
         "ÏÓÎÏ :", "ÃÎǽ :", "¸­¤µ :", "´ïÍÑ :", "Âѵנ:", "Ì¥ÎÏ :"
 #else
-       "STR: ", "INT: ", "WIS: ", "DEX: ", "CON: ", "CHR: "
+       "STR : ", "INT : ", "WIS : ", "DEX : ", "CON : ", "CHR : "
 #endif
 
 };
@@ -6168,7 +6168,7 @@ cptr stat_names_reduced[6] =
 #ifdef JP
         "ÏÓÎÏx:", "ÃÎǽx:", "¸­¤µx:", "´ïÍÑx:", "Âѵ×x:", "Ì¥ÎÏx:"
 #else
-       "Str: ", "Int: ", "Wis: ", "Dex: ", "Con: ", "Chr: "
+       "Str : ", "Int : ", "Wis : ", "Dex : ", "Con : ", "Chr : "
 #endif
 
 };
@@ -6288,14 +6288,6 @@ cptr window_flag_desc[32] =
 /*
  * Available Options
  *
- * Option Screen Sets:
- *
- *      Set 1: User Interface
- *      Set 2: Disturbance
- *      Set 3: Inventory
- *      Set 4: Game Play
- *
- * Note that bits 28-31 of set 0 are currently unused.
  */
 option_type option_info[] =
 {
@@ -6311,6 +6303,24 @@ option_type option_info[] =
 
 
 #ifdef JP
+       { &always_pickup,               FALSE, 1, 0, 5,
+        "always_pickup",                "¾ï¤Ë¥¢¥¤¥Æ¥à¤ò½¦¤¦" },
+#else
+       { &always_pickup,               FALSE,  1, 0, 5,
+       "always_pickup",                "Pick things up by default" },
+#endif
+
+
+#ifdef JP
+       { &carry_query_flag,            FALSE, 1, 0, 3,
+       "carry_query_flag",  "¥¢¥¤¥Æ¥à¤ò½¦¤¦Á°¤Ë³Îǧ¤¹¤ë" },
+#else
+       { &carry_query_flag,            FALSE, 1, 0, 3,
+       "carry_query_flag",             "Prompt before picking things up" },
+#endif
+
+
+#ifdef JP
        { &quick_messages,              TRUE,  1, 0, 1,
      "quick_messages",  "¥¯¥¤¥Ã¥¯¡¦¥á¥Ã¥»¡¼¥¸¤ò»ÈÍѤ¹¤ë" },
 #else
@@ -6347,15 +6357,6 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &carry_query_flag,            FALSE, 1, 0, 3,
-       "carry_query_flag",  "¥¢¥¤¥Æ¥à¤ò½¦¤¦Á°¤Ë³Îǧ¤¹¤ë" },
-#else
-       { &carry_query_flag,            FALSE, 1, 0, 3,
-       "carry_query_flag",             "Prompt before picking things up" },
-#endif
-
-
-#ifdef JP
        { &use_old_target,              FALSE, 1, 0, 4,
      "use_old_target",  "¾ï¤Ë°ÊÁ°¤Î¥¿¡¼¥²¥Ã¥È¤ò»ØÄꤹ¤ë" },
 #else
@@ -6365,15 +6366,6 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &always_pickup,               FALSE, 1, 0, 5,
-        "always_pickup",                "¾ï¤Ë¥¢¥¤¥Æ¥à¤ò½¦¤¦" },
-#else
-       { &always_pickup,               FALSE,  1, 0, 5,
-       "always_pickup",                "Pick things up by default" },
-#endif
-
-
-#ifdef JP
        { &always_repeat,               TRUE,  1, 0, 6,
         "always_repeat",                "¥³¥Þ¥ó¥É¼«Æ°·«¤êÊÖ¤·" },
 #else
@@ -6392,10 +6384,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
 
@@ -6410,14 +6402,65 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &target_pet,                  TRUE,  1, 2, 5,
+       { &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
@@ -6590,11 +6633,11 @@ option_type option_info[] =
 
 
 #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
 
 
@@ -6605,7 +6648,7 @@ option_type option_info[] =
         "manual_haggle",                "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
 #else
        { &manual_haggle,               FALSE, 3, 1, 0,
-       "manual_haggle",                "Manualy haggle in stores" },
+       "manual_haggle",                "Manually haggle in stores" },
 #endif
 
 
@@ -6646,15 +6689,6 @@ 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",                  "¡Ö²ó¤ê¤òÄ´¤Ù¤ë¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
 #else
@@ -6726,66 +6760,15 @@ option_type option_info[] =
 #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",                   "¾²¾å¤Ç½Å¤Ê¤Ã¤¿¥¢¥¤¥Æ¥à¤ò¥ê¥¹¥È¤¹¤ë" },
-#else
-       { &easy_floor,                  FALSE, 3, 5, 9,
-       "easy_floor",                   "Display floor stacks in a list" },
-#endif
-#endif /* ALLOW_EASY_FLOOR -- TNB */
-
-
 #ifdef JP
-       { &use_command,                 FALSE, 3, 5, 10,
-       "use_command",                  "¡Ö»È¤¦(a)¡×¥³¥Þ¥ó¥É¤Ç¥¢¥¤¥Æ¥à¤ò²¿¤Ç¤â»È¤¨¤ë" },
-#else
-       { &use_command,                 FALSE, 3, 5, 10,
-       "use_command",                  "Allow unified use command" },
-#endif
-
-
-#ifdef JP
-       { &last_words,                  FALSE, 3, 0, 28,
+       { &last_words,                  TRUE, 3, 0, 28,
        "last_words",                   "¥­¥ã¥é¥¯¥¿¡¼¤¬»à¤ó¤À»þ°ä¸À¤ò¤Î¤³¤¹" },
 #else
-       { &last_words,                  FALSE, 3, 0, 28,
+       { &last_words,                  TRUE, 3, 0, 28,
        "last_words",                   "Leave last words when your character dies" },
 #endif
 
 
-#ifdef JP
-       { &over_exert,                  TRUE,  3, 0, 29,
-       "over_exert",                   "MP¤¬Â­¤ê¤Ê¤¯¤Æ¤âËâË¡¤ËÄ©À魯¤ë" },
-#else
-       { &over_exert,                  TRUE,  3, 0, 29,
-       "over_exert",                   "Allow casting spells when short of mana" },
-#endif
-
-
 #ifdef WORLD_SCORE
 #ifdef JP
        { &send_score,                  TRUE,  3, 4, 6,
@@ -6836,10 +6819,10 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &disturb_move,                TRUE,  4, 0, 20,
+       { &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
 
@@ -6899,14 +6882,23 @@ option_type option_info[] =
 
 
 #ifdef JP
-       { &alert_hitpoint,              FALSE, 4, 0, 26,
+       { &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,         FALSE, 4, 0, 27,
+        "disturb_trap_detect",          "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤¿¤È¤­¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+#else
+       { &disturb_trap_detect,         FALSE, 4, 0, 27,
+       "disturb_trap_detect",          "Disturb when leaving last trap detect area"},
+#endif
+
+
        /*** Efficiency ***/
 
 #ifdef JP
@@ -6928,11 +6920,11 @@ 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
 
 
@@ -7168,7 +7160,7 @@ option_type option_info[] =
         "autochara",                   "ÂγÊ/Ãϰ̤˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ" },
 #else
        { &autochara,                   FALSE, 6, 6, 16,
-       "autochara",                    "Autorole for weight, height and social status" },
+       "autochara",                    "Autoroll for weight, height and social status" },
 #endif
 
 
@@ -7186,17 +7178,17 @@ option_type option_info[] =
 
 #ifdef JP
         { &destroy_items,               FALSE, 7, 7, 0,
-        "destroy_items",                "¥¢¥¤¥Æ¥à¤Î¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë" },
+        "destroy_items",                "¥¢¥¤¥Æ¥à¤Î´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë" },
 #else
         { &destroy_items,               FALSE, 7, 7, 0,
         "destroy_items",                "Use easy auto-destroyer" },
 #endif
 
 #ifdef JP
-        { &leave_worth,                 FALSE, 7, 7, 2,
+        { &leave_worth,                 TRUE, 7, 7, 2,
         "leave_worth",                  "²ÁÃͤ¬¤¢¤ë¥¢¥¤¥Æ¥à¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_worth,                 FALSE, 7, 7, 2,
+        { &leave_worth,                 TRUE, 7, 7, 2,
         "leave_worth",                  "Auto-destroyer leaves known worthy items" },
 #endif
 
@@ -7209,18 +7201,18 @@ option_type option_info[] =
 #endif
 
 #ifdef JP
-        { &leave_chest,                 FALSE, 7, 7, 7,
+        { &leave_chest,                 TRUE, 7, 7, 7,
         "leave_chest",                  "³«Éõ¤µ¤ì¤Æ¤¤¤Ê¤¤È¢¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_chest,                 FALSE, 7, 7, 7,
+        { &leave_chest,                 TRUE, 7, 7, 7,
         "leave_chest",                  "Auto-destroyer leaves closed chests" },
 #endif
 
 #ifdef JP
-        { &leave_wanted,                FALSE, 7, 7, 4,
+        { &leave_wanted,                TRUE, 7, 7, 4,
         "leave_wanted",                 "¾Þ¶â¼ó¤Î»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
 #else
-        { &leave_wanted,                FALSE, 7, 7, 4,
+        { &leave_wanted,                TRUE, 7, 7, 4,
         "leave_wanted",                 "Auto-destroyer leaves wanted corpses" },
 #endif
 
@@ -7237,7 +7229,7 @@ option_type option_info[] =
         "leave_junk",                   "¤¬¤é¤¯¤¿¤Ï²õ¤µ¤Ê¤¤" },
 #else
         { &leave_junk,                  FALSE, 7, 7, 6,
-        "leave_junk",                   "Auto-destroyer leaves junks" },
+        "leave_junk",                   "Auto-destroyer leaves junk" },
 #endif
 
 
@@ -7344,7 +7336,7 @@ option_type option_info[] =
         "record_named_pet",             "̾Á°¤Ä¤­¥Ú¥Ã¥È¤Î¾ðÊó¤òµ­Ï¿¤¹¤ë" },
 #else
         { &record_named_pet,            FALSE, 10, 4, 23,
-        "record_named_pet",             "Record infomations of named pets" },
+        "record_named_pet",             "Record informations of named pets" },
 #endif
 
 
@@ -7724,7 +7716,7 @@ cptr shougou_moji[5]=
 #ifdef JP
 {"[½é¿´¼Ô]", "[ÆþÌç¼Ô]", "[½ÏÎý¼Ô]", "[¥¨¥­¥¹¥Ñ¡¼¥È]", "[ã¿Í]"};
 #else
-{"[Unskilled]", "[Beginer]", "[Skilled]", "[Expert]", "[Master]"};
+{"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
 #endif
 
 byte conv_terrain2feat[MAX_WILDERNESS] =