OSDN Git Service

Avoided compiler warnings about a 32-bit integer being passed to a %ld or %lu format...
[hengbandforosx/hengbandosx.git] / src / cmd4.c
index a89df23..d6a9606 100644 (file)
@@ -1,56 +1,98 @@
 /* File: cmd4.c */
 
-/* Purpose: Interface commands */
-
 /*
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
  *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies.  Other copyrights may also apply.
  */
 
+/* Purpose: Interface commands */
+
 #include "angband.h"
 
 
+
+/*
+ * A set of functions to maintain automatic dumps of various kinds.
+ * -Mogami-
+ *
+ * remove_auto_dump(orig_file, mark)
+ *     Remove the old automatic dump of type "mark".
+ * auto_dump_printf(fmt, ...)
+ *     Dump a formatted string using fprintf().
+ * open_auto_dump(buf, mark)
+ *     Open a file, remove old dump, and add new header.
+ * close_auto_dump(void)
+ *     Add a footer, and close the file.
+ *
+ *    The dump commands of original Angband simply add new lines to
+ * existing files; these files will become bigger and bigger unless
+ * an user deletes some or all of these files by hand at some
+ * point.
+ *
+ *     These three functions automatically delete old dumped lines 
+ * before adding new ones.  Since there are various kinds of automatic 
+ * dumps in a single file, we add a header and a footer with a type 
+ * name for every automatic dump, and kill old lines only when the 
+ * lines have the correct type of header and footer.
+ *
+ *     We need to be quite paranoid about correctness; the user might 
+ * (mistakenly) edit the file by hand, and see all their work come
+ * to nothing on the next auto dump otherwise.  The current code only 
+ * detects changes by noting inconsistencies between the actual number 
+ * of lines and the number written in the footer.  Note that this will 
+ * not catch single-line edits.
+ */
+
 /*
- *  mark strings for auto dump
+ *  Mark strings for auto dump
  */
 static char auto_dump_header[] = "# vvvvvvv== %s ==vvvvvvv";
 static char auto_dump_footer[] = "# ^^^^^^^== %s ==^^^^^^^";
 
 /*
+ * Variables for auto dump
+ */
+static FILE *auto_dump_stream;
+static cptr auto_dump_mark;
+static int auto_dump_line_num;
+
+/*
  * Remove old lines automatically generated before.
  */
-static void remove_auto_dump(cptr orig_file, cptr mark)
+static void remove_auto_dump(cptr orig_file)
 {
        FILE *tmp_fff, *orig_fff;
 
        char tmp_file[1024];
        char buf[1024];
        bool between_mark = FALSE;
-       bool success = FALSE;
+       bool changed = FALSE;
        int line_num = 0;
        long header_location = 0;
        char header_mark_str[80];
        char footer_mark_str[80];
        size_t mark_len;
 
-       sprintf(header_mark_str, auto_dump_header, mark);
-       sprintf(footer_mark_str, auto_dump_footer, mark);
+       /* Prepare a header/footer mark string */
+       sprintf(header_mark_str, auto_dump_header, auto_dump_mark);
+       sprintf(footer_mark_str, auto_dump_footer, auto_dump_mark);
 
        mark_len = strlen(footer_mark_str);
 
-       /* If original file is not exist, nothing to do */
+       /* Open an old dump file in read-only mode */
        orig_fff = my_fopen(orig_file, "r");
-       if (!orig_fff)
-       {
-               return;
-       }
 
-       /* Open a new file */
+       /* If original file does not exist, nothing to do */
+       if (!orig_fff) return;
+
+       /* Open a new (temporary) file */
        tmp_fff = my_fopen_temp(tmp_file, 1024);
-       if (!tmp_fff) {
+
+       if (!tmp_fff)
+       {
 #ifdef JP
            msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", tmp_file);
 #else
@@ -59,100 +101,180 @@ static void remove_auto_dump(cptr orig_file, cptr mark)
            msg_print(NULL);
            return;
        }
-       
-       while (1)
+
+       /* Loop for every line */
+       while (TRUE)
        {
+               /* Read a line */
                if (my_fgets(orig_fff, buf, sizeof(buf)))
                {
+                       /* Read error: Assume End of File */
+
+                       /*
+                        * Was looking for the footer, but not found.
+                        *
+                        * Since automatic dump might be edited by hand,
+                        * it's dangerous to kill these lines.
+                        * Seek back to the next line of the (pseudo) header,
+                        * and read again.
+                        */
                        if (between_mark)
                        {
                                fseek(orig_fff, header_location, SEEK_SET);
                                between_mark = FALSE;
                                continue;
                        }
+
+                       /* Success -- End the loop */
                        else
                        {
                                break;
                        }
                }
 
+               /* We are looking for the header mark of automatic dump */
                if (!between_mark)
                {
+                       /* Is this line a header? */
                        if (!strcmp(buf, header_mark_str))
                        {
+                               /* Memorise seek point of this line */
                                header_location = ftell(orig_fff);
+
+                               /* Initialize counter for number of lines */
                                line_num = 0;
+
+                               /* Look for the footer from now */
                                between_mark = TRUE;
-                               success = TRUE;
+
+                               /* There are some changes */
+                               changed = TRUE;
                        }
+
+                       /* Not a header */
                        else
                        {
+                               /* Copy orginally lines */
                                fprintf(tmp_fff, "%s\n", buf);
                        }
                }
+
+               /* We are looking for the footer mark of automatic dump */
                else
                {
+                       /* Is this line a footer? */
                        if (!strncmp(buf, footer_mark_str, mark_len))
                        {
                                int tmp;
 
-                               if (!sscanf(buf + mark_len, " (%d)", &tmp)
+                               /*
+                                * Compare the number of lines
+                                *
+                                * If there is an inconsistency between
+                                * actual number of lines and the
+                                * number here, the automatic dump
+                                * might be edited by hand.  So it's
+                                * dangerous to kill these lines.
+                                * Seek back to the next line of the
+                                * (pseudo) header, and read again.
+                                */
+                               if (!sscanf(buf + mark_len, " (%d)", &tmp)
                                    || tmp != line_num)
                                {
                                        fseek(orig_fff, header_location, SEEK_SET);
                                }
 
+                               /* Look for another header */
                                between_mark = FALSE;
                        }
+
+                       /* Not a footer */
                        else
                        {
+                               /* Ignore old line, and count number of lines */
                                line_num++;
                        }
                }
        }
+
+       /* Close files */
        my_fclose(orig_fff);
        my_fclose(tmp_fff);
 
-       if (success)
+       /* If there are some changes, overwrite the original file with new one */
+       if (changed)
        {
-               /* copy contents of temporally file */
+               /* Copy contents of temporary file */
 
                tmp_fff = my_fopen(tmp_file, "r");
                orig_fff = my_fopen(orig_file, "w");
-               
+
                while (!my_fgets(tmp_fff, buf, sizeof(buf)))
                        fprintf(orig_fff, "%s\n", buf);
-               
+
                my_fclose(orig_fff);
                my_fclose(tmp_fff);
        }
+
+       /* Kill the temporary file */
        fd_kill(tmp_file);
 
        return;
 }
 
+
+/*
+ * Dump a formatted line, using "vstrnfmt()".
+ */
+static void auto_dump_printf(cptr fmt, ...)
+{
+       cptr p;
+       va_list vp;
+
+       char buf[1024];
+
+       /* Begin the Varargs Stuff */
+       va_start(vp, fmt);
+
+       /* Format the args, save the length */
+       (void)vstrnfmt(buf, sizeof(buf), fmt, vp);
+
+       /* End the Varargs Stuff */
+       va_end(vp);
+
+       /* Count number of lines */
+       for (p = buf; *p; p++)
+       {
+               if (*p == '\n') auto_dump_line_num++;
+       }
+
+       /* Dump it */
+       fprintf(auto_dump_stream, "%s", buf);
+}
+
+
 /*
  *  Open file to append auto dump.
  */
-static FILE *open_auto_dump(cptr buf, cptr mark, int *line)
+static bool open_auto_dump(cptr buf, cptr mark)
 {
-       FILE *fff;
 
        char header_mark_str[80];
 
-       /* Drop priv's */
-       safe_setuid_drop();
+       /* Save the mark string */
+       auto_dump_mark = mark;
 
-       sprintf(header_mark_str, auto_dump_header, mark);
+       /* Prepare a header mark string */
+       sprintf(header_mark_str, auto_dump_header, auto_dump_mark);
 
        /* Remove old macro dumps */
-       remove_auto_dump(buf, mark);
+       remove_auto_dump(buf);
 
        /* Append to the file */
-       fff = my_fopen(buf, "a");
+       auto_dump_stream = my_fopen(buf, "a");
 
        /* Failure */
-       if (!fff) {
+       if (!auto_dump_stream) {
 #ifdef JP
                msg_format("%s ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", buf);
 #else
@@ -160,61 +282,81 @@ static FILE *open_auto_dump(cptr buf, cptr mark, int *line)
 #endif
                msg_print(NULL);
 
-               /* Grab priv's */
-               safe_setuid_grab();
-               
-               return NULL;
+               /* Failed */
+               return FALSE;
        }
 
        /* Start dumping */
-       fprintf(fff, "%s\n", header_mark_str);
+       fprintf(auto_dump_stream, "%s\n", header_mark_str);
+
+       /* Initialize counter */
+       auto_dump_line_num = 0;
 
 #ifdef JP
-       fprintf(fff, "# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°À¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£\n");
-       fprintf(fff, "# *·Ù¹ð!!* ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤ë¤Î¤ÇÊÔ½¸¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£\n");
+       auto_dump_printf("# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°À¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£\n");
+       auto_dump_printf("# *·Ù¹ð!!* ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤ë¤Î¤ÇÊÔ½¸¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£\n");
 #else
-       fprintf(fff, "# *Warning!!* The lines below are automatic dump.\n");
-       fprintf(fff, "# *Warning!!* Don't edit these! These lines will be deleted automaticaly.\n");
+       auto_dump_printf("# *Warning!*  The lines below are an automatic dump.\n");
+       auto_dump_printf("# Don't edit them; changes will be deleted and replaced automatically.\n");
 #endif
-       *line = 2;
 
-       return fff;
+       /* Success */
+       return TRUE;
 }
 
 /*
  *  Append foot part and close auto dump.
  */
-static void close_auto_dump(FILE *fff, cptr mark, int line_num)
+static void close_auto_dump(void)
 {
        char footer_mark_str[80];
 
-       sprintf(footer_mark_str, auto_dump_footer, mark);
+       /* Prepare a footer mark string */
+       sprintf(footer_mark_str, auto_dump_footer, auto_dump_mark);
 
-       /* End of dumping */
 #ifdef JP
-       fprintf(fff, "# *·Ù¹ð!!* °Ê¾å¤Î¹Ô¤Ï¼«Æ°À¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£\n");
-       fprintf(fff, "# *·Ù¹ð!!* ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤ë¤Î¤ÇÊÔ½¸¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£\n");
+       auto_dump_printf("# *·Ù¹ð!!* °Ê¾å¤Î¹Ô¤Ï¼«Æ°À¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£\n");
+       auto_dump_printf("# *·Ù¹ð!!* ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤ë¤Î¤ÇÊÔ½¸¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£\n");
 #else
-       fprintf(fff, "# *Warning!!* The lines above are automatic dump.\n");
-       fprintf(fff, "# *Warning!!* Don't edit these! These lines will be deleted automaticaly.\n");
+       auto_dump_printf("# *Warning!*  The lines above are an automatic dump.\n");
+       auto_dump_printf("# Don't edit them; changes will be deleted and replaced automatically.\n");
 #endif
-       line_num += 2;
 
-       fprintf(fff, "%s (%d)\n", footer_mark_str, line_num);
+       /* End of dump */
+       fprintf(auto_dump_stream, "%s (%d)\n", footer_mark_str, auto_dump_line_num);
 
-       my_fclose(fff);
+       /* Close */
+       my_fclose(auto_dump_stream);
 
-       /* Grab priv's */
-       safe_setuid_grab();
-               
        return;
 }
 
 
+#ifndef JP
 /*
- *   Take note to the dialy.
+ * Return suffix of ordinal number
  */
+cptr get_ordinal_number_suffix(int num)
+{
+       num = ABS(num) % 100;
+       switch (num % 10)
+       {
+       case 1:
+               return (num == 11) ? "th" : "st";
+       case 2:
+               return (num == 12) ? "th" : "nd";
+       case 3:
+               return (num == 13) ? "th" : "rd";
+       default:
+               return "th";
+       }
+}
+#endif
+
 
+/*
+ *   Take note to the diary.
+ */
 errr do_cmd_write_nikki(int type, int num, cptr note)
 {
        int day, hour, min;
@@ -223,6 +365,8 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
        char buf[1024];
        cptr note_level = "";
        bool do_level = TRUE;
+       char note_level_buf[40];
+       int q_idx;
 
        static bool disable_nikki = FALSE;
 
@@ -244,7 +388,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                /* Get the quest text */
                init_flags = INIT_ASSIGN;
 
-               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                /* Reset the old quest number */
                p_ptr->inside_quest = old_quest;
@@ -257,9 +401,6 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
        sprintf(file_name,"playrec-%s.txt",savefile_base);
 #endif
 
-       /* Hack -- drop permissions */
-       safe_setuid_drop();
-
        /* Build the filename */
        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, file_name);
 
@@ -271,8 +412,6 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
        /* Failure */
        if (!fff)
        {
-               /* Hack -- grab permissions */
-               safe_setuid_grab();
 #ifdef JP
                msg_format("%s ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£¥×¥ì¥¤µ­Ï¿¤ò°ì»þÄä»ß¤·¤Þ¤¹¡£", buf);
 #else
@@ -283,6 +422,8 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                return (-1);
        }
 
+       q_idx = quest_number(dun_level);
+
        if (write_level)
        {
                if (p_ptr->inside_arena)
@@ -297,18 +438,22 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #else
                        note_level = "Surface:";
 #endif
-               else if (quest_number(dun_level) && ((quest_number(dun_level) < MIN_RANDOM_QUEST) && !(quest_number(dun_level) == QUEST_OBERON || quest_number(dun_level) == QUEST_SERPENT)))
+               else if (q_idx && (is_fixed_quest_idx(q_idx)
+                        && !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
 #ifdef JP
                        note_level = "¥¯¥¨¥¹¥È:";
 #else
                        note_level = "Quest:";
 #endif
                else
+               {
 #ifdef JP
-                       note_level = format("%d³¬(%s):", dun_level, d_name+d_info[dungeon_type].name);
+                       sprintf(note_level_buf, "%d³¬(%s):", dun_level, d_name+d_info[dungeon_type].name);
 #else
-                       note_level = format("%s L%d:", d_name+d_info[dungeon_type].name, dun_level);
+                       sprintf(note_level_buf, "%s L%d:", d_name+d_info[dungeon_type].name, dun_level);
 #endif
+                       note_level = note_level_buf;
+               }
        }
 
        switch(type)
@@ -316,9 +461,11 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                case NIKKI_HIGAWARI:
                {
 #ifdef JP
-                       fprintf(fff, "%dÆüÌÜ\n",day);
+                       if (day < MAX_DAYS) fprintf(fff, "%dÆüÌÜ\n", day);
+                       else fputs("*****ÆüÌÜ\n", fff);
 #else
-                       fprintf(fff, "Day %d\n",day);
+                       if (day < MAX_DAYS) fprintf(fff, "Day %d\n", day);
+                       else fputs("Day *****\n", fff);
 #endif
                        do_level = FALSE;
                        break;
@@ -339,7 +486,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s %s¤òȯ¸«¤·¤¿¡£\n", hour, min, note_level, note);
 #else
-                       fprintf(fff, " %2d:%02d %20s discover %s.\n", hour, min, note_level, note);
+                       fprintf(fff, " %2d:%02d %20s discovered %s.\n", hour, min, note_level, note);
 #endif
                        break;
                }
@@ -379,7 +526,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s ¥é¥ó¥À¥à¥¯¥¨¥¹¥È(%s)¤òãÀ®¤·¤¿¡£\n", hour, min, note_level, name);
 #else
-                       fprintf(fff, " %2d:%02d %20s completed randome quest '%s'\n", hour, min, note_level, name);
+                       fprintf(fff, " %2d:%02d %20s completed random quest '%s'\n", hour, min, note_level, name);
 #endif
                        break;
                }
@@ -415,7 +562,8 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                case NIKKI_STAIR:
                {
                        cptr to;
-                       if (quest_number(dun_level) && ((quest_number(dun_level) < MIN_RANDOM_QUEST) && !(quest_number(dun_level) == QUEST_OBERON || quest_number(dun_level) == QUEST_SERPENT)))
+                       if (q_idx && (is_fixed_quest_idx(q_idx)
+                            && !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
                        {
 #ifdef JP
                                to = "ÃϾå";
@@ -429,11 +577,11 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                                if (!(dun_level+num)) to = "ÃϾå";
                                else to = format("%d³¬", dun_level+num);
 #else
-                               if (!(dun_level+num)) to = "the surfice";
+                               if (!(dun_level+num)) to = "the surface";
                                else to = format("level %d", dun_level+num);
 #endif
                        }
-                               
+
 #ifdef JP 
                        fprintf(fff, " %2d:%02d %20s %s¤Ø%s¡£\n", hour, min, note_level, to, note);
 #else
@@ -447,13 +595,13 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                                fprintf(fff, " %2d:%02d %20s µ¢´Ô¤ò»È¤Ã¤Æ%s¤Î%d³¬¤Ø²¼¤ê¤¿¡£\n", hour, min, note_level, d_name+d_info[dungeon_type].name, max_dlv[dungeon_type]);
 #else
-                               fprintf(fff, " %2d:%02d %20s recall to dungeon level %d of %s.\n", hour, min, note_level, max_dlv[dungeon_type], d_name+d_info[dungeon_type].name);
+                               fprintf(fff, " %2d:%02d %20s recalled to dungeon level %d of %s.\n", hour, min, note_level, max_dlv[dungeon_type], d_name+d_info[dungeon_type].name);
 #endif
                        else
 #ifdef JP
                                fprintf(fff, " %2d:%02d %20s µ¢´Ô¤ò»È¤Ã¤ÆÃϾå¤Ø¤ÈÌá¤Ã¤¿¡£\n", hour, min, note_level);
 #else
-                               fprintf(fff, " %2d:%02d %20s recall from dungeon to surface.\n", hour, min, note_level);
+                               fprintf(fff, " %2d:%02d %20s recalled from dungeon to surface.\n", hour, min, note_level);
 #endif
                        break;
                }
@@ -463,44 +611,16 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s ¥¯¥¨¥¹¥È¡Ö%s¡×¤Ø¤ÈÆÍÆþ¤·¤¿¡£\n", hour, min, note_level, quest[num].name);
 #else
-                       fprintf(fff, " %2d:%02d %20s enter quest '%s'.\n", hour, min, note_level, quest[num].name);
+                       fprintf(fff, " %2d:%02d %20s entered the quest '%s'.\n", hour, min, note_level, quest[num].name);
 #endif
                        break;
                }
                case NIKKI_TELE_LEV:
                {
-                       cptr to;
-                       if (!dun_level)
-                       {
-#ifdef JP
-                               to = "1³¬";
-#else
-                               to = "level 1";
-#endif
-                       }
-                       else if (quest_number(dun_level) && ((quest_number(dun_level) < MIN_RANDOM_QUEST) && !(quest_number(dun_level) == QUEST_OBERON || quest_number(dun_level) == QUEST_SERPENT)))
-                       {
-#ifdef JP
-                               to = "ÃϾå";
-#else
-                               to = "the surface";
-#endif
-                       }
-                       else
-                       {
-#ifdef JP
-                               if (!(dun_level+num)) to = "ÃϾå";
-                               else to = format("%d³¬", dun_level+num);
-#else
-                               if (!(dun_level+num)) to = "surface";
-                               else to = format("level %d", dun_level+num);
-#endif
-                       }
-                               
 #ifdef JP
-                       fprintf(fff, " %2d:%02d %20s %s¤Ø¤È¥Æ¥ì¥Ý¡¼¥È¤Ç°ÜÆ°¤·¤¿¡£\n", hour, min, note_level, to);
+                       fprintf(fff, " %2d:%02d %20s ¥ì¥Ù¥ë¡¦¥Æ¥ì¥Ý¡¼¥È¤Çæ½Ð¤·¤¿¡£\n", hour, min, note_level);
 #else
-                       fprintf(fff, " %2d:%02d %20s teleport level to %s.\n", hour, min, note_level, to);
+                       fprintf(fff, " %2d:%02d %20s Got out using teleport level.\n", hour, min, note_level);
 #endif
                        break;
                }
@@ -509,7 +629,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s %s¤ò¹ØÆþ¤·¤¿¡£\n", hour, min, note_level, note);
 #else
-                       fprintf(fff, " %2d:%02d %20s buy %s.\n", hour, min, note_level, note);
+                       fprintf(fff, " %2d:%02d %20s bought %s.\n", hour, min, note_level, note);
 #endif
                        break;
                }
@@ -518,34 +638,33 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s %s¤òÇäµÑ¤·¤¿¡£\n", hour, min, note_level, note);
 #else
-                       fprintf(fff, " %2d:%02d %20s sell %s.\n", hour, min, note_level, note);
+                       fprintf(fff, " %2d:%02d %20s sold %s.\n", hour, min, note_level, note);
 #endif
                        break;
                }
                case NIKKI_ARENA:
                {
-                       if (num == 99)
+                       if (num < 0)
                        {
-
 #ifdef JP
-                               fprintf(fff, " %2d:%02d %20s Æ®µ»¾ì¤Î%d²óÀï¤Ç¡¢%s¤ÎÁ°¤ËÇÔ¤ìµî¤Ã¤¿¡£\n", hour, min, note_level, p_ptr->arena_number + 1, note);
+                               fprintf(fff, " %2d:%02d %20s Æ®µ»¾ì¤Î%d²óÀï¤Ç¡¢%s¤ÎÁ°¤ËÇÔ¤ìµî¤Ã¤¿¡£\n", hour, min, note_level, -num, note);
 #else
-                               int n =  p_ptr->arena_number + 1;
-                               fprintf(fff, " %2d:%02d %20s beaten by %s in the %d%s fight.\n", hour, min, note_level, note, n, (n%10==1?"st":n%10==2?"nd":n%10==3?"rd":"th"));
+                               int n = -num;
+                               fprintf(fff, " %2d:%02d %20s beaten by %s in the %d%s fight.\n", hour, min, note_level, note, n, get_ordinal_number_suffix(n));
 #endif
                                break;
                        }
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s Æ®µ»¾ì¤Î%d²óÀï(%s)¤Ë¾¡Íø¤·¤¿¡£\n", hour, min, note_level, num, note);
 #else
-                       fprintf(fff, " %2d:%02d %20s win the %d%s fight (%s).\n", hour, min, note_level, num, (num%10==1?"st":num%10==2?"nd":num%10==3?"rd":"th"), note);
+                       fprintf(fff, " %2d:%02d %20s won the %d%s fight (%s).\n", hour, min, note_level, num, get_ordinal_number_suffix(num), note);
 #endif
                        if (num == MAX_ARENA_MONS)
                        {
 #ifdef JP
                                fprintf(fff, "                 Æ®µ»¾ì¤Î¤¹¤Ù¤Æ¤ÎŨ¤Ë¾¡Íø¤·¡¢¥Á¥ã¥ó¥Ô¥ª¥ó¤È¤Ê¤Ã¤¿¡£\n");
 #else
-                               fprintf(fff, "                 win all fight to become a Chanpion.\n");
+                               fprintf(fff, "                 won all fight to become a Chanpion.\n");
 #endif
                                do_level = FALSE;
                        }
@@ -556,7 +675,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s %s¤ò¼±Ê̤·¤¿¡£\n", hour, min, note_level, note);
 #else
-                       fprintf(fff, " %2d:%02d %20s identify %s.\n", hour, min, note_level, note);
+                       fprintf(fff, " %2d:%02d %20s identified %s.\n", hour, min, note_level, note);
 #endif
                        break;
                }
@@ -575,7 +694,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #else
                                to = format("level %d of %s", dun_level, d_name+d_info[dungeon_type].name);
 #endif
-                               
+
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s %s¤Ø¤È¥¦¥£¥¶¡¼¥É¡¦¥Æ¥ì¥Ý¡¼¥È¤Ç°ÜÆ°¤·¤¿¡£\n", hour, min, note_level, to);
 #else
@@ -598,11 +717,11 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #else
                                to = format("level %d of %s", dun_level, d_name+d_info[dungeon_type].name);
 #endif
-                               
+
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s %s¤Ø¤È¥Ñ¥¿¡¼¥ó¤ÎÎϤǰÜÆ°¤·¤¿¡£\n", hour, min, note_level, to);
 #else
-                       fprintf(fff, " %2d:%02d %20s use Pattern to teleport to %s.\n", hour, min, note_level, to);
+                       fprintf(fff, " %2d:%02d %20s used Pattern to teleport to %s.\n", hour, min, note_level, to);
 #endif
                        break;
                }
@@ -611,7 +730,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                        fprintf(fff, " %2d:%02d %20s ¥ì¥Ù¥ë¤¬%d¤Ë¾å¤¬¤Ã¤¿¡£\n", hour, min, note_level, num);
 #else
-                       fprintf(fff, " %2d:%02d %20s reach player level %d.\n", hour, min, note_level, num);
+                       fprintf(fff, " %2d:%02d %20s reached player level %d.\n", hour, min, note_level, num);
 #endif
                        break;
                }
@@ -636,56 +755,63 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 #ifdef JP
                                        fprintf(fff, "%s¤òι¤Îͧ¤Ë¤¹¤ë¤³¤È¤Ë·è¤á¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "decide to travel together with %s.\n", note);
+                                       fprintf(fff, "decided to travel together with %s.\n", note);
 #endif
                                        break;
                                case 1:
 #ifdef JP
                                        fprintf(fff, "%s¤Î̾Á°¤ò¾Ã¤·¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "unname %s.\n", note);
+                                       fprintf(fff, "unnamed %s.\n", note);
 #endif
                                        break;
                                case 2:
 #ifdef JP
                                        fprintf(fff, "%s¤ò²òÊü¤·¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "dismiss %s.\n", note);
+                                       fprintf(fff, "dismissed %s.\n", note);
 #endif
                                        break;
                                case 3:
 #ifdef JP
                                        fprintf(fff, "%s¤¬»à¤ó¤Ç¤·¤Þ¤Ã¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "%s die.\n", note);
+                                       fprintf(fff, "%s died.\n", note);
 #endif
                                        break;
                                case 4:
 #ifdef JP
                                        fprintf(fff, "%s¤ò¤ª¤¤¤ÆÊ̤ΥޥåפذÜÆ°¤·¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "move to other map leaving %s behind.\n", note);
+                                       fprintf(fff, "moved to another map leaving %s behind.\n", note);
 #endif
                                        break;
                                case 5:
 #ifdef JP
                                        fprintf(fff, "%s¤È¤Ï¤°¤ì¤Æ¤·¤Þ¤Ã¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "lose sight of %s.\n", note);
+                                       fprintf(fff, "lost sight of %s.\n", note);
 #endif
                                        break;
                                case 6:
 #ifdef JP
                                        fprintf(fff, "%s¤¬*Ç˲õ*¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "%s is made disappeared by *destruction*.\n", note);
+                                       fprintf(fff, "%s was made disappeared by *destruction*.\n", note);
 #endif
                                        break;
                                case 7:
 #ifdef JP
                                        fprintf(fff, "%s¤¬´äÀФ˲¡¤·ÄÙ¤µ¤ì¤¿¡£\n", note);
 #else
-                                       fprintf(fff, "%s is crushed by falling rocks.\n", note);
+                                       fprintf(fff, "%s was crushed by falling rocks.\n", note);
+#endif
+                                       break;
+                               case 8:
+#ifdef JP
+                                       fprintf(fff, "%s¤¬¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s was made disappeared by teleport level.\n", note);
 #endif
                                        break;
                                default:
@@ -700,9 +826,6 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
 
        my_fclose(fff);
 
-       /* Hack -- grab permissions */
-       safe_setuid_grab();
-
        if (do_level) write_level = FALSE;
 
        return (0);
@@ -789,9 +912,6 @@ static void do_cmd_disp_nikki(void)
        sprintf(file_name,"playrec-%s.txt",savefile_base);
 #endif
 
-       /* Hack -- drop permissions */
-       safe_setuid_drop();
-
        /* Build the filename */
        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, file_name);
 
@@ -811,9 +931,6 @@ static void do_cmd_disp_nikki(void)
 
        /* Display the file contents */
        show_file(FALSE, buf, nikki_title, -1, 0);
-
-       /* Hack -- grab permissions */
-       safe_setuid_grab();
 }
 
 static void do_cmd_bunshou(void)
@@ -876,9 +993,6 @@ static void do_cmd_erase_nikki(void)
        sprintf(file_name,"playrec-%s.txt",savefile_base);
 #endif
 
-       /* Hack -- drop permissions */
-       safe_setuid_drop();
-
        /* Build the filename */
        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, file_name);
 
@@ -901,19 +1015,8 @@ static void do_cmd_erase_nikki(void)
 #endif
        }
        msg_print(NULL);
-
-       /* Hack -- grab permissions */
-       safe_setuid_grab();
 }
 
-#if 0
-void do_debug(void)
-{
-       msg_format("%d %d %d:%d",py,px, p_ptr->energy, p_ptr->skill_dis);
-       msg_print(NULL);
-       battle_monsters();
-}
-#endif
 
 void do_cmd_nikki(void)
 {
@@ -981,11 +1084,6 @@ void do_cmd_nikki(void)
                case '4':
                        do_cmd_erase_nikki();
                        break;
-#if 0
-               case ':':
-                       do_debug();
-                       break;
-#endif
                default: /* Unknown option */
                        bell();
                }
@@ -1126,6 +1224,9 @@ void do_cmd_change_name(void)
                if (c == 'c')
                {
                        get_name();
+
+                       /* Process the player name */
+                       process_player_name(FALSE);
                }
 
                /* File dump */
@@ -1141,7 +1242,7 @@ void do_cmd_change_name(void)
                        {
                                if (tmp[0] && (tmp[0] != ' '))
                                {
-                                       file_character(tmp, TRUE);
+                                       file_character(tmp);
                                }
                        }
                }
@@ -1269,7 +1370,7 @@ void do_cmd_messages(int num_now)
 #ifdef JP
                /* translation */
                prt(format("°ÊÁ°¤Î¥á¥Ã¥»¡¼¥¸ %d-%d Á´Éô¤Ç(%d) ¥ª¥Õ¥»¥Ã¥È(%d)",
-                          i, i+j-1, n, q), 0, 0);
+                          i, i+j-1, n, q), 0, 0);
 #else
                prt(format("Message Recall (%d-%d of %d), Offset %d",
                    i, i+j-1, n, q), 0, 0);
