OSDN Git Service

地形に関する変更.
[hengband/hengband.git] / src / tables.c
index d12c4e4..1ae6051 100644 (file)
@@ -4136,1031 +4136,6 @@ cptr realm_names[]
        "unknown"
 };
 
-/*
- * Names of the spells (mage spells then priest spells)
- */
-#ifdef JP
-cptr spell_names[VALID_REALM][32] =
-{
-       /*** Life Spells ***/
-       {
-               /* Common Life Spellbooks */
-"·Ú½ý¤Î¼£Ìþ",
-"½ËÊ¡",
-"·Ú½ý",
-"¸÷¤Î¾¤´­",
-"æ« & ±£¤·Èâ´¶ÃÎ",
-"½Å½ý¤Î¼£Ìþ",
-"²òÆÇ",
-"¶õÊ¢½¼Â­",
-
-"²ò¼ö",
-"½Å½ý",
-"Ã×Ì¿½ý¤Î¼£Ìþ",
-"ÂÑÇ®ÂÑ´¨",
-"¼þÊÕ´¶ÃÎ",
-"¥Ñ¥Ë¥Ã¥¯¡¦¥¢¥ó¥Ç¥Ã¥É",
-"ÂÎÎϲóÉü",
-"·ë³¦¤ÎÌæ¾Ï",
-
-               /* Rare Life Spellbooks */
-"*²ò¼ö*",
-"´Õ¼±",
-"¥¢¥ó¥Ç¥Ã¥ÉÂ໶",
-"Æä¤Î¹ï",
-"Ã×Ì¿½ý",
-"µ¢´Ô¤Î¾Û",
-"¿¿¼Â¤Îº×ÃÅ",
-"¿¿¡¦·ë³¦",
-
-"ÉÔÌÓ²½",
-"Á´´¶ÃÎ",
-"¥¢¥ó¥Ç¥Ã¥É¾ÃÌÇ",
-"ÀéΤ´ã",
-"Á´Éü³è",
-"*ÂÎÎϲóÉü*",
-"À»¤Ê¤ë¥Ó¥¸¥ç¥ó",
-"µæ¶Ë¤ÎÂÑÀ­"
-       },
-
-       /*** Sorcery Spells ***/
-
-       {
-               /* Common Sorcery Spellbooks */
-"¥â¥ó¥¹¥¿¡¼´¶ÃÎ",
-"¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È",
-"櫤ÈÈâ´¶ÃÎ",
-"¥é¥¤¥È¡¦¥¨¥ê¥¢",
-"¥Ñ¥Ë¥Ã¥¯¡¦¥â¥ó¥¹¥¿¡¼",
-"¥Æ¥ì¥Ý¡¼¥È",
-"¥¹¥ê¡¼¥×¡¦¥â¥ó¥¹¥¿¡¼",
-"ËâÎϽ¼Å¶",
-
-"ËâË¡¤ÎÃÏ¿Þ",
-"´ÕÄê",
-"¥¹¥í¥¦¡¦¥â¥ó¥¹¥¿¡¼",
-"¼þÊÕ¥¹¥ê¡¼¥×",
-"¥Æ¥ì¥Ý¡¼¥È¡¦¥â¥ó¥¹¥¿¡¼",
-"¥¹¥Ô¡¼¥É",
-"¿¿¡¦´¶ÃÎ",
-"¿¿¡¦´ÕÄê",
-
-               /* Rare Sorcery Spellbooks */
-"ʪÂΤȺâÊõ´¶ÃÎ",
-"¥Á¥ã¡¼¥à¡¦¥â¥ó¥¹¥¿¡¼",
-"Àº¿À´¶ÃÎ",
-"³¹°ÜÆ°",
-"¼«¸ÊʬÀÏ",
-"¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë",
-"µ¢´Ô¤Î¼öʸ",
-"¼¡¸µ¤ÎÈâ",
-
-"Ä´ºº",
-"Çúȯ¤Î¥ë¡¼¥ó",
-"Ç°Æ°ÎÏ",
-"ÀéΤ´ã",
-"̥λ¤Î»ëÀþ",
-"Ï£¶â½Ñ",
-"²øʪÄÉÊü",
-"̵½ý¤Îµå"
-
-       },
-
-       /*** Nature Spells ***/
-
-       {
-               /* Common Nature Spellbooks */
-"¥â¥ó¥¹¥¿¡¼´¶ÃÎ",
-"°ðºÊ",
-"櫤ÈÈâ´¶ÃÎ",
-"¿©ÎÈÀ¸À®",
-"Æü¤Î¸÷",
-"ưʪ½¬¤·",
-"´Ä¶­¤Ø¤ÎÂÑÀ­",
-"½ý¤ÈÆǼ£ÎÅ",
-
-"´äÀÐÍϲò",
-"¥¢¥¤¥¹¡¦¥Ü¥ë¥È",
-"¼«Á³¤Î³ÐÀÃ",
-"¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È",
-"ÂÀÍÛ¸÷Àþ",
-"­¤«¤»",
-"ưʪ¾¤´­",
-"ÌôÁð¼£ÎÅ",
-
-               /* Rare Nature Spellbooks */
-"³¬ÃÊÀ¸À®",
-"È©Àв½",
-"¿¿¡¦ÂÑÀ­",
-"¿¹ÎÓÁϤ",
-"ưʪͧÏÂ",
-"»î¶âÀÐ",
-"ÀФÎÊÉ",
-"Éå¿©ËÉ»ß",
-
-"ÃÏ¿Ì",
-"¥«¥Þ¥¤¥¿¥Á",
-"¥Ö¥ê¥¶¡¼¥É",
-"°ðºÊÍò",
-"±²Ä¬",
-"ÍÛ¸÷¾¤´­",
-"ÀºÎî¤Î¿Ï",
-"¼«Á³¤Î¶¼°Ò"
-
-       },
-
-       /*** Chaos Spells ***/
-
-       {
-               /* Common Chaos Spellbooks */
-"¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë",
-"¥È¥é¥Ã¥×/¥É¥¢Ç˲õ",
-"Á®¸÷",
-"º®Íð¤Î¼ê",
-"ËâÎÏßÚÎö",
-"¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È",
-"ÎϤηý",
-"¥Æ¥ì¥Ý¡¼¥È",
-
-"¥ï¥ó¥À¡¼",
-"¥«¥ª¥¹¡¦¥Ü¥ë¥È",
-"¥½¥Ë¥Ã¥¯¡¦¥Ö¡¼¥à",
-"ÇËÌǤÎÌð",
-"¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë",
-"¥Æ¥ì¥Ý¡¼¥È¡¦¥¢¥¦¥§¥¤",
-"Ç˲õ¤Î¸ÀÍÕ",
-"¥í¥°¥ë¥¹È¯Æ°",
-
-               /* Rare Chaos Spellbooks */
-"¾¼ÔÊÑÍÆ",
-"Ï¢º¿°ðºÊ",
-"ËâÎÏÉõÆþ",
-"¸¶»Òʬ²ò",
-"¸½¼ÂÊÑÍÆ",
-"¥Þ¥¸¥Ã¥¯¡¦¥í¥±¥Ã¥È",
-"º®Æ٤οÏ",
-"°­Ë⾤´­",
-
-"½ÅÎϸ÷Àþ",
-"ήÀ±·²",
-"±ë¤Î°ì·â",
-"º®ÆÙ¾¤Íè",
-"¼«¸ÊÊÑÍÆ",
-"ËâÎϤÎÍò",
-"¥í¥°¥ë¥¹¤Î¥Ö¥ì¥¹",
-"µõ̵¾¤Íè"
-
-       },
-
-       /*** Death Spells ***/
-
-       {
-               /* Common Death Spellbooks */
-"̵À¸Ì¿´¶ÃÎ",
-"¼ö»¦ÃÆ",
-"¼Ù°­´¶ÃÎ",
-"°­½­±À",
-"¹õ¤¤Ì²¤ê",
-"ÂÑÆÇ",
-"¶²¹²",
-"¥¢¥ó¥Ç¥Ã¥É½¾Â°",
-
-"¥¨¥ó¥È¥í¥Ô¡¼¤Îµå",
-"ÃϹö¤ÎÌð",
-"»¦Ù¤±À",
-"¥â¥ó¥¹¥¿¡¼¾ÃÌÇ",
-"ÆǤοÏ",
-"µÛ·ì¥É¥ì¥¤¥ó",
-"È¿º²¤Î½Ñ",
-"Ëõ»¦",
-
-               /* Rare Death Spellbooks */
-"¶¸Àï»Î²½",
-"°­Î´­",
-"°Å¹õ¤ÎÌð",
-"¶¸ÍðÀï»Î",
-"µÛ·ì¤Î¿Ï",
-"¿¿¡¦µÛ·ì",
-"»à¤Î¸Àº²",
-"°Å¹õ¤ÎÍò",
-
-"»à¤Î¸÷Àþ",
-"»à¼Ô¾¤´­",
-"»à¼Ô¤ÎÈëÅÁ",
-"µÛ·ìµ´ÊѲ½",
-"À¸Ì¿ÎÏÉü³è",
-"¼þÊÕËõ»¦",
-"ÃϹö¤Î¹å²Ð",
-"Í©Âβ½"
-
-       },
-
-       /*** Trump Spells ***/
-
-       {
-               /* Common Trump Spellbooks */
-"¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È",
-"ÃØéá¤Î¥«¡¼¥É",
-"¥·¥ã¥Ã¥Õ¥ë",
-"¥Õ¥í¥¢¡¦¥ê¥»¥Ã¥È",
-"¥Æ¥ì¥Ý¡¼¥È",
-"´¶ÃΤΥ«¡¼¥É",
-"¥Æ¥ì¥Ý¡¼¥È¡¦¥â¥ó¥¹¥¿¡¼",
-"ưʪ¤Î¥«¡¼¥É",
-
-"°ÜÆ°¤Î¥«¡¼¥É",
-"¥«¥ß¥«¥¼¤Î¥«¡¼¥É",
-"¸¸Î´­",
-"¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼",
-"¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë",
-"¼¡¸µ¤ÎÈâ",
-"µ¢´Ô¤Î¼öʸ",
-"²øʪÄÉÊü",
-
-               /* Rare Trump Spellbooks */
-"°ÌÃÖ¸ò´¹¤Î¥«¡¼¥É",
-"¥¢¥ó¥Ç¥Ã¥É¤Î¥«¡¼¥É",
-"à¨ÃîÎà¤Î¥«¡¼¥É",
-"¥â¥ó¥¹¥¿¡¼¤Î¥«¡¼¥É",
-"¥Ï¥¦¥ó¥É¤Î¥«¡¼¥É",
-"¥È¥é¥ó¥×¤Î¿Ï",
-"¿Í´Ö¥È¥é¥ó¥×",
-"¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤Î¥«¡¼¥É",
-
-"ͽ¸«¤Î¥«¡¼¥É",
-"Ãμ±¤Î¥«¡¼¥É",
-"²óÉü¥â¥ó¥¹¥¿¡¼",
-"¥É¥é¥´¥ó¤Î¥«¡¼¥É",
-"ð¨ÀФΥ«¡¼¥É",
-"¥Ç¡¼¥â¥ó¤Î¥«¡¼¥É",
-"ÃϹö¤Î¥«¡¼¥É",
-"¸ÅÂå¥É¥é¥´¥ó¤Î¥«¡¼¥É"
-
-       },
-
-       /*** Arcane Spells (_only_ common spells) ***/
-
-       {
-"ÅÅ·â",
-"ËâË¡¤Î»Ü¾û",
-"Æ©ÌÀÂδ¶ÃÎ",
-"¥â¥ó¥¹¥¿¡¼´¶ÃÎ",
-"¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È",
-"¥é¥¤¥È¡¦¥¨¥ê¥¢",
-"櫤ÈÈâ Ç˲õ",
-"·Ú½ý¤Î¼£Ìþ",
-
-"櫤ÈÈâ ´¶ÃÎ",
-"dzÁÇ",
-"ºâÊõ´¶ÃÎ",
-"ËâË¡ ´¶ÃÎ",
-"¥¢¥¤¥Æ¥à´¶ÃÎ",
-"²òÆÇ",
-"ÂÑÎä",
-"ÂѲÐ",
-
-"ÂÑÅÅ",
-"ÂÑ»À",
-"½Å½ý¤Î¼£Ìþ",
-"¥Æ¥ì¥Ý¡¼¥È",
-"´ÕÄê",
-"´äÀÐÍϲò",
-"Á®¸÷",
-"¶õÊ¢½¼Â­",
-
-"Æ©ÌÀ»ëǧ",
-"¥¨¥ì¥á¥ó¥¿¥ë¾¤´­",
-"¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë",
-"¥Æ¥ì¥Ý¡¼¥È¡¦¥â¥ó¥¹¥¿¡¼",
-"¸µÁǤεå",
-"Á´´¶ÃÎ",
-"µ¢´Ô¤Î¼öʸ",
-"ÀéΤ´ã",
-
-       },
-
-       /*** Craft Spells ***/
-
-       {
-               /* Common Craft Spellbooks */
-"ÀÖ³°Àþ»ëÎÏ",
-"²óÉüÎ϶¯²½",
-"¶õÊ¢½¼Â­",
-"ÂÑÎ䵤",
-"ÂѲбê",
-"»Îµ¤¹âÍÈ",
-"ÂÑÅÅ·â",
-"ÂÑ»À",
-
-"Æ©ÌÀ»ëǧ",
-"²ò¼ö",
-"ÂÑÆÇ",
-"¶¸Àï»Î²½",
-"¼«¸ÊʬÀÏ",
-"Âмٰ­·ë³¦",
-"Ìþ¤·",
-"ËâË¡·õ",
-
-               /* Rare Craft Spellbooks */
-"¥Æ¥ì¥Ñ¥·¡¼",
-"È©Àв½",
-"Á´ÂÑÀ­",
-"¥¹¥Ô¡¼¥É",
-"ÊÉÈ´¤±",
-"½âË᤭",
-"¥´¡¼¥ì¥àÀ½Â¤",
-"ËâË¡¤Î³»",
-
-"ÁõÈ÷̵Îϲ½",
-"¼ö¤¤Ê´ºÕ",
-"´°Á´¤Ê¤ëÃμ±",
-"Éð´ï¶¯²½",
-"Ëɶñ¶¯²½",
-"Éð´ï°À­ÉÕÍ¿",
-"¿Í´Ö¥È¥é¥ó¥×",
-"°À­¤Ø¤ÎÌȱÖ",
-
-       },
-
-       /*** Daemon Spells ***/
-
-       {
-               /* Common Daemon Spellbooks */
-"¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë",
-"̵À¸Ì¿´¶ÃÎ",
-"¼Ù¤Ê¤ë½ËÊ¡",
-"ÂѲбê",
-"¶²¹²",
-"ÃϹö¤ÎÌð",
-"¸ÅÂå¤Î»àÎ´­",
-"ÃϹö¤Î±ë",
-
-"¥Ç¡¼¥â¥ó»ÙÇÛ",
-"¥Ó¥¸¥ç¥ó",
-"ÂÑÃϹö",
-"¥×¥é¥º¥Þ¡¦¥Ü¥ë¥È",
-"¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë",
-"±ê¤Î¿Ï",
-"ÃϹöµå",
-"¥Ç¡¼¥â¥ó¾¤´­",
-
-               /* Rare Daemon Spellbooks */
-"°­Ëâ¤ÎÌÜ",
-"°­Ëâ¤Î¥¯¥í¡¼¥¯",
-"ÍÏ´äή",
-"¥×¥é¥º¥Þµå",
-"°­ËâÊѲ½",
-"ÃϹö¤ÎÇÈÆ°",
-"¥µ¥­¥å¥Ð¥¹¤ÎÀÜÊ­",
-"ÇËÌǤμê",
-
-"»Îµ¤¹âÍÈ",
-"ÉÔÌǤÎÆùÂÎ",
-"¶¸µ¤¤Î±ß´Ä",
-"¥Ú¥Ã¥ÈÇúÇË",
-"¥°¥ì¡¼¥¿¡¼¥Ç¡¼¥â¥ó¾¤´­",
-"ÃϹöÍò",
-"·ì¤Î¼ö¤¤",
-"ËⲦÊѲ½",
-
-       },
-
-       /*** Crusade Spells ***/
-
-       {
-               /* Common Crusade Spellbooks */
-"Ĩȳ",
-"¼Ù°­Â¸ºß´¶ÃÎ",
-"¶²Éݽüµî",
-"°Ò°µ",
-"À»°è",
-"Æþ¸ý",
-"¥¹¥¿¡¼¥À¥¹¥È",
-"¿ÈÂξô²½",
-
-"¼Ù°­Èô¤Ð¤·",
-"À»¤Ê¤ë¸÷µå",
-"°­Ëâʧ¤¤",
-"²ò¼ö",
-"Æ©ÌÀ»ëǧ",
-"Âмٰ­·ë³¦",
-"ºÛ¤­¤ÎÍë",
-"À»¤Ê¤ë¸æ¸ÀÍÕ",
-
-               /* Rare Crusade Spellbooks */
-"³«¤«¤ì¤¿Æ»",
-"ÉõËâ",
-"À»¤Ê¤ë¥ª¡¼¥é",
-"¥¢¥ó¥Ç¥Ã¥É&°­ËâÂ໶",
-"¼Ù°­Â໶",
-"À»¤Ê¤ë¿Ï",
-"¥¹¥¿¡¼¥Ð¡¼¥¹¥È",
-"Å·»È¾¤´­",
-
-"»Îµ¤¹âÍÈ",
-"¼ö¤¤Â໶",
-"¼Ù°­ÄÉÊü",
-"¥Ï¥ë¥Þ¥²¥É¥ó",
-"ÌܤˤÏÌܤò",
-"¿À¤ÎÅܤê",
-"¿À°Ò",
-"À»Àï",
-
-       },
-
-       /*** Music Spells ***/
-
-       /* Ìõ¸ì
-          Song : ²Î, Note : ²»¿§, Pattern : ÀûΧ, 
-          Ballad : ²Î(Íضʢª¡Ö±´¡×¤ÈÌõ¤¹?), Chant : ²ÎÀ¼, */
-       {
-               /******* Apprentice Handbook *******/
-               "ÃÙÆߤβÎ",     /*"Song of Holding"*/
-               "½ËÊ¡¤Î²Î",     /*"Song of Blessing"*/
-               "Êø²õ¤Î²»¿§",   /*"Wracking Note"*/
-               "Û¯Û°¤ÎÀûΧ",   /*"Stun Pattern"*/
-               "À¸Ì¿¤Îή¤ì",   /*"Flow of Life"*/
-               "ÂÀÍۤβÎ",     /*"Song of the Sun"*/
-               "¶²ÉݤβÎ",
-               "À襤¤Î²Î",     /*"Heroic Ballad"*/
-
-               /******* Minstrel's Music *******/
-               "ÎîŪÃγÐ",     /*"Clairaudience"*/
-               "º²¤Î²Î",
-               "Ãμ±¤Î²Î",     /*"Song of Lore"*/
-               "±£ÆۤβÎ",
-               "¸¸±Æ¤ÎÀûΧ",   /*"Illusion Pattern"*/
-               "ÇËÌǤ櫤Ó",   /*"Doomcall"*/
-               "¥Õ¥£¥ê¥¨¥ë¤Î²Î",       /*"Firiel's Song"*/
-               "ι¤ÎÃç´Ö",     /*"Fellowship Chant"*/
-
-               /******* Harps of Rivendell *******/
-               "ʬ²ò²»ÇÈ",
-               "¸µÁÇÂÑÀ­",
-               "¥Û¥Ó¥Ã¥È¤Î¥á¥í¥Ç¥£",
-               "ÏĤó¤ÀÀ¤³¦",
-               "Â໶¤Î²Î",
-               "¥µ¥ë¥Þ¥ó¤Î´Å¸À",
-               "Íò¤Î²»¿§",
-               "¤â¤¦°ì¤Ä¤ÎÀ¤³¦",
-
-               /******* Lays of Beleriand *******/
-               "Ç˲õ¤ÎÀûΧ",
-               "ÄäÂڤβÎ",
-               "¼é¤ê¤Î²Î",
-               "±Ñͺ¤Î»í",
-               "¥ä¥ô¥¡¥ó¥Ê¤Î½õ¤±",
-               "ºÆÀ¸¤Î²Î",
-               "¥µ¥¦¥í¥ó¤ÎËâ½Ñ",
-               "¥Õ¥£¥ó¥´¥ë¥Õ¥£¥ó¤ÎÄ©Àï",
-       },
-
-       /*** Hissatsuwaza ***/
-
-       {
-               "ÈôÈÓ¹Ë",
-               "¸Þ·î±«»Â¤ê",
-               "¥Ö¡¼¥á¥é¥ó",
-               "±ëÎî",
-               "»¦µ¤´¶ÃÎ",
-               "¤ß¤ÍÂǤÁ",
-               "¥«¥¦¥ó¥¿¡¼",
-               "ʧ¤¤È´¤±",
-
-               "¥µ¡¼¥Ú¥ó¥Ä¥¿¥ó",
-               "»ÂËâ·õÆõ¤ÎÂÀÅá",
-               "ÎöÉ÷·õ",
-               "Åá¾¢¤ÎÌÜÍø¤­",
-               "ÇË´ä»Â",
-               "Íð¤ìÀã·î²Ö",
-               "µÞ½êÆͤ­",
-               "Ëâ¿À»Â¤ê",
-
-               "¼Î¤Æ¿È",
-               "Íë·âÏÉÄÞ»Â",
-               "Æþ¿È",
-               "ÀÖή±²",
-               "·ã¿Ì·â",
-               "ÃÏÁö¤ê",
-               "µ¤Ç÷¤Îͺ¶«¤Ó",
-               "̵Áл°ÃÊ",
-
-               "µÛ·ìµ´¤Î²ç",
-               "¸¸ÏÇ",
-               "É´¿Í»Â¤ê",
-               "Å·æÆζÁ®",
-               "Æó½Å¤Î·õ·â",
-               "¸×ÉúÀäÅáÀª",
-               "·Ä±Àµ´Ç¦·õ",
-               "ÀÚÊ¢",
-       },
-};
-
-#else
-
-cptr spell_names[VALID_REALM][32] =
-{
-       /*** Life Spells ***/
-       {
-               /* Common Life Spellbooks */
-               "Cure Light Wounds",
-               "Bless",
-               "Cause Light Wounds",
-               "Call Light",
-               "Detect Doors & Traps",
-               "Cure Medium Wounds",
-               "Cure Poison",   
-               "Satisfy Hunger",
-
-               "Remove Curse",
-               "Cause Medium Wounds",
-               "Cure Critical Wounds",
-               "Resist Heat and Cold",
-               "Sense Surroundings",
-               "Turn Undead",
-               "Healing",
-               "Glyph of Warding",
-
-               /* Rare Life Spellbooks */
-               "Dispel Curse",
-               "Perception",
-               "Dispel Undead",
-               "Day of the Dove",
-               "Cause Critical Wounds",
-               "Word of Recall",
-               "Alter Reality",
-               "Warding True",
-
-               "Sterilization",
-               "Detection",
-               "Annihilate Undead",
-               "Clairvoyance",
-               "Restoration",
-               "Healing True",
-               "Holy Vision",
-               "Ultimate Resistance",
-       },
-
-       /*** Sorcery Spells ***/
-
-       {
-               /* Common Sorcery Spellbooks */
-               "Detect Monsters",
-               "Phase Door",
-               "Detect Doors and Traps",
-               "Light Area",
-               "Confuse Monster",
-               "Teleport",
-               "Sleep Monster",
-               "Recharging",
-
-               "Magic Mapping",
-               "Identify",
-               "Slow Monster",
-               "Mass Sleep",
-               "Teleport Away",
-               "Haste Self",
-               "Detection True",
-               "Identify True",
-
-               /* Rare Sorcery Spellbooks */
-               "Detect items and Treasure",
-               "Charm Monster",
-               "Sense Minds",
-               "Teleport to town",
-               "Self Knowledge",
-               "Teleport Level",
-               "Word of Recall",
-               "Dimension Door",
-
-               "Probing",
-               "Explosive Rune",
-               "Telekinesis",
-               "Clairvoyance",
-               "Charm monsters",
-               "Alchemy",
-               "Banishment",
-               "Globe of Invulnerability",
-       },
-
-       /*** Nature Spells ***/
-
-       {
-               /* Common Nature Spellbooks */
-               "Detect Creatures",
-               "Lightning",
-               "Detect Doors and Traps",
-               "Produce Food",
-               "Daylight",
-               "Animal Taming",
-               "Resist Environment",
-               "Cure Wounds & Poison",
-
-               "Stone to Mud",
-               "Frost Bolt",
-               "Nature Awareness",
-               "Fire Bolt",
-               "Ray of Sunlight",
-               "Entangle",
-               "Summon Animal",
-               "Herbal Healing",
-
-               /* Rare Nature Spellbooks */
-               "Stair Building",
-               "Stone Skin",
-               "Resistance True",
-               "Forest Creation",
-               "Animal Friendship",
-               "Stone Tell",
-               "Wall of Stone",
-               "Protect from Corrosion",
-
-               "Earthquake",
-               "Cyclone",
-               "Blizzard",
-               "Lightning Storm",
-               "Whirlpool",
-               "Call Sunlight",
-               "Elemental Branding",
-               "Nature's Wrath",
-       },
-
-       /*** Chaos Spells ***/
-
-       {
-               /* Common Chaos Spellbooks */
-               "Magic Missile",
-               "Trap / Door Destruction",
-               "Flash of Light",
-               "Touch of Confusion",
-               "Mana Burst",
-               "Fire Bolt",
-               "Fist of Force",
-               "Teleport Self",
-
-               "Wonder",
-               "Chaos Bolt",
-               "Sonic Boom",
-               "Doom Bolt",
-               "Fire Ball",
-               "Teleport Other",
-               "Word of Destruction",
-               "Invoke Logrus",
-
-               /* Rare Chaos Spellbooks */
-               "Polymorph Other",
-               "Chain Lightning",
-               "Arcane Binding",
-               "Disintegrate",
-               "Alter Reality",
-               "Magic Rocket",
-               "Chaos Branding",
-               "Summon Demon",
-
-               "Beam of Gravity",
-               "Meteor Swarm",
-               "Flame Strike",
-               "Call Chaos",
-               "Polymorph Self",
-               "Mana Storm",
-               "Breathe Logrus",
-               "Call the Void",
-       },
-
-       /*** Death Spells ***/
-
-       {
-               /* Common Death Spellbooks */
-               "Detect Unlife",
-               "Malediction",
-               "Detect Evil",
-               "Stinking Cloud",
-               "Black Sleep",
-               "Resist Poison",
-               "Horrify",
-               "Enslave Undead",
-
-               "Orb of Entropy",
-               "Nether Bolt",
-               "Cloud kill",
-               "Genocide One",
-               "Poison Branding",
-               "Vampiric Drain",
-               "Animate dead",
-               "Genocide",
-
-               /* Rare Death Spellbooks */
-               "Berserk",
-               "Invoke Spirits",
-               "Dark Bolt",
-               "Battle Frenzy",
-               "Vampiric Branding",
-               "Vampirism True",
-               "Nether Wave",
-               "Darkness Storm",
-
-               "Death Ray",
-               "Raise the Dead",
-               "Esoteria",
-               "Polymorph Vampire",
-               "Restore Life",
-               "Mass Genocide",
-               "Hellfire",
-               "Wraithform",
-       },
-
-       /*** Trump Spells ***/
-
-       {
-               /* Common Trump Spellbooks */
-               "Phase Door",
-               "Trump Spiders",
-               "Shuffle",
-               "Reset Recall",
-               "Teleport",
-               "Trump Spying",
-               "Teleport Away",
-               "Trump Animals",
-
-               "Trump Reach",
-               "Trump Kamikaze",
-               "Phantasmal Servant",
-               "Haste Monster",
-               "Teleport Level",
-               "Dimension Door",
-               "Word of Recall",
-               "Banish",
-
-               /* Rare Trump Spellbooks */
-               "Swap Position",
-               "Trump Undead",
-               "Trump Reptiles",
-               "Trump Monsters",
-               "Trump Hounds",
-               "Trump Branding",
-               "Living Trump",
-               "Trump Cyberdemon",
-
-               "Trump Divination",
-               "Trump Lore",
-               "Heal Monster",
-               "Trump Dragon",
-               "Trump Meteor",
-               "Trump Demon",
-               "Trump Greater Undead",
-               "Trump Ancient Dragon",
-       },
-
-       /*** Arcane Spells (_only_ common spells) ***/
-
-       {
-               "Zap",
-               "Wizard Lock",
-               "Detect Invisibility",
-               "Detect Monsters",
-               "Blink",
-               "Light Area",
-               "Trap & Door Destruction",
-               "Cure Light Wounds",
-
-               "Detect Doors & Traps",
-               "Phlogiston",
-               "Detect Treasure",
-               "Detect Enchantment",
-               "Detect Objects",
-               "Cure Poison",
-               "Resist Cold",
-               "Resist Fire",
-
-               "Resist Lightning",
-               "Resist Acid",
-               "Cure Medium Wounds",
-               "Teleport",
-               "Identify",
-               "Stone to Mud",
-               "Ray of Light",
-               "Satisfy Hunger",
-
-               "See Invisible",
-               "Conjure Elemental",
-               "Teleport Level",
-               "Teleport Away",
-               "Elemental Ball",
-               "Detection",
-               "Word of Recall",
-               "Clairvoyance",
-       },
-
-       /*** Craft Spells ***/
-
-       {
-               /* Common Craft Spellbooks */
-               "Infravision",
-               "Regeneration",
-               "Satisfy Hunger",
-               "Resist Cold",
-               "Resist Fire",
-               "Heroism",
-               "Resist Lightning",
-               "Resist Acid",
-
-               "See Invisibility",
-               "Remove Curse",
-               "Resist Poison",
-               "Berserk",
-               "Self Knowledge",
-               "Protection from Evil",
-               "Cure",
-               "Mana Branding",
-
-               /* Rare Craft Spellbooks */
-               "Telepathy",
-               "Stone Skin",
-               "Resistance",
-               "Haste Self",
-               "Walk through Wall",
-               "Polish Shield",
-               "Create Golem",
-               "Magical armor",
-
-               "Remove Enchantment",
-               "Remove All Curse",
-               "Knowledge True", /* "Total Knowledge", */
-               "Enchant Weapon",
-               "Enchant Armor",
-               "Brand Weapon",
-               "Living Trump",
-               "Immunity",
-       },
-
-       /*** Daemon Spells ***/
-
-       {
-               /* Common Daemon Spellbooks */
-               "Magic Missile",
-               "Detect Unlife",
-               "Evil Bless",
-               "Resist Fire",
-               "Horrify",
-               "Nether Bolt",
-               "Summon Manes",
-               "Hellish Flame",
-
-               "Dominate Demon",
-               "Vision",
-               "Resist Nether",
-               "Plasma bolt",
-               "Fire Ball",
-               "Fire Branding",
-               "Nether Ball",
-               "Summon Demon",
-
-               /* Rare Daemon Spellbooks */
-               "Devilish Eye",
-               "Devil Cloak",
-               "The Flow of Lava",
-               "Plasma Ball",
-               "Polymorph Demon",
-               "Nather Wave",
-               "Kiss of Succubus",
-               "Doom Hand",
-
-               "Raise the Morale",
-               "Immortal Body",
-               "Insanity Circle",
-               "Explode Pets",
-               "Summon Greater Demon",
-               "Nether Storm",
-               "Bloody Curse",
-               "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 ***/
-
-       {
-               /******* Apprentice Handbook *******/
-               "Song of Holding",
-               "Song of Blessing",
-               "Wrecking Note",
-               "Stun Pattern",
-               "Flow of Life",
-               "Song of the Sun",
-               "Song of Fear", /* ¶²ÉݤβΠ*/
-               "Heroic Ballad",
-
-               /******* Minstrel's Music *******/
-               "Clairaudience",
-               "Soul Shriek", /* º²¤Î²Î */
-               "Song of Lore",
-               "Hiding Tune", /* "±£ÆۤβÎ", */
-               "Illusion Pattern",
-               "Doomcall",
-               "Firiel's Song",
-               "Fellowship Chant", /* "ι¤ÎÃç´Ö" */
-
-               /******* Harps of Rivendell *******/
-               "Sound of disintegration", /* Ê¬²ò²»ÇÈ */
-               "Finrod's Resistance", /* ¸µÁÇÂÑÀ­ */
-               "Hobbit Melodies", /* ¥Û¥Ó¥Ã¥È¤Î¥á¥í¥Ç¥£ */
-               "World Contortion", /* ÏĤó¤ÀÀ¤³¦ */
-               "Dispelling chant", /* Â໶¤Î²Î */
-               "The Voice of Saruman", /* ¥µ¥ë¥Þ¥ó¤Î´Å¸À */
-               "Song of the Tempest", /* Íò¤Î²»¿§ */
-               "Ambarkanta", /* ¤â¤¦°ì¤Ä¤ÎÀ¤³¦ */
-
-               /******* Lays of Beleriand *******/
-               "Wrecking Pattern", /* Ç˲õ¤ÎÀûΧ */
-               "Stationary Shriek", /* ÄäÂڤβΠ*/
-               "Endurance", /* ¼é¤ê¤Î²Î */
-               "The Hero's Poem", /* ±Ñͺ¤Î»í */
-               "Relief of Yavanna", /* "¥ä¥ô¥¡¥ó¥Ê¤Î½õ¤±" */
-               "Goddess' rebirth", /* "ºÆÀ¸¤Î²Î" */
-               "Wizardry of Sauron", /* "¥µ¥¦¥í¥ó¤ÎËâ½Ñ", */
-               "Fingolfin's Challenge", /* "¥Õ¥£¥ó¥´¥ë¥Õ¥£¥ó¤ÎÄ©Àï", */
-       },
-
-       /*** Hissatsuwaza ***/
-       {
-               "Tobi-Izuna",
-               "3-Way Attack",
-               "Boomerang",
-               "Burning Strike",
-               "Detect Ferocity",
-               "Strike to Stun",
-               "Counter",
-               "Harainuke",
-
-               "Serpent's Tongue",
-               "Zammaken",
-               "Wind Blast",
-               "Judge",
-               "Rock Smash",
-               "Midare-Setsugekka",
-               "Spot Aiming",
-               "Majingiri",
-
-               "Desperate Attack",
-               "Lightning Eagle",
-               "Rush Attack",
-               "Bloody Maelstrom",
-               "Earthquake Blow",
-               "Crack",
-               "War Cry",
-               "Musou-Sandan",
-
-               "Vampire's Fang",
-               "Moon Dazzling",
-               "Hundred Slaughter",
-               "Dragonic Flash",
-               "Twin Slash",
-               "Kofuku-Zettousei",
-               "Keiun-Kininken",
-               "Harakiri",
-       },
-};
-#endif
 
 /*
  * Each chest has a certain set of traps, determined by pval
@@ -5258,7 +4233,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "±Ñͺ",
                "Ã˼ß",
                "Çì¼ß",
-               "Îμç",
+               "·¯¼ç",
        },
 
        /* Mage */
@@ -5300,9 +4275,9 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "¥Ú¥Æ¥ó»Õ",                     /*ÇîÅÌ¡¢¥Ú¥Æ¥ó»Õ¡¢º¾µ½»Õ */
                "¥í¥¦¥·¡¼¥Õ",
                "¥Ï¥¤¥·¡¼¥Õ",
-               "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ",
+               "¥Þ¥¹¥¿¡¼", /* "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ", */
                "¥¢¥µ¥·¥ó",                                             /* °Å»¦¼Ô */
-               "¥®¥ë¥É¥Þ¥¹¥¿¡¼",
+               "ƬÎÎ", /*"¥®¥ë¥É¥Þ¥¹¥¿¡¼",*/
        },
 
        /* Rangers */