@@ -1422,7 +1523,7 @@ void do_cmd_messages(int num_now)
 /*
  * Number of cheating options
  */
-#define CHEAT_MAX 6
+#define CHEAT_MAX 7
 
 /*
  * Cheating options
@@ -1431,51 +1532,59 @@ static option_type cheat_info[CHEAT_MAX] =
 {
        { &cheat_peek,          FALSE,  255,    0x01, 0x00,
 #ifdef JP
-       "cheat_peek",           "¥¢¥¤¥Æ¥à¤ÎÀ¸À®¤ò¤Î¤¾¤­¸«¤ë" },
+       "cheat_peek",           "¥¢¥¤¥Æ¥à¤ÎÀ¸À®¤ò¤Î¤¾¤­¸«¤ë"
 #else
-       "cheat_peek",           "Peek into object creation" },
+       "cheat_peek",           "Peek into object creation"
 #endif
-
+       },
 
        { &cheat_hear,          FALSE,  255,    0x02, 0x00,
 #ifdef JP
-       "cheat_hear",           "¥â¥ó¥¹¥¿¡¼¤ÎÀ¸À®¤ò¤Î¤¾¤­¸«¤ë" },
+       "cheat_hear",           "¥â¥ó¥¹¥¿¡¼¤ÎÀ¸À®¤ò¤Î¤¾¤­¸«¤ë"
 #else
-       "cheat_hear",           "Peek into monster creation" },
+       "cheat_hear",           "Peek into monster creation"
 #endif
-
+       },
 
        { &cheat_room,          FALSE,  255,    0x04, 0x00,
 #ifdef JP
-       "cheat_room",           "¥À¥ó¥¸¥ç¥ó¤ÎÀ¸À®¤ò¤Î¤¾¤­¸«¤ë" },
+       "cheat_room",           "¥À¥ó¥¸¥ç¥ó¤ÎÀ¸À®¤ò¤Î¤¾¤­¸«¤ë"
 #else
-       "cheat_room",           "Peek into dungeon creation" },
+       "cheat_room",           "Peek into dungeon creation"
 #endif
-
+       },
 
        { &cheat_xtra,          FALSE,  255,    0x08, 0x00,
 #ifdef JP
-       "cheat_xtra",           "¤½¤Î¾¤Î»ö¤ò¤Î¤¾¤­¸«¤ë" },
+       "cheat_xtra",           "¤½¤Î¾¤Î»ö¤ò¤Î¤¾¤­¸«¤ë"
 #else
-       "cheat_xtra",           "Peek into something else" },
+       "cheat_xtra",           "Peek into something else"
 #endif
-
+       },
 
        { &cheat_know,          FALSE,  255,    0x10, 0x00,
 #ifdef JP
-       "cheat_know",           "´°Á´¤Ê¥â¥ó¥¹¥¿¡¼¤Î»×¤¤½Ð¤òÃΤë" },
+       "cheat_know",           "´°Á´¤Ê¥â¥ó¥¹¥¿¡¼¤Î»×¤¤½Ð¤òÃΤë"
 #else
-       "cheat_know",           "Know complete monster info" },
+       "cheat_know",           "Know complete monster info"
 #endif
-
+       },
 
        { &cheat_live,          FALSE,  255,    0x20, 0x00,
 #ifdef JP
-       "cheat_live",           "»à¤ò²óÈò¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë" }
+       "cheat_live",           "»à¤ò²óÈò¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë"
 #else
-       "cheat_live",           "Allow player to avoid death" }
+       "cheat_live",           "Allow player to avoid death"
 #endif
+       },
 
+       { &cheat_save,          FALSE,  255,    0x40, 0x00,
+#ifdef JP
+       "cheat_save",           "»à¤ó¤À»þ¥»¡¼¥Ö¤¹¤ë¤«³Îǧ¤¹¤ë"
+#else
+       "cheat_save",           "Ask for saving death"
+#endif
+       }
 };
 
 /*
@@ -1496,6 +1605,8 @@ static void do_cmd_options_cheat(cptr info)
        /* Interact with the player */
        while (TRUE)
        {
+               int dir;
+
                /* Prompt XXX XXX XXX */
 #ifdef JP
                sprintf(buf, "%s ( ¥ê¥¿¡¼¥ó¤Ç¼¡¤Ø, y/n ¤Ç¥»¥Ã¥È, ESC ¤Ç·èÄê )", info);
@@ -1539,6 +1650,14 @@ static void do_cmd_options_cheat(cptr info)
                /* Get a key */
                ch = inkey();
 
+               /*
+                * HACK - Try to translate the key into a direction
+                * to allow using the roguelike keys for navigation.
+                */
+               dir = get_keymap_dir(ch);
+               if ((dir == 2) || (dir == 4) || (dir == 6) || (dir == 8))
+                       ch = I2D(dir);
+
                /* Analyze */
                switch (ch)
                {
@@ -1588,6 +1707,20 @@ static void do_cmd_options_cheat(cptr info)
                                break;
                        }
 
+                       case '?':
+                       {
+#ifdef JP
+                               strnfmt(buf, sizeof(buf), "joption.txt#%s", cheat_info[k].o_text);
+#else
+                               strnfmt(buf, sizeof(buf), "option.txt#%s", cheat_info[k].o_text);
+#endif
+                               /* Peruse the help file */
+                               (void)show_file(TRUE, buf, NULL, 0, 0);
+
+                               Term_clear(); 
+                               break;
+                       }
+
                        default:
                        {
                                bell();
@@ -1620,17 +1753,19 @@ static option_type autosave_info[2] =
 
 static s16b toggle_frequency(s16b current)
 {
-       if (current == 0) return 50;
-       if (current == 50) return 100;
-       if (current == 100) return 250;
-       if (current == 250) return 500;
-       if (current == 500) return 1000;
-       if (current == 1000) return 2500;
-       if (current == 2500) return 5000;
-       if (current == 5000) return 10000;
-       if (current == 10000) return 25000;
-
-       return 0;
+       switch (current)
+       {
+       case 0: return 50;
+       case 50: return 100;
+       case 100: return 250;
+       case 250: return 500;
+       case 500: return 1000;
+       case 1000: return 2500;
+       case 2500: return 5000;
+       case 5000: return 10000;
+       case 10000: return 25000;
+       default: return 0;
+       }
 }
 
 
@@ -1745,11 +1880,25 @@ static void do_cmd_options_autosave(cptr info)
                                autosave_freq = toggle_frequency(autosave_freq);
 #ifdef JP
                                prt(format("¼«Æ°¥»¡¼¥Ö¤ÎÉÑÅÙ¡§ %d ¥¿¡¼¥óËè", 
+                                          autosave_freq), 5, 0);
 #else
                                prt(format("Timed autosave frequency: every %d turns",
+                                          autosave_freq), 5, 0);
+#endif
+                               break;
+                       }
+
+                       case '?':
+                       {
+#ifdef JP
+                               (void)show_file(TRUE, "joption.txt#Autosave", NULL, 0, 0);
+#else
+                               (void)show_file(TRUE, "option.txt#Autosave", NULL, 0, 0);
 #endif
 
-                                   autosave_freq), 5, 0);
+
+                               Term_clear(); 
+                               break;
                        }
 
                        default:
@@ -1789,24 +1938,28 @@ void do_cmd_options_aux(int page, cptr info)
        /* Clear screen */
        Term_clear();
 
-#ifdef JP
-       if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë¤È¤­¤Î¤ßÍ­¸ú", 6, 6);
-#else
-       if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "Following options will protect items from easy auto-destroyer.", 6, 3);
-#endif
-
        /* Interact with the player */
        while (TRUE)
        {
+               int dir;
+
                /* Prompt XXX XXX XXX */
 #ifdef JP
-               sprintf(buf, "%s ( ¥ê¥¿¡¼¥ó¤Ç¼¡¤Ø, y/n ¤Ç¥»¥Ã¥È, ESC ¤Ç·èÄê ) ", info);
+               sprintf(buf, "%s (¥ê¥¿¡¼¥ó:¼¡, y/n:Êѹ¹, ESC:½ªÎ», ?:¥Ø¥ë¥×) ", info);
 #else
-               sprintf(buf, "%s (RET to advance, y/n to set, ESC to accept) ", info);
+               sprintf(buf, "%s (RET:next, y/n:change, ESC:accept, ?:help) ", info);
 #endif
 
                prt(buf, 0, 0);
 
+
+               /* HACK -- description for easy-auto-destroy options */
+#ifdef JP
+               if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë¤È¤­¤Î¤ßÍ­¸ú", 6, 6);
+#else
+               if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "Following options will protect items from easy auto-destroyer.", 6, 3);
+#endif
+
                /* Display the options */
                for (i = 0; i < n; i++)
                {
@@ -1817,26 +1970,35 @@ void do_cmd_options_aux(int page, cptr info)
 
                        /* Display the option text */
                        sprintf(buf, "%-48s: %s (%.19s)",
-                               option_info[opt[i]].o_desc,
+                               option_info[opt[i]].o_desc,
 #ifdef JP
-                               (*option_info[opt[i]].o_var ? "¤Ï¤¤  " : "¤¤¤¤¤¨"),
+                               (*option_info[opt[i]].o_var ? "¤Ï¤¤  " : "¤¤¤¤¤¨"),
 #else
-                               (*option_info[opt[i]].o_var ? "yes" : "no "),
+                               (*option_info[opt[i]].o_var ? "yes" : "no "),
 #endif
 
-                               option_info[opt[i]].o_text);
+                               option_info[opt[i]].o_text);
                        if ((page == PAGE_AUTODESTROY) && i > 2) c_prt(a, buf, i + 5, 0);
                        else c_prt(a, buf, i + 2, 0);
                }
 
                if ((page == PAGE_AUTODESTROY) && (k > 2)) l = 3;
                else l = 0;
+
                /* Hilite current option */
                move_cursor(k + 2 + l, 50);
 
                /* Get a key */
                ch = inkey();
 
+               /*
+                * HACK - Try to translate the key into a direction
+                * to allow using the roguelike keys for navigation.
+                */
+               dir = get_keymap_dir(ch);
+               if ((dir == 2) || (dir == 4) || (dir == 6) || (dir == 8))
+                       ch = I2D(dir);
+
                /* Analyze */
                switch (ch)
                {
@@ -1847,8 +2009,6 @@ void do_cmd_options_aux(int page, cptr info)
 
                        case '-':
                        case '8':
-                       case 'k':
-                       case 'K':
                        {
                                k = (n + k - 1) % n;
                                break;
@@ -1858,8 +2018,6 @@ void do_cmd_options_aux(int page, cptr info)
                        case '\n':
                        case '\r':
                        case '2':
-                       case 'j':
-                       case 'J':
                        {
                                k = (k + 1) % n;
                                break;
@@ -1868,8 +2026,6 @@ void do_cmd_options_aux(int page, cptr info)
                        case 'y':
                        case 'Y':
                        case '6':
-                       case 'l':
-                       case 'L':
                        {
                                (*option_info[opt[k]].o_var) = TRUE;
                                k = (k + 1) % n;
@@ -1879,8 +2035,6 @@ void do_cmd_options_aux(int page, cptr info)
                        case 'n':
                        case 'N':
                        case '4':
-                       case 'h':
-                       case 'H':
                        {
                                (*option_info[opt[k]].o_var) = FALSE;
                                k = (k + 1) % n;
@@ -1894,6 +2048,20 @@ void do_cmd_options_aux(int page, cptr info)
                                break;
                        }
 
+                       case '?':
+                       {
+#ifdef JP
+                               strnfmt(buf, sizeof(buf), "joption.txt#%s", option_info[opt[k]].o_text);
+#else
+                               strnfmt(buf, sizeof(buf), "option.txt#%s", option_info[opt[k]].o_text);
+#endif
+                               /* Peruse the help file */
+                               (void)show_file(TRUE, buf, NULL, 0, 0);
+
+                               Term_clear(); 
+                               break;
+                       }
+
                        default:
                        {
                                bell();
@@ -2048,6 +2216,19 @@ static void do_cmd_options_win(void)
                                break;
                        }
 
+                       case '?':
+                       {
+#ifdef JP
+                               (void)show_file(TRUE, "joption.txt#Window", NULL, 0, 0);
+#else
+                               (void)show_file(TRUE, "option.txt#Window", NULL, 0, 0);
+#endif
+
+
+                               Term_clear(); 
+                               break;
+                       }
+
                        default:
                        {
                                d = get_keymap_dir(ch);
@@ -2102,7 +2283,6 @@ void do_cmd_options(void)
        /* Save the screen */
        screen_save();
 
-
        /* Interact */
        while (1)
        {
@@ -2132,8 +2312,6 @@ void do_cmd_options(void)
                prt("(A)    ¼«Æ°¥»¡¼¥Ö         ¥ª¥×¥·¥ç¥ó", 14, 5);
                /* Window flags */
                prt("(W) ¥¦¥¤¥ó¥É¥¦¥Õ¥é¥°", 15, 5);
-               /* Cheating */
-               prt("(C)       º¾µ½            ¥ª¥×¥·¥ç¥ó", 16, 5);
 #else
                prt("(1) Input Options", 4, 5);
                prt("(2) Output Options", 5, 5);
@@ -2151,10 +2329,17 @@ void do_cmd_options(void)
 
                /* Window flags */
                prt("(W) Window Flags", 15, 5);
+#endif
 
-               /* Cheating */
-               prt("(C) Cheating Options", 16, 5);
+               if (p_ptr->noscore || allow_debug_opts)
+               {
+                       /* Cheating */
+#ifdef JP
+                       prt("(C)       º¾µ½            ¥ª¥×¥·¥ç¥ó", 16, 5);
+#else
+                       prt("(C) Cheating Options", 16, 5);
 #endif
+               }
 
 
                /* Prompt */
@@ -2239,34 +2424,41 @@ void do_cmd_options(void)
                                break;
                        }
 
-                        /* Object auto-destruction Options */
-                        case '6':
-                        {
-                                /* Spawn */
+                       /* Object auto-destruction Options */
+                       case '6':
+                       {
+                               /* Spawn */
 #ifdef JP
-                                do_cmd_options_aux(7, "´Ê°×¥¢¥¤¥Æ¥à¼«Æ°Ç˲õ¥ª¥×¥·¥ç¥ó");
+                               do_cmd_options_aux(7, "´Ê°×¥¢¥¤¥Æ¥à¼«Æ°Ç˲õ¥ª¥×¥·¥ç¥ó");
 #else
-                                do_cmd_options_aux(7, "Easy Auto-Destroyer Options");
+                               do_cmd_options_aux(7, "Easy Auto-Destroyer Options");
 #endif
-                                break;
-                        }
+                               break;
+                       }
 
-                        /* Play-record Options */
-                        case 'R':
-                        case 'r':
-                        {
-                                /* Spawn */
+                       /* Play-record Options */
+                       case 'R':
+                       case 'r':
+                       {
+                               /* Spawn */
 #ifdef JP
-                                do_cmd_options_aux(10, "¥×¥ì¥¤µ­Ï¿¥ª¥×¥·¥ç¥ó");
+                               do_cmd_options_aux(10, "¥×¥ì¥¤µ­Ï¿¥ª¥×¥·¥ç¥ó");
 #else
-                                do_cmd_options_aux(10, "Play-record Option");
+                               do_cmd_options_aux(10, "Play-record Option");
 #endif
-                                break;
-                        }
+                               break;
+                       }
 
                        /* Cheating Options */
                        case 'C':
                        {
+                               if (!p_ptr->noscore && !allow_debug_opts)
+                               {
+                                       /* Cheat options are not permitted */
+                                       bell();
+                                       break;
+                               }
+
                                /* Spawn */
 #ifdef JP
                                do_cmd_options_cheat("º¾µ½»Õ¤Ï·è¤·¤Æ¾¡Íø¤Ç¤­¤Ê¤¤¡ª");
@@ -2296,9 +2488,9 @@ void do_cmd_options(void)
                                /* Spawn */
                                do_cmd_options_win();
                                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL |
-                                                 PW_PLAYER | PW_MESSAGE | PW_OVERHEAD |
-                                                 PW_MONSTER | PW_OBJECT | PW_SNAPSHOT |
-                                                 PW_BORG_1 | PW_BORG_2 | PW_DUNGEON);
+                                                 PW_PLAYER | PW_MESSAGE | PW_OVERHEAD |
+                                                 PW_MONSTER | PW_OBJECT | PW_SNAPSHOT |
+                                                 PW_BORG_1 | PW_BORG_2 | PW_DUNGEON);
                                break;
                        }
 
@@ -2320,11 +2512,12 @@ void do_cmd_options(void)
                                        int msec = delay_factor * delay_factor * delay_factor;
 #ifdef JP
                                        prt(format("¸½ºß¤Î¥¦¥§¥¤¥È: %d (%d¥ß¥êÉÃ)",
+                                                  delay_factor, msec), 22, 0);
 #else
                                        prt(format("Current base delay factor: %d (%d msec)",
+                                                  delay_factor, msec), 22, 0);
 #endif
 
-                                                  delay_factor, msec), 22, 0);
 #ifdef JP
                                        prt("¥¦¥§¥¤¥È (0-9) ESC¤Ç·èÄê: ", 20, 0);
 #else
@@ -2333,7 +2526,16 @@ void do_cmd_options(void)
 
                                        k = inkey();
                                        if (k == ESCAPE) break;
-                                       if (isdigit(k)) delay_factor = D2I(k);
+                                       else if (k == '?')
+                                       {
+#ifdef JP
+                                               (void)show_file(TRUE, "joption.txt#BaseDelay", NULL, 0, 0);
+#else
+                                               (void)show_file(TRUE, "option.txt#BaseDelay", NULL, 0, 0);
+#endif
+                                               Term_clear(); 
+                                       }
+                                       else if (isdigit(k)) delay_factor = D2I(k);
                                        else bell();
                                }
 
@@ -2356,28 +2558,46 @@ void do_cmd_options(void)
                                while (1)
                                {
 #ifdef JP
-           prt(format("¸½ºß¤ÎÄã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð: %d0%%",
-                      hitpoint_warn), 22, 0);
+                                       prt(format("¸½ºß¤ÎÄã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð: %d0%%",
+                                                  hitpoint_warn), 22, 0);
 #else
                                        prt(format("Current hitpoint warning: %d0%%",
-                                                  hitpoint_warn), 22, 0);
+                                                  hitpoint_warn), 22, 0);
 #endif
 
 #ifdef JP
-                       prt("Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð (0-9) ESC¤Ç·èÄê: ", 20, 0);
+                                       prt("Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð (0-9) ESC¤Ç·èÄê: ", 20, 0);
 #else
                                        prt("Hitpoint Warning (0-9 or ESC to accept): ", 20, 0);
 #endif
 
                                        k = inkey();
                                        if (k == ESCAPE) break;
-                                       if (isdigit(k)) hitpoint_warn = D2I(k);
+                                       else if (k == '?')
+                                       {
+#ifdef JP
+                                               (void)show_file(TRUE, "joption.txt#Hitpoint", NULL, 0, 0);
+#else
+                                               (void)show_file(TRUE, "option.txt#Hitpoint", NULL, 0, 0);
+#endif
+                                               Term_clear(); 
+                                       }
+                                       else if (isdigit(k)) hitpoint_warn = D2I(k);
                                        else bell();
                                }
 
                                break;
                        }
 
+                       case '?':
+#ifdef JP
+                               (void)show_file(TRUE, "joption.txt", NULL, 0, 0);
+#else
+                               (void)show_file(TRUE, "option.txt", NULL, 0, 0);
+#endif
+                               Term_clear(); 
+                               break;
+
                        /* Unknown option */
                        default:
                        {
@@ -2494,9 +2714,7 @@ static errr macro_dump(cptr fname)
 {
        static cptr mark = "Macro Dump";
 
-       int i, line_num;
-
-       FILE *fff;
+       int i;
 
        char buf[1024];
 
@@ -2507,16 +2725,14 @@ static errr macro_dump(cptr fname)
        FILE_TYPE(FILE_TYPE_TEXT);
 
        /* Append to the file */
-       fff = open_auto_dump(buf, mark, &line_num);
-       if (!fff) return (-1);
+       if (!open_auto_dump(buf, mark)) return (-1);
 
        /* Start dumping */
 #ifdef JP
-       fprintf(fff, "\n# ¼«Æ°¥Þ¥¯¥í¥»¡¼¥Ö\n\n");
+       auto_dump_printf("\n# ¼«Æ°¥Þ¥¯¥í¥»¡¼¥Ö\n\n");
 #else
-       fprintf(fff, "\n# Automatic macro dump\n\n");
+       auto_dump_printf("\n# Automatic macro dump\n\n");
 #endif
-       line_num += 3;
 
        /* Dump them */
        for (i = 0; i < macro__num; i++)
@@ -2525,23 +2741,20 @@ static errr macro_dump(cptr fname)
                ascii_to_text(buf, macro__act[i]);
 
                /* Dump the macro */
-               fprintf(fff, "A:%s\n", buf);
+               auto_dump_printf("A:%s\n", buf);
 
                /* Extract the action */
                ascii_to_text(buf, macro__pat[i]);
 
                /* Dump normal macros */
-               fprintf(fff, "P:%s\n", buf);
+               auto_dump_printf("P:%s\n", buf);
 
                /* End the macro */
-               fprintf(fff, "\n");
-
-               /* count number of lines */
-               line_num += 3;
+               auto_dump_printf("\n");
        }
 
        /* Close */
-       close_auto_dump(fff, mark, line_num);
+       close_auto_dump();
 
        /* Success */
        return (0);
@@ -2642,11 +2855,8 @@ static void do_cmd_macro_aux_keymap(char *buf)
 static errr keymap_dump(cptr fname)
 {
        static cptr mark = "Keymap Dump";
-       int line_num;
        int i;
 
-       FILE *fff;
-
        char key[1024];
        char buf[1024];
 
@@ -2672,16 +2882,14 @@ static errr keymap_dump(cptr fname)
        FILE_TYPE(FILE_TYPE_TEXT);
 
        /* Append to the file */
-       fff = open_auto_dump(buf, mark, &line_num);
-       if (!fff) return -1;
+       if (!open_auto_dump(buf, mark)) return -1;
 
        /* Start dumping */
 #ifdef JP
-       fprintf(fff, "\n# ¼«Æ°¥­¡¼ÇÛÃÖ¥»¡¼¥Ö\n\n");
+       auto_dump_printf("\n# ¼«Æ°¥­¡¼ÇÛÃÖ¥»¡¼¥Ö\n\n");
 #else
-       fprintf(fff, "\n# Automatic keymap dump\n\n");
+       auto_dump_printf("\n# Automatic keymap dump\n\n");
 #endif
-       line_num += 3;
 
        /* Dump them */
        for (i = 0; i < 256; i++)
@@ -2703,13 +2911,12 @@ static errr keymap_dump(cptr fname)
                ascii_to_text(buf, act);
 
                /* Dump the macro */
-               fprintf(fff, "A:%s\n", buf);
-               fprintf(fff, "C:%d:%s\n", mode, key);
-               line_num += 2;
+               auto_dump_printf("A:%s\n", buf);
+               auto_dump_printf("C:%d:%s\n", mode, key);
        }
 
        /* Close */
-       close_auto_dump(fff, mark, line_num);
+       close_auto_dump();
 
        /* Success */
        return (0);
@@ -2772,7 +2979,7 @@ void do_cmd_macros(void)
 
                /* Describe that action */
 #ifdef JP
-               prt("(1) ¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥í¡¼¥É", 4, 5);
+               prt("¥Þ¥¯¥í¹ÔÆ°¤¬(¤â¤·¤¢¤ì¤Ð)²¼¤Ëɽ¼¨¤µ¤ì¤Þ¤¹:", 20, 0);
 #else
                prt("Current action (if any) shown below:", 20, 0);
 #endif
@@ -2794,15 +3001,15 @@ void do_cmd_macros(void)
 
 #ifdef ALLOW_MACROS
 #ifdef JP
-                prt("(2) ¥Õ¥¡¥¤¥ë¤Ë¥Þ¥¯¥í¤òÄɲÃ", 5, 5);
-                prt("(3) ¥Þ¥¯¥í¤Î³Îǧ", 6, 5);
-                prt("(4) ¥Þ¥¯¥í¤ÎºîÀ®", 7, 5);
-                prt("(5) ¥Þ¥¯¥í¤Îºï½ü", 8, 5);
-                prt("(6) ¥Õ¥¡¥¤¥ë¤Ë¥­¡¼ÇÛÃÖ¤òÄɲÃ", 9, 5);
-                prt("(7) ¥­¡¼ÇÛÃ֤γÎǧ", 10, 5);
-                prt("(8) ¥­¡¼ÇÛÃ֤κîÀ®", 11, 5);
-                prt("(9) ¥­¡¼ÇÛÃ֤κï½ü", 12, 5);
-                prt("(0) ¥Þ¥¯¥í¹ÔÆ°¤ÎÆþÎÏ", 13, 5);
+               prt("(2) ¥Õ¥¡¥¤¥ë¤Ë¥Þ¥¯¥í¤òÄɲÃ", 5, 5);
+               prt("(3) ¥Þ¥¯¥í¤Î³Îǧ", 6, 5);
+               prt("(4) ¥Þ¥¯¥í¤ÎºîÀ®", 7, 5);
+               prt("(5) ¥Þ¥¯¥í¤Îºï½ü", 8, 5);
+               prt("(6) ¥Õ¥¡¥¤¥ë¤Ë¥­¡¼ÇÛÃÖ¤òÄɲÃ", 9, 5);
+               prt("(7) ¥­¡¼ÇÛÃ֤γÎǧ", 10, 5);
+               prt("(8) ¥­¡¼ÇÛÃ֤κîÀ®", 11, 5);
+               prt("(9) ¥­¡¼ÇÛÃ֤κï½ü", 12, 5);
+               prt("(0) ¥Þ¥¯¥í¹ÔÆ°¤ÎÆþÎÏ", 13, 5);
 #else
                prt("(2) Append macros to a file", 5, 5);
                prt("(3) Query a macro", 6, 5);
@@ -3343,12 +3550,13 @@ void do_cmd_visuals(void)
 {
        int i;
 
-       FILE *fff;
-
        char tmp[160];
 
        char buf[1024];
 
+       const char *empty_symbol = "<< ? >>";
+
+       if (use_bigtile) empty_symbol = "<< ?? >>";
 
        /* File type is "TEXT" */
        FILE_TYPE(FILE_TYPE_TEXT);
@@ -3410,7 +3618,7 @@ void do_cmd_visuals(void)
 
                /* Prompt */
 #ifdef JP
-               prt("¥³¥Þ¥ó¥É:", 18, 0);
+               prt("¥³¥Þ¥ó¥É:", 15, 0);
 #else
                prt("Command: ", 15, 0);
 #endif
@@ -3435,7 +3643,7 @@ void do_cmd_visuals(void)
 
                        /* Prompt */
 #ifdef JP
-                       prt("¥Õ¥¡¥¤¥ë: ", 18, 0);
+                       prt("¥Õ¥¡¥¤¥ë: ", 17, 0);
 #else
                        prt("File: ", 17, 0);
 #endif
@@ -3457,7 +3665,6 @@ void do_cmd_visuals(void)
                else if (i == '2')
                {
                        static cptr mark = "Monster attr/chars";
-                       int line_num;
 
                        /* Prompt */
 #ifdef JP
@@ -3485,19 +3692,17 @@ void do_cmd_visuals(void)
                        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
                        /* Append to the file */
-                       fff = open_auto_dump(buf, mark, &line_num);
-                       if (!fff) continue;
+                       if (!open_auto_dump(buf, mark)) continue;
 
                        /* Start dumping */
 #ifdef JP
-                       fprintf(fff, "\n# ¥â¥ó¥¹¥¿¡¼¤Î[¿§/ʸ»ú]¤ÎÀßÄê\n\n");
+                       auto_dump_printf("\n# ¥â¥ó¥¹¥¿¡¼¤Î[¿§/ʸ»ú]¤ÎÀßÄê\n\n");
 #else
-                       fprintf(fff, "\n# Monster attr/char definitions\n\n");
+                       auto_dump_printf("\n# Monster attr/char definitions\n\n");
 #endif
-                       line_num += 3;
 
                        /* Dump monsters */
-                       for (i = 0; i < max_r_idx; i++)
+                       for (i = 1; i < max_r_idx; i++)
                        {
                                monster_race *r_ptr = &r_info[i];
 
@@ -3505,17 +3710,15 @@ void do_cmd_visuals(void)
                                if (!r_ptr->name) continue;
 
                                /* Dump a comment */
-                               fprintf(fff, "# %s\n", (r_name + r_ptr->name));
-                               line_num++;
+                               auto_dump_printf("# %s\n", (r_name + r_ptr->name));
 
                                /* Dump the monster attr/char info */
-                               fprintf(fff, "R:%d:0x%02X:0x%02X\n\n", i,
-                                       (byte)(r_ptr->x_attr), (byte)(r_ptr->x_char));
-                               line_num += 2;
+                               auto_dump_printf("R:%d:0x%02X/0x%02X\n\n", i,
+                                       (byte)(r_ptr->x_attr), (byte)(r_ptr->x_char));
                        }
 
                        /* Close */
-                       close_auto_dump(fff, mark, line_num);
+                       close_auto_dump();
 
                        /* Message */
 #ifdef JP
@@ -3530,7 +3733,6 @@ void do_cmd_visuals(void)
                else if (i == '3')
                {
                        static cptr mark = "Object attr/chars";
-                       int line_num;
 
                        /* Prompt */
 #ifdef JP
@@ -3558,37 +3760,40 @@ void do_cmd_visuals(void)
                        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
                        /* Append to the file */
-                       fff = open_auto_dump(buf, mark, &line_num);
-                       if (!fff) continue;
+                       if (!open_auto_dump(buf, mark)) continue;
 
                        /* Start dumping */
 #ifdef JP
-                       fprintf(fff, "\n# ¥¢¥¤¥Æ¥à¤Î[¿§/ʸ»ú]¤ÎÀßÄê\n\n");
+                       auto_dump_printf("\n# ¥¢¥¤¥Æ¥à¤Î[¿§/ʸ»ú]¤ÎÀßÄê\n\n");
 #else
-                       fprintf(fff, "\n# Object attr/char definitions\n\n");
+                       auto_dump_printf("\n# Object attr/char definitions\n\n");
 #endif
-                       line_num += 3;
 
                        /* Dump objects */
-                       for (i = 0; i < max_k_idx; i++)
+                       for (i = 1; i < max_k_idx; i++)
                        {
+                               char o_name[80];
                                object_kind *k_ptr = &k_info[i];
 
                                /* Skip non-entries */
                                if (!k_ptr->name) continue;
 
+                               /* Skip entries with flavor */
+                               if (k_ptr->flavor) continue;
+
+                               /* Tidy name */
+                               strip_name(o_name, i);
+
                                /* Dump a comment */
-                               fprintf(fff, "# %s\n", (k_name + k_ptr->name));
-                               line_num++;
+                               auto_dump_printf("# %s\n", o_name);
 
                                /* Dump the object attr/char info */
-                               fprintf(fff, "K:%d:0x%02X:0x%02X\n\n", i,
-                                       (byte)(k_ptr->x_attr), (byte)(k_ptr->x_char));
-                               line_num += 2;
+                               auto_dump_printf("K:%d:0x%02X/0x%02X\n\n", i,
+                                       (byte)(k_ptr->x_attr), (byte)(k_ptr->x_char));
                        }
 
                        /* Close */
-                       close_auto_dump(fff, mark, line_num);
+                       close_auto_dump();
 
                        /* Message */
 #ifdef JP
@@ -3603,7 +3808,6 @@ void do_cmd_visuals(void)
                else if (i == '4')
                {
                        static cptr mark = "Feature attr/chars";
-                       int line_num;
 
                        /* Prompt */
 #ifdef JP
@@ -3631,37 +3835,36 @@ void do_cmd_visuals(void)
                        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
                        /* Append to the file */
-                       fff = open_auto_dump(buf, mark, &line_num);
-                       if (!fff) continue;
+                       if (!open_auto_dump(buf, mark)) continue;
 
                        /* Start dumping */
 #ifdef JP
-                       fprintf(fff, "\n# ÃÏ·Á¤Î[¿§/ʸ»ú]¤ÎÀßÄê\n\n");
+                       auto_dump_printf("\n# ÃÏ·Á¤Î[¿§/ʸ»ú]¤ÎÀßÄê\n\n");
 #else
-                       fprintf(fff, "\n# Feature attr/char definitions\n\n");
+                       auto_dump_printf("\n# Feature attr/char definitions\n\n");
 #endif
-                       line_num += 3;
 
                        /* Dump features */
-                       for (i = 0; i < max_f_idx; i++)
+                       for (i = 1; i < max_f_idx; i++)
                        {
                                feature_type *f_ptr = &f_info[i];
 
                                /* Skip non-entries */
                                if (!f_ptr->name) continue;
 
+                               /* Skip mimiccing features */
+                               if (f_ptr->mimic != i) continue;
+
                                /* Dump a comment */
-                               fprintf(fff, "# %s\n", (f_name + f_ptr->name));
-                               line_num++;
+                               auto_dump_printf("# %s\n", (f_name + f_ptr->name));
 
                                /* Dump the feature attr/char info */
-                               fprintf(fff, "F:%d:0x%02X:0x%02X\n\n", i,
-                                       (byte)(f_ptr->x_attr), (byte)(f_ptr->x_char));
-                               line_num += 2;
+                               auto_dump_printf("F:%d:0x%02X/0x%02X\n\n", i,
+                                       (byte)(f_ptr->x_attr), (byte)(f_ptr->x_char));
                        }
 
                        /* Close */
-                       close_auto_dump(fff, mark, line_num);
+                       close_auto_dump();
 
                        /* Message */
 #ifdef JP
@@ -3689,7 +3892,8 @@ void do_cmd_visuals(void)
                        while (1)
                        {
                                monster_race *r_ptr = &r_info[r];
-                               char c;
+                               byte a, a2;
+                               char c, c2;
                                int t;
 
                                byte da = (r_ptr->d_attr);
@@ -3700,60 +3904,59 @@ void do_cmd_visuals(void)
                                /* Label the object */
 #ifdef JP
                                Term_putstr(5, 17, -1, TERM_WHITE,
-                                           format("¥â¥ó¥¹¥¿¡¼ = %d, Ì¾Á° = %-40.40s",
-                                                  r, (r_name + r_ptr->name)));
+                                           format("¥â¥ó¥¹¥¿¡¼ = %d, Ì¾Á° = %-40.40s",
+                                                  r, (r_name + r_ptr->name)));
 #else
                                Term_putstr(5, 17, -1, TERM_WHITE,
-                                           format("Monster = %d, Name = %-40.40s",
-                                                  r, (r_name + r_ptr->name)));
+                                           format("Monster = %d, Name = %-40.40s",
+                                                  r, (r_name + r_ptr->name)));
 #endif
 
 
                                /* Label the Default values */
 #ifdef JP
                                Term_putstr(10, 19, -1, TERM_WHITE,
-                                           format("½é´üÃÍ  ¿§ / Ê¸»ú = %3u / %3u", da, dc));
+                                           format("½é´üÃÍ  ¿§ / Ê¸»ú = %3u / %3u", da, dc));
 #else
                                Term_putstr(10, 19, -1, TERM_WHITE,
-                                           format("Default attr/char = %3u / %3u", da, dc));
+                                           format("Default attr/char = %3u / %3u", da, dc));
 #endif
 
-                               Term_putstr(40, 19, -1, TERM_WHITE, "<< ? >>");
-                               Term_putch(43, 19, da, dc);
-                               if (use_bigtile)
-                               {
-                                       if (da & 0x80)
-                                               Term_putch(44, 19, 255, -1);
-                                       else
-                                               Term_putch(44, 19, 0, ' ');
-                               }
+                               Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol);
+
+                               a = da;
+                               c = dc;
+                               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+                               Term_putch(43, 19, a, c);
+                               if (use_bigtile) Term_putch(43 + 1, 19, a2, c2);
 
                                /* Label the Current values */
 #ifdef JP
                                Term_putstr(10, 20, -1, TERM_WHITE,
-                                           format("¸½ºßÃÍ  ¿§ / Ê¸»ú = %3u / %3u", ca, cc));
+                                           format("¸½ºßÃÍ  ¿§ / Ê¸»ú = %3u / %3u", ca, cc));
 #else
                                Term_putstr(10, 20, -1, TERM_WHITE,
-                                           format("Current attr/char = %3u / %3u", ca, cc));
+                                           format("Current attr/char = %3u / %3u", ca, cc));
 #endif
 
-                               Term_putstr(40, 20, -1, TERM_WHITE, "<< ? >>");
-                               Term_putch(43, 20, ca, cc);
-                               if (use_bigtile)
-                               {
-                                       if (ca & 0x80)
-                                               Term_putch(44, 20, 255, -1);
-                                       else
-                                               Term_putch(44, 20, 0, ' ');
-                               }
+                               Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol);
+
+                               a = ca;
+                               c = cc;
+                               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+                               Term_putch(43, 20, a, c);
+                               if (use_bigtile) Term_putch(43 + 1, 20, a2, c2);
+
 
                                /* Prompt */
 #ifdef JP
                                Term_putstr(0, 22, -1, TERM_WHITE,
-                                           "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
+                                           "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
 #else
                                Term_putstr(0, 22, -1, TERM_WHITE,
-                                           "Command (n/N/^N/a/A/^A/c/C/^C): ");
+                                           "Command (n/N/^N/a/A/^A/c/C/^C): ");
 #endif
 
                                /* Get a command */
@@ -3802,7 +4005,8 @@ void do_cmd_visuals(void)
                        while (1)
                        {
                                object_kind *k_ptr = &k_info[k];
-                               char c;
+                               byte a, a2;
+                               char c, c2;
                                int t;
 
                                byte da = (byte)k_ptr->d_attr;
@@ -3813,60 +4017,58 @@ void do_cmd_visuals(void)
                                /* Label the object */
 #ifdef JP
                                Term_putstr(5, 17, -1, TERM_WHITE,
-                                           format("¥¢¥¤¥Æ¥à = %d, Ì¾Á° = %-40.40s",
-                                                  k, (k_name + k_ptr->name)));
+                                           format("¥¢¥¤¥Æ¥à = %d, Ì¾Á° = %-40.40s",
+                                                  k, (k_name + k_ptr->name)));
 #else
                                Term_putstr(5, 17, -1, TERM_WHITE,
-                                           format("Object = %d, Name = %-40.40s",
-                                                  k, (k_name + k_ptr->name)));
+                                           format("Object = %d, Name = %-40.40s",
+                                                  k, (k_name + k_ptr->name)));
 #endif
 
 
                                /* Label the Default values */
 #ifdef JP
                                Term_putstr(10, 19, -1, TERM_WHITE,
-                                           format("½é´üÃÍ  ¿§ / Ê¸»ú = %3d / %3d", da, dc));
+                                           format("½é´üÃÍ  ¿§ / Ê¸»ú = %3d / %3d", da, dc));
 #else
                                Term_putstr(10, 19, -1, TERM_WHITE,
-                                           format("Default attr/char = %3d / %3d", da, dc));
+                                           format("Default attr/char = %3d / %3d", da, dc));
 #endif
 
-                               Term_putstr(40, 19, -1, TERM_WHITE, "<< ? >>");
-                               Term_putch(43, 19, da, dc);
-                               if (use_bigtile)
-                               {
-                                       if (da & 0x80)
-                                               Term_putch(44, 19, 255, -1);
-                                       else
-                                               Term_putch(44, 19, 0, ' ');
-                               }
+                               Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol);
+                               a = da;
+                               c = dc;
+                               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
 
-                               /* Label the Current values */
+                               Term_putch(43, 19, a, c);
+                               if (use_bigtile) Term_putch(43 + 1, 19, a2, c2);
+
+
+                               /* Label the Current values */
 #ifdef JP
                                Term_putstr(10, 20, -1, TERM_WHITE,
-                                           format("¸½ºßÃÍ  ¿§ / Ê¸»ú = %3d / %3d", ca, cc));
+                                           format("¸½ºßÃÍ  ¿§ / Ê¸»ú = %3d / %3d", ca, cc));
 #else
                                Term_putstr(10, 20, -1, TERM_WHITE,
-                                           format("Current attr/char = %3d / %3d", ca, cc));
+                                           format("Current attr/char = %3d / %3d", ca, cc));
 #endif
 
-                               Term_putstr(40, 20, -1, TERM_WHITE, "<< ? >>");
-                               Term_putch(43, 20, ca, cc);
-                               if (use_bigtile)
-                               {
-                                       if (ca & 0x80)
-                                               Term_putch(44, 20, 255, -1);
-                                       else
-                                               Term_putch(44, 20, 0, ' ');
-                               }
+                               Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol);
+                               a = ca;
+                               c = cc;
+                               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+                               Term_putch(43, 20, a, c);
+                               if (use_bigtile) Term_putch(43 + 1, 20, a2, c2);
+
 
                                /* Prompt */
 #ifdef JP
                                Term_putstr(0, 22, -1, TERM_WHITE,
-                                           "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
+                                           "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
 #else
                                Term_putstr(0, 22, -1, TERM_WHITE,
-                                           "Command (n/N/^N/a/A/^A/c/C/^C): ");
+                                           "Command (n/N/^N/a/A/^A/c/C/^C): ");
 #endif
 
                                /* Get a command */
@@ -3915,7 +4117,8 @@ void do_cmd_visuals(void)
                        while (1)
                        {
                                feature_type *f_ptr = &f_info[f];
-                               char c;
+                               byte a, a2;
+                               char c, c2;
                                int t;
 
                                byte da = (byte)f_ptr->d_attr;
@@ -3926,60 +4129,58 @@ void do_cmd_visuals(void)
                                /* Label the object */
 #ifdef JP
                                Term_putstr(5, 17, -1, TERM_WHITE,
-                                           format("ÃÏ·Á = %d, Ì¾Á° = %-40.40s",
-                                                  f, (f_name + f_ptr->name)));
+                                           format("ÃÏ·Á = %d, Ì¾Á° = %-40.40s",
+                                                  f, (f_name + f_ptr->name)));
 #else
                                Term_putstr(5, 17, -1, TERM_WHITE,
-                                           format("Terrain = %d, Name = %-40.40s",
-                                                  f, (f_name + f_ptr->name)));
+                                           format("Terrain = %d, Name = %-40.40s",
+                                                  f, (f_name + f_ptr->name)));
 #endif
 
 
                                /* Label the Default values */
 #ifdef JP
                                Term_putstr(10, 19, -1, TERM_WHITE,
-                                           format("½é´üÃÍ  ¿§ / Ê¸»ú = %3d / %3d", da, dc));
+                                           format("½é´üÃÍ  ¿§ / Ê¸»ú = %3d / %3d", da, dc));
 #else
                                Term_putstr(10, 19, -1, TERM_WHITE,
-                                           format("Default attr/char = %3d / %3d", da, dc));
+                                           format("Default attr/char = %3d / %3d", da, dc));
 #endif
 
-                               Term_putstr(40, 19, -1, TERM_WHITE, "<< ? >>");
-                               Term_putch(43, 19, da, dc);
-                               if (use_bigtile)
-                               {
-                                       if (da & 0x80)
-                                               Term_putch(44, 19, 255, -1);
-                                       else
-                                               Term_putch(44, 19, 0, ' ');
-                               }
+                               Term_putstr(40, 19, -1, TERM_WHITE, empty_symbol);
+                               a = da;
+                               c = dc;
+                               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+                               Term_putch(43, 19, a, c);
+                               if (use_bigtile) Term_putch(43 + 1, 19, a2, c2);
+
 
                                /* Label the Current values */
 #ifdef JP
                                Term_putstr(10, 20, -1, TERM_WHITE,
-                                           format("¸½ºßÃÍ  ¿§ / Ê¸»ú = %3d / %3d", ca, cc));
+                                           format("¸½ºßÃÍ  ¿§ / Ê¸»ú = %3d / %3d", ca, cc));
 #else
                                Term_putstr(10, 20, -1, TERM_WHITE,
-                                           format("Current attr/char = %3d / %3d", ca, cc));
+                                           format("Current attr/char = %3d / %3d", ca, cc));
 #endif
 
-                               Term_putstr(40, 20, -1, TERM_WHITE, "<< ? >>");
-                               Term_putch(43, 20, ca, cc);
-                               if (use_bigtile)
-                               {
-                                       if (ca & 0x80)
-                                               Term_putch(44, 20, 255, -1);
-                                       else
-                                               Term_putch(44, 20, 0, ' ');
-                               }
+                               Term_putstr(40, 20, -1, TERM_WHITE, empty_symbol);
+                               a = ca;
+                               c = cc;
+                               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+                               Term_putch(43, 20, a, c);
+                               if (use_bigtile) Term_putch(43 + 1, 20, a2, c2);
+
 
                                /* Prompt */
 #ifdef JP
                                Term_putstr(0, 22, -1, TERM_WHITE,
-                                           "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
+                                           "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
 #else
                                Term_putstr(0, 22, -1, TERM_WHITE,
-                                           "Command (n/N/^N/a/A/^A/c/C/^C): ");
+                                           "Command (n/N/^N/a/A/^A/c/C/^C): ");
 #endif
 
                                /* Get a command */