@@ -5330,7 +4305,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "½Åµ³»Î",
                "À»µ³»Î",
                "¾åµéÀ»µ³»Î",
-               "À»µ³»ÎĹ",
+               "À»µ³»ÎÃÄĹ",
        },
 
        /* Warrior-Mage */
@@ -5345,7 +4320,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "ËâÃ˼ß",
                /* "Ëâ¸ø¼ß", */
                "ÀïÆ®Ëâ½Ñ»Î",
-               "¥¦¥£¥¶¡¼¥É¥í¡¼¥É",
+               "Ãμ±¤Î¼é¸î¼Ô", /* "¥¦¥£¥¶¡¼¥É¥í¡¼¥É", */
        },
 
        /* Chaos Warrior */
@@ -5387,7 +4362,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "¥µ¥¤¥­¥Ã¥¯",
                "¥µ¥¤¥ª¥Ë¥Ã¥¯",
                "ĶǽÎϼÔ",
-               "¥Þ¥¤¥ó¥É¥Þ¥¹¥¿¡¼",
+               "Àº¿À¤Î»ÙÇÛ¼Ô", /* "¥Þ¥¤¥ó¥É¥Þ¥¹¥¿¡¼", */
        },
 
        /* High Mage; same as Mage */
@@ -5516,7 +4491,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "ËâÃ˼ß",
                /* "Ëâ¸ø¼ß", */
                "ÀïÆ®Ëâ½Ñ»Î",