@@ -4051,8 +4252,6 @@ void do_cmd_colors(void)
 {
        int i;
 
-       FILE *fff;
-
        char tmp[160];
 
        char buf[1024];
@@ -4089,8 +4288,8 @@ void do_cmd_colors(void)
 
 #ifdef ALLOW_COLORS
 #ifdef JP
-                prt("(2) ¥«¥é¡¼¤ÎÀßÄê¤ò¥Õ¥¡¥¤¥ë¤Ë½ñ¤­½Ð¤¹", 5, 5);
-                prt("(3) ¥«¥é¡¼¤ÎÀßÄê¤òÊѹ¹¤¹¤ë", 6, 5);
+               prt("(2) ¥«¥é¡¼¤ÎÀßÄê¤ò¥Õ¥¡¥¤¥ë¤Ë½ñ¤­½Ð¤¹", 5, 5);
+               prt("(3) ¥«¥é¡¼¤ÎÀßÄê¤òÊѹ¹¤¹¤ë", 6, 5);
 #else
                prt("(2) Dump colors", 5, 5);
                prt("(3) Modify colors", 6, 5);
@@ -4153,7 +4352,6 @@ void do_cmd_colors(void)
                else if (i == '2')
                {
                        static cptr mark = "Colors";
-                       int line_num;
 
                        /* Prompt */
 #ifdef JP
@@ -4181,16 +4379,14 @@ void do_cmd_colors(void)
                        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, tmp);
 
                        /* Append to the file */
-                       fff = open_auto_dump(buf, mark, &line_num);
-                       if (!fff) continue;
+                       if (!open_auto_dump(buf, mark)) continue;
 
                        /* Start dumping */
 #ifdef JP
-                       fprintf(fff, "\n# ¥«¥é¡¼¤ÎÀßÄê\n\n");
+                       auto_dump_printf("\n# ¥«¥é¡¼¤ÎÀßÄê\n\n");
 #else
-                       fprintf(fff, "\n# Color redefinitions\n\n");
+                       auto_dump_printf("\n# Color redefinitions\n\n");
 #endif
-                       line_num += 3;
 
                        /* Dump colors */
                        for (i = 0; i < 256; i++)
@@ -4215,20 +4411,18 @@ void do_cmd_colors(void)
 
                                /* Dump a comment */
 #ifdef JP
-                               fprintf(fff, "# ¥«¥é¡¼ '%s'\n", name);
+                               auto_dump_printf("# ¥«¥é¡¼ '%s'\n", name);
 #else
-                               fprintf(fff, "# Color '%s'\n", name);
+                               auto_dump_printf("# Color '%s'\n", name);
 #endif
-                               line_num++;
 
                                /* Dump the monster attr/char info */
-                               fprintf(fff, "V:%d:0x%02X:0x%02X:0x%02X:0x%02X\n\n",
-                                       i, kv, rv, gv, bv);
-                               line_num += 2;
+                               auto_dump_printf("V:%d:0x%02X:0x%02X:0x%02X:0x%02X\n\n",
+                                       i, kv, rv, gv, bv);
                        }
 
                        /* Close */
-                       close_auto_dump(fff, mark, line_num);
+                       close_auto_dump();
 
                        /* Message */
 #ifdef JP
@@ -4282,28 +4476,28 @@ void do_cmd_colors(void)
                                /* Describe the color */
 #ifdef JP
                                Term_putstr(5, 10, -1, TERM_WHITE,
-                                           format("¥«¥é¡¼ = %d, Ì¾Á° = %s", a, name));
+                                           format("¥«¥é¡¼ = %d, Ì¾Á° = %s", a, name));
 #else
                                Term_putstr(5, 10, -1, TERM_WHITE,
-                                           format("Color = %d, Name = %s", a, name));
+                                           format("Color = %d, Name = %s", a, name));
 #endif
 
 
                                /* Label the Current values */
                                Term_putstr(5, 12, -1, TERM_WHITE,
-                                           format("K = 0x%02x / R,G,B = 0x%02x,0x%02x,0x%02x",
-                                                  angband_color_table[a][0],
-                                                  angband_color_table[a][1],
-                                                  angband_color_table[a][2],
-                                                  angband_color_table[a][3]));
+                                           format("K = 0x%02x / R,G,B = 0x%02x,0x%02x,0x%02x",
+                                                  angband_color_table[a][0],
+                                                  angband_color_table[a][1],
+                                                  angband_color_table[a][2],
+                                                  angband_color_table[a][3]));
 
                                /* Prompt */
 #ifdef JP
                                Term_putstr(0, 14, -1, TERM_WHITE,
-                                           "¥³¥Þ¥ó¥É (n/N/k/K/r/R/g/G/b/B): ");
+                                           "¥³¥Þ¥ó¥É (n/N/k/K/r/R/g/G/b/B): ");
 #else
                                Term_putstr(0, 14, -1, TERM_WHITE,
-                                           "Command (n/N/k/K/r/R/g/G/b/B): ");
+                                           "Command (n/N/k/K/r/R/g/G/b/B): ");
 #endif
 
 
@@ -4391,10 +4585,10 @@ void do_cmd_version(void)
        /* Silly message */
 #ifdef JP
        msg_format("ÊѶòÈÚÅÜ(Hengband) %d.%d.%d",
-                   FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+                   FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
 #else
        msg_format("You are playing Hengband %d.%d.%d.",
-                   FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+                   FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
 #endif
 }
 
@@ -4636,103 +4830,582 @@ void do_cmd_feeling(void)
        }
 
        /* Display the feeling */
-        if (turn - old_turn >= (150 - dun_level)*TURNS_PER_TICK || cheat_xtra)
-        {
-                if (p_ptr->muta3 & MUT3_GOOD_LUCK) msg_print(do_cmd_feeling_text_lucky[feeling]);
-                else {
+       if (turn - old_turn >= (150 - dun_level)*TURNS_PER_TICK || cheat_xtra)
+       {
+               if (p_ptr->muta3 & MUT3_GOOD_LUCK) msg_print(do_cmd_feeling_text_lucky[feeling]);
+               else {
                                        if((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON)){
                                                msg_print(do_cmd_feeling_text_combat[feeling]);
                                        }else
                                                msg_print(do_cmd_feeling_text[feeling]);
                                }
-        }
-        else
-        {
-                msg_print(do_cmd_feeling_text[0]);
-        }
+       }
+       else
+       {
+               msg_print(do_cmd_feeling_text[0]);
+       }
 }
 
 
 
+/*
+ * Description of each monster group.
+ */
+static cptr monster_group_text[] = 
+{
+#ifdef JP
+       "¥æ¥Ë¡¼¥¯",     /* "Uniques" */
+       "¥¢¥ê",
+       "¥³¥¦¥â¥ê",
+       "¥à¥«¥Ç",
+       "¥É¥é¥´¥ó",
+       "ÌܶÌ",
+       "¥Í¥³",
+       "¥´¡¼¥ì¥à",
+       "ɸ½à¿Í´Ö·¿À¸Êª",
+       "¥Ù¥È¥Ù¥È",
+       "¥¼¥ê¡¼",
+       "¥³¥Ü¥ë¥É",
+       "¿åÀ³À¸Êª",
+       "¥â¥ë¥É",
+       "¥Ê¡¼¥¬",
+       "¥ª¡¼¥¯",
+       "¿Í´Ö",
+       "»Í­½Ã",
+       "¥Í¥º¥ß",
+       "¥¹¥±¥ë¥È¥ó",
+       "¥Ç¡¼¥â¥ó",
+       "¥Ü¥ë¥Æ¥Ã¥¯¥¹",
+       "¥¤¥â¥à¥·/Âç·²",
+       /* "unused", */
+       "¥¤¡¼¥¯",
+       "¥¾¥ó¥Ó/¥ß¥¤¥é",
+       "Å·»È",
+       "Ļ",
+       "¸¤",
+       /* "¸ÅÂå¥É¥é¥´¥ó/¥ï¥¤¥¢¡¼¥à", */
+       "¥¨¥ì¥á¥ó¥¿¥ë",
+       "¥È¥ó¥Ü",
+       "¥´¡¼¥¹¥È",
+       "»¨¼ï",
+       "º«Ãî",
+       "¥Ø¥Ó",
+       "¥­¥é¡¼¡¦¥Ó¡¼¥È¥ë",
+       "¥ê¥Ã¥Á",
+       "¿¼ó¤Îà¨ÃîÎà",
+       "Ææ¤ÎÀ¸Êª",
+       "¥ª¡¼¥¬",
+       "µðÂç¿Í´Ö·¿À¸Êª",
+       "¥¯¥¤¥ë¥¹¥ë¥°",
+       "à¨ÃîÎà/ξÀ¸Îà",
+       "ÃØéá/¥µ¥½¥ê/¥À¥Ë",
+       "¥È¥í¥ë",
+       /* "¾åµé¥Ç¡¼¥â¥ó", */
+       "¥Ð¥ó¥Ñ¥¤¥¢",
+       "¥ï¥¤¥È/¥ì¥¤¥¹/Åù",
+       "¥¾¡¼¥ó/¥¶¥ì¥ó/Åù",
+       "¥¤¥¨¥Æ¥£",
+       "¥Ï¥¦¥ó¥É",
+       "¥ß¥ß¥Ã¥¯",
+       "ÊÉ/¿¢Êª/µ¤ÂÎ",
+       "¤ª¤Ð¤±¥­¥Î¥³",
+       "µåÂÎ",
+#else
+       "Uniques",
+       "Ant",
+       "Bat",
+       "Centipede",
+       "Dragon",
+       "Floating Eye",
+       "Feline",
+       "Golem",
+       "Hobbit/Elf/Dwarf",
+       "Icky Thing",
+       "Jelly",
+       "Kobold",
+       "Aquatic monster",
+       "Mold",
+       "Naga",
+       "Orc",
+       "Person/Human",
+       "Quadruped",
+       "Rodent",
+       "Skeleton",
+       "Demon",
+       "Vortex",
+       "Worm/Worm-Mass",
+       /* "unused", */
+       "Yeek",
+       "Zombie/Mummy",
+       "Angel",
+       "Bird",
+       "Canine",
+       /* "Ancient Dragon/Wyrm", */
+       "Elemental",
+       "Dragon Fly",
+       "Ghost",
+       "Hybrid",
+       "Insect",
+       "Snake",
+       "Killer Beetle",
+       "Lich",
+       "Multi-Headed Reptile",
+       "Mystery Living",
+       "Ogre",
+       "Giant Humanoid",
+       "Quylthulg",
+       "Reptile/Amphibian",
+       "Spider/Scorpion/Tick",
+       "Troll",
+       /* "Major Demon", */
+       "Vampire",
+       "Wight/Wraith/etc",
+       "Xorn/Xaren/etc",
+       "Yeti",
+       "Zephyr Hound",
+       "Mimic",
+       "Wall/Plant/Gas",
+       "Mushroom patch",
+       "Ball",
+#endif
+       NULL
+};
 
 
 /*
- * Encode the screen colors
+ * Symbols of monsters in each group. Note the "Uniques" group
+ * is handled differently.
  */
-static char hack[17] = "dwsorgbuDWvyRGBU";
+static cptr monster_group_char[] =
+{
+       (char *) -1L,
+       "a",
+       "b",
+       "c",
+       "dD",
+       "e",
+       "f",
+       "g",
+       "h",
+       "i",
+       "j",
+       "k",
+       "l",
+       "m",
+       "n",
+       "o",
+       "pt",
+       "q",
+       "r",
+       "s",
+       "uU",
+       "v",
+       "w",
+       /* "x", */
+       "y",
+       "z",
+       "A",
+       "B",
+       "C",
+       /* "D", */
+       "E",
+       "F",
+       "G",
+       "H",
+       "I",
+       "J",
+       "K",
+       "L",
+       "M",
+       "N",
+       "O",
+       "P",
+       "Q",
+       "R",
+       "S",
+       "T",
+       /* "U", */
+       "V",
+       "W",
+       "X",
+       "Y",
+       "Z",
+       "!$&()+./=>?[\\]`{|~",
+       "#%",
+       ",",
+       "*",
+       NULL
+};
 
 
-static errr photo_fgets(FILE *fff, char *buf, huge n)
+/*
+ * hook function to sort monsters by level
+ */
+static bool ang_sort_comp_monster_level(vptr u, vptr v, int a, int b)
 {
-       huge i = 0;
+       u16b *who = (u16b*)(u);
+
+       int w1 = who[a];
+       int w2 = who[b];
 
-       char *s;
+       monster_race *r_ptr1 = &r_info[w1];
+       monster_race *r_ptr2 = &r_info[w2];
 
-       char tmp[1024];
+       /* Unused */
+       (void)v;
+
+       if (r_ptr2->level > r_ptr1->level) return TRUE;
+       if (r_ptr1->level > r_ptr2->level) return FALSE;
+
+       if ((r_ptr2->flags1 & RF1_UNIQUE) && !(r_ptr1->flags1 & RF1_UNIQUE)) return TRUE;
+       if ((r_ptr1->flags1 & RF1_UNIQUE) && !(r_ptr2->flags1 & RF1_UNIQUE)) return FALSE;
+       return w1 <= w2;
+}
+
+/*
+ * Build a list of monster indexes in the given group. Return the number
+ * of monsters in the group.
+ *
+ * mode & 0x01 : check for non-empty group
+ * mode & 0x02 : cheat?
+ */
+static int collect_monsters(int grp_cur, s16b mon_idx[], byte mode)
+{
+       int i, mon_cnt = 0;
+       int dummy_why;
+
+       /* Get a list of x_char in this group */
+       cptr group_char = monster_group_char[grp_cur];
+
+       /* XXX Hack -- Check if this is the "Uniques" group */
+       bool grp_unique = (monster_group_char[grp_cur] == (char *) -1L);
 
-       /* Read a line */
-       if (fgets(tmp, 1024, fff))
+       /* Check every race */
+       for (i = 0; i < max_r_idx; i++)
        {
-               /* Convert weirdness */
-               for (s = tmp; *s; s++)
+               /* Access the race */
+               monster_race *r_ptr = &r_info[i];
+
+               /* Skip empty race */
+               if (!r_ptr->name) continue ;
+
+               /* Require known monsters */
+               if (!(mode & 0x02) && !cheat_know && !r_ptr->r_sights ) continue;
+
+               if (grp_unique && !(r_ptr->flags1 & RF1_UNIQUE)) continue;
+
+               /* Check for race in the group */
+               if (grp_unique || strchr(group_char, r_ptr->d_char))
                {
-                       /* Handle newline */
-                       if (*s == '\n')
-                       {
-                               /* Terminate */
-                               buf[i] = '\0';
+                       /* Add the race */
+                       mon_idx[mon_cnt++] = i;
 
-                               /* Success */
-                               return (0);
-                       }
+                       /* XXX Hack -- Just checking for non-empty group */
+                       if (mode & 0x01) break;
+               }
+       }
 
-                       /* Handle tabs */
-                       else if (*s == '\t')
-                       {
-                               /* Hack -- require room */
-                               if (i + 8 >= n) break;
+       /* Terminate the list */
+       mon_idx[mon_cnt] = 0;
 
-                               /* Append a space */
-                               buf[i++] = ' ';
+       /* Select the sort method */
+       ang_sort_comp = ang_sort_comp_monster_level;
+       ang_sort_swap = ang_sort_swap_hook;
 
-                               /* Append some more spaces */
-                               while (!(i % 8)) buf[i++] = ' ';
-                       }
+       /* Sort by monster level */
+       ang_sort(mon_idx, &dummy_why, mon_cnt);
 
+       /* Return the number of races */
+       return mon_cnt;
+}
+
+
+/*
+ * Description of each monster group.
+ */
+static cptr object_group_text[] = 
+{
 #ifdef JP
-                       else if (iskanji(*s))
-                       {
-                               if (!s[1]) break;
-                               buf[i++] = *s++;
-                               buf[i++] = *s;
-                       }
-# ifndef EUC
-       /* È¾³Ñ¤«¤Ê¤ËÂбþ */
-                       else if ((((int)*s & 0xff) > 0xa1) && (((int)*s & 0xff ) < 0xdf))
+       "¥­¥Î¥³",       /* "Mushrooms" */
+       "Ìô",           /* "Potions" */
+       "Ìý¤Ä¤Ü",       /* "Flasks" */
+       "´¬Êª",         /* "Scrolls" */
+       "»ØÎØ",         /* "Rings" */
+       "¥¢¥ß¥å¥ì¥Ã¥È", /* "Amulets" */
+       "ū",           /* "Whistle" */
+       "¸÷¸»",         /* "Lanterns" */
+       "ËâË¡ËÀ",       /* "Wands" */
+       "¾ó",           /* "Staffs" */
+       "¥í¥Ã¥É",       /* "Rods" */
+       "¥«¡¼¥É",       /* "Cards" */
+       "¥­¥ã¥×¥Á¥ã¡¼¡¦¥Ü¡¼¥ë",
+       "ÍÓÈé»æ",       
+       "¤¯¤µ¤Ó",
+       "Ȣ",
+       "¿Í·Á",
+       "Áü",
+       "¥´¥ß",
+       "¶õ¤Î¥Ó¥ó",
+       "¹ü",
+       "»àÂÎ",
+       "Åá·õÎà",       /* "Swords" */
+       "Æß´ï",         /* "Blunt Weapons" */
+       "ĹÊÁÉð´ï",     /* "Polearms" */
+       "ºÎ·¡Æ»¶ñ",     /* "Diggers" */
+       "Èô¤ÓÆ»¶ñ",     /* "Bows" */
+       "ÃÆ",
+       "Ìð",
+       "¥Ü¥ë¥È",
+       "·ÚÁõ³»",       /* "Soft Armor" */
+       "½ÅÁõ³»",       /* "Hard Armor" */
+       "¥É¥é¥´¥ó³»",   /* "Dragon Armor" */
+       "½â",   /* "Shields" */
+       "¥¯¥í¡¼¥¯",     /* "Cloaks" */
+       "äƼê", /* "Gloves" */
+       "¥Ø¥ë¥á¥Ã¥È",   /* "Helms" */
+       "´§",   /* "Crowns" */
+       "¥Ö¡¼¥Ä",       /* "Boots" */
+       "ËâË¡½ñ",
+#else
+       "Mushrooms",
+       "Potions",
+       "Flasks",
+       "Scrolls",
+       "Rings",
+       "Amulets",
+       "Whistle",
+       "Lanterns",
+       "Wands",
+       "Staves",
+       "Rods",
+       "Cards",
+       "Capture Balls",
+       "Parchments",
+       "Spikes",
+       "Boxs",
+       "Figurines",
+       "Statues",
+       "Junks",
+       "Bottles",
+       "Skeletons",
+       "Corpses",
+       "Swords",
+       "Blunt Weapons",
+       "Polearms",
+       "Diggers",
+       "Bows",
+       "Shots",
+       "Arrows",
+       "Bolts",
+       "Soft Armor",
+       "Hard Armor",
+       "Dragon Armor",
+       "Shields",
+       "Cloaks",
+       "Gloves",
+       "Helms",
+       "Crowns",
+       "Boots",
+       "Spellbooks",
+#endif
+       NULL
+};
+
+
+/*
+ * TVALs of items in each group
+ */
+static byte object_group_tval[] = 
+{
+       TV_FOOD,
+       TV_POTION,
+       TV_FLASK,
+       TV_SCROLL,
+       TV_RING,
+       TV_AMULET,
+       TV_WHISTLE,
+       TV_LITE,
+       TV_WAND,
+       TV_STAFF,
+       TV_ROD,
+       TV_CARD,
+       TV_CAPTURE,
+       TV_PARCHMENT,
+       TV_SPIKE,
+       TV_CHEST,
+       TV_FIGURINE,
+       TV_STATUE,
+       TV_JUNK,
+       TV_BOTTLE,
+       TV_SKELETON,
+       TV_CORPSE,
+       TV_SWORD,
+       TV_HAFTED,
+       TV_POLEARM,
+       TV_DIGGING,
+       TV_BOW,
+       TV_SHOT,
+       TV_ARROW,
+       TV_BOLT,
+       TV_SOFT_ARMOR,
+       TV_HARD_ARMOR,
+       TV_DRAG_ARMOR,
+       TV_SHIELD,
+       TV_CLOAK,
+       TV_GLOVES,
+       TV_HELM,
+       TV_CROWN,
+       TV_BOOTS,
+       TV_LIFE_BOOK, /* Hack -- all spellbooks */
+       0
+};
+
+
+/*
+ * Build a list of monster indexes in the given group. Return the number
+ * of monsters in the group.
+ */
+static int collect_objects(int grp_cur, int object_idx[])
+{
+       int i, j, k, object_cnt = 0;
+
+       /* Get a list of x_char in this group */
+       byte group_tval = object_group_tval[grp_cur];
+
+       /* Check every object */
+       for (i = 0; i < max_k_idx; i++)
+       {
+               /* Access the race */
+               object_kind *k_ptr = &k_info[i];
+
+               /* Skip empty objects */
+               if (!k_ptr->name) continue;
+
+               /* Skip non-flavoured objects */
+               if (!k_ptr->flavor && !p_ptr->wizard) continue;
+
+               /* Skip items with no distribution (special artifacts) */
+               for (j = 0, k = 0; j < 4; j++) k += k_ptr->chance[j];
+               if (!(k))  continue; 
+
+               /* Require objects ever seen*/
+               if (!k_ptr->aware && !p_ptr->wizard) continue;
+
+               /* Check for race in the group */
+               if (TV_LIFE_BOOK == group_tval)
+               {
+                       /* Hack -- All spell books */
+                       if (TV_LIFE_BOOK <= k_ptr->tval && k_ptr->tval <= TV_HISSATSU_BOOK)
                        {
-                               buf[i++] = *s;
-                               if (i >= n) break;
+                               /* Add the race */
+                               object_idx[object_cnt++] = i;
                        }
-# endif
-#endif
-                       /* Handle printables */
-                       else
-                       {
-                               /* Copy */
-                               buf[i++] = *s;
+               }
+               else if (k_ptr->tval == group_tval)
+               {
+                       /* Add the race */
+                       object_idx[object_cnt++] = i;
+               }
+       }
 
-                               /* Check length */
-                               if (i >= n) break;
-                       }
+       /* Terminate the list */
+       object_idx[object_cnt] = 0;
+
+       /* Return the number of races */
+       return object_cnt;
+}
+
+
+/*
+ * Description of each feature group.
+ */
+static cptr feature_group_text[] = 
+{
+       "terrains",
+       NULL
+};
+
+
+/*
+ * Build a list of feature indexes in the given group. Return the number
+ * of features in the group.
+ */
+static int collect_features(int grp_cur, int *feat_idx)
+{
+       int i, feat_cnt = 0;
+
+       /* Unused;  There is a single group. */
+       (void)grp_cur;
+
+       /* Check every feature */
+       for (i = 1; i < max_f_idx; i++)
+       {
+               /* Access the index */
+               feature_type *f_ptr = &f_info[i];
+
+               /* Skip empty index */
+               if (!f_ptr->name) continue;
+
+               /* Skip mimiccing features */
+               if (f_ptr->mimic != i) continue;
+
+               /* Add the index */
+               feat_idx[feat_cnt++] = i;
+       }
+
+       /* Terminate the list */
+       feat_idx[feat_cnt] = 0;
+
+       /* Return the number of races */
+       return feat_cnt;
+}
+
+
+#if 0
+/*
+ * Build a list of monster indexes in the given group. Return the number
+ * of monsters in the group.
+ */
+static int collect_artifacts(int grp_cur, int object_idx[])
+{
+       int i, object_cnt = 0;
+
+       /* Get a list of x_char in this group */
+       byte group_tval = object_group_tval[grp_cur];
+
+       /* Check every object */
+       for (i = 0; i < max_a_idx; i++)
+       {
+               /* Access the artifact */
+               artifact_type *a_ptr = &a_info[i];
+
+               /* Skip empty artifacts */
+               if (!a_ptr->name) continue;
+
+               /* Skip "uncreated" artifacts */
+               if (!a_ptr->cur_num) continue;
+
+               /* Check for race in the group */
+               if (a_ptr->tval == group_tval)
+               {
+                       /* Add the race */
+                       object_idx[object_cnt++] = i;
                }
        }
 
-       /* Nothing */
-       buf[0] = '\0';
+       /* Terminate the list */
+       object_idx[object_cnt] = 0;
 
-       /* Failure */
-       return (1);
+       /* Return the number of races */
+       return object_cnt;
 }
+#endif /* 0 */
+
+
+/*
+ * Encode the screen colors
+ */
+static char hack[17] = "dwsorgbuDWvyRGBU";
 
 
 /*
@@ -4755,9 +5428,6 @@ void do_cmd_load_screen(void)
 
        Term_get_size(&wid, &hgt);
 
-       /* Hack -- drop permissions */
-       safe_setuid_drop();
-
        /* Build the filename */
        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "dump.txt");
 
@@ -4784,32 +5454,46 @@ void do_cmd_load_screen(void)
 
 
        /* Load the screen */
-       for (y = 0; okay && (y < hgt); y++)
+       for (y = 0; okay; y++)
        {
-               /* Get a line of data */
-               if (photo_fgets(fff, buf, 1024)) okay = FALSE;
+               /* Get a line of data including control code */
+               if (!fgets(buf, 1024, fff)) okay = FALSE;
+
+               /* Get the blank line */
+               if (buf[0] == '\n' || buf[0] == '\0') break;
+
+               /* Ignore too large screen image */
+               if (y >= hgt) continue;
 
                /* Show each row */
                for (x = 0; x < wid - 1; x++)
                {
+                       /* End of line */
+                       if (buf[x] == '\n' || buf[x] == '\0') break;
+
                        /* Put the attr/char */
                        Term_draw(x, y, TERM_WHITE, buf[x]);
                }
        }
 
-       /* Get the blank line */
-       if (my_fgets(fff, buf, sizeof(buf))) okay = FALSE;
-
-
        /* Dump the screen */