-               "¥¦¥£¥¶¡¼¥É¥í¡¼¥É",
+               "Ãμ±¤Î¼é¸î¼Ô", /* "¥¦¥£¥¶¡¼¥É¥í¡¼¥É", */
        },
 
        /* Samurai */
@@ -5851,7 +4826,7 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
                "Soldier",
                "Mercenary",
                "Veteran",
-               "Swordsman",
+               "Bowman",
                "Champion",
                "Hero",
                "Baron",
@@ -5988,14 +4963,14 @@ cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
        /* Mirror Master */
        {
                "Mirrorstarer",
-               "Mirrorpolisher",
+               "Mirrorcleaner",
                "Mirrormaker",
                "Mirrormagician",
-               "Guru of Mirror ",
+               "Mirror Guru",
                "Mirror Mage",
                "Mirror King",
-               "Mirror Emperror",
-               "Avatar of Mirror",
+               "Mirror Emperor",
+               "Mirror Avatar",
                "Ruffnor King",
        },
 
@@ -6604,170 +5579,244 @@ option_type option_info[] =
        "numpad_as_cursorkey",          "Use numpad keys as cursor keys in editor mode" },
 #endif
 
-       /*** Output Options ***/
+       /*** Map Screen Options ***/
 
 #ifdef JP