-       for (y = 0; okay && (y < hgt); y++)
+       for (y = 0; okay; y++)
        {
-               /* Get a line of data */
-               if (photo_fgets(fff, buf, 1024)) okay = FALSE;
+               /* Get a line of data including control code */
+               if (!fgets(buf, 1024, fff)) okay = FALSE;
+
+               /* Get the blank line */
+               if (buf[0] == '\n' || buf[0] == '\0') break;
+
+               /* Ignore too large screen image */
+               if (y >= hgt) continue;
 
                /* Dump each row */
                for (x = 0; x < wid - 1; x++)
                {
+                       /* End of line */
+                       if (buf[x] == '\n' || buf[x] == '\0') break;
+
                        /* Get the attr/char */
                        (void)(Term_what(x, y, &a, &c));
 
@@ -4826,16 +5510,9 @@ void do_cmd_load_screen(void)
        }
 
 
-       /* Get the blank line */
-       if (my_fgets(fff, buf, sizeof(buf))) okay = FALSE;
-
-
        /* Close it */
        my_fclose(fff);
 
-       /* Hack -- grab permissions */
-       safe_setuid_grab();
-               
 
        /* Message */
 #ifdef JP
@@ -4874,8 +5551,8 @@ static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr,
 
        /* 
        * HACK:Ring of Lordly protection and Dragon shield/helm
-        * have random resistances.
-        */
+       * have random resistances.
+       */
   if ( ((o_ptr->tval >= TV_BOW && o_ptr->tval<= TV_DRAG_ARMOR && o_ptr->name2)
        || (o_ptr->tval == TV_RING && o_ptr->sval == SV_RING_LORDLY) 
        || (o_ptr->tval == TV_SHIELD && o_ptr->sval == SV_DRAGON_SHIELD) 
@@ -5088,7 +5765,7 @@ static void do_cmd_knowledge_inven(void)
 
        byte tval;
        int i=0;
-        int j=0;
+       int j=0;
 
        char  where[32];
 
@@ -5098,18 +5775,18 @@ static void do_cmd_knowledge_inven(void)
 #ifdef JP
            msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
 #else
-           msg_format("Failed to create temporally file %s.", file_name);
+           msg_format("Failed to create temporary file %s.", file_name);
 #endif
            msg_print(NULL);
            return;
        }
        fprintf(fff,"%s\n",inven_res_label);
 
-        for (tval=TV_BOW; tval <= TV_RING; tval++){
+       for (tval=TV_BOW; tval <= TV_RING; tval++){
 
-          if (j!=0) {
-              for (;j<9;j++) fprintf(fff, "\n");
-              j=0;
+         if (j!=0) {
+             for (;j<9;j++) fprintf(fff, "\n");
+             j=0;
              fprintf(fff,"%s\n",inven_res_label);              
          }
          
@@ -5350,13 +6027,7 @@ static void do_cmd_save_screen_html(void)
 
        msg_print(NULL);
 
-       /* Hack -- drop permissions */
-       safe_setuid_drop();
-
        do_cmd_save_screen_html_aux(buf, 1);
-
-       /* Hack -- grab permissions */
-       safe_setuid_grab();
 }
 
 
@@ -5435,10 +6106,6 @@ void do_cmd_save_screen(void)
 
                char buf[1024];
 
-
-               /* Hack -- drop permissions */
-               safe_setuid_drop();
-
                /* Build the filename */
                path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "dump.txt");
 
@@ -5451,8 +6118,6 @@ void do_cmd_save_screen(void)
                /* Oops */
                if (!fff)
                {
-                       /* Hack -- grab permissions */
-                       safe_setuid_grab();
 #ifdef JP
                        msg_format("¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£", buf);
 #else
@@ -5518,9 +6183,6 @@ void do_cmd_save_screen(void)
                /* Close it */
                my_fclose(fff);
 
-               /* Hack -- grab permissions */
-               safe_setuid_grab();
-
                /* Message */
 #ifdef JP
        msg_print("²èÌÌ(µ­Ç°»£±Æ)¤ò¥Õ¥¡¥¤¥ë¤Ë½ñ¤­½Ð¤·¤Þ¤·¤¿¡£");
@@ -5566,7 +6228,6 @@ static bool ang_sort_art_comp(vptr u, vptr v, int a, int b)
 
        int z1, z2;
 
-
        /* Sort by total kills */
        if (*why >= 3)
        {
@@ -5623,6 +6284,9 @@ static void ang_sort_art_swap(vptr u, vptr v, int a, int b)
 
        u16b holder;
 
+       /* Unused */
+       (void)v;
+
        /* Swap */
        holder = who[a];
        who[a] = who[b];
@@ -5661,7 +6325,7 @@ static void do_cmd_knowledge_artifacts(void)
        }
 
        /* Allocate the "who" array */
-       C_MAKE(who, max_r_idx, s16b);
+       C_MAKE(who, max_a_idx, s16b);
 
        /* Allocate the "okay" array */
        C_MAKE(okay, max_a_idx, bool);
@@ -5739,12 +6403,12 @@ static void do_cmd_knowledge_artifacts(void)
                if (okay[k]) who[n++] = k;
        }
 
-        /* Select the sort method */
-        ang_sort_comp = ang_sort_art_comp;
-        ang_sort_swap = ang_sort_art_swap;
+       /* Select the sort method */
+       ang_sort_comp = ang_sort_art_comp;
+       ang_sort_swap = ang_sort_art_swap;
 
-        /* Sort the array by dungeon depth of monsters */
-        ang_sort(who, &why, n);
+       /* Sort the array by dungeon depth of monsters */
+       ang_sort(who, &why, n);
 
        /* Scan the artifacts */
        for (k = 0; k < n; k++)
@@ -5753,7 +6417,7 @@ static void do_cmd_knowledge_artifacts(void)
 
                /* Paranoia */
 #ifdef JP
-strcpy(base_name, "̤ÃΤÎÅÁÀâ¤Î¥¢¥¤¥Æ¥à");
+               strcpy(base_name, "̤ÃΤÎÅÁÀâ¤Î¥¢¥¤¥Æ¥à");
 #else
                strcpy(base_name, "Unknown Artifact");
 #endif
@@ -5791,7 +6455,7 @@ strcpy(base_name, "̤
        }
 
        /* Free the "who" array */
-       C_KILL(who, max_r_idx, s16b);
+       C_KILL(who, max_a_idx, s16b);
 
        /* Free the "okay" array */
        C_KILL(okay, max_a_idx, bool);
@@ -5850,12 +6514,12 @@ static void do_cmd_knowledge_uniques(void)
                if (r_ptr->name) who[n++] = i;
        }
 
-        /* Select the sort method */
-        ang_sort_comp = ang_sort_comp_hook;
-        ang_sort_swap = ang_sort_swap_hook;
+       /* Select the sort method */
+       ang_sort_comp = ang_sort_comp_hook;
+       ang_sort_swap = ang_sort_swap_hook;
 
-        /* Sort the array by dungeon depth of monsters */
-        ang_sort(who, &why, n);
+       /* Sort the array by dungeon depth of monsters */
+       ang_sort(who, &why, n);
 
        /* Scan the monster races */
        for (k = 0; k < n; k++)
@@ -5875,10 +6539,10 @@ static void do_cmd_knowledge_uniques(void)
                                /* Print a message */
 #ifdef JP
                                fprintf(fff, "     %s¤Ï¤Þ¤ÀÀ¸¤­¤Æ¤¤¤ë¡£\n",
-                                       (r_name + r_ptr->name));
+                                       (r_name + r_ptr->name));
 #else
                                fprintf(fff, "     %s is alive\n",
-                                       (r_name + r_ptr->name));
+                                       (r_name + r_ptr->name));
 #endif
 
                        }
@@ -5905,103 +6569,11 @@ static void do_cmd_knowledge_uniques(void)
 
 
 /*
- * Display dead uniques
- */
-static void do_cmd_knowledge_uniques_dead(void)
-{
-       int i, k, n = 0;
-       u16b why = 2;
-       s16b *who;
-
-       FILE *fff;
-
-       char file_name[1024];
-
-       /* Open a new file */
-       fff = my_fopen_temp(file_name, 1024);
-
-       if (!fff) {
-#ifdef JP
-           msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
-#else
-           msg_format("Failed to create temporary file %s.", file_name);
-#endif
-           msg_print(NULL);
-           return;
-       }
-
-       /* Allocate the "who" array */
-       C_MAKE(who, max_r_idx, s16b);
-
-       /* Scan the monsters */
-       for (i = 1; i < max_r_idx; i++)
-       {
-               monster_race *r_ptr = &r_info[i];
-
-               /* Use that monster */
-               if (r_ptr->name) who[n++] = i;
-       }
-
-        /* Select the sort method */
-        ang_sort_comp = ang_sort_comp_hook;
-        ang_sort_swap = ang_sort_swap_hook;
-
-        /* Sort the array by dungeon depth of monsters */
-        ang_sort(who, &why, n);
-
-       /* Scan the monster races */
-       for (k = 0; k < n; k++)
-       {
-               monster_race *r_ptr = &r_info[who[k]];
-
-               /* Only print Uniques */
-               if (r_ptr->flags1 & (RF1_UNIQUE))
-               {
-                       bool dead = (r_ptr->max_num == 0);
-
-                       if (!dead) continue;
-
-                       /* Only display "known" uniques */
-                       if (dead || cheat_know || r_ptr->r_sights)
-                       {
-                               /* Print a message */
-#ifdef JP
-                               fprintf(fff, "     %s¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡£\n",
-                                       (r_name + r_ptr->name));
-#else
-                               fprintf(fff, "     %s is dead\n",
-                                       (r_name + r_ptr->name));
-#endif
-
-                       }
-               }
-       }
-
-       /* Free the "who" array */
-       C_KILL(who, max_r_idx, s16b);
-
-       /* Close the file */
-       my_fclose(fff);
-
-       /* Display the file contents */
-#ifdef JP
-       show_file(TRUE, file_name, "Åݤ·¤¿¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼", 0, 0);
-#else
-       show_file(TRUE, file_name, "Dead Uniques", 0, 0);
-#endif
-
-
-       /* Remove the file */
-       fd_kill(file_name);
-}
-
-
-/*
  * Display weapon-exp
  */
 static void do_cmd_knowledge_weapon_exp(void)
 {
-       int i,j, num, shougou;
+       int i, j, num, weapon_exp;
 
        FILE *fff;
 
@@ -6020,7 +6592,7 @@ static void do_cmd_knowledge_weapon_exp(void)
            return;
        }
 
-       for(i = 0; i < 5; i++)
+       for (i = 0; i < 5; i++)
        {
                for (num = 0; num < 64; num++)
                {
@@ -6028,22 +6600,18 @@ static void do_cmd_knowledge_weapon_exp(void)
                        {
                                object_kind *k_ptr = &k_info[j];
 
-                               if ((k_ptr->tval == TV_SWORD-i) && (k_ptr->sval == num))
+                               if ((k_ptr->tval == TV_SWORD - i) && (k_ptr->sval == num))
                                {
-                                       if((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON)) continue;
+                                       if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON)) continue;
 
-                                       if(p_ptr->weapon_exp[4-i][num]<4000) shougou=0;
-                                       else if(p_ptr->weapon_exp[4-i][num]<6000) shougou=1;
-                                       else if(p_ptr->weapon_exp[4-i][num]<7000) shougou=2;
-                                       else if(p_ptr->weapon_exp[4-i][num]<8000) shougou=3;
-                                       else shougou=4;
+                                       weapon_exp = p_ptr->weapon_exp[4 - i][num];
                                        strip_name(tmp, j);
-                                       fprintf(fff,"%-25s ",tmp);
-                                       if (p_ptr->weapon_exp[4-i][num] >= s_info[p_ptr->pclass].w_max[4-i][num]) fprintf(fff,"!");
-                                       else fprintf(fff," ");
-                                       fprintf(fff,"%s",shougou_moji[shougou]);
-                                       if (cheat_xtra) fprintf(fff," %d",p_ptr->weapon_exp[4-i][num]);
-                                       fprintf(fff,"\n");
+                                       fprintf(fff, "%-25s ", tmp);
+                                       if (weapon_exp >= s_info[p_ptr->pclass].w_max[4 - i][num]) fprintf(fff, "!");
+                                       else fprintf(fff, " ");
+                                       fprintf(fff, "%s", exp_level_str[weapon_exp_level(weapon_exp)]);
+                                       if (cheat_xtra) fprintf(fff, " %d", weapon_exp);
+                                       fprintf(fff, "\n");
                                        break;
                                }
                        }
@@ -6071,7 +6639,7 @@ static void do_cmd_knowledge_weapon_exp(void)
  */
 static void do_cmd_knowledge_spell_exp(void)
 {
-       int i=0, shougou;
+       int i = 0, spell_exp, exp_level;
 
        FILE *fff;
        magic_type *s_ptr;
@@ -6090,12 +6658,12 @@ static void do_cmd_knowledge_spell_exp(void)
            return;
        }
 
-       if(p_ptr->realm1 != REALM_NONE)
+       if (p_ptr->realm1 != REALM_NONE)
        {
 #ifdef JP
-               fprintf(fff,"%s¤ÎËâË¡½ñ\n",realm_names[p_ptr->realm1]);
+               fprintf(fff, "%s¤ÎËâË¡½ñ\n", realm_names[p_ptr->realm1]);
 #else
-               fprintf(fff,"%s Spellbook\n",realm_names[p_ptr->realm1]);
+               fprintf(fff, "%s Spellbook\n", realm_names[p_ptr->realm1]);
 #endif
                for (i = 0; i < 32; i++)
                {
@@ -6107,29 +6675,30 @@ static void do_cmd_knowledge_spell_exp(void)
                        {
                                s_ptr = &mp_ptr->info[p_ptr->realm1 - 1][i];
                        }
-                       if(s_ptr->slevel == 99) continue;
-                       if(p_ptr->spell_exp[i]<900) shougou=0;
-                       else if(p_ptr->spell_exp[i]<1200) shougou=1;
-                       else if(p_ptr->spell_exp[i]<1400) shougou=2;
-                       else if(p_ptr->spell_exp[i]<1600) shougou=3;
-                       else shougou=4;
-                       fprintf(fff,"%-25s ",spell_names[technic2magic(p_ptr->realm1)-1][i]);
+                       if (s_ptr->slevel >= 99) continue;
+                       spell_exp = p_ptr->spell_exp[i];
+                       exp_level = spell_exp_level(spell_exp);
+                       fprintf(fff, "%-25s ", spell_names[technic2magic(p_ptr->realm1) - 1][i]);
                        if (p_ptr->realm1 == REALM_HISSATSU)
-                               fprintf(fff,"[--]");
+                               fprintf(fff, "[--]");
                        else
                        {
-                               if (shougou == 4) fprintf(fff,"!");
-                               else fprintf(fff," ");
-                               fprintf(fff,"%s",shougou_moji[shougou]);
+                               if (exp_level >= EXP_LEVEL_MASTER) fprintf(fff, "!");
+                               else fprintf(fff, " ");
+                               fprintf(fff, "%s", exp_level_str[exp_level]);
                        }
-                       if (cheat_xtra) fprintf(fff," %d",p_ptr->spell_exp[i]);
-                       fprintf(fff,"\n");
+                       if (cheat_xtra) fprintf(fff, " %d", spell_exp);
+                       fprintf(fff, "\n");
                }
        }
 
-       if(p_ptr->realm2 != REALM_NONE)
+       if (p_ptr->realm2 != REALM_NONE)
        {
-               fprintf(fff,"\n%s Spellbook\n",realm_names[p_ptr->realm2]);
+#ifdef JP
+               fprintf(fff, "%s¤ÎËâË¡½ñ\n", realm_names[p_ptr->realm2]);
+#else
+               fprintf(fff, "\n%s Spellbook\n", realm_names[p_ptr->realm2]);
+#endif
                for (i = 0; i < 32; i++)
                {
                        if (!is_magic(p_ptr->realm1))
@@ -6140,18 +6709,16 @@ static void do_cmd_knowledge_spell_exp(void)
                        {
                                s_ptr = &mp_ptr->info[p_ptr->realm2 - 1][i];
                        }
-                       if(s_ptr->slevel == 99) continue;
-
-                       if(p_ptr->spell_exp[i+32]<900) shougou=0;
-                       else if(p_ptr->spell_exp[i+32]<1200) shougou=1;
-                       else if(p_ptr->spell_exp[i+32]<1400) shougou=2;
-                       else shougou=3;
-                       fprintf(fff,"%-25s ",spell_names[technic2magic(p_ptr->realm2)-1][i]);
-                       if (shougou == 3) fprintf(fff,"!");
-                       else fprintf(fff," ");
-                       fprintf(fff,"%s",shougou_moji[shougou]);
-                       if (cheat_xtra) fprintf(fff," %d",p_ptr->spell_exp[i+32]);
-                       fprintf(fff,"\n");
+                       if (s_ptr->slevel >= 99) continue;
+
+                       spell_exp = p_ptr->spell_exp[i + 32];
+                       exp_level = spell_exp_level(spell_exp);
+                       fprintf(fff, "%-25s ", spell_names[technic2magic(p_ptr->realm2) - 1][i]);
+                       if (exp_level >= EXP_LEVEL_EXPERT) fprintf(fff, "!");
+                       else fprintf(fff, " ");
+                       fprintf(fff, "%s", exp_level_str[exp_level]);
+                       if (cheat_xtra) fprintf(fff, " %d", spell_exp);
+                       fprintf(fff, "\n");
                }
        }
 
@@ -6176,7 +6743,7 @@ static void do_cmd_knowledge_spell_exp(void)
  */
 static void do_cmd_knowledge_skill_exp(void)
 {
-       int i=0, shougou;
+       int i = 0, skill_exp;
 
        FILE *fff;
 
@@ -6201,28 +6768,13 @@ static void do_cmd_knowledge_skill_exp(void)
 
        for (i = 0; i < 3; i++)
        {
-               if(i == GINOU_RIDING)
-               {
-                       if(p_ptr->skill_exp[i]<500) shougou=0;
-                       else if(p_ptr->skill_exp[i]<2000) shougou=1;
-                       else if(p_ptr->skill_exp[i]<5000) shougou=2;
-                       else if(p_ptr->skill_exp[i]<8000) shougou=3;
-                       else shougou=4;
-               }
-               else
-               {
-                       if(p_ptr->skill_exp[i]<4000) shougou=0;
-                       else if(p_ptr->skill_exp[i]<6000) shougou=1;
-                       else if(p_ptr->skill_exp[i]<7000) shougou=2;
-                       else if(p_ptr->skill_exp[i]<8000) shougou=3;
-                       else shougou=4;
-               }
-               fprintf(fff,"%-20s ",skill_name[i]);
-               if (p_ptr->skill_exp[i] == s_info[p_ptr->pclass].s_max[i]) fprintf(fff,"!");
-               else fprintf(fff," ");
-               fprintf(fff,"%s",shougou_moji[shougou]);
-               if (cheat_xtra) fprintf(fff," %d",p_ptr->skill_exp[i]);
-               fprintf(fff,"\n");
+               skill_exp = p_ptr->skill_exp[i];
+               fprintf(fff, "%-20s ", skill_name[i]);
+               if (skill_exp >= s_info[p_ptr->pclass].s_max[i]) fprintf(fff, "!");
+               else fprintf(fff, " ");
+               fprintf(fff, "%s", exp_level_str[(i == GINOU_RIDING) ? riding_exp_level(skill_exp) : weapon_exp_level(skill_exp)]);
+               if (cheat_xtra) fprintf(fff, " %d", skill_exp);
+               fprintf(fff, "\n");
        }
 
        /* Close the file */
@@ -6351,7 +6903,7 @@ void plural_aux(char *Name)
                strcpy(&(Name[NameLen - 2]), "lves");
        }
        else if (suffix(Name, "ch") ||
-                suffix(Name, "sh") ||
+                suffix(Name, "sh") ||
                         suffix(Name, "nx") ||
                         suffix(Name, "s") ||
                         suffix(Name, "o"))
@@ -6372,6 +6924,7 @@ static void do_cmd_knowledge_pets(void)
        int             i;
        FILE            *fff;
        monster_type    *m_ptr;
+       char            pet_name[80];
        int             t_friends = 0;
        int             show_upkeep = 0;
        char            file_name[1024];
@@ -6392,40 +6945,46 @@ static void do_cmd_knowledge_pets(void)
        /* Process the monsters (backwards) */
        for (i = m_max - 1; i >= 1; i--)
        {
-               monster_race *r_ptr;
                /* Access the monster */
                m_ptr = &m_list[i];
 
                /* Ignore "dead" monsters */
                if (!m_ptr->r_idx) continue;
-               r_ptr = &r_info[m_ptr->r_idx];
 
                /* Calculate "upkeep" for pets */
                if (is_pet(m_ptr))
                {
-                       char pet_name[80];
                        t_friends++;
-                       monster_desc(pet_name, m_ptr, 0x88);
-                       fprintf(fff, "%s (%s)", pet_name, look_mon_desc(i));
-                       if (p_ptr->riding == i)
-#ifdef JP
-                               fprintf(fff, " ¾èÇÏÃæ");
-#else
-                               fprintf(fff, " Riding");
-#endif
-                       fprintf(fff, "\n");
+                       monster_desc(pet_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+                       fprintf(fff, "%s (%s)\n", pet_name, look_mon_desc(m_ptr, 0x00));
                }
        }
 
+       /* Process the waiting pets (backwards) */
+       for (i = MAX_PARTY_MON - 1; i >= 0; i--)
+       {
+               /* Access the monster */
+               m_ptr = &party_mon[i];
+
+               /* Ignore "dead" monsters */
+               if (!m_ptr->r_idx) continue;
+
+               t_friends++;
+
+               /* List waiting pets */
+               monster_desc(pet_name, m_ptr, MD_ASSUME_OUTSIDE | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+               fprintf(fff, "%s (%s)\n", pet_name, look_mon_desc(m_ptr, 0x00));
+       }
+
        show_upkeep = calculate_upkeep();
 
        fprintf(fff, "----------------------------------------------\n");
 #ifdef JP
-       fprintf(fff, "    ¹ç·×: %d ɤ¤Î¥Ú¥Ã¥È\n", t_friends);
+       fprintf(fff, "    ¹ç·×: %d ÂΤΥڥåÈ\n", t_friends);
        fprintf(fff, " °Ý»ý¥³¥¹¥È: %d%% MP\n", show_upkeep);
 #else
        fprintf(fff, "   Total: %d pet%s.\n",
-               t_friends, (t_friends == 1 ? "" : "s"));
+               t_friends, (t_friends == 1 ? "" : "s"));
        fprintf(fff, "   Upkeep: %d%% mana.\n", show_upkeep);
 #endif
 
@@ -6436,7 +6995,7 @@ static void do_cmd_knowledge_pets(void)
 
        /* Display the file contents */
 #ifdef JP
-show_file(TRUE, file_name, "¸½ºß¤Î¥Ú¥Ã¥È", 0, 0);
+       show_file(TRUE, file_name, "¸½ºß¤Î¥Ú¥Ã¥È", 0, 0);
 #else
        show_file(TRUE, file_name, "Current Pets", 0, 0);
 #endif
@@ -6462,7 +7021,7 @@ static void do_cmd_knowledge_kill_count(void)
 
        char file_name[1024];
 
-       s32b Total = 0;
+       long Total = 0;
 
 
        /* Open a new file */
@@ -6515,21 +7074,12 @@ static void do_cmd_knowledge_kill_count(void)
 #else
                        fprintf(fff,"You have defeated no enemies yet.\n\n");
 #endif
-
-               else if (Total == 1)
-#ifdef JP
-                       fprintf(fff,"¤¢¤Ê¤¿¤Ï°ìɤ¤ÎŨ¤òÅݤ·¤Æ¤¤¤ë¡£\n\n");
-#else
-                       fprintf(fff,"You have defeated one enemy.\n\n");
-#endif
-
                else
 #ifdef JP
-                       fprintf(fff,"¤¢¤Ê¤¿¤Ï %lu ɤ¤ÎŨ¤òÅݤ·¤Æ¤¤¤ë¡£\n\n", Total);
+                       fprintf(fff,"¤¢¤Ê¤¿¤Ï%ldÂΤÎŨ¤òÅݤ·¤Æ¤¤¤ë¡£\n\n", Total);
 #else
-                       fprintf(fff,"You have defeated %lu enemies.\n\n", Total);
+                       fprintf(fff,"You have defeated %ld %s.\n\n", Total, (Total == 1) ? "enemy" : "enemies");
 #endif
-
        }
 
        Total = 0;
@@ -6543,12 +7093,12 @@ static void do_cmd_knowledge_kill_count(void)
                if (r_ptr->name) who[n++] = i;
        }
 
-        /* Select the sort method */
-        ang_sort_comp = ang_sort_comp_hook;
-        ang_sort_swap = ang_sort_swap_hook;
+       /* Select the sort method */
+       ang_sort_comp = ang_sort_comp_hook;
+       ang_sort_swap = ang_sort_swap_hook;
 
-        /* Sort the array by dungeon depth of monsters */
-        ang_sort(who, &why, n);
+       /* Sort the array by dungeon depth of monsters */
+       ang_sort(who, &why, n);
 
        /* Scan the monster races */
        for (k = 0; k < n; k++)