-       { &depth_in_feet,               FALSE, OPT_PAGE_OUTPUT, 0, 7,
-       "depth_in_feet",                "¥À¥ó¥¸¥ç¥ó¤Î¿¼¤µ¤ò¥Õ¥£¡¼¥È¤Çɽ¼¨¤¹¤ë" },
+       { &center_player,               FALSE, OPT_PAGE_MAPSCREEN, 5, 11,
+       "center_player",                "¾ï¤Ë¥×¥ì¥¤¥ä¡¼¤òÃæ¿´¤ËÃÖ¤¯(*ÃÙ¤¤*)" },
 #else
-       { &depth_in_feet,               FALSE, OPT_PAGE_OUTPUT, 0, 7,
-       "depth_in_feet",                "Show dungeon level in feet" },
+       { &center_player,               FALSE, OPT_PAGE_MAPSCREEN, 5, 11,
+       "center_player",                "Center map while walking (*slow*)" },
 #endif
 
 #ifdef JP
-       { &show_labels,                 TRUE,  OPT_PAGE_OUTPUT, 0, 10,
-       "show_labels",                  "ÁõÈ÷°ìÍ÷¤ÇÁõÈ÷¾ì½ê¤òɽ¼¨¤¹¤ë" },
+       { &center_running,              TRUE,  OPT_PAGE_MAPSCREEN, 5, 12,
+       "center_running",               "Áö¤Ã¤Æ¤¤¤ë»þ¤Ç¤âÃæ¿´¤ËÃÖ¤¯" },
 #else
-       { &show_labels,                 TRUE,  OPT_PAGE_OUTPUT, 0, 10,
-       "show_labels",                  "Show labels in object listings" },
+       { &center_running,              TRUE,  OPT_PAGE_MAPSCREEN, 5, 12,
+       "center_running",               "Centering even while running" },
 #endif
 
 #ifdef JP
-       { &show_weights,                TRUE,  OPT_PAGE_OUTPUT, 0, 11,
-       "show_weights",                 "¥¢¥¤¥Æ¥à°ìÍ÷¤Ç½ÅÎ̤òɽ¼¨¤¹¤ë" },
+       { &view_yellow_lite,            TRUE,  OPT_PAGE_MAPSCREEN, 1, 28,
+       "view_yellow_lite",             "ÌÀ¤«¤ê¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
 #else
-       { &show_weights,                TRUE,  OPT_PAGE_OUTPUT, 0, 11,
-       "show_weights",                 "Show weights in object listings" },
+       { &view_yellow_lite,            TRUE,  OPT_PAGE_MAPSCREEN, 1, 28,
+       "view_yellow_lite",             "Use special colors for torch-lit grids" },
 #endif
 
 #ifdef JP
-       { &show_item_graph,             TRUE,  OPT_PAGE_OUTPUT, 2, 0,
-       "show_item_graph",              "¥¢¥¤¥Æ¥à¤Î¥·¥ó¥Ü¥ë¤òɽ¼¨¤¹¤ë" },
+       { &view_bright_lite,            TRUE,  OPT_PAGE_MAPSCREEN, 1, 29,
+       "view_bright_lite",             "»ë³¦¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
 #else
-       { &show_item_graph,             TRUE,  OPT_PAGE_OUTPUT, 2, 0,
-       "show_item_graph",              "Show items graphics" },
+       { &view_bright_lite,            TRUE,  OPT_PAGE_MAPSCREEN, 1, 29,
+       "view_bright_lite",             "Use special colors for 'viewable' grids" },
 #endif
 
 #ifdef JP
-       { &plain_pickup,                FALSE, OPT_PAGE_OUTPUT, 6, 6,
-       "plain_pickup",                 "¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë" },
+       { &view_granite_lite,           TRUE,  OPT_PAGE_MAPSCREEN, 1, 30,
+       "view_granite_lite",            "ÊɤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
 #else
-       { &plain_pickup,                FALSE, OPT_PAGE_JAPANESE_ONLY, 6, 6,
-       "plain_pickup",                 "Plain pickup messages(japanese only)" },
+       { &view_granite_lite,           TRUE,  OPT_PAGE_MAPSCREEN, 1, 30,
+       "view_granite_lite",            "Use special colors for wall grids (slow)" },
 #endif
 
 #ifdef JP
-       { &equippy_chars,               TRUE,  OPT_PAGE_OUTPUT, 1, 12,
-       "equippy_chars",                "¥¹¥Æ¡¼¥¿¥¹¤Ëʸ»ú¤ÇÁõÈ÷¤òɽ¼¨¤¹¤ë" },
+       { &view_special_lite,           TRUE,  OPT_PAGE_MAPSCREEN, 1, 31,
+       "view_special_lite",            "¾²¤òÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
 #else
-       { &equippy_chars,               TRUE,  OPT_PAGE_OUTPUT, 1, 12,
-       "equippy_chars",                "Display 'equippy' chars" },
+       { &view_special_lite,           TRUE,  OPT_PAGE_MAPSCREEN, 1, 31,
+       "view_special_lite",            "Use special colors for floor grids (slow)" },
 #endif
 
 #ifdef JP
-       { &display_mutations,           FALSE, OPT_PAGE_OUTPUT, 5, 0,
-       "display_mutations",            "'C'¥³¥Þ¥ó¥É¤ÇÆÍÁ³ÊÑ°Û¤òɽ¼¨¤¹¤ë" },
+       { &view_perma_grids,            TRUE,  OPT_PAGE_MAPSCREEN, 1, 6,
+       "view_perma_grids",             "ÌÀ¤ë¤¤¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
 #else
-       { &display_mutations,           FALSE, OPT_PAGE_OUTPUT, 5, 0,
-       "display_mutations",            "Display mutations in 'C'haracter Display" },
+       { &view_perma_grids,            TRUE,  OPT_PAGE_MAPSCREEN, 1, 6,
+       "view_perma_grids",             "Map remembers all perma-lit grids" },
+#endif
+
+#ifdef JP
+       { &view_torch_grids,            FALSE, OPT_PAGE_MAPSCREEN, 1, 7,
+       "view_torch_grids",             "ÌÀ¤«¤ê¤Ç¾È¤é¤·¤¿¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
+#else
+       { &view_torch_grids,            FALSE, OPT_PAGE_MAPSCREEN, 1, 7,
+       "view_torch_grids",             "Map remembers all torch-lit grids" },
+#endif
+
+#ifdef JP
+       { &view_unsafe_grids,           FALSE, OPT_PAGE_MAPSCREEN, 1, 8,
+       "view_unsafe_grids",            "¥È¥é¥Ã¥×´¶ÃκѤߤǤʤ¤¾ì½ê¤òɽ¼¨¤¹¤ë" },
+#else
+       { &view_unsafe_grids,           FALSE, OPT_PAGE_MAPSCREEN, 1, 8,
+       "view_unsafe_grids",            "Map marked by detect traps" },
+#endif
+
+#ifdef JP
+       { &view_reduce_view,            FALSE, OPT_PAGE_MAPSCREEN, 1, 17,
+       "view_reduce_view",             "³¹¤Ç¤Ï»ëÌî¤ò¶¹¤¯¤¹¤ë" },
+#else
+       { &view_reduce_view,            FALSE, OPT_PAGE_MAPSCREEN, 1, 17,
+       "view_reduce_view",             "Reduce view-radius in town" },
+#endif
+
+#ifdef JP
+       { &fresh_before,                TRUE,  OPT_PAGE_MAPSCREEN, 1, 23,
+       "fresh_before",                 "Ϣ³¥³¥Þ¥ó¥ÉÃæ¤Ë²èÌ̤òºÆÉÁ²è¤·Â³¤±¤ë" },
+#else
+       { &fresh_before,                TRUE,  OPT_PAGE_MAPSCREEN, 1, 23,
+       "fresh_before",                 "Flush output while continuous command" },
+#endif
+
+#ifdef JP
+       { &fresh_after,                 FALSE, OPT_PAGE_MAPSCREEN, 1, 24,
+       "fresh_after",                  "¥³¥Þ¥ó¥É¸å¤Ë²èÌ̤ò¾ï¤ËºÆÉÁ²è¤·Â³¤±¤ë" },
+#else
+       { &fresh_after,                 FALSE, OPT_PAGE_MAPSCREEN, 1, 24,
+       "fresh_after",                  "Flush output after monster's move" },
+#endif
+
+#ifdef JP
+       { &fresh_message,               FALSE, OPT_PAGE_MAPSCREEN, 1, 25,
+       "fresh_message",                "¥á¥Ã¥»¡¼¥¸¤Î¸å¤Ë²èÌ̤òºÆÉÁ²è¤¹¤ë" },
+#else
+       { &fresh_message,               FALSE, OPT_PAGE_MAPSCREEN, 1, 25,
+       "fresh_message",                "Flush output after every message" },
+#endif
+
+#ifdef JP
+       { &hilite_player,               FALSE, OPT_PAGE_MAPSCREEN, 1, 27,
+       "hilite_player",                "¥×¥ì¥¤¥ä¡¼¤Ë¥«¡¼¥½¥ë¤ò¹ç¤ï¤»¤ë" },
+#else
+       { &hilite_player,               FALSE, OPT_PAGE_MAPSCREEN, 1, 27,
+       "hilite_player",                "Hilite the player with the cursor" },
+#endif
+
+#ifdef JP
+       { &display_path,                FALSE, OPT_PAGE_MAPSCREEN, 2, 8,
+       "display_path",                 "ËâË¡¤äÌð¤Îµ°Àפòɽ¼¨¤¹¤ë" },
+#else
+       { &display_path,                FALSE, OPT_PAGE_MAPSCREEN, 2, 8,
+       "display_path",                 "Display actual path before shooting" },
 #endif
 
+       /*** Text Display Options ***/
+
 #ifdef JP
-       { &plain_descriptions,          TRUE,  OPT_PAGE_OUTPUT, 5, 1,
+       { &plain_descriptions,          TRUE,  OPT_PAGE_TEXT, 5, 1,
        "plain_descriptions",           "¥¢¥¤¥Æ¥à¤Îµ­½Ò¤ò´Êά¤Ë¤¹¤ë" },
 #else
-       { &plain_descriptions,          TRUE,  OPT_PAGE_OUTPUT, 5, 1,
+       { &plain_descriptions,          TRUE,  OPT_PAGE_TEXT, 5, 1,
        "plain_descriptions",           "Plain object descriptions" },
 #endif
 
 #ifdef JP
-       { &center_player,               FALSE, OPT_PAGE_OUTPUT, 5, 11,
-       "center_player",                "¾ï¤Ë¥×¥ì¥¤¥ä¡¼¤òÃæ¿´¤ËÃÖ¤¯(*ÃÙ¤¤*)" },
+       { &plain_pickup,                FALSE, OPT_PAGE_TEXT, 6, 6,
+       "plain_pickup",                 "¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë" },
 #else
-       { &center_player,               FALSE, OPT_PAGE_OUTPUT, 5, 11,
-       "center_player",                "Center map while walking (*slow*)" },
+       { &plain_pickup,                FALSE, OPT_PAGE_JAPANESE_ONLY, 6, 6,
+       "plain_pickup",                 "Plain pickup messages(japanese only)" },
 #endif
 
 #ifdef JP
-       { &center_running,              TRUE,  OPT_PAGE_OUTPUT, 5, 12,
-       "center_running",               "Áö¤Ã¤Æ¤¤¤ë»þ¤Ç¤âÃæ¿´¤ËÃÖ¤¯" },
+       { &always_show_list,            TRUE,  OPT_PAGE_TEXT, 4, 0,
+       "always_show_list",             "ÁªÂò»þ¤Ë¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë" },
 #else
-       { &center_running,              TRUE,  OPT_PAGE_OUTPUT, 5, 12,
-       "center_running",               "Centering even while running" },
+       { &always_show_list,            TRUE,  OPT_PAGE_TEXT, 4, 0,
+       "always_show_list",             "Always show list when choosing items" },
 #endif
 
 #ifdef JP
-       { &view_yellow_lite,            TRUE,  OPT_PAGE_OUTPUT, 1, 28,
-       "view_yellow_lite",             "ÌÀ¤«¤ê¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
+       { &depth_in_feet,               FALSE, OPT_PAGE_TEXT, 0, 7,
+       "depth_in_feet",                "¥À¥ó¥¸¥ç¥ó¤Î¿¼¤µ¤ò¥Õ¥£¡¼¥È¤Çɽ¼¨¤¹¤ë" },
 #else
-       { &view_yellow_lite,            TRUE,  OPT_PAGE_OUTPUT, 1, 28,
-       "view_yellow_lite",             "Use special colors for torch-lit grids" },
+       { &depth_in_feet,               FALSE, OPT_PAGE_TEXT, 0, 7,
+       "depth_in_feet",                "Show dungeon level in feet" },
 #endif
 
 #ifdef JP
-       { &view_bright_lite,            TRUE,  OPT_PAGE_OUTPUT, 1, 29,
-       "view_bright_lite",             "»ë³¦¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
+       { &show_labels,                 TRUE,  OPT_PAGE_TEXT, 0, 10,
+       "show_labels",                  "ÁõÈ÷°ìÍ÷¤ÇÁõÈ÷¾ì½ê¤òɽ¼¨¤¹¤ë" },
 #else
-       { &view_bright_lite,            TRUE,  OPT_PAGE_OUTPUT, 1, 29,
-       "view_bright_lite",             "Use special colors for 'viewable' grids" },
+       { &show_labels,                 TRUE,  OPT_PAGE_TEXT, 0, 10,
+       "show_labels",                  "Show labels in object listings" },
 #endif
 
 #ifdef JP
-       { &view_granite_lite,           TRUE,  OPT_PAGE_OUTPUT, 1, 30,
-       "view_granite_lite",            "ÊɤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
+       { &show_weights,                TRUE,  OPT_PAGE_TEXT, 0, 11,
+       "show_weights",                 "¥¢¥¤¥Æ¥à°ìÍ÷¤Ç½ÅÎ̤òɽ¼¨¤¹¤ë" },
 #else
-       { &view_granite_lite,           TRUE,  OPT_PAGE_OUTPUT, 1, 30,
-       "view_granite_lite",            "Use special colors for wall grids (slow)" },
+       { &show_weights,                TRUE,  OPT_PAGE_TEXT, 0, 11,
+       "show_weights",                 "Show weights in object listings" },
 #endif
 
 #ifdef JP
-       { &view_special_lite,           TRUE,  OPT_PAGE_OUTPUT, 1, 31,
-       "view_special_lite",            "¾²¤òÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
+       { &show_item_graph,             TRUE,  OPT_PAGE_TEXT, 2, 0,
+       "show_item_graph",              "¥¢¥¤¥Æ¥à¤Î¥·¥ó¥Ü¥ë¤òɽ¼¨¤¹¤ë" },
 #else
-       { &view_special_lite,           TRUE,  OPT_PAGE_OUTPUT, 1, 31,
-       "view_special_lite",            "Use special colors for floor grids (slow)" },
+       { &show_item_graph,             TRUE,  OPT_PAGE_TEXT, 2, 0,
+       "show_item_graph",              "Show items graphics" },
 #endif
 
 #ifdef JP
-       { &new_ascii_graphics,          FALSE, OPT_PAGE_OUTPUT, 2, 4,
-       "new_ascii_graphics",           "ÃÏ·Á¤ÎÌÀ°Å¤ò¤Ï¤Ã¤­¤ê¤Èɽ¼¨¤¹¤ë" },
+       { &equippy_chars,               TRUE,  OPT_PAGE_TEXT, 1, 12,
+       "equippy_chars",                "¥¹¥Æ¡¼¥¿¥¹¤Ëʸ»ú¤ÇÁõÈ÷¤òɽ¼¨¤¹¤ë" },
 #else
-       { &new_ascii_graphics,          FALSE, OPT_PAGE_OUTPUT, 2, 4,
-       "new_ascii_graphics",           "Show a clear contrast between light and dark" },
+       { &equippy_chars,               TRUE,  OPT_PAGE_TEXT, 1, 12,
+       "equippy_chars",                "Display 'equippy' chars" },
 #endif
 
 #ifdef JP
-       { &display_path,                FALSE, OPT_PAGE_OUTPUT, 2, 8,
-       "display_path",                 "ËâË¡¤äÌð¤Îµ°Àפòɽ¼¨¤¹¤ë" },
+       { &display_mutations,           FALSE, OPT_PAGE_TEXT, 5, 0,
+       "display_mutations",            "'C'¥³¥Þ¥ó¥É¤ÇÆÍÁ³ÊÑ°Û¤òɽ¼¨¤¹¤ë" },
 #else
-       { &display_path,                FALSE, OPT_PAGE_OUTPUT, 2, 8,
-       "display_path",                 "Display actual path before shooting" },
+       { &display_mutations,           FALSE, OPT_PAGE_TEXT, 5, 0,
+       "display_mutations",            "Display mutations in 'C'haracter Display" },
 #endif
 
 #ifdef JP
-       { &always_show_list,            TRUE,  OPT_PAGE_OUTPUT, 4, 0,
-       "always_show_list",             "ÁªÂò»þ¤Ë¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë" },
+       { &compress_savefile,           FALSE, OPT_PAGE_TEXT, 1, 26,
+       "compress_savefile",            "¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ëÃæ¤Î¥á¥Ã¥»¡¼¥¸¤ò°µ½Ì¤¹¤ë" },
 #else
-       { &always_show_list,            TRUE,  OPT_PAGE_OUTPUT, 4, 0,
-       "always_show_list",             "Always show list at first when select items" },
+       { &compress_savefile,           FALSE, OPT_PAGE_TEXT, 1, 26,
+       "compress_savefile",            "Compress messages in savefiles" },
 #endif
 
 #ifdef JP
-       { &abbrev_extra,                FALSE, OPT_PAGE_OUTPUT, 2, 10,
+       { &abbrev_extra,                FALSE, OPT_PAGE_TEXT, 2, 10,
        "abbrev_extra",                 "¥¢¥¤¥Æ¥à¤ËÄɲÃÂÑÀ­/ǽÎϤÎά¾Î¤ò¹ï¤à" },
 #else
-       { &abbrev_extra,                FALSE, OPT_PAGE_OUTPUT, 2, 10,
+       { &abbrev_extra,                FALSE, OPT_PAGE_TEXT, 2, 10,
        "abbrev_extra",                 "Describe obj's extra resistances by abbreviation" },
 #endif
 
 #ifdef JP
-       { &abbrev_all,                  FALSE, OPT_PAGE_OUTPUT, 2, 11,
+       { &abbrev_all,                  FALSE, OPT_PAGE_TEXT, 2, 11,
        "abbrev_all",                   "¥¢¥¤¥Æ¥à¤ËÁ´¤Æ¤ÎÂÑÀ­/ǽÎϤÎά¾Î¤ò¹ï¤à" },
 #else
-       { &abbrev_all,                  FALSE, OPT_PAGE_OUTPUT, 2, 11,
+       { &abbrev_all,                  FALSE, OPT_PAGE_TEXT, 2, 11,
        "abbrev_all",                   "Describe obj's all resistances by abbreviation" },
 #endif
 
-       /*** Game-Play ***/
+#ifdef JP
+       { &exp_need,                    FALSE, OPT_PAGE_TEXT, 2, 12,
+       "exp_need",                     "¼¡¤Î¥ì¥Ù¥ë¤ËɬÍפʷи³Ãͤòɽ¼¨¤¹¤ë" },
+#else
+       { &exp_need,                    FALSE, OPT_PAGE_TEXT, 2, 12,
+       "exp_need",                     "Show the experience needed for next level" },
+#endif
 
 #ifdef JP
-       { &auto_scum,                   FALSE, OPT_PAGE_GAMEPLAY, 1, 1,
-       "auto_scum",                    "³¬¤ÎÊ·°Ïµ¤¼«Æ°Áª¤ê¹¥¤ß" },
+       { &ignore_unview,               FALSE, OPT_PAGE_TEXT, 2, 13,
+       "ignore_unview",                "»ë³¦³°¤Î¥â¥ó¥¹¥¿¡¼¤Î¹ÔÆ°¤òɽ¼¨¤·¤Ê¤¤" },
 #else
-       { &auto_scum,                   FALSE, OPT_PAGE_GAMEPLAY, 1, 1,
-       "auto_scum",                    "Auto-scum for good levels" },
+       { &ignore_unview,               FALSE, OPT_PAGE_TEXT, 2, 13,
+       "ignore_unview",                "Ignore whenever any monster does" },
 #endif
 
+       /*** Game-Play ***/
+
 #ifdef JP
        { &stack_force_notes,           TRUE,  OPT_PAGE_GAMEPLAY, 0, 8,
        "stack_force_notes",            "°Û¤Ê¤ëÌäΥ¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
@@ -6793,30 +5842,6 @@ option_type option_info[] =
 #endif
 
 #ifdef JP
-       { &view_perma_grids,            TRUE,  OPT_PAGE_GAMEPLAY, 1, 6,
-       "view_perma_grids",             "ÌÀ¤ë¤¤¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
-#else
-       { &view_perma_grids,            TRUE,  OPT_PAGE_GAMEPLAY, 1, 6,
-       "view_perma_grids",             "Map remembers all perma-lit grids" },
-#endif
-
-#ifdef JP
-       { &view_torch_grids,            FALSE, OPT_PAGE_GAMEPLAY, 1, 7,
-       "view_torch_grids",             "ÌÀ¤«¤ê¤Ç¾È¤é¤·¤¿¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
-#else
-       { &view_torch_grids,            FALSE, OPT_PAGE_GAMEPLAY, 1, 7,
-       "view_torch_grids",             "Map remembers all torch-lit grids" },
-#endif
-
-#ifdef JP
-       { &view_unsafe_grids,           FALSE, OPT_PAGE_GAMEPLAY, 1, 8,
-       "view_unsafe_grids",            "¥È¥é¥Ã¥×´¶ÃκѤߤǤʤ¤¾ì½ê¤òɽ¼¨¤¹¤ë" },
-#else
-       { &view_unsafe_grids,           FALSE, OPT_PAGE_GAMEPLAY, 1, 8,
-       "view_unsafe_grids",            "Map marked by detect traps" },
-#endif
-
-#ifdef JP
        { &small_levels,                TRUE,  OPT_PAGE_GAMEPLAY, 0, 30,
        "small_levels",                 "Èó¾ï¤Ë¾®¤µ¤¤¥Õ¥í¥¢¤ÎÀ¸À®¤ò²Äǽ¤Ë¤¹¤ë" },
 #else
@@ -6901,6 +5926,30 @@ option_type option_info[] =
 #endif
 
 #ifdef JP
+       { &check_abort,                 TRUE,  OPT_PAGE_DISTURBANCE, 1, 18,
+       "check_abort",                  "Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
+#else
+       { &check_abort,                 TRUE,  OPT_PAGE_DISTURBANCE, 1, 18,
+       "check_abort",                  "Check for user abort while continuous command" },
+#endif
+
+#ifdef JP
+       { &flush_failure,               TRUE,  OPT_PAGE_DISTURBANCE, 1, 20,
+       "flush_failure",                "ÍÍ¡¹¤Ê¥ß¥¹È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
+#else
+       { &flush_failure,               TRUE,  OPT_PAGE_DISTURBANCE, 1, 20,
+       "flush_failure",                "Flush input on various failures" },
+#endif
+
+#ifdef JP
+       { &flush_disturb,               FALSE, OPT_PAGE_DISTURBANCE, 1, 21,
+       "flush_disturb",                "¾ã³²È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
+#else
+       { &flush_disturb,               FALSE, OPT_PAGE_DISTURBANCE, 1, 21,
+       "flush_disturb",                "Flush input whenever disturbed" },
+#endif
+
+#ifdef JP
        { &disturb_move,                FALSE, OPT_PAGE_DISTURBANCE, 0, 20,
        "disturb_move",                 "¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
 #else
@@ -6980,88 +6029,6 @@ option_type option_info[] =
        "alert_trap_detect",            "Alert when leaving trap detected area" },
 #endif
 
-       /*** Efficiency ***/
-
-#ifdef JP
-       { &view_reduce_view,            FALSE, OPT_PAGE_EFFICIENCY, 1, 17,
-       "view_reduce_view",             "³¹¤Ç¤Ï»ëÌî¤ò¶¹¤¯¤¹¤ë" },
-#else
-       { &view_reduce_view,            FALSE, OPT_PAGE_EFFICIENCY, 1, 17,
-       "view_reduce_view",             "Reduce view-radius in town" },
-#endif
-
-#ifdef JP
-       { &check_abort,                 TRUE,  OPT_PAGE_EFFICIENCY, 1, 18,
-       "check_abort",                  "Ϣ³¥³¥Þ¥ó¥É¤Ï¥­¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
-#else
-       { &check_abort,                 TRUE,  OPT_PAGE_EFFICIENCY, 1, 18,
-       "check_abort",                  "Check for user abort while continuous command" },
-#endif
-
-#ifdef JP
-       { &flush_failure,               TRUE,  OPT_PAGE_EFFICIENCY, 1, 20,
-       "flush_failure",                "ÍÍ¡¹¤Ê¥ß¥¹È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
-#else
-       { &flush_failure,               TRUE,  OPT_PAGE_EFFICIENCY, 1, 20,
-       "flush_failure",                "Flush input on various failures" },
-#endif
-
-#ifdef JP
-       { &flush_disturb,               FALSE, OPT_PAGE_EFFICIENCY, 1, 21,
-       "flush_disturb",                "¾ã³²È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
-#else
-       { &flush_disturb,               FALSE, OPT_PAGE_EFFICIENCY, 1, 21,
-       "flush_disturb",                "Flush input whenever disturbed" },
-#endif
-
-#ifdef JP
-       { &fresh_before,                TRUE,  OPT_PAGE_EFFICIENCY, 1, 23,
-       "fresh_before",                 "Ϣ³¥³¥Þ¥ó¥ÉÃæ¤Ë²èÌ̤òºÆÉÁ²è¤·Â³¤±¤ë" },
-#else
-       { &fresh_before,                TRUE,  OPT_PAGE_EFFICIENCY, 1, 23,
-       "fresh_before",                 "Flush output while continuous command" },
-#endif
-
-#ifdef JP
-       { &fresh_after,                 FALSE, OPT_PAGE_EFFICIENCY, 1, 24,
-       "fresh_after",                  "¥³¥Þ¥ó¥É¸å¤Ë²èÌ̤ò¾ï¤ËºÆÉÁ²è¤·Â³¤±¤ë" },
-#else
-       { &fresh_after,                 FALSE, OPT_PAGE_EFFICIENCY, 1, 24,
-       "fresh_after",                  "Flush output after monster's move" },
-#endif
-
-#ifdef JP
-       { &fresh_message,               FALSE, OPT_PAGE_EFFICIENCY, 1, 25,
-       "fresh_message",                "¥á¥Ã¥»¡¼¥¸¤Î¸å¤Ë²èÌ̤òºÆÉÁ²è¤¹¤ë" },
-#else
-       { &fresh_message,               FALSE, OPT_PAGE_EFFICIENCY, 1, 25,
-       "fresh_message",                "Flush output after every message" },
-#endif
-
-#ifdef JP
-       { &compress_savefile,           FALSE, OPT_PAGE_EFFICIENCY, 1, 26,
-       "compress_savefile",            "¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ëÃæ¤Î¥á¥Ã¥»¡¼¥¸¤ò°µ½Ì¤¹¤ë" },
-#else
-       { &compress_savefile,           FALSE, OPT_PAGE_EFFICIENCY, 1, 26,
-       "compress_savefile",            "Compress messages in savefiles" },
-#endif
-
-#ifdef JP
-       { &hilite_player,               FALSE, OPT_PAGE_EFFICIENCY, 1, 27,
-       "hilite_player",                "¥×¥ì¥¤¥ä¡¼¤Ë¥«¡¼¥½¥ë¤ò¹ç¤ï¤»¤ë" },
-#else
-       { &hilite_player,               FALSE, OPT_PAGE_EFFICIENCY, 1, 27,
-       "hilite_player",                "Hilite the player with the cursor" },
-#endif
-
-#ifdef JP
-       { &exp_need,                    FALSE, OPT_PAGE_OUTPUT, 2, 12,
-       "exp_need",                "¼¡¤Î¥ì¥Ù¥ë¤ËɬÍפʷи³Ãͤòɽ¼¨¤¹¤ë" },
-#else
-       { &exp_need,                    FALSE, OPT_PAGE_OUTPUT, 2, 12,
-       "exp_need",                "Show the experience needed for next level" },
-#endif
-
        /*** Birth Options ***/
 
 #ifdef JP
@@ -7137,14 +6104,6 @@ option_type option_info[] =
 #endif
 
 #ifdef JP
-       { &ironman_autoscum,            FALSE, OPT_PAGE_BIRTH, 6, 5,
-       "ironman_autoscum",             "(Å´¿ÍÍÑ)¾ï¤Ë³¬¤ÎÊ·°Ïµ¤¤ò¼«Æ°Áª¤ê¹¥¤ß¤¹¤ë" },
-#else
-       { &ironman_autoscum,            FALSE, OPT_PAGE_BIRTH, 6, 5,
-       "ironman_autoscum",             "Permanently enable the autoscummer" },
-#endif
-
-#ifdef JP
        { &ironman_empty_levels,        FALSE, OPT_PAGE_BIRTH, 6, 8,
        "ironman_empty_levels",         "(Å´¿ÍÍÑ)¾ï¤Ë¶õ¤Ã¤Ý¤Î¥¢¥ê¡¼¥Ê¥ì¥Ù¥ë¤òÀ¸À®(*)" },
 #else
@@ -7333,11 +6292,11 @@ option_type option_info[] =
 #endif
 
 #ifdef JP
-       { &record_maxdeapth,            TRUE,  OPT_PAGE_PLAYRECORD, 4, 16,
-       "record_maxdeapth",             "ºÇ¿¼³¬¤ò¹¹¿·¤·¤¿¤È¤­¤Ëµ­Ï¿¤¹¤ë" },
+       { &record_maxdepth,             TRUE,  OPT_PAGE_PLAYRECORD, 4, 16,
+       "record_maxdepth",              "ºÇ¿¼³¬¤ò¹¹¿·¤·¤¿¤È¤­¤Ëµ­Ï¿¤¹¤ë" },
 #else
-       { &record_maxdeapth,            TRUE,  OPT_PAGE_PLAYRECORD, 4, 16,
-       "record_maxdeapth",             "Record movements to deepest level" },
+       { &record_maxdepth,             TRUE,  OPT_PAGE_PLAYRECORD, 4, 16,
+       "record_maxdepth",              "Record movements to deepest level" },
 #endif
 
 #ifdef JP
@@ -7775,22 +6734,6 @@ cptr exp_level_str[5]=
 {"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
 #endif
 
-byte conv_terrain2feat[MAX_WILDERNESS] =
-{
-  FEAT_PERM_EXTRA,
-  FEAT_TOWN,
-  FEAT_DEEP_WATER,
-  FEAT_SHAL_WATER,
-  FEAT_SWAMP,
-  FEAT_DIRT,
-  FEAT_GRASS,
-  FEAT_TREES,
-  FEAT_DIRT,
-  FEAT_SHAL_LAVA,
-  FEAT_DEEP_LAVA,
-  FEAT_MOUNTAIN
-};
-
 /* Weird melee attack types when hallucinating */
 #ifdef JP
 cptr silly_attacks[MAX_SILLY_ATTACK] =
@@ -8168,3 +7111,127 @@ mbe_info_type mbe_info[] =
        {  5, GF_MANA,       }, /* DR_MANA   */
        { 60, GF_MISSILE,    }, /* SUPERHURT */
 };
+
+
+/*
+ * The table of features' actions
+ */
+byte feature_action_flags[FF_FLAG_MAX] =
+{
+       0, /* LOS */
+       0, /* PROJECT */
+       0, /* MOVE */
+       0, /* PLACE */
+       0, /* DROP */
+       0, /* SECRET */
+       0, /* NOTICE */
+       0, /* REMEMBER */
+       0, /* OPEN */
+       0, /* CLOSE */
+       FAF_CRASH_GLASS, /* BASH */
+       0, /* SPIKE */
+       FAF_DESTROY, /* DISARM */
+       0, /* STORE */
+       FAF_DESTROY | FAF_CRASH_GLASS, /* TUNNEL */
+       0, /* MAY_HAVE_GOLD */
+       0, /* HAS_GOLD */
+       0, /* HAS_ITEM */
+       0, /* DOOR */
+       0, /* TRAP */
+       0, /* STAIRS */
+       0, /* GLYPH */
+       0, /* LESS */
+       0, /* MORE */
+       0, /* RUN */
+       0, /* FLOOR */
+       0, /* WALL */
+       0, /* PERMANENT */
+       0, /* INNER */
+       0, /* OUTER */
+       0, /* SOLID */
+       0, /* HIT_TRAP */
+
+       0, /* BRIDGE */
+       0, /* RIVER */
+       0, /* LAKE */
+       0, /* BRIDGED */
+       0, /* COVERED */
+       0, /* GLOW */
+       0, /* ENSECRET */
+       0, /* WATER */
+       0, /* LAVA */
+       0, /* SHALLOW */
+       0, /* DEEP */
+       0, /* FILLED */
+       FAF_DESTROY | FAF_CRASH_GLASS, /* HURT_ROCK */
+       0, /* HURT_FIRE */
+       0, /* HURT_COLD */
+       0, /* HURT_ACID */
+       0, /* ICE */
+       0, /* ACID */
+       0, /* OIL */
+       0, /* XXX04 */
+       0, /* CAN_CLIMB */
+       0, /* CAN_FLY */
+       0, /* CAN_SWIM */
+       0, /* CAN_PASS */
+       0, /* CAN_OOZE */
+       0, /* CAN_DIG */
+       0, /* HIDE_ITEM */
+       0, /* HIDE_SNEAK */
+       0, /* HIDE_SWIM */
+       0, /* HIDE_DIG */
+       0, /* KILL_HUGE */
+       0, /* KILL_MOVE */
+
+       0, /* PICK_TRAP */
+       0, /* PICK_DOOR */
+       0, /* ALLOC */
+       0, /* CHEST */
+       0, /* DROP_1D2 */
+       0, /* DROP_2D2 */
+       0, /* DROP_GOOD */
+       0, /* DROP_GREAT */
+       0, /* HURT_POIS */
+       0, /* HURT_ELEC */
+       0, /* HURT_WATER */
+       0, /* HURT_BWATER */
+       0, /* USE_FEAT */
+       0, /* GET_FEAT */
+       0, /* GROUND */
+       0, /* OUTSIDE */
+       0, /* EASY_HIDE */
+       0, /* EASY_CLIMB */
+       0, /* MUST_CLIMB */
+       0, /* TREE */
+       0, /* NEED_TREE */
+       0, /* BLOOD */
+       0, /* DUST */
+       0, /* SLIME */
+       0, /* PLANT */
+       0, /* XXX2 */
+       0, /* INSTANT */
+       0, /* EXPLODE */
+       0, /* TIMED */
+       0, /* ERUPT */
+       0, /* STRIKE */
+       0, /* SPREAD */
+
+       0, /* SPECIAL */
+       FAF_DESTROY | FAF_NO_DROP | FAF_CRASH_GLASS, /* HURT_DISI */
+       0, /* QUEST_ENTER */
+       0, /* QUEST_EXIT */
+       0, /* QUEST */
+       0, /* SHAFT */
+       0, /* MOUNTAIN */
+       0, /* BLDG */
+       0, /* MINOR_GLYPH */
+       0, /* PATTERN */
+       0, /* TOWN */
+       0, /* ENTRANCE */
+       0, /* MIRROR */
+       0, /* UNPERM */
+       0, /* TELEPORTABLE */
+       0, /* CONVERT */
+       0, /* GLASS */
+};