@@ -6574,11 +7124,11 @@ static void do_cmd_knowledge_kill_count(void)
                        if (This > 0)
                        {
 #ifdef JP
-/* p,t¤Ï¿Í¤È¿ô¤¨¤ë by ita*/
-if(strchr("pt",r_ptr->d_char))
-fprintf(fff, "     %3d ¿Í¤Î %s\n", This, r_name + r_ptr->name);
-else
-fprintf(fff, "     %3d ɤ¤Î %s\n", This, r_name + r_ptr->name);
+                               /* p,t¤Ï¿Í¤È¿ô¤¨¤ë by ita */
+                               if (strchr("pt", r_ptr->d_char))
+                                       fprintf(fff, "     %3d ¿Í¤Î %s\n", This, r_name + r_ptr->name);
+                               else
+                                       fprintf(fff, "     %3d ÂΤΠ%s\n", This, r_name + r_ptr->name);
 #else
                                if (This < 2)
                                {
@@ -6608,10 +7158,10 @@ fprintf(fff, "     %3d ɤ
 
        fprintf(fff,"----------------------------------------------\n");
 #ifdef JP
-       fprintf(fff,"    ¹ç·×: %lu ɤ¤òÅݤ·¤¿¡£\n", Total);
+       fprintf(fff,"    ¹ç·×: %lu ÂΤòÅݤ·¤¿¡£\n", Total);
 #else
        fprintf(fff,"   Total: %lu creature%s killed.\n",
-               Total, (Total == 1 ? "" : "s"));
+               Total, (Total == 1 ? "" : "s"));
 #endif
 
 
@@ -6623,7 +7173,7 @@ fprintf(fff, "     %3d ɤ
 
        /* Display the file contents */
 #ifdef JP
-show_file(TRUE, file_name, "Åݤ·¤¿Å¨¤Î¿ô", 0, 0);
+       show_file(TRUE, file_name, "Åݤ·¤¿Å¨¤Î¿ô", 0, 0);
 #else
        show_file(TRUE, file_name, "Kill Count", 0, 0);
 #endif
@@ -6635,79 +7185,1185 @@ show_file(TRUE, file_name, "
 
 
 /*
+ * Display the object groups.
+ */
+static void display_group_list(int col, int row, int wid, int per_page,
+       int grp_idx[], cptr group_text[], int grp_cur, int grp_top)
+{
+       int i;
+
+       /* Display lines until done */
+       for (i = 0; i < per_page && (grp_idx[i] >= 0); i++)
+       {
+               /* Get the group index */
+               int grp = grp_idx[grp_top + i];
+
+               /* Choose a color */
+               byte attr = (grp_top + i == grp_cur) ? TERM_L_BLUE : TERM_WHITE;
+
+               /* Erase the entire line */
+               Term_erase(col, row + i, wid);
+
+               /* Display the group label */
+               c_put_str(attr, group_text[grp], row + i, col);
+       }
+}
+
+
+/* 
+ * Move the cursor in a browser window 
+ */
+static void browser_cursor(char ch, int *column, int *grp_cur, int grp_cnt, 
+                                                  int *list_cur, int list_cnt)
+{
+       int d;
+       int col = *column;
+       int grp = *grp_cur;
+       int list = *list_cur;
+
+       /* Extract direction */
+       if (ch == ' ')
+       {
+               /* Hack -- scroll up full screen */
+               d = 3;
+       }
+       else if (ch == '-')
+       {
+               /* Hack -- scroll down full screen */
+               d = 9;
+       }
+       else
+       {
+               d = get_keymap_dir(ch);
+       }
+
+       if (!d) return;
+
+       /* Diagonals - hack */
+       if ((ddx[d] > 0) && ddy[d])
+       {
+               int browser_rows;
+               int wid, hgt;
+
+               /* Get size */
+               Term_get_size(&wid, &hgt);
+
+               browser_rows = hgt - 8;
+
+               /* Browse group list */
+               if (!col)
+               {
+                       int old_grp = grp;
+
+                       /* Move up or down */
+                       grp += ddy[d] * (browser_rows - 1);
+
+                       /* Verify */
+                       if (grp >= grp_cnt)     grp = grp_cnt - 1;
+                       if (grp < 0) grp = 0;
+                       if (grp != old_grp)     list = 0;
+               }
+
+               /* Browse sub-list list */
+               else
+               {
+                       /* Move up or down */
+                       list += ddy[d] * browser_rows;
+
+                       /* Verify */
+                       if (list >= list_cnt) list = list_cnt - 1;
+                       if (list < 0) list = 0;
+               }
+
+               (*grp_cur) = grp;
+               (*list_cur) = list;
+
+               return;
+       }
+
+       if (ddx[d])
+       {
+               col += ddx[d];
+               if (col < 0) col = 0;
+               if (col > 1) col = 1;
+
+               (*column) = col;
+
+               return;
+       }
+
+       /* Browse group list */
+       if (!col)
+       {
+               int old_grp = grp;
+
+               /* Move up or down */
+               grp += ddy[d];
+
+               /* Verify */
+               if (grp >= grp_cnt)     grp = grp_cnt - 1;
+               if (grp < 0) grp = 0;
+               if (grp != old_grp)     list = 0;
+       }
+
+       /* Browse sub-list list */
+       else
+       {
+               /* Move up or down */
+               list += ddy[d];
+
+               /* Verify */
+               if (list >= list_cnt) list = list_cnt - 1;
+               if (list < 0) list = 0;
+       }
+
+       (*grp_cur) = grp;
+       (*list_cur) = list;
+}
+
+
+/*
+ * Display visuals.
+ */
+static void display_visual_list(int col, int row, int height, int width, byte attr_top, byte char_left)
+{
+       int i, j;
+
+       /* Clear the display lines */
+       for (i = 0; i < height; i++)
+       {
+               Term_erase(col, row + i, width);
+       }
+
+       /* Bigtile mode uses double width */
+       if (use_bigtile) width /= 2;
+
+       /* Display lines until done */
+       for (i = 0; i < height; i++)
+       {
+               /* Display columns until done */
+               for (j = 0; j < width; j++)
+               {
+                       byte a, a2;
+                       char c, c2;
+                       int x = col + j;
+                       int y = row + i;
+                       int ia, ic;
+
+                       /* Bigtile mode uses double width */
+                       if (use_bigtile) x += j;
+
+                       ia = attr_top + i;
+                       ic = char_left + j;
+
+                       /* Ignore illegal characters */
+                       if (ia > 0x7f || ic > 0xff || ic < ' ' ||
+                           (!use_graphics && ic > 0x7f))
+                               continue;
+
+                       a = (byte)ia;
+                       c = (char)ic;
+
+                       /* Force correct code for both ASCII character and tile */
+                       if (c & 0x80) a |= 0x80;
+
+                       if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+                       /* Display symbol */
+                       Term_putch(x, y, a, c);
+
+                       /* Second byte */
+                       if (use_bigtile) Term_putch(x + 1, y, a2, c2);
+               }
+       }
+}
+
+
+/*
+ * Place the cursor at the collect position for visual mode
+ */
+static void place_visual_list_cursor(int col, int row, byte a, byte c, byte attr_top, byte char_left)
+{
+       int i = (a & 0x7f) - attr_top;
+       int j = c - char_left;
+
+       int x = col + j;
+       int y = row + i;
+
+       /* Bigtile mode uses double width */
+       if (use_bigtile) x += j;
+
+       /* Place the cursor */
+       Term_gotoxy(x, y);
+}
+
+
+/*
+ *  Clipboard variables for copy&paste in visual mode
+ */
+static byte attr_idx = 0;
+static byte char_idx = 0;
+
+/*
+ *  Do visual mode command -- Change symbols
+ */
+static bool visual_mode_command(char ch, bool *visual_list_ptr, 
+                               int height, int width, 
+                               byte *attr_top_ptr, byte *char_left_ptr, 
+                               byte *cur_attr_ptr, byte *cur_char_ptr)
+{
+       static byte attr_old = 0, char_old = 0;
+
+       switch (ch)
+       {
+       case ESCAPE:
+               if (*visual_list_ptr)
+               {
+                       /* Cancel change */
+                       *cur_attr_ptr = attr_old;
+                       *cur_char_ptr = char_old;
+                       *visual_list_ptr = FALSE;
+
+                       return TRUE;
+               }
+
+               break;
+
+       case '\n':
+       case '\r':
+               if (*visual_list_ptr)
+               {
+                       /* Accept change */
+                       *visual_list_ptr = FALSE;
+
+                       return TRUE;
+               }
+               break;
+
+       case 'V':
+       case 'v':
+               if (!*visual_list_ptr)
+               {
+                       *visual_list_ptr = TRUE;
+
+                       *attr_top_ptr = MAX(0, (*cur_attr_ptr & 0x7f) - 5);
+                       *char_left_ptr = MAX(0, *cur_char_ptr - 10);
+
+                       attr_old = *cur_attr_ptr;
+                       char_old = *cur_char_ptr;
+
+                       return TRUE;
+               }
+               break;
+
+       case 'C':
+       case 'c':
+               /* Set the visual */
+               attr_idx = *cur_attr_ptr;
+               char_idx = *cur_char_ptr;
+
+               return TRUE;
+
+       case 'P':
+       case 'p':
+               if (attr_idx || (!(char_idx & 0x80) && char_idx)) /* Allow TERM_DARK text */
+               {
+                       /* Set the char */
+                       *cur_attr_ptr = attr_idx;
+                       *attr_top_ptr = MAX(0, (*cur_attr_ptr & 0x7f) - 5);
+               }
+
+               if (char_idx)
+               {
+                       /* Set the char */
+                       *cur_char_ptr = char_idx;
+                       *char_left_ptr = MAX(0, *cur_char_ptr - 10);
+               }
+
+               return TRUE;
+
+       default:
+               if (*visual_list_ptr)
+               {
+                       int eff_width;
+                       int d = get_keymap_dir(ch);
+                       byte a = (*cur_attr_ptr & 0x7f);
+                       byte c = *cur_char_ptr;
+
+                       if (use_bigtile) eff_width = width / 2;
+                       else eff_width = width;
+                                       
+                       /* Restrict direction */
+                       if ((a == 0) && (ddy[d] < 0)) d = 0;
+                       if ((c == 0) && (ddx[d] < 0)) d = 0;
+                       if ((a == 0x7f) && (ddy[d] > 0)) d = 0;
+                       if ((c == 0xff) && (ddx[d] > 0)) d = 0;
+
+                       a += ddy[d];
+                       c += ddx[d];
+
+                       /* Force correct code for both ASCII character and tile */
+                       if (c & 0x80) a |= 0x80;
+
+                       /* Set the visual */
+                       *cur_attr_ptr = a;
+                       *cur_char_ptr = c;
+
+
+                       /* Move the frame */
+                       if ((ddx[d] < 0) && *char_left_ptr > MAX(0, (int)c - 10)) (*char_left_ptr)--;
+                       if ((ddx[d] > 0) && *char_left_ptr + eff_width < MIN(0xff, (int)c + 10)) (*char_left_ptr)++;
+                       if ((ddy[d] < 0) && *attr_top_ptr > MAX(0, (int)(a & 0x7f) - 4)) (*attr_top_ptr)--;
+                       if ((ddy[d] > 0) && *attr_top_ptr + height < MIN(0x7f, (a & 0x7f) + 4)) (*attr_top_ptr)++;
+                       return TRUE;
+               }
+                               
+               break;
+       }
+
+       /* Visual mode command is not used */
+       return FALSE;
+}
+
+
+/*
+ * Display the monsters in a group.
+ */
+static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
+       int mon_cur, int mon_top)
+{
+       int i;
+
+       /* Display lines until done */
+       for (i = 0; i < per_page && mon_idx[mon_top + i]; i++)
+       {
+               byte attr;
+               byte a, a2;
+               char c, c2;
+
+               /* Get the race index */
+               int r_idx = mon_idx[mon_top + i] ;
+
+               /* Access the race */
+               monster_race *r_ptr = &r_info[r_idx];
+
+
+               /* Choose a color */
+               attr = ((i + mon_top == mon_cur) ? TERM_L_BLUE : TERM_WHITE);
+
+               /* Display the name */
+               c_prt(attr, (r_name + r_ptr->name), row + i, col);
+
+               /* Hack -- visual_list mode */
+               if (per_page == 1)
+               {
+                       c_prt(attr, format("%02x/%02x", r_ptr->x_attr, r_ptr->x_char), row + i, 60);
+               }
+               else if (p_ptr->wizard) 
+               {
+                       c_prt(attr, format("%d", r_idx), row + i, 62);
+               }
+
+               a = r_ptr->x_attr;
+               c = r_ptr->x_char;
+               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+               /* Erase chars before overwritten by the race letter */
+               Term_erase(69, row + i, 255);
+
+               /* Display symbol */
+               Term_putch(70, row + i, a, c);
+
+               /* Second byte */
+               if (use_bigtile) Term_putch(70 + 1, row + i, a2, c2);
+
+               /* Display kills */
+               if (!(r_ptr->flags1 & RF1_UNIQUE)) put_str(format("%5d", r_ptr->r_pkills), row + i, 73);
+#ifdef JP
+               else c_put_str((r_ptr->max_num == 0 ? TERM_L_DARK : TERM_WHITE), (r_ptr->max_num == 0 ? "»àË´" : "À¸Â¸"), row + i, 74);
+#else
+               else c_put_str((r_ptr->max_num == 0 ? TERM_L_DARK : TERM_WHITE), (r_ptr->max_num == 0 ? " dead" : "alive"), row + i, 73);
+#endif
+       
+       }
+
+       /* Clear remaining lines */
+       for (; i < per_page; i++)
+       {
+               Term_erase(col, row + i, 255);
+       }
+}
+
+
+/*
+ * Display known monsters.
+ */
+static void do_cmd_knowledge_monsters(void)
+{
+       int i, len, max;
+       int grp_cur, grp_top, old_grp_cur;
+       int mon_cur, mon_top;
+       int grp_cnt, grp_idx[100];
+       int mon_cnt;
+       s16b *mon_idx;
+       
+       int column = 0;
+       bool flag;
+       bool redraw;
+
+       bool visual_list = FALSE;
+       byte attr_top = 0, char_left = 0;
+
+       int browser_rows;
+       int wid, hgt;
+
+       /* Get size */
+       Term_get_size(&wid, &hgt);
+
+       browser_rows = hgt - 8;
+
+       /* Allocate the "mon_idx" array */
+       C_MAKE(mon_idx, max_r_idx, s16b);
+
+       max = 0;
+       grp_cnt = 0;
+
+       /* Check every group */
+       for (i = 0; monster_group_text[i] != NULL; i++)
+       {
+               /* Measure the label */
+               len = strlen(monster_group_text[i]);
+
+               /* Save the maximum length */
+               if (len > max) max = len;
+
+               /* See if any monsters are known */
+               if ((monster_group_char[i] == ((char *) -1L)) || collect_monsters(i, mon_idx, 0x01))
+               {
+                       /* Build a list of groups with known monsters */
+                       grp_idx[grp_cnt++] = i;
+               }
+       }
+
+       /* Terminate the list */
+       grp_idx[grp_cnt] = -1;
+
+       old_grp_cur = -1;
+       grp_cur = grp_top = 0;
+       mon_cur = mon_top = 0;
+       mon_cnt = 0;
+
+       flag = FALSE;
+       redraw = TRUE;
+
+       while (!flag)
+       {
+               char ch;
+               monster_race *r_ptr;
+
+               if (redraw)
+               {
+                       clear_from(0);
+               
+#ifdef JP
+                       prt("Ãμ± - ¥â¥ó¥¹¥¿¡¼", 2, 0);
+                       prt("¥°¥ë¡¼¥×", 4, 0);
+                       prt("̾Á°", 4, max + 3);
+                       if (p_ptr->wizard) prt("Idx", 4, 62);
+                       prt("ʸ»ú »¦³²¿ô", 4, 67);
+#else
+                       prt("Knowledge - Monsters", 2, 0);
+                       prt("Group", 4, 0);
+                       prt("Name", 4, max + 3);
+                       if (p_ptr->wizard) prt("Idx", 4, 62);
+                       prt("Sym  Kills", 4, 68);
+#endif
+
+                       for (i = 0; i < 78; i++)
+                       {
+                               Term_putch(i, 5, TERM_WHITE, '=');
+                       }
+
+                       for (i = 0; i < browser_rows; i++)
+                       {
+                               Term_putch(max + 1, 6 + i, TERM_WHITE, '|');
+                       }
+
+                       redraw = FALSE;
+               }
+
+               /* Scroll group list */
+               if (grp_cur < grp_top) grp_top = grp_cur;
+               if (grp_cur >= grp_top + browser_rows) grp_top = grp_cur - browser_rows + 1;
+
+               /* Display a list of monster groups */
+               display_group_list(0, 6, max, browser_rows, grp_idx, monster_group_text, grp_cur, grp_top);
+
+               if (old_grp_cur != grp_cur)
+               {
+                       old_grp_cur = grp_cur;
+
+                       /* Get a list of monsters in the current group */
+                       mon_cnt = collect_monsters(grp_idx[grp_cur], mon_idx, 0x00);
+               }
+
+               /* Scroll monster list */
+               while (mon_cur < mon_top)
+                       mon_top = MAX(0, mon_top - browser_rows/2);
+               while (mon_cur >= mon_top + browser_rows)
+                       mon_top = MIN(mon_cnt - browser_rows, mon_top + browser_rows/2);
+
+               if (!visual_list)
+               {
+                       /* Display a list of monsters in the current group */
+                       display_monster_list(max + 3, 6, browser_rows, mon_idx, mon_cur, mon_top);
+               }
+               else
+               {
+                       mon_top = mon_cur;
+
+                       /* Display a monster name */
+                       display_monster_list(max + 3, 6, 1, mon_idx, mon_cur, mon_top);
+
+                       /* Display visual list below first monster */
+                       display_visual_list(max + 3, 7, browser_rows-1, wid - (max + 3), attr_top, char_left);
+               }
+
+               /* Prompt */
+#ifdef JP
+               prt(format("<Êý¸þ>, 'r'¤Ç»×¤¤½Ð¤ò¸«¤ë%s%s, ESC", visual_list ? ", ENTER¤Ç·èÄê" : ", 'v'¤Ç¥·¥ó¥Ü¥ëÊѹ¹", (attr_idx||char_idx) ? ", 'c', 'p'¤Ç¥Ú¡¼¥¹¥È" : ", 'c'¤Ç¥³¥Ô¡¼"), hgt - 1, 0);
+#else
+               prt(format("<dir>, 'r' to recall%s%s, ESC", visual_list ? ", ENTER to accept" : ", 'v' for visuals", (attr_idx||char_idx) ? ", 'c', 'p' to paste" : ", 'c' to copy"), hgt - 1, 0);
+#endif
+
+               /* Get the current monster */
+               r_ptr = &r_info[mon_idx[mon_cur]];
+
+               /* Mega Hack -- track this monster race */
+               if (mon_cnt) monster_race_track(mon_idx[mon_cur]);
+
+               /* Hack -- handle stuff */
+               handle_stuff();
+
+               if (visual_list)
+               {
+                       place_visual_list_cursor(max + 3, 7, r_ptr->x_attr, r_ptr->x_char, attr_top, char_left);
+               }
+               else if (!column)
+               {
+                       Term_gotoxy(0, 6 + (grp_cur - grp_top));
+               }
+               else
+               {
+                       Term_gotoxy(max + 3, 6 + (mon_cur - mon_top));
+               }
+       
+               ch = inkey();
+
+               /* Do visual mode command if needed */
+               if (visual_mode_command(ch, &visual_list, browser_rows-1, wid - (max + 3), &attr_top, &char_left, &r_ptr->x_attr, &r_ptr->x_char)) continue;
+
+               switch (ch)
+               {
+                       case ESCAPE:
+                       {
+                               flag = TRUE;
+                               break;
+                       }
+
+                       case 'R':
+                       case 'r':
+                       {
+                               /* Recall on screen */
+                               if (mon_idx[mon_cur])
+                               {
+                                       screen_roff(mon_idx[mon_cur], 0);
+
+                                       (void)inkey();
+       
+                                       redraw = TRUE;
+                               }
+                               break;
+                       }
+
+                       default:
+                       {
+                               /* Move the cursor */
+                               browser_cursor(ch, &column, &grp_cur, grp_cnt, &mon_cur, mon_cnt);
+
+                               break;
+                       }
+               }
+       }
+
+       /* Free the "mon_idx" array */
+       C_KILL(mon_idx, max_r_idx, s16b);
+}
+
+
+/*
+ * Display the objects in a group.
+ */
+static void display_object_list(int col, int row, int per_page, int object_idx[],
+       int object_cur, int object_top)
+{
+       int i;
+
+       /* Display lines until done */
+       for (i = 0; i < per_page && object_idx[object_top + i]; i++)
+       {
+               char o_name[80];
+               byte a, a2;
+               char c, c2;
+
+               /* Get the object index */
+               int k_idx = object_idx[object_top + i];
+
+               /* Access the object */
+               object_kind *k_ptr = &k_info[k_idx];
+
+               /* Choose a color */
+               byte attr = (k_ptr->aware ? TERM_WHITE : TERM_SLATE);
+               byte cursor = (k_ptr->aware ? TERM_L_BLUE : TERM_BLUE);
+
+               attr = ((i + object_top == object_cur) ? cursor : attr);
+               
+               /* Tidy name */
+               strip_name(o_name, k_idx);
+
+               /* Display the name */
+               c_prt(attr, o_name, row + i, col);
+
+               /* Hack -- visual_list mode */
+               if (per_page == 1)
+               {
+                       c_prt(attr, format("%02x/%02x", k_ptr->x_attr, k_ptr->x_char), row + i, 60);
+               }
+               else if (p_ptr->wizard)
+               {
+                       c_prt(attr, format ("%d", k_idx), row + i, 70);
+               }
+
+               a = k_ptr->flavor ? misc_to_attr[k_ptr->flavor] : k_ptr->x_attr;
+               c = k_ptr->flavor ? misc_to_char[k_ptr->flavor] : k_ptr->x_char;
+
+               /* Symbol is unknown */ 
+               if (!k_ptr->aware && !p_ptr->wizard)
+               {
+                       c = ' ';
+                       a = TERM_DARK;
+               }
+
+               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+               /* Display symbol */
+               Term_putch(76, row + i, a, c);
+
+               /* Second byte */
+               if (use_bigtile) Term_putch(76 + 1, row + i, a2, c2);
+       }
+
+       /* Clear remaining lines */
+       for (; i < per_page; i++)
+       {
+               Term_erase(col, row + i, 255);
+       }
+}
+
+/*
+ * Describe fake object
+ */
+static void desc_obj_fake(int k_idx)
+{
+       object_type *o_ptr;
+       object_type object_type_body;
+
+       /* Get local object */
+       o_ptr = &object_type_body;
+
+       /* Wipe the object */
+       object_wipe(o_ptr);
+
+       /* Create the artifact */
+       object_prep(o_ptr, k_idx);
+
+       /* It's fully know */
+       o_ptr->ident |= IDENT_KNOWN;
+
+       /* Track the object */
+       /* object_actual_track(o_ptr); */
+
+       /* Hack - mark as fake */
+       /* term_obj_real = FALSE; */
+
+       /* Hack -- Handle stuff */
+       handle_stuff();
+
+       if (!screen_object(o_ptr, SCROBJ_FAKE_OBJECT | SCROBJ_FORCE_DETAIL))
+       {
+#ifdef JP
+               msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£");
+#else
+               msg_print("You see nothing special.");
+#endif
+               msg_print(NULL);
+       }
+}
+
+
+
+/*
  * Display known objects
  */
 static void do_cmd_knowledge_objects(void)
 {
-       int k;
+       int i, len, max;
+       int grp_cur, grp_top, old_grp_cur;
+       int object_old, object_cur, object_top;
+       int grp_cnt, grp_idx[100];
+       int object_cnt;
+       int *object_idx;
 
-       FILE *fff;
+       int column = 0;
+       bool flag;
+       bool redraw;
 
-       char o_name[MAX_NLEN];
+       bool visual_list = FALSE;
+       byte attr_top = 0, char_left = 0;
 
-       char file_name[1024];
+       int browser_rows;
+       int wid, hgt;
+
+       /* Get size */
+       Term_get_size(&wid, &hgt);
 
+       browser_rows = hgt - 8;
 
-       /* Open a new file */
-       fff = my_fopen_temp(file_name, 1024);
-       if (!fff) {
+       /* Allocate the "object_idx" array */
+       C_MAKE(object_idx, max_k_idx, int);
+
+       max = 0;
+       grp_cnt = 0;
+
+       /* Check every group */
+       for (i = 0; object_group_text[i] != NULL; i++)
+       {
+               /* Measure the label */
+               len = strlen(object_group_text[i]);
+
+               /* Save the maximum length */
+               if (len > max) max = len;
+
+               /* See if any monsters are known */
+               if (collect_objects(i, object_idx))
+               {
+                       /* Build a list of groups with known monsters */
+                       grp_idx[grp_cnt++] = i;
+               }
+       }
+
+       /* Terminate the list */
+       grp_idx[grp_cnt] = -1;
+
+       old_grp_cur = -1;
+       grp_cur = grp_top = 0;
+       object_cur = object_top = 0;
+       object_old = -1;
+       object_cnt = 0;
+
+       flag = FALSE;
+       redraw = TRUE;
+
+       while (!flag)
+       {
+               char ch;
+               object_kind *k_ptr;
+
+               if (redraw)
+               {
+                       clear_from(0);
+               
 #ifdef JP
-           msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
+                       prt("Ãμ± - ¥¢¥¤¥Æ¥à", 2, 0);
+                       prt("¥°¥ë¡¼¥×", 4, 0);
+                       prt("̾Á°", 4, max + 3);
+                       if (p_ptr->wizard) prt("Idx", 4, 70);
+                       prt("ʸ»ú", 4, 74);
 #else
-           msg_format("Failed to create temporary file %s.", file_name);
+                       prt("Knowledge - objects", 2, 0);
+                       prt("Group", 4, 0);
+                       prt("Name", 4, max + 3);
+                       if (p_ptr->wizard) prt("Idx", 4, 70);
+                       prt("Sym", 4, 75);
 #endif
-           msg_print(NULL);
-           return;
+
+                       for (i = 0; i < 78; i++)
+                       {
+                               Term_putch(i, 5, TERM_WHITE, '=');
+                       }
+
+                       for (i = 0; i < browser_rows; i++)
+                       {
+                               Term_putch(max + 1, 6 + i, TERM_WHITE, '|');
+                       }
+
+                       redraw = FALSE;
+               }
+
+               /* Scroll group list */
+               if (grp_cur < grp_top) grp_top = grp_cur;
+               if (grp_cur >= grp_top + browser_rows) grp_top = grp_cur - browser_rows + 1;
+
+               /* Display a list of object groups */
+               display_group_list(0, 6, max, browser_rows, grp_idx, object_group_text, grp_cur, grp_top);
+
+               if (old_grp_cur != grp_cur)
+               {
+                       old_grp_cur = grp_cur;
+
+                       /* Get a list of objects in the current group */
+                       object_cnt = collect_objects(grp_idx[grp_cur], object_idx);
+               }
+
+               /* Scroll object list */
+               while (object_cur < object_top)
+                       object_top = MAX(0, object_top - browser_rows/2);
+               while (object_cur >= object_top + browser_rows)
+                       object_top = MIN(object_cnt - browser_rows, object_top + browser_rows/2);
+
+               if (!visual_list)
+               {
+                       /* Display a list of objects in the current group */
+                       display_object_list(max + 3, 6, browser_rows, object_idx, object_cur, object_top);
+               }
+               else
+               {
+                       object_top = object_cur;
+
+                       /* Display a list of objects in the current group */
+                       display_object_list(max + 3, 6, 1, object_idx, object_cur, object_top);
+
+                       /* Display visual list below first object */
+                       display_visual_list(max + 3, 7, browser_rows-1, wid - (max + 3), attr_top, char_left);
+               }
+
+               /* Get the current object */
+               k_ptr = &k_info[object_idx[object_cur]];
+
+               /* Mega Hack -- track this object */
+               if (object_cnt) object_kind_track(object_idx[object_cur]);
+
+               /* Prompt */
+#ifdef JP
+               prt(format("<Êý¸þ>, 'r'¤Ç¾ÜºÙ¤ò¸«¤ë%s%s, ESC", k_ptr->flavor ? "" : visual_list ? ", ENTER¤Ç·èÄê" : ", 'v'¤Ç¥·¥ó¥Ü¥ëÊѹ¹", (attr_idx||char_idx) ? ", 'c', 'p'¤Ç¥Ú¡¼¥¹¥È" : ", 'c'¤Ç¥³¥Ô¡¼"), hgt - 1, 0);
+#else
+               prt(format("<dir>, 'r' to recall%s%s, ESC", k_ptr->flavor ? "" : visual_list ? ", ENTER to accept" : ", 'v' for visuals", (attr_idx||char_idx) ? ", 'c', 'p' to paste" : ", 'c' to copy"), hgt - 1, 0);
+#endif
+
+               /* The "current" object changed */
+               if (object_old != object_idx[object_cur])
+               {
+                       /* Hack -- handle stuff */
+                       handle_stuff();
+
+                       /* Remember the "current" object */
+                       object_old = object_idx[object_cur];
+               }
+
+               if (visual_list)
+               {
+                       place_visual_list_cursor(max + 3, 7, k_ptr->x_attr, k_ptr->x_char, attr_top, char_left);
+               }
+               else if (!column)
+               {
+                       Term_gotoxy(0, 6 + (grp_cur - grp_top));
+               }
+               else
+               {
+                       Term_gotoxy(max + 3, 6 + (object_cur - object_top));
+               }
+       
+               ch = inkey();
+
+               /* Do visual mode command if needed */
+               /* Symbol of objects with flavor cannot be changed */
+               if (!k_ptr->flavor && visual_mode_command(ch, &visual_list, browser_rows-1, wid - (max + 3), &attr_top, &char_left, &k_ptr->x_attr, &k_ptr->x_char)) continue;
+
+               switch (ch)
+               {
+                       case ESCAPE:
+                       {
+                               flag = TRUE;
+                               break;
+                       }
+
+                       case 'R':
+                       case 'r':
+                       {
+                               /* Recall on screen */
+                               if (grp_cnt > 0)
+                                       desc_obj_fake(object_idx[object_cur]);
+
+                               redraw = TRUE;
+                               break;
+                       }
+
+                       default:
+                       {
+                               /* Move the cursor */
+                               browser_cursor(ch, &column, &grp_cur, grp_cnt, &object_cur, object_cnt);
+                               break;
+                       }
+               }
        }
 
-       /* Scan the object kinds */
-       for (k = 1; k < max_k_idx; k++)
+       /* Free the "object_idx" array */
+       C_KILL(object_idx, max_k_idx, int);
+}
+
+
+
+/*
+ * Display the features in a group.
+ */
+static void display_feature_list(int col, int row, int per_page, int *feat_idx,
+       int feat_cur, int feat_top)
+{
+       int i;
+
+       /* Display lines until done */
+       for (i = 0; i < per_page && feat_idx[feat_top + i]; i++)
+       {
+               byte a, a2;
+               char c, c2;
+               byte attr;
+
+               /* Get the index */
+               int f_idx = feat_idx[feat_top + i];
+
+               /* Access the index */
+               feature_type *f_ptr = &f_info[f_idx];
+
+               /* Choose a color */
+               attr = ((i + feat_top == feat_cur) ? TERM_L_BLUE : TERM_WHITE);
+
+               /* Display the name */
+               c_prt(attr, f_name + f_ptr->name, row + i, col);
+
+               /* Hack -- visual_list mode */
+               if (per_page == 1)
+               {
+                       c_prt(attr, format("%02x/%02x", f_ptr->x_attr, f_ptr->x_char), row + i, 60);
+               }
+
+               a = f_ptr->x_attr;
+               c = f_ptr->x_char;
+
+               if (use_bigtile) bigtile_attr(&c, &a, &c2, &a2);
+
+               /* Display symbol */
+               Term_putch(68, row + i, a, c);
+
+               /* Second byte */
+               if (use_bigtile) Term_putch(68 + 1, row + i, a2, c2);
+       }
+
+       /* Clear remaining lines */
+       for (; i < per_page; i++)
        {
-               object_kind *k_ptr = &k_info[k];
+               Term_erase(col, row + i, 255);
+       }
+}
+
+
+/*
+ * Interact with feature visuals.
+ */
+static void do_cmd_knowledge_features(void)
+{
+       int i, len, max;
+       int grp_cur, grp_top, old_grp_cur;
+       int feat_cur, feat_top;
+       int grp_cnt, grp_idx[100];
+       int feat_cnt;
+       int *feat_idx;
+       
+       int column = 0;
+       bool flag;
+       bool redraw;
+
+       bool visual_list = FALSE;
+       byte attr_top = 0, char_left = 0;
+
+       int browser_rows;
+       int wid, hgt;
+
+       /* Get size */
+       Term_get_size(&wid, &hgt);
+
+       browser_rows = hgt - 8;
+
+       /* Allocate the "feat_idx" array */
+       C_MAKE(feat_idx, max_f_idx, int);
+
+       max = 0;
+       grp_cnt = 0;
+
+       /* Check every group */
+       for (i = 0; feature_group_text[i] != NULL; i++)
+       {
+               /* Measure the label */
+               len = strlen(feature_group_text[i]);
+
+               /* Save the maximum length */
+               if (len > max) max = len;
+
+               /* See if any features are known */
+               if (collect_features(i, feat_idx))
+               {
+                       /* Build a list of groups with known features */
+                       grp_idx[grp_cnt++] = i;
+               }
+       }
+
+       /* Terminate the list */
+       grp_idx[grp_cnt] = -1;
+
+       old_grp_cur = -1;
+       grp_cur = grp_top = 0;
+       feat_cur = feat_top = 0;
+       feat_cnt = 0;
+
+       flag = FALSE;
+       redraw = TRUE;
+
+       while ((!flag) && (grp_cnt))
+       {
+               char ch;
+               feature_type *f_ptr;
+
+               if (redraw)
+               {
+                       clear_from(0);
+
+#ifdef JP
+                       prt("ɽ¼¨ - ÃÏ·Á", 2, 0);
+                       prt("¥°¥ë¡¼¥×", 4, 0);
+                       prt("̾Á°", 4, max + 3);
+                       prt("ʸ»ú", 4, 66);
+#else
+                       prt("Visuals - features", 2, 0);
+                       prt("Group", 4, 0);
+                       prt("Name", 4, max + 3);
+                       prt("Sym", 4, 67);
+#endif
+
+                       for (i = 0; i < 78; i++)
+                       {
+                               Term_putch(i, 5, TERM_WHITE, '=');
+                       }
+
+                       for (i = 0; i < browser_rows; i++)
+                       {
+                               Term_putch(max + 1, 6 + i, TERM_WHITE, '|');
+                       }
+
+                       redraw = FALSE;
+               }
+
+               /* Scroll group list */
+               if (grp_cur < grp_top) grp_top = grp_cur;
+               if (grp_cur >= grp_top + browser_rows) grp_top = grp_cur - browser_rows + 1;
 
-               /* Hack -- skip artifacts */
-               if (k_ptr->gen_flags & (TRG_INSTA_ART)) continue;
+               /* Display a list of feature groups */
+               display_group_list(0, 6, max, browser_rows, grp_idx, feature_group_text, grp_cur, grp_top);
 
-               /* List known flavored objects */
-               if (k_ptr->flavor && k_ptr->aware)
+               if (old_grp_cur != grp_cur)
                {
-                       object_type *i_ptr;
-                       object_type object_type_body;
+                       old_grp_cur = grp_cur;
 
-                       /* Get local object */
-                       i_ptr = &object_type_body;
-
-                       /* Create fake object */
-                       object_prep(i_ptr, k);
+                       /* Get a list of features in the current group */
+                       feat_cnt = collect_features(grp_idx[grp_cur], feat_idx);
+               }
 
-                       /* Describe the object */
-                       object_desc_store(o_name, i_ptr, FALSE, 0);
+               /* Scroll feature list */
+               while (feat_cur < feat_top)
+                       feat_top = MAX(0, feat_top - browser_rows/2);
+               while (feat_cur >= feat_top + browser_rows)
+                       feat_top = MIN(feat_cnt - browser_rows, feat_top + browser_rows/2);
 
-                       /* Print a message */
-                       fprintf(fff, "     %s\n", o_name);
+               if (!visual_list)
+               {
+                       /* Display a list of features in the current group */
+                       display_feature_list(max + 3, 6, browser_rows, feat_idx, feat_cur, feat_top);
                }
-       }
+               else
+               {
+                       feat_top = feat_cur;
 
-       /* Close the file */
-       my_fclose(fff);
+                       /* Display a list of features in the current group */
+                       display_feature_list(max + 3, 6, 1, feat_idx, feat_cur, feat_top);
 
-       /* Display the file contents */
+                       /* Display visual list below first object */
+                       display_visual_list(max + 3, 7, browser_rows-1, wid - (max + 3), attr_top, char_left);
+               }
+
+               /* Prompt */
 #ifdef JP
-       show_file(TRUE, file_name, "´ûÃΤΥ¢¥¤¥Æ¥à", 0, 0);
+               prt(format("<Êý¸þ>%s%s, ESC", visual_list ? ", ENTER¤Ç·èÄê" : ", 'v'¤Ç¥·¥ó¥Ü¥ëÊѹ¹", (attr_idx||char_idx) ? ", 'c', 'p'¤Ç¥Ú¡¼¥¹¥È" : ", 'c'¤Ç¥³¥Ô¡¼"), hgt - 1, 0);
 #else
-       show_file(TRUE, file_name, "Known Objects", 0, 0);
+               prt(format("<dir>%s%s, ESC", visual_list ? ", ENTER to accept" : ", 'v' for visuals", (attr_idx||char_idx) ? ", 'c', 'p' to paste" : ", 'c' to copy"), hgt - 1, 0);
 #endif
 
+               /* Get the current feature */
+               f_ptr = &f_info[feat_idx[feat_cur]];
 
-       /* Remove the file */
-       fd_kill(file_name);
+               if (visual_list)
+               {
+                       place_visual_list_cursor(max + 3, 7, f_ptr->x_attr, f_ptr->x_char, attr_top, char_left);
+               }
+               else if (!column)
+               {
+                       Term_gotoxy(0, 6 + (grp_cur - grp_top));
+               }
+               else
+               {
+                       Term_gotoxy(max + 3, 6 + (feat_cur - feat_top));
+               }
+       
+               ch = inkey();
+
+               /* Do visual mode command if needed */
+               if (visual_mode_command(ch, &visual_list, browser_rows-1, wid - (max + 3), &attr_top, &char_left, &f_ptr->x_attr, &f_ptr->x_char)) continue;
+
+               switch (ch)
+               {
+                       case ESCAPE:
+                       {
+                               flag = TRUE;
+                               break;
+                       }
+
+                       default:
+                       {
+                               /* Move the cursor */
+                               browser_cursor(ch, &column, &grp_cur, grp_cnt, &feat_cur, feat_cnt);
+                               break;
+                       }
+               }
+       }
+
+       /* Prompt */
+       if (!grp_cnt) msg_print("No features known.");
+
+       /* Free the "feat_idx" array */
+       C_KILL(feat_idx, max_f_idx, int);
 }
 
 
 /*
-* List virtues & status
-*
-*/
+ * List wanted monsters
+ */
 static void do_cmd_knowledge_kubi(void)
 {
        int i;
@@ -6730,6 +8386,8 @@ static void do_cmd_knowledge_kubi(void)
        
        if (fff)
        {
+               bool listed = FALSE;
+
 #ifdef JP
                fprintf(fff, "º£Æü¤Î¥¿¡¼¥²¥Ã¥È : %s\n", (p_ptr->today_mon ? r_name + r_info[p_ptr->today_mon].name : "ÉÔÌÀ"));
                fprintf(fff, "\n");
@@ -6739,17 +8397,25 @@ static void do_cmd_knowledge_kubi(void)
                fprintf(fff, "\n");
                fprintf(fff, "List of wanted monsters\n");
 #endif
+               fprintf(fff, "----------------------------------------------\n");
+
                for (i = 0; i < MAX_KUBI; i++)
                {
-                       fprintf(fff,"%-40s ---- ",r_name + r_info[(kubi_r_idx[i] > 10000 ? kubi_r_idx[i] - 10000 : kubi_r_idx[i])].name);
-                       if (kubi_r_idx[i] > 10000)
+                       if (kubi_r_idx[i] <= 10000)
+                       {
+                               fprintf(fff,"%s\n", r_name + r_info[kubi_r_idx[i]].name);
+
+                               listed = TRUE;
+                       }
+               }
+
+               if (!listed)
+               {
 #ifdef JP
-                               fprintf(fff, "ºÑ\n");
+                       fprintf(fff,"\n%s\n", "¾Þ¶â¼ó¤Ï¤â¤¦»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó¡£");
 #else
-                               fprintf(fff, "done\n");
+                       fprintf(fff,"\n%s\n", "There is no more wanted monster.");
 #endif
-                       else
-                               fprintf(fff, "$%d\n", 300 * (r_info[kubi_r_idx[i]].level + 1));
                }
        }
        
@@ -6758,7 +8424,7 @@ static void do_cmd_knowledge_kubi(void)
        
        /* Display the file contents */
 #ifdef JP
-show_file(TRUE, file_name, "¾Þ¶â¼ó¤Î°ìÍ÷", 0, 0);
+       show_file(TRUE, file_name, "¾Þ¶â¼ó¤Î°ìÍ÷", 0, 0);
 #else
        show_file(TRUE, file_name, "Wanted monsters", 0, 0);
 #endif
@@ -6769,9 +8435,8 @@ show_file(TRUE, file_name, "
 }
 
 /*
-* List virtues & status
-*
-*/
+ * List virtues & status
+ */
 static void do_cmd_knowledge_virtues(void)
 {
        FILE *fff;
@@ -6806,7 +8471,7 @@ static void do_cmd_knowledge_virtues(void)
        
        /* Display the file contents */
 #ifdef JP
-show_file(TRUE, file_name, "Ȭ¤Ä¤ÎÆÁ", 0, 0);
+       show_file(TRUE, file_name, "Ȭ¤Ä¤ÎÆÁ", 0, 0);
 #else
        show_file(TRUE, file_name, "Virtues", 0, 0);
 #endif
@@ -6866,7 +8531,7 @@ static void do_cmd_knowledge_dungeon(void)
        
        /* Display the file contents */
 #ifdef JP
-show_file(TRUE, file_name, "º£¤Þ¤Ç¤ËÆþ¤Ã¤¿¥À¥ó¥¸¥ç¥ó", 0, 0);
+       show_file(TRUE, file_name, "º£¤Þ¤Ç¤ËÆþ¤Ã¤¿¥À¥ó¥¸¥ç¥ó", 0, 0);
 #else
        show_file(TRUE, file_name, "Dungeon", 0, 0);
 #endif
@@ -6906,13 +8571,13 @@ static void do_cmd_knowledge_stat(void)
                        ((PY_MAX_LEVEL - 1+3) * (p_ptr->hitdie + 1))));
 
 #ifdef JP
-if (p_ptr->knowledge & KNOW_HPRATE) fprintf(fff, "¸½ºß¤ÎÂÎÎÏ¥é¥ó¥¯ : %d/100\n\n", percent);
-else fprintf(fff, "¸½ºß¤ÎÂÎÎÏ¥é¥ó¥¯ : ???\n\n");
-fprintf(fff, "ǽÎϤκÇÂçÃÍ\n\n");
+               if (p_ptr->knowledge & KNOW_HPRATE) fprintf(fff, "¸½ºß¤ÎÂÎÎÏ¥é¥ó¥¯ : %d/100\n\n", percent);
+               else fprintf(fff, "¸½ºß¤ÎÂÎÎÏ¥é¥ó¥¯ : ???\n\n");
+               fprintf(fff, "ǽÎϤκÇÂçÃÍ\n\n");
 #else
                if (p_ptr->knowledge & KNOW_HPRATE) fprintf(fff, "Your current Life Rating is %d/100.\n\n", percent);
                else fprintf(fff, "Your current Life Rating is ???.\n\n");
-fprintf(fff, "Limits of maximum stats\n\n");
+               fprintf(fff, "Limits of maximum stats\n\n");
 #endif
                for (v_nr = 0; v_nr < 6; v_nr++)
                {
@@ -6928,7 +8593,7 @@ fprintf(fff, "Limits of maximum stats\n\n");
        
        /* Display the file contents */
 #ifdef JP
-show_file(TRUE, file_name, "¼«Ê¬¤Ë´Ø¤¹¤ë¾ðÊó", 0, 0);
+       show_file(TRUE, file_name, "¼«Ê¬¤Ë´Ø¤¹¤ë¾ðÊó", 0, 0);
 #else
        show_file(TRUE, file_name, "HP-rate & Max stat", 0, 0);
 #endif
@@ -6938,13 +8603,12 @@ show_file(TRUE, file_name, "
        fd_kill(file_name);
 }
 
+
 /*
- * Print quest status of all active quests
+ * Print all active quests
  */
-static void do_cmd_knowledge_quests(void)
+static void do_cmd_knowledge_quests_current(FILE *fff)
 {
-       FILE *fff;
-       char file_name[1024];
        char tmp_str[120];
        char rand_tmp_str[120] = "\0";
        char name[80];
@@ -6953,18 +8617,6 @@ static void do_cmd_knowledge_quests(void)
        int rand_level = 100;
        int total = 0;
 
-       /* Open a new file */
-       fff = my_fopen_temp(file_name, 1024);
-       if (!fff) {
-#ifdef JP
-           msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
-#else
-           msg_format("Failed to create temporary file %s.", file_name);
-#endif
-           msg_print(NULL);
-           return;
-       }
-
 #ifdef JP
        fprintf(fff, "¡Ô¿ë¹ÔÃæ¤Î¥¯¥¨¥¹¥È¡Õ\n");
 #else
@@ -6973,53 +8625,52 @@ static void do_cmd_knowledge_quests(void)
 
        for (i = 1; i < max_quests; i++)
        {
-               /* No info from "silent" quests */
-               if (quest[i].flags & QUEST_FLAG_SILENT) continue;
-
-               if (quest[i].status == QUEST_STATUS_TAKEN || quest[i].status == QUEST_STATUS_COMPLETED)
+               if ((quest[i].status == QUEST_STATUS_TAKEN) || (quest[i].status == QUEST_STATUS_COMPLETED))
                {
-                       int old_quest;
+                       /* Set the quest number temporary */
+                       int old_quest = p_ptr->inside_quest;
                        int j;
 
                        /* Clear the text */
-                       for (j = 0; j < 10; j++)
-                       {
-                               quest_text[j][0] = '\0';
-                       }
-
+                       for (j = 0; j < 10; j++) quest_text[j][0] = '\0';
                        quest_text_line = 0;
 
-                       total++;
-
-                       /* Set the quest number temporary */
-                       old_quest = p_ptr->inside_quest;
                        p_ptr->inside_quest = i;
 
                        /* Get the quest text */
                        init_flags = INIT_SHOW_TEXT;
 
-                       process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                        /* Reset the old quest number */
                        p_ptr->inside_quest = old_quest;
 
+                       /* No info from "silent" quests */
+                       if (quest[i].flags & QUEST_FLAG_SILENT) continue;
+
+                       total++;
+
                        if (quest[i].type != QUEST_TYPE_RANDOM)
                        {
                                char note[80] = "\0";
 
                                if (quest[i].status == QUEST_STATUS_TAKEN)
                                {
-                                       if (quest[i].type == QUEST_TYPE_KILL_LEVEL || quest[i].type == QUEST_TYPE_KILL_ANY_LEVEL)
+                                       switch (quest[i].type)
                                        {
+                                       case QUEST_TYPE_KILL_LEVEL:
+                                       case QUEST_TYPE_KILL_ANY_LEVEL:
                                                r_ptr = &r_info[quest[i].r_idx];
                                                strcpy(name, r_name + r_ptr->name);
                                                if (quest[i].max_num > 1)
                                                {
 #ifdef JP
-                                                       sprintf(note," - %d ÂΤÎ%s¤òÅݤ¹¡£(¤¢¤È %d ÂÎ)",quest[i].max_num, name, quest[i].max_num-quest[i].cur_num);
+                                                       sprintf(note," - %d ÂΤÎ%s¤òÅݤ¹¡£(¤¢¤È %d ÂÎ)",
+                                                               quest[i].max_num, name, quest[i].max_num - quest[i].cur_num);
 #else
                                                        plural_aux(name);
-                                                       sprintf(note," - kill %d %s, have killed %d.",quest[i].max_num, name, quest[i].cur_num);
+                                                       sprintf(note," - kill %d %s, have killed %d.",
+                                                               quest[i].max_num, name, quest[i].cur_num);
 #endif
                                                }
                                                else
@@ -7028,58 +8679,63 @@ static void do_cmd_knowledge_quests(void)
 #else
                                                        sprintf(note," - kill %s.",name);
 #endif
-                                       }
-                                       else if (quest[i].type == QUEST_TYPE_KILL_NUMBER)
-                                       {
-#ifdef JP
-                                               sprintf(note," - %d ÂΤΥâ¥ó¥¹¥¿¡¼¤òÅݤ¹¡£(¤¢¤È %d ÂÎ)",quest[i].max_num, quest[i].max_num-quest[i].cur_num);
-#else
-                                               sprintf(note," - Kill %d monsters, have killed %d.",quest[i].max_num, quest[i].cur_num);
-#endif
-                                       }
-                                       else if (quest[i].type == QUEST_TYPE_FIND_ARTIFACT)
-                                       {
+                                               break;
+
+                                       case QUEST_TYPE_FIND_ARTIFACT:
                                                strcpy(name, a_name + a_info[quest[i].k_idx].name);
 #ifdef JP
                                                sprintf(note," - %s¤ò¸«¤Ä¤±½Ð¤¹¡£", name);
 #else
                                                sprintf(note," - Find out %s.", name);
 #endif
-                                       }
-                                       else if (quest[i].type == QUEST_TYPE_FIND_EXIT)
+                                               break;
+
+                                       case QUEST_TYPE_FIND_EXIT:
 #ifdef JP
                                                sprintf(note," - Ãµº÷¤¹¤ë¡£");
 #else
                                                sprintf(note," - Search.");
 #endif
-                                       else if (quest[i].type == QUEST_TYPE_KILL_ALL)
+                                               break;
+
+                                       case QUEST_TYPE_KILL_NUMBER:
+#ifdef JP
+                                               sprintf(note," - %d ÂΤΥâ¥ó¥¹¥¿¡¼¤òÅݤ¹¡£(¤¢¤È %d ÂÎ)",
+                                                       quest[i].max_num, quest[i].max_num - quest[i].cur_num);
+#else
+                                               sprintf(note," - Kill %d monsters, have killed %d.",
+                                                       quest[i].max_num, quest[i].cur_num);
+#endif
+                                               break;
+
+                                       case QUEST_TYPE_KILL_ALL:
 #ifdef JP
                                                sprintf(note," - Á´¤Æ¤Î¥â¥ó¥¹¥¿¡¼¤òÅݤ¹¡£");
 #else
                                                sprintf(note," - Kill all monsters.");
 #endif
+                                               break;
+                                       }
                                }
 
                                /* Print the quest info */
 #ifdef JP
-                               sprintf(tmp_str, "%s (´í¸±ÅÙ:%d³¬ÁêÅö)%s\n",
+                               sprintf(tmp_str, "  %s (´í¸±ÅÙ:%d³¬ÁêÅö)%s\n",
+                                       quest[i].name, quest[i].level, note);
 #else
-                               sprintf(tmp_str, "%s (Danger level: %d)%s\n",
-#endif
-
+                               sprintf(tmp_str, "  %s (Danger level: %d)%s\n",
                                        quest[i].name, quest[i].level, note);
+#endif
 
                                fprintf(fff, tmp_str);
 
                                if (quest[i].status == QUEST_STATUS_COMPLETED)
                                {
 #ifdef JP
-                                       sprintf(tmp_str, "  ¥¯¥¨¥¹¥ÈãÀ® - ¤Þ¤ÀÊó½·¤ò¼õ¤±¤È¤Ã¤Æ¤Ê¤¤¡£\n");
+                                       sprintf(tmp_str, "    ¥¯¥¨¥¹¥ÈãÀ® - ¤Þ¤ÀÊó½·¤ò¼õ¤±¤È¤Ã¤Æ¤Ê¤¤¡£\n");
 #else
-                                       sprintf(tmp_str, "  Quest Completed - Unrewarded\n");
+                                       sprintf(tmp_str, "    Quest Completed - Unrewarded\n");
 #endif
-
-
                                        fprintf(fff, tmp_str);
                                }
                                else
@@ -7088,13 +8744,12 @@ static void do_cmd_knowledge_quests(void)
 
                                        while (quest_text[j][0] && j < 10)
                                        {
-                                               fprintf(fff, "  %s\n", quest_text[j]);
+                                               fprintf(fff, "    %s\n", quest_text[j]);
                                                j++;
                                        }
                                }
                        }
-                       else if ((quest[i].type == QUEST_TYPE_RANDOM) &&
-                                (quest[i].level < rand_level))
+                       else if (quest[i].level < rand_level) /* QUEST_TYPE_RANDOM */
                        {
                                /* New random */
                                rand_level = quest[i].level;
@@ -7108,27 +8763,26 @@ static void do_cmd_knowledge_quests(void)
                                        if (quest[i].max_num > 1)
                                        {
 #ifdef JP
-sprintf(rand_tmp_str,"%s (%d ³¬) - %d ÂΤÎ%s¤òÅݤ¹¡£(¤¢¤È %d ÂÎ)\n",
-       quest[i].name, quest[i].level,
-       quest[i].max_num, name, quest[i].max_num-quest[i].cur_num);
+                                               sprintf(rand_tmp_str,"  %s (%d ³¬) - %d ÂΤÎ%s¤òÅݤ¹¡£(¤¢¤È %d ÂÎ)\n",
+                                                       quest[i].name, quest[i].level,
+                                                       quest[i].max_num, name, quest[i].max_num - quest[i].cur_num);
 #else
                                                plural_aux(name);
 
-                                               sprintf(rand_tmp_str,"%s (Dungeon level: %d)\n  Kill %d %s, have killed %d.\n",
+                                               sprintf(rand_tmp_str,"  %s (Dungeon level: %d)\n  Kill %d %s, have killed %d.\n",
                                                        quest[i].name, quest[i].level,
                                                        quest[i].max_num, name, quest[i].cur_num);
 #endif
-
                                        }
                                        else
                                        {
 #ifdef JP
-sprintf(rand_tmp_str,"%s (%d ³¬) - %s¤òÅݤ¹¡£\n",
+                                               sprintf(rand_tmp_str,"  %s (%d ³¬) - %s¤òÅݤ¹¡£\n",
+                                                       quest[i].name, quest[i].level, name);
 #else
-                                               sprintf(rand_tmp_str,"%s (Dungeon level: %d)\n  Kill %s.\n",
-#endif
-
+                                               sprintf(rand_tmp_str,"  %s (Dungeon level: %d)\n  Kill %s.\n",
                                                        quest[i].name, quest[i].level, name);
+#endif
                                        }
                                }
                        }
@@ -7139,162 +8793,193 @@ sprintf(rand_tmp_str,"%s (%d 
        if (rand_tmp_str[0]) fprintf(fff, rand_tmp_str);
 
 #ifdef JP
-       if (!total) fprintf(fff, "¤Ê¤·\n");
+       if (!total) fprintf(fff, "  ¤Ê¤·\n");
 #else
-       if (!total) fprintf(fff, "Nothing.\n");
+       if (!total) fprintf(fff, "  Nothing.\n");
 #endif
+}
+
+
+/*
+ * Print all finished quests
+ */
+void do_cmd_knowledge_quests_completed(FILE *fff, int quest_num[])
+{
+       char tmp_str[120];
+       int i;
+       int total = 0;
 
 #ifdef JP
-       fprintf(fff, "\n¡ÔãÀ®¤·¤¿¥¯¥¨¥¹¥È¡Õ\n");
+       fprintf(fff, "¡ÔãÀ®¤·¤¿¥¯¥¨¥¹¥È¡Õ\n");
 #else
-       fprintf(fff, "\n< Completed Quest >\n");
+       fprintf(fff, "< Completed Quest >\n");
 #endif
-       total = 0;
        for (i = 1; i < max_quests; i++)
        {
-               /* No info from "silent" quests */
-               if (quest[i].flags & QUEST_FLAG_SILENT) continue;
+               int q_idx = quest_num[i];
 
-               if (quest[i].status == QUEST_STATUS_FINISHED)
+               if (quest[q_idx].status == QUEST_STATUS_FINISHED)
                {
-                       int old_quest;
-
-                       total++;
-
-                       if (i < MIN_RANDOM_QUEST)
+                       if (is_fixed_quest_idx(q_idx))
                        {
                                /* Set the quest number temporary */
-                               old_quest = p_ptr->inside_quest;
-                               p_ptr->inside_quest = i;
+                               int old_quest = p_ptr->inside_quest;
+
+                               p_ptr->inside_quest = q_idx;
 
                                /* Get the quest */
                                init_flags = INIT_ASSIGN;
 
-                               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                                /* Reset the old quest number */
                                p_ptr->inside_quest = old_quest;
+
+                               /* No info from "silent" quests */
+                               if (quest[q_idx].flags & QUEST_FLAG_SILENT) continue;
                        }
 
-                       if ((i >= MIN_RANDOM_QUEST) && quest[i].r_idx)
+                       total++;
+
+                       if (!is_fixed_quest_idx(q_idx) && quest[q_idx].r_idx)
                        {
                                /* Print the quest info */
 
-                                if (quest[i].complev == 0)
-                                {
-                                        sprintf(tmp_str, 
+                               if (quest[q_idx].complev == 0)
+                               {
+                                       sprintf(tmp_str,
 #ifdef JP
-                                                "%s (%d³¬) - ÉÔÀᄀ\n",
+                                               "  %-40s (%3d³¬)            -   ÉÔÀᄀ\n",
 #else
-                                                "%s (Dungeon level: %d) - (Cancelled)\n",
+                                               "  %-40s (Dungeon level: %3d) - (Cancelled)\n",
 #endif
-                                                r_name+r_info[quest[i].r_idx].name,
-                                                quest[i].level);
-                                }
-                                else
-                                {
-                                        sprintf(tmp_str, 
+                                               r_name+r_info[quest[q_idx].r_idx].name,
+                                               quest[q_idx].level);
+                               }
+                               else
+                               {
+                                       sprintf(tmp_str,
 #ifdef JP
-                                                "%s (%d³¬) - ¥ì¥Ù¥ë%d\n",
+                                               "  %-40s (%3d³¬)            - ¥ì¥Ù¥ë%2d\n",
 #else
-                                                "%s (Dungeon level: %d) - level %d\n",
+                                               "  %-40s (Dungeon level: %3d) - level %2d\n",
 #endif
-                                                r_name+r_info[quest[i].r_idx].name,
-                                                quest[i].level,
-                                                quest[i].complev);
-                                }
+                                               r_name+r_info[quest[q_idx].r_idx].name,
+                                               quest[q_idx].level,
+                                               quest[q_idx].complev);
+                               }
                        }
                        else
                        {
                                /* Print the quest info */
 #ifdef JP
-                               sprintf(tmp_str, "%s (´í¸±ÅÙ:%d³¬ÁêÅö) - ¥ì¥Ù¥ë%d\n",
+                               sprintf(tmp_str, "  %-40s (´í¸±ÅÙ:%3d³¬ÁêÅö) - ¥ì¥Ù¥ë%2d\n",
+                                       quest[q_idx].name, quest[q_idx].level, quest[q_idx].complev);
 #else
-                               sprintf(tmp_str, "%s (Danger level: %d) - level %d\n",
+                               sprintf(tmp_str, "  %-40s (Danger  level: %3d) - level %2d\n",
+                                       quest[q_idx].name, quest[q_idx].level, quest[q_idx].complev);
 #endif
-
-                                       quest[i].name, quest[i].level, quest[i].complev);
                        }
 
                        fprintf(fff, tmp_str);
                }
        }
 #ifdef JP
-       if (!total) fprintf(fff, "¤Ê¤·\n");
+       if (!total) fprintf(fff, "  ¤Ê¤·\n");
 #else
-       if (!total) fprintf(fff, "Nothing.\n");
+       if (!total) fprintf(fff, "  Nothing.\n");
 #endif
+}
+
+
+/*
+ * Print all failed quests
+ */
+void do_cmd_knowledge_quests_failed(FILE *fff, int quest_num[])
+{
+       char tmp_str[120];
+       int i;
+       int total = 0;
 
 #ifdef JP
-       fprintf(fff, "\n¡Ô¼ºÇÔ¤·¤¿¥¯¥¨¥¹¥È¡Õ\n");
+       fprintf(fff, "¡Ô¼ºÇÔ¤·¤¿¥¯¥¨¥¹¥È¡Õ\n");
 #else
-       fprintf(fff, "\n< Failed Quest >\n");
+       fprintf(fff, "< Failed Quest >\n");
 #endif
-       total = 0;
        for (i = 1; i < max_quests; i++)
        {
-               /* No info from "silent" quests */
-               if (quest[i].flags & QUEST_FLAG_SILENT) continue;
+               int q_idx = quest_num[i];
 
-               if ((quest[i].status == QUEST_STATUS_FAILED_DONE) || (quest[i].status == QUEST_STATUS_FAILED))
+               if ((quest[q_idx].status == QUEST_STATUS_FAILED_DONE) || (quest[q_idx].status == QUEST_STATUS_FAILED))
                {
-                       int old_quest;
-
-                       total++;
-
-                       if (i < MIN_RANDOM_QUEST)
+                       if (is_fixed_quest_idx(q_idx))
                        {
                                /* Set the quest number temporary */
-                               old_quest = p_ptr->inside_quest;
-                               p_ptr->inside_quest = i;
+                               int old_quest = p_ptr->inside_quest;
+
+                               p_ptr->inside_quest = q_idx;
 
                                /* Get the quest text */
                                init_flags = INIT_ASSIGN;
 
-                               process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+                               process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                                /* Reset the old quest number */
                                p_ptr->inside_quest = old_quest;
+
+                               /* No info from "silent" quests */
+                               if (quest[q_idx].flags & QUEST_FLAG_SILENT) continue;
                        }
 
-                       if ((i >= MIN_RANDOM_QUEST) && quest[i].r_idx)
+                       total++;
+
+                       if (!is_fixed_quest_idx(q_idx) && quest[q_idx].r_idx)
                        {
                                /* Print the quest info */
 #ifdef JP
-                               sprintf(tmp_str, "%s (%d³¬) - ¥ì¥Ù¥ë%d\n",
+                               sprintf(tmp_str, "  %-40s (%3d³¬)            - ¥ì¥Ù¥ë%2d\n",
+                                       r_name+r_info[quest[q_idx].r_idx].name, quest[q_idx].level, quest[q_idx].complev);
 #else
-                               sprintf(tmp_str, "%s (Dungeon level: %d) - level %d\n",
+                               sprintf(tmp_str, "  %-40s (Dungeon level: %3d) - level %2d\n",
+                                       r_name+r_info[quest[q_idx].r_idx].name, quest[q_idx].level, quest[q_idx].complev);
 #endif
-
-                                       r_name+r_info[quest[i].r_idx].name, quest[i].level, quest[i].complev);
                        }
                        else
                        {
                                /* Print the quest info */
 #ifdef JP
-                               sprintf(tmp_str, "%s (´í¸±ÅÙ:%d³¬ÁêÅö) - ¥ì¥Ù¥ë%d\n",
+                               sprintf(tmp_str, "  %-40s (´í¸±ÅÙ:%3d³¬ÁêÅö) - ¥ì¥Ù¥ë%2d\n",
+                                       quest[q_idx].name, quest[q_idx].level, quest[q_idx].complev);
 #else
-                               sprintf(tmp_str, "%s (Danger level: %d) - level %d\n",
+                               sprintf(tmp_str, "  %-40s (Danger  level: %3d) - level %2d\n",
+                                       quest[q_idx].name, quest[q_idx].level, quest[q_idx].complev);
 #endif
-
-                                       quest[i].name, quest[i].level, quest[i].complev);
                        }
                        fprintf(fff, tmp_str);
                }
        }
 #ifdef JP
-       if (!total) fprintf(fff, "¤Ê¤·\n");
+       if (!total) fprintf(fff, "  ¤Ê¤·\n");
 #else
-       if (!total) fprintf(fff, "Nothing.\n");
+       if (!total) fprintf(fff, "  Nothing.\n");
 #endif
+}
+
+
+/*
+ * Print all random quests
+ */
+static void do_cmd_knowledge_quests_wiz_random(FILE *fff)
+{
+       char tmp_str[120];
+       int i;
+       int total = 0;
 
-       if (p_ptr->wizard) {
 #ifdef JP
-       fprintf(fff, "\n¡Ô»Ä¤ê¤Î¥é¥ó¥À¥à¥¯¥¨¥¹¥È¡Õ\n");
+       fprintf(fff, "¡Ô»Ä¤ê¤Î¥é¥ó¥À¥à¥¯¥¨¥¹¥È¡Õ\n");
 #else
-       fprintf(fff, "\n< Remaining Random Quest >\n");
+       fprintf(fff, "< Remaining Random Quest >\n");
 #endif
-       total = 0;
        for (i = 1; i < max_quests; i++)
        {
                /* No info from "silent" quests */
@@ -7306,21 +8991,94 @@ sprintf(rand_tmp_str,"%s (%d 
 
                        /* Print the quest info */
 #ifdef JP
-                       sprintf(tmp_str, "%s (%d³¬, %s)\n",
+                       sprintf(tmp_str, "  %s (%d³¬, %s)\n",
+                               quest[i].name, quest[i].level, r_name+r_info[quest[i].r_idx].name);
 #else
-                       sprintf(tmp_str, "%s (%d, %s)\n",
-#endif
-
+                       sprintf(tmp_str, "  %s (%d, %s)\n",
                                quest[i].name, quest[i].level, r_name+r_info[quest[i].r_idx].name);
+#endif
                        fprintf(fff, tmp_str);
                }
        }
 #ifdef JP
-       if (!total) fprintf(fff, "¤Ê¤·\n");
+       if (!total) fprintf(fff, "  ¤Ê¤·\n");
+#else
+       if (!total) fprintf(fff, "  Nothing.\n");
+#endif
+}
+
+
+bool ang_sort_comp_quest_num(vptr u, vptr v, int a, int b)
+{
+       int *q_num = (int *)u;
+       quest_type *qa = &quest[q_num[a]];
+       quest_type *qb = &quest[q_num[b]];
+
+       /* Unused */
+       (void)v;
+
+       if (qa->complev < qb->complev) return TRUE;
+       if (qa->complev > qb->complev) return FALSE;
+       if (qa->level <= qb->level) return TRUE;
+       return FALSE;
+}
+
+void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b)
+{
+       int *q_num = (int *)u;
+       int tmp;
+
+       /* Unused */
+       (void)v;
+
+       tmp = q_num[a];
+       q_num[a] = q_num[b];
+       q_num[b] = tmp;
+}
+
+
+/*
+ * Print quest status of all active quests
+ */
+static void do_cmd_knowledge_quests(void)
+{
+       FILE *fff;
+       char file_name[1024];
+       int *quest_num, dummy, i;
+
+       /* Open a new file */
+       fff = my_fopen_temp(file_name, 1024);
+       if (!fff)
+       {
+#ifdef JP
+           msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
 #else
-       if (!total) fprintf(fff, "Nothing.\n");
+           msg_format("Failed to create temporary file %s.", file_name);
 #endif
-       }       
+           msg_print(NULL);
+           return;
+       }
+
+       /* Allocate Memory */
+       C_MAKE(quest_num, max_quests, int);
+
+       /* Sort by compete level */
+       for (i = 1; i < max_quests; i++) quest_num[i] = i;
+       ang_sort_comp = ang_sort_comp_quest_num;
+       ang_sort_swap = ang_sort_swap_quest_num;
+       ang_sort(quest_num, &dummy, max_quests);
+
+       /* Dump Quest Information */
+       do_cmd_knowledge_quests_current(fff);
+       fputc('\n', fff);
+       do_cmd_knowledge_quests_completed(fff, quest_num);
+       fputc('\n', fff);
+       do_cmd_knowledge_quests_failed(fff, quest_num);
+       if (p_ptr->wizard)
+       {
+               fputc('\n', fff);
+               do_cmd_knowledge_quests_wiz_random(fff);
+       }
 
        /* Close the file */
        my_fclose(fff);
@@ -7332,41 +9090,41 @@ sprintf(rand_tmp_str,"%s (%d 
        show_file(TRUE, file_name, "Quest status", 0, 0);
 #endif
 
-
        /* Remove the file */
        fd_kill(file_name);
-}
 
+       /* Free Memory */
+       C_KILL(quest_num, max_quests, int);
+}
 
 
 /*
-* List my home
-*
-*/
+ * List my home
+ */
 static void do_cmd_knowledge_home(void)
 {
        FILE *fff;
-       
-       int i, x;
+
+       int i;
        char file_name[1024];
        store_type  *st_ptr;
        char o_name[MAX_NLEN];
        cptr            paren = ")";
 
-       process_dungeon_file("w_info_j.txt", 0, 0, max_wild_y, max_wild_x);
+       process_dungeon_file("w_info.txt", 0, 0, max_wild_y, max_wild_x);
 
        /* Open a new file */
        fff = my_fopen_temp(file_name, 1024);
        if (!fff) {
 #ifdef JP
-           msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
+               msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£", file_name);
 #else
-           msg_format("Failed to create temporary file %s.", file_name);
+               msg_format("Failed to create temporary file %s.", file_name);
 #endif
-           msg_print(NULL);
-           return;
+               msg_print(NULL);
+               return;
        }
-       
+
        if (fff)
        {
                /* Print all homes in the different towns */
@@ -7375,19 +9133,21 @@ static void do_cmd_knowledge_home(void)
                /* Home -- if anything there */
                if (st_ptr->stock_num)
                {
+#ifdef JP
+                       int x = 1;
+#endif
                        /* Header with name of the town */
 #ifdef JP
                        fprintf(fff, "  [ ²æ¤¬²È¤Î¥¢¥¤¥Æ¥à ]\n");
 #else
                        fprintf(fff, "  [Home Inventory]\n");
 #endif
-                               x = 1;
 
                        /* Dump all available items */
                        for (i = 0; i < st_ptr->stock_num; i++)
                        {
 #ifdef JP
-                               if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
+                               if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
                                object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
                                if (strlen(o_name) <= 80-3)
                                {
@@ -7415,18 +9175,18 @@ static void do_cmd_knowledge_home(void)
                        fprintf(fff, "\n\n");
                }
        }
-       
+
        /* Close the file */
        my_fclose(fff);
-       
+
        /* Display the file contents */
 #ifdef JP
-show_file(TRUE, file_name, "²æ¤¬²È¤Î¥¢¥¤¥Æ¥à", 0, 0);
+       show_file(TRUE, file_name, "²æ¤¬²È¤Î¥¢¥¤¥Æ¥à", 0, 0);
 #else
        show_file(TRUE, file_name, "Home Inventory", 0, 0);
 #endif
 
-       
+
        /* Remove the file */
        fd_kill(file_name);
 }
@@ -7492,7 +9252,7 @@ static void do_cmd_knowledge_autopick(void)
                        tmp = "Destroy";
 #endif
                }
-               else
+               else if (act & DO_AUTOPICK)
                {
 #ifdef JP
                        tmp = "½¦¤¦";
@@ -7500,6 +9260,14 @@ static void do_cmd_knowledge_autopick(void)
                        tmp = "Pickup";
 #endif
                }
+               else /* if (act & DO_QUERY_AUTOPICK) */ /* Obvious */
+               {
+#ifdef JP
+                       tmp = "³Îǧ";
+#else
+                       tmp = "Query";
+#endif
+               }
 
                if (act & DO_DISPLAY)
                        fprintf(fff, "%11s", format("[%s]", tmp));
@@ -7555,12 +9323,13 @@ void do_cmd_knowledge(void)
                        prt("(1) ´ûÃΤÎÅÁÀâ¤Î¥¢¥¤¥Æ¥à                 ¤Î°ìÍ÷", 6, 5);
                        prt("(2) ´ûÃΤΥ¢¥¤¥Æ¥à                       ¤Î°ìÍ÷", 7, 5);
                        prt("(3) ´ûÃΤÎÀ¸¤­¤Æ¤¤¤ë¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼ ¤Î°ìÍ÷", 8, 5);
-                       prt("(4) Åݤ·¤¿¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼           ¤Î°ìÍ÷", 9, 5);
+                       prt("(4) ´ûÃΤΥâ¥ó¥¹¥¿¡¼                     ¤Î°ìÍ÷", 9, 5);
                        prt("(5) Åݤ·¤¿Å¨¤Î¿ô                         ¤Î°ìÍ÷", 10, 5);
                        prt("(6) ¾Þ¶â¼ó                               ¤Î°ìÍ÷", 11, 5);
                        prt("(7) ¸½ºß¤Î¥Ú¥Ã¥È                         ¤Î°ìÍ÷", 12, 5);
                        prt("(8) ²æ¤¬²È¤Î¥¢¥¤¥Æ¥à                     ¤Î°ìÍ÷", 13, 5);
                        prt("(9) *´ÕÄê*ºÑ¤ßÁõÈ÷¤ÎÂÑÀ­                 ¤Î°ìÍ÷", 14, 5);
+                       prt("(0) ÃÏ·Á¤Îɽ¼¨Ê¸»ú/¥¿¥¤¥ë                ¤Î°ìÍ÷", 15, 5);
                } else {
                        prt("(a) ¼«Ê¬¤Ë´Ø¤¹¤ë¾ðÊó                     ¤Î°ìÍ÷", 6, 5);
                        prt("(b) ÆÍÁ³ÊÑ°Û                             ¤Î°ìÍ÷", 7, 5);
@@ -7577,12 +9346,13 @@ void do_cmd_knowledge(void)
                        prt("(1) Display known artifacts", 6, 5);
                        prt("(2) Display known objects", 7, 5);
                        prt("(3) Display remaining uniques", 8, 5);
-                       prt("(4) Display dead uniques", 9, 5);
+                       prt("(4) Display known monster", 9, 5);
                        prt("(5) Display kill count", 10, 5);
                        prt("(6) Display wanted monsters", 11, 5);
                        prt("(7) Display current pets", 12, 5);
                        prt("(8) Display home inventory", 13, 5);
                        prt("(9) Display *identified* equip.", 14, 5);
+                       prt("(0) Display terrain symbols.", 15, 5);
                } else {
                        prt("(a) Display about yourself", 6, 5);
                        prt("(b) Display mutations", 7, 5);
@@ -7597,13 +9367,13 @@ void do_cmd_knowledge(void)
 #endif
                /* Prompt */
 #ifdef JP
-               prt("-³¤¯-", 16, 8);
+               prt("-³¤¯-", 17, 8);
                prt("ESC) È´¤±¤ë", 21, 1);
                prt("SPACE) ¼¡¥Ú¡¼¥¸", 21, 30);
                /*prt("-) Á°¥Ú¡¼¥¸", 21, 60);*/
                prt("¥³¥Þ¥ó¥É:", 20, 0);
 #else
-               prt("-more-", 16, 8);
+               prt("-more-", 17, 8);
                prt("ESC) Exit menu", 21, 1);
                prt("SPACE) Next page", 21, 30);
                /*prt("-) Previous page", 21, 60);*/
@@ -7629,8 +9399,8 @@ void do_cmd_knowledge(void)
                case '3': /* Uniques */
                        do_cmd_knowledge_uniques();
                        break;
-               case '4': /* Uniques */
-                       do_cmd_knowledge_uniques_dead();
+               case '4': /* Monsters */
+                       do_cmd_knowledge_monsters();
                        break;
                case '5': /* Kill count  */
                        do_cmd_knowledge_kill_count();
@@ -7647,6 +9417,9 @@ void do_cmd_knowledge(void)
                case '9': /* Resist list */
                        do_cmd_knowledge_inven();
                        break;
+               case '0': /* Feature list */
+                       do_cmd_knowledge_features();
+                       break;
                /* Next page */
                case 'a': /* Max stat */
                        do_cmd_knowledge_stat();
@@ -7714,6 +9487,7 @@ void do_cmd_time(void)
        char desc[1024];
 
        char buf[1024];
+       char day_buf[10];
 
        FILE *fff;
 
@@ -7727,41 +9501,46 @@ void do_cmd_time(void)
        num = 0;
 
 #ifdef JP
-strcpy(desc, "ÊѤʻþ¹ï¤À¡£");
+       strcpy(desc, "ÊѤʻþ¹ï¤À¡£");
 #else
        strcpy(desc, "It is a strange time.");
 #endif
 
 
+       if (day < MAX_DAYS) sprintf(day_buf, "%d", day);
+       else strcpy(day_buf, "*****");
+
        /* Message */
 #ifdef JP
-msg_format("%d ÆüÌÜ,»þ¹ï¤Ï%d:%02d %s¤Ç¤¹¡£",
+       msg_format("%sÆüÌÜ, »þ¹ï¤Ï%d:%02d %s¤Ç¤¹¡£",
+                  day_buf, (hour % 12 == 0) ? 12 : (hour % 12),
+                  min, (hour < 12) ? "AM" : "PM");
 #else
-       msg_format("This is day %d. The time is %d:%02d %s.",
+       msg_format("This is day %s. The time is %d:%02d %s.",
+                  day_buf, (hour % 12 == 0) ? 12 : (hour % 12),
+                  min, (hour < 12) ? "AM" : "PM");
 #endif
 
-                                 day, (hour % 12 == 0) ? 12 : (hour % 12),
-                                 min, (hour < 12) ? "AM" : "PM");
 
        /* Find the path */
        if (!randint0(10) || p_ptr->image)
-               {
+       {
 #ifdef JP
                path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "timefun_j.txt");
 #else
                path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "timefun.txt");
 #endif
 
-               }
-               else
-               {
+       }
+       else
+       {
 #ifdef JP
                path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "timenorm_j.txt");
 #else
                path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "timenorm.txt");
 #endif
 
-               }
+       }
 
        /* Open this file */
        fff = my_fopen(buf, "rt");