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;
fprintf(fff, " %2d:%02d %20s ", hour, min, note_level);
switch (num)
{
- case 0:
+ case RECORD_NAMED_PET_NAME:
#ifdef JP
fprintf(fff, "%s¤òι¤Îͧ¤Ë¤¹¤ë¤³¤È¤Ë·è¤á¤¿¡£\n", note);
#else
fprintf(fff, "decided to travel together with %s.\n", note);
#endif
break;
- case 1:
+ case RECORD_NAMED_PET_UNNAME:
#ifdef JP
fprintf(fff, "%s¤Î̾Á°¤ò¾Ã¤·¤¿¡£\n", note);
#else
fprintf(fff, "unnamed %s.\n", note);
#endif
break;
- case 2:
+ case RECORD_NAMED_PET_DISMISS:
#ifdef JP
fprintf(fff, "%s¤ò²òÊü¤·¤¿¡£\n", note);
#else
fprintf(fff, "dismissed %s.\n", note);
#endif
break;
- case 3:
+ case RECORD_NAMED_PET_DEATH:
#ifdef JP
fprintf(fff, "%s¤¬»à¤ó¤Ç¤·¤Þ¤Ã¤¿¡£\n", note);
#else
fprintf(fff, "%s died.\n", note);
#endif
break;
- case 4:
+ case RECORD_NAMED_PET_MOVED:
#ifdef JP
fprintf(fff, "%s¤ò¤ª¤¤¤ÆÊ̤ΥޥåפذÜÆ°¤·¤¿¡£\n", note);
#else
fprintf(fff, "moved to another map leaving %s behind.\n", note);
#endif
break;
- case 5:
+ case RECORD_NAMED_PET_LOST_SIGHT:
#ifdef JP
fprintf(fff, "%s¤È¤Ï¤°¤ì¤Æ¤·¤Þ¤Ã¤¿¡£\n", note);
#else
fprintf(fff, "lost sight of %s.\n", note);
#endif
break;
- case 6:
+ case RECORD_NAMED_PET_DESTROY:
#ifdef JP
fprintf(fff, "%s¤¬*Ç˲õ*¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
#else
fprintf(fff, "%s was made disappeared by *destruction*.\n", note);
#endif
break;
- case 7:
+ case RECORD_NAMED_PET_EARTHQUAKE:
#ifdef JP
fprintf(fff, "%s¤¬´äÀФ˲¡¤·ÄÙ¤µ¤ì¤¿¡£\n", note);
#else
fprintf(fff, "%s was crushed by falling rocks.\n", note);
#endif
break;
+ case RECORD_NAMED_PET_GENOCIDE:
+#ifdef JP
+ fprintf(fff, "%s¤¬Ëõ»¦¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+ fprintf(fff, "%s was made disappeared by genocide.\n", note);
+#endif
+ break;
+ case RECORD_NAMED_PET_WIZ_ZAP:
+#ifdef JP
+ fprintf(fff, "%s¤¬¥Ç¥Ð¥Ã¥°¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+ fprintf(fff, "%s was removed by debug command.\n", note);
+#endif
+ break;
+ case RECORD_NAMED_PET_TELE_LEVEL:
+#ifdef JP
+ fprintf(fff, "%s¤¬¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+ fprintf(fff, "%s was made disappeared by teleport level.\n", note);
+#endif
+ break;
+ case RECORD_NAMED_PET_BLAST:
+#ifdef JP
+ fprintf(fff, "%s¤òÇúÇˤ·¤¿¡£\n", note);
+#else
+ fprintf(fff, "blasted %s.\n", note);
+#endif
+ break;
+ case RECORD_NAMED_PET_HEAL_LEPER:
+#ifdef JP
+ fprintf(fff, "%s¤Îɵ¤¤¬¼£¤ê餫¤é³°¤ì¤¿¡£\n", note);
+#else
+ fprintf(fff, "%s was healed and left.\n", note);
+#endif
+ break;
+ case RECORD_NAMED_PET_COMPACT:
+#ifdef JP
+ fprintf(fff, "%s¤¬¥â¥ó¥¹¥¿¡¼¾ðÊ󰵽̤ˤè¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+ fprintf(fff, "%s was made disappeared by compacting monsters.\n", note);
+#endif
+ break;
+ case RECORD_NAMED_PET_LOSE_PARENT:
+#ifdef JP
+ fprintf(fff, "%s¤Î¾¤´¼Ô¤¬´û¤Ë¤¤¤Ê¤¤¤¿¤á¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+ fprintf(fff, "%s disappeared because there does not exist summoner.\n", note);
+#endif
+ break;
default:
fprintf(fff, "\n");
break;
prt("(2) ʸ¾Ï¤òµÏ¿¤¹¤ë", 5, 5);
prt("(3) ľÁ°¤ËÆþ¼êËô¤Ï´ÕÄꤷ¤¿¤â¤Î¤òµÏ¿¤¹¤ë", 6, 5);
prt("(4) µÏ¿¤ò¾Ãµî¤¹¤ë", 7, 5);
+
+ prt("(R) ¥×¥ì¥¤Æ°²è¤òµÏ¿¤¹¤ë/Ãæ»ß¤¹¤ë", 9, 5);
#else
prt("(1) Display your record", 4, 5);
prt("(2) Add record", 5, 5);
prt("(3) Record item you last get/identify", 6, 5);
prt("(4) Delete your record", 7, 5);
+
+ prt("(R) Record playing movie / or stop it", 9, 5);
#endif
case '4':
do_cmd_erase_nikki();
break;
+ case 'r': case 'R':
+ screen_load();
+ prepare_movie_hooks();
+ return;
default: /* Unknown option */
bell();
}
{
int i, n;
- char shower[80];
- char finder[80];
+ char shower_str[81];
+ char finder_str[81];
+ char back_str[81];
+ cptr shower = NULL;
int wid, hgt;
int num_lines;
num_lines = hgt - 4;
/* Wipe finder */
- strcpy(finder, "");
+ strcpy(finder_str, "");
/* Wipe shower */
- strcpy(shower, "");
-
+ strcpy(shower_str, "");
/* Total messages */
n = message_num();
cptr msg = message_str(i+j);
/* Dump the messages, bottom to top */
- c_prt((i+j < num_now ? TERM_WHITE : TERM_SLATE), msg, num_lines + 1 - j, 0);
+ c_prt((i + j < num_now ? TERM_WHITE : TERM_SLATE), msg, num_lines + 1 - j, 0);
/* Hilite "shower" */
- if (shower[0])
+ if (shower && shower[0])
{
cptr str = msg;
#ifdef JP
/* translation */
prt(format("°ÊÁ°¤Î¥á¥Ã¥»¡¼¥¸ %d-%d Á´Éô¤Ç(%d)",
- i, i+j-1, n), 0, 0);
+ i, i + j - 1, n), 0, 0);
#else
prt(format("Message Recall (%d-%d of %d)",
- i, i+j-1, n), 0, 0);
+ i, i + j - 1, n), 0, 0);
#endif
-
/* Display prompt (not very informative) */
#ifdef JP
prt("[ 'p' ¤Ç¹¹¤Ë¸Å¤¤¤â¤Î, 'n' ¤Ç¹¹¤Ë¿·¤·¤¤¤â¤Î, '/' ¤Ç¸¡º÷, ESC ¤ÇÃæÃÇ ]", hgt - 1, 0);
prt("[Press 'p' for older, 'n' for newer, ..., or ESCAPE]", hgt - 1, 0);
#endif
-
/* Get a command */
skey = inkey_special(TRUE);
/* Hack -- Save the old index */
j = i;
- /* Hack -- handle show */
- if (skey == '=')
+ switch (skey)
{
+ /* Hack -- handle show */
+ case '=':
/* Prompt */
#ifdef JP
prt("¶¯Ä´: ", hgt - 1, 0);
prt("Show: ", hgt - 1, 0);
#endif
-
/* Get a "shower" string, or continue */
- if (!askfor(shower, 80)) continue;
+ strcpy(back_str, shower_str);
+ if (askfor(shower_str, 80))
+ {
+ /* Show it */
+ shower = shower_str[0] ? shower_str : NULL;
+ }
+ else strcpy(shower_str, back_str);
/* Okay */
continue;
- }
/* Hack -- handle find */
- if (skey == '/' || skey == KTRL('s'))
- {
- int z;
+ case '/':
+ case KTRL('s'):
+ {
+ int z;
- /* Prompt */
+ /* Prompt */
#ifdef JP
- prt("¸¡º÷: ", hgt - 1, 0);
+ prt("¸¡º÷: ", hgt - 1, 0);
#else
- prt("Find: ", hgt - 1, 0);
+ prt("Find: ", hgt - 1, 0);
#endif
+ /* Get a "finder" string, or continue */
+ strcpy(back_str, finder_str);
+ if (!askfor(finder_str, 80))
+ {
+ strcpy(finder_str, back_str);
+ continue;
+ }
+ else if (!finder_str[0])
+ {
+ shower = NULL; /* Stop showing */
+ continue;
+ }
- /* Get a "finder" string, or continue */
- if (!askfor(finder, 80)) continue;
-
- /* Show it */
- strcpy(shower, finder);
-
- /* Scan messages */
- for (z = i + 1; z < n; z++)
- {
- cptr msg = message_str(z);
+ /* Show it */
+ shower = finder_str;
- /* Search for it */
- if (my_strstr(msg, finder))
+ /* Scan messages */
+ for (z = i + 1; z < n; z++)
{
- /* New location */
- i = z;
+ cptr msg = message_str(z);
- /* Done */
- break;
+ /* Search for it */
+ if (my_strstr(msg, finder_str))
+ {
+ /* New location */
+ i = z;
+
+ /* Done */
+ break;
+ }
}
}
- }
+ break;
/* Recall 1 older message */
- if (skey == SKEY_TOP)
- {
+ case SKEY_TOP:
/* Go to the oldest line */
i = n - num_lines;
- }
+ break;
/* Recall 1 newer message */
- if (skey == SKEY_BOTTOM)
- {
+ case SKEY_BOTTOM:
/* Go to the newest line */
i = 0;
- }
+ break;
/* Recall 1 older message */
- if (skey == '8' || skey == SKEY_UP || skey == '\n' || skey == '\r')
- {
+ case '8':
+ case SKEY_UP:
+ case '\n':
+ case '\r':
/* Go older if legal */
i = MIN(i + 1, n - num_lines);
- }
+ break;
/* Recall 10 older messages */
- if (skey == '+')
- {
+ case '+':
/* Go older if legal */
i = MIN(i + 10, n - num_lines);
- }
+ break;
/* Recall 20 older messages */
- if (skey == 'p' || skey == KTRL('P') || skey == ' ' || skey == SKEY_PGUP)
- {
+ case 'p':
+ case KTRL('P'):
+ case ' ':
+ case SKEY_PGUP:
/* Go older if legal */
i = MIN(i + num_lines, n - num_lines);
- }
+ break;
/* Recall 20 newer messages */
- if (skey == 'n' || skey == KTRL('N') || skey == SKEY_PGDOWN)
- {
+ case 'n':
+ case KTRL('N'):
+ case SKEY_PGDOWN:
/* Go newer (if able) */
i = MAX(0, i - num_lines);
- }
+ break;
/* Recall 10 newer messages */
- if (skey == '-')
- {
+ case '-':
/* Go newer (if able) */
i = MAX(0, i - 10);
- }
+ break;
/* Recall 1 newer messages */
- if (skey == '2' || skey == SKEY_DOWN)
- {
+ case '2':
+ case SKEY_DOWN:
/* Go newer (if able) */
i = MAX(0, i - 1);
+ break;
}
/* Hack -- Error of some kind */
+#define OPT_NUM 15
+
+static struct opts
+{
+ char key;
+ cptr name;
+ int row;
+}
+option_fields[OPT_NUM] =
+{
+#ifdef JP
+ { '1', " ¥¡¼ÆþÎÏ ¥ª¥×¥·¥ç¥ó", 3 },
+ { '2', " ¥Þ¥Ã¥×²èÌÌ ¥ª¥×¥·¥ç¥ó", 4 },
+ { '3', " ¥Æ¥¥¹¥Èɽ¼¨ ¥ª¥×¥·¥ç¥ó", 5 },
+ { '4', " ¥²¡¼¥à¥×¥ì¥¤ ¥ª¥×¥·¥ç¥ó", 6 },
+ { '5', " ¹ÔÆ°Ãæ»ß´Ø·¸ ¥ª¥×¥·¥ç¥ó", 7 },
+ { '6', " ´Ê°×¼«Æ°Ç˲õ ¥ª¥×¥·¥ç¥ó", 8 },
+ { 'r', " ¥×¥ì¥¤µÏ¿ ¥ª¥×¥·¥ç¥ó", 9 },
+
+ { 'p', "¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿", 11 },
+ { 'd', " ´ðËÜ¥¦¥§¥¤¥ÈÎÌ ", 12 },
+ { 'h', "Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È", 13 },
+ { 'm', " ÄãËâÎÏ¿§ïçÃÍ ", 14 },
+ { 'a', " ¼«Æ°¥»¡¼¥Ö ¥ª¥×¥·¥ç¥ó", 15 },
+ { 'w', "¥¦¥¤¥ó¥É¥¦¥Õ¥é¥°", 16 },
+
+ { 'b', " ½é´ü ¥ª¥×¥·¥ç¥ó (»²¾È¤Î¤ß)", 18 },
+ { 'c', " º¾µ½ ¥ª¥×¥·¥ç¥ó", 19 },
+#else
+ { '1', "Input Options", 3 },
+ { '2', "Map Screen Options", 4 },
+ { '3', "Text Display Options", 5 },
+ { '4', "Game-Play Options", 6 },
+ { '5', "Disturbance Options", 7 },
+ { '6', "Easy Auto-Destroyer Options", 8 },
+ { 'r', "Play record Options", 9 },
+
+ { 'p', "Auto-picker/destroyer editor", 11 },
+ { 'd', "Base Delay Factor", 12 },
+ { 'h', "Hitpoint Warning", 13 },
+ { 'm', "Mana Color Threshold", 14 },
+ { 'a', "Autosave Options", 15 },
+ { 'w', "Window Flags", 16 },
+
+ { 'b', "Birth Options (Browse Only)", 18 },
+ { 'c', "Cheat Options", 19 },
+#endif
+};
+
/*
* Set or unset various options.
*/
void do_cmd_options(void)
{
- int k;
-
+ char k;
+ int i, d, skey;
+ int y = 0;
/* Save the screen */
screen_save();
/* Interact */
while (1)
{
+ int n = OPT_NUM;
+
+ /* Does not list cheat option when cheat option is off */
+ if (!p_ptr->noscore && !allow_debug_opts) n--;
+
/* Clear screen */
Term_clear();
#ifdef JP
prt("[ ¥ª¥×¥·¥ç¥ó¤ÎÀßÄê ]", 1, 0);
#else
- prt("Options", 1, 0);
+ prt("TinyAngband options", 1, 0);
#endif
-
- /* Give some choices */
-#ifdef JP
- prt("(1) ¥¡¼ÆþÎÏ ¥ª¥×¥·¥ç¥ó", 2, 5);
- prt("(2) ¥Þ¥Ã¥×²èÌÌ ¥ª¥×¥·¥ç¥ó", 3, 5);
- prt("(3) ¥Æ¥¥¹¥Èɽ¼¨ ¥ª¥×¥·¥ç¥ó", 4, 5);
- prt("(4) ¥²¡¼¥à¥×¥ì¥¤ ¥ª¥×¥·¥ç¥ó", 5, 5);
- prt("(5) ¹ÔÆ°Ãæ»ß´Ø·¸ ¥ª¥×¥·¥ç¥ó", 6, 5);
- prt("(6) ´Ê°×¼«Æ°Ç˲õ ¥ª¥×¥·¥ç¥ó", 7, 5);
- prt("(R) ¥×¥ì¥¤µÏ¿ ¥ª¥×¥·¥ç¥ó", 8, 5);
-
- /* Special choices */
- prt("(P) ¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿", 10, 5);
- prt("(D) ´ðËÜ¥¦¥§¥¤¥ÈÎÌ", 11, 5);
- prt("(H) Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð", 12, 5);
- prt("(M) ÄãËâÎÏ¿§ïçÃÍ", 13, 5);
- prt("(A) ¼«Æ°¥»¡¼¥Ö ¥ª¥×¥·¥ç¥ó", 14, 5);
- /* Window flags */
- prt("(W) ¥¦¥¤¥ó¥É¥¦¥Õ¥é¥°", 15, 5);
-#else
- prt("(1) Input Options", 2, 5);
- prt("(2) Map Screen Options", 3, 5);
- prt("(3) Text Display Options", 4, 5);
- prt("(4) Game-Play Options", 5, 5);
- prt("(5) Disturbance Options", 6, 5);
- prt("(6) Easy Auto-Destroyer Options", 7, 5);
- prt("(R) Play-record Options", 8, 5);
- /* Special choices */
- prt("(P) Auto-picker/destroyer editor", 10, 5);
- prt("(D) Base Delay Factor", 11, 5);
- prt("(H) Hitpoint Warning", 12, 5);
- prt("(M) Mana Color Threshold", 13, 5);
- prt("(A) Autosave Options", 14, 5);
- /* Window flags */
- prt("(W) Window Flags", 15, 5);
-#endif
-
- if (!p_ptr->wizard || !allow_debug_opts)
- {
- /* Birth */
-#ifdef JP
- prt("(B) ½é´ü ¥ª¥×¥·¥ç¥ó (»²¾È¤Î¤ß)", 16, 5);
-#else
- prt("(B) Birth Options (Browse Only)", 16, 5);
-#endif
- }
- else
+ while(1)
{
- /* Birth */
+ /* Give some choices */
+ for (i = 0; i < n; i++)
+ {
+ byte a = TERM_WHITE;
+ if (i == y) a = TERM_L_BLUE;
+ Term_putstr(5, option_fields[i].row, -1, a,
+ format("(%c) %s", toupper(option_fields[i].key), option_fields[i].name));
+ }
+
#ifdef JP
- prt("(B) ½é´ü ¥ª¥×¥·¥ç¥ó", 16, 5);
+ prt("<Êý¸þ>¤Ç°ÜÆ°, Enter¤Ç·èÄê, ESC¤Ç¥¥ã¥ó¥»¥ë, ?¤Ç¥Ø¥ë¥×: ", 21, 0);
#else
- prt("(B) Birth Options", 16, 5);
+ prt("Move to <dir>, Select to Enter, Cancel to ESC, ? to help: ", 21, 0);
#endif
- }
+ /* Get command */
+ skey = inkey_special(TRUE);
+ if (!(skey & SKEY_MASK)) k = (char)skey;
+ else k = 0;
- if (p_ptr->noscore || allow_debug_opts)
- {
- /* Cheating */
-#ifdef JP
- prt("(C) º¾µ½ ¥ª¥×¥·¥ç¥ó", 17, 5);
-#else
- prt("(C) Cheating Options", 17, 5);
-#endif
- }
+ /* Exit */
+ if (k == ESCAPE) break;
+ if (my_strchr("\n\r ", k))
+ {
+ k = option_fields[y].key;
+ break;
+ }
- /* Prompt */
-#ifdef JP
- prt("¥³¥Þ¥ó¥É:", 19, 0);
-#else
- prt("Command: ", 19, 0);
-#endif
+ for (i = 0; i < n; i++)
+ {
+ if (tolower(k) == option_fields[i].key) break;
+ }
+ /* Command is found */
+ if (i < n) break;
- /* Get command */
- k = inkey();
+ /* Hack -- browse help */
+ if (k == '?') break;
+
+ /* Move cursor */
+ d = 0;
+ if (skey == SKEY_UP) d = 8;
+ if (skey == SKEY_DOWN) d = 2;
+ y = (y + ddy[d] + n) % n;
+ if (!d) bell();
+ }
/* Exit */
if (k == ESCAPE) break;
#else
do_cmd_options_aux(OPT_PAGE_INPUT, "Input Options");
#endif
-
break;
}
#else
do_cmd_options_aux(OPT_PAGE_MAPSCREEN, "Map Screen Options");
#endif
-
break;
}
#else
do_cmd_options_aux(OPT_PAGE_TEXT, "Text Display Options");
#endif
-
break;
}
#else
do_cmd_options_aux(OPT_PAGE_GAMEPLAY, "Game-Play Options");
#endif
-
break;
}
#else
do_cmd_options_aux(OPT_PAGE_DISTURBANCE, "Disturbance Options");
#endif
-
break;
}
#else
do_cmd_options_aux(OPT_PAGE_BIRTH, (!p_ptr->wizard || !allow_debug_opts) ? "Birth Options(browse only)" : "Birth Options((*)s effect score)");
#endif
-
break;
}
#else
do_cmd_options_cheat("Cheaters never win");
#endif
-
break;
}
#else
do_cmd_options_autosave("Autosave");
#endif
-
break;
}
case 'd':
{
/* Prompt */
+ clear_from(18);
#ifdef JP
prt("¥³¥Þ¥ó¥É: ´ðËÜ¥¦¥§¥¤¥ÈÎÌ", 19, 0);
#else
prt("Command: Base Delay Factor", 19, 0);
#endif
-
/* Get a new value */
while (1)
{
case 'h':
{
/* Prompt */
+ clear_from(18);
#ifdef JP
prt("¥³¥Þ¥ó¥É: Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð", 19, 0);
#else
prt("Command: Hitpoint Warning", 19, 0);
#endif
-
/* Get a new value */
while (1)
{
case 'm':
{
/* Prompt */
+ clear_from(18);
#ifdef JP
prt("¥³¥Þ¥ó¥É: ÄãËâÎÏ¿§ïçÃÍ", 19, 0);
#else
prt("Command: Mana Color Threshold", 19, 0);
#endif
-
/* Get a new value */
while (1)
{
/* Describe that action */
#ifdef JP
- prt("(1) ¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥í¡¼¥É", 4, 5);
+ prt("¥Þ¥¯¥í¹ÔÆ°¤¬(¤â¤·¤¢¤ì¤Ð)²¼¤Ëɽ¼¨¤µ¤ì¤Þ¤¹:", 20, 0);
#else
prt("Current action (if any) shown below:", 20, 0);
#endif
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Ask for a file */
if (!askfor(tmp, 80)) continue;
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Ask for a file */
if (!askfor(tmp, 80)) continue;
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Ask for a file */
if (!askfor(tmp, 80)) continue;
static void print_visuals_menu(cptr choice_msg)
{
#ifdef JP
- prt("²èÌÌɽ¼¨¤ÎÀßÄê", 1, 0);
+ prt("[ ²èÌÌɽ¼¨¤ÎÀßÄê ]", 1, 0);
#else
prt("Interact with Visuals", 1, 0);
#endif
#endif
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Query */
if (!askfor(tmp, 70)) continue;
#endif
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Get a filename */
if (!askfor(tmp, 70)) continue;
#endif
/* Dump monsters */
- for (i = 1; i < max_r_idx; i++)
+ for (i = 0; i < max_r_idx; i++)
{
monster_race *r_ptr = &r_info[i];
#endif
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Get a filename */
if (!askfor(tmp, 70)) continue;
#endif
/* Dump objects */
- for (i = 1; i < max_k_idx; i++)
+ for (i = 0; i < max_k_idx; i++)
{
char o_name[80];
object_kind *k_ptr = &k_info[i];
#endif
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Get a filename */
if (!askfor(tmp, 70)) continue;
#endif
/* Dump features */
- for (i = 1; i < max_f_idx; i++)
+ for (i = 0; i < max_f_idx; i++)
{
feature_type *f_ptr = &f_info[i];
#ifdef JP
Term_putstr(5, 17, -1, TERM_WHITE,
format("¥¢¥¤¥Æ¥à = %d, ̾Á° = %-40.40s",
- k, (k_name + k_ptr->name)));
+ k, k_name + (!k_ptr->flavor ? k_ptr->name : k_ptr->flavor_name)));
#else
Term_putstr(5, 17, -1, TERM_WHITE,
format("Object = %d, Name = %-40.40s",
- k, (k_name + k_ptr->name)));
+ k, k_name + (!k_ptr->flavor ? k_ptr->name : k_ptr->flavor_name)));
#endif
/* Label the Default values */
break;
}
}
- while (!k_info[k].name || k_info[k].flavor);
+ while (!k_info[k].name);
}
break;
case 'a':
/* Default file */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Query */
if (!askfor(tmp, 70)) continue;
/* Default filename */
- sprintf(tmp, "%s.prf", player_name);
+ sprintf(tmp, "%s.prf", player_base);
/* Get a filename */
if (!askfor(tmp, 70)) continue;
#ifdef JP
"¥æ¥Ë¡¼¥¯", /* "Uniques" */
"¾èÇϲÄǽ¤Ê¥â¥ó¥¹¥¿¡¼", /* "Riding" */
+ "¾Þ¶â¼ó", /* "Wanted */
+ "¥¢¥ó¥Ð¡¼¤Î²¦Â²", /* "Ambertite" */
"¥¢¥ê",
"¥³¥¦¥â¥ê",
"¥à¥«¥Ç",
#else
"Uniques",
"Ridable monsters",
+ "Wanted monsters",
+ "Ambertite",
"Ant",
"Bat",
"Centipede",
{
(char *) -1L,
(char *) -2L,
+ (char *) -3L,
+ (char *) -4L,
"a",
"b",
"c",
/* XXX Hack -- Check if this is the "Riding" group */
bool grp_riding = (monster_group_char[grp_cur] == (char *) -2L);
+ /* XXX Hack -- Check if this is the "Wanted" group */
+ bool grp_wanted = (monster_group_char[grp_cur] == (char *) -3L);
+
+ /* XXX Hack -- Check if this is the "Amberite" group */
+ bool grp_amberite = (monster_group_char[grp_cur] == (char *) -4L);
+
+
/* Check every race */
for (i = 0; i < max_r_idx; i++)
{
if (!(r_ptr->flags7 & RF7_RIDING)) continue;
}
+ else if (grp_wanted)
+ {
+ bool wanted = FALSE;
+ int j;
+ for (j = 0; j < MAX_KUBI; j++)
+ {
+ if (kubi_r_idx[j] == i || kubi_r_idx[j] - 10000 == i ||
+ (p_ptr->today_mon && p_ptr->today_mon == i))
+ {
+ wanted = TRUE;
+ break;
+ }
+ }
+ if (!wanted) continue;
+ }
+
+ else if (grp_amberite)
+ {
+ if (!(r_ptr->flags3 & RF3_AMBERITE)) continue;
+ }
+
else
{
/* Check for race in the group */
"¥´¥ß",
"¶õ¤Î¥Ó¥ó",
"¹ü",
+ "»àÂÎ",
"Åá·õÎà", /* "Swords" */
"Æß´ï", /* "Blunt Weapons" */
"ĹÊÁÉð´ï", /* "Polearms" */
"´§", /* "Crowns" */
"¥Ö¡¼¥Ä", /* "Boots" */
"ËâË¡½ñ",
+ "ºâÊõ",
"²¿¤«",
#else
"Mushrooms",
"Junks",
"Bottles",
"Skeletons",
+ "Corpses",
"Swords",
"Blunt Weapons",
"Polearms",
"Crowns",
"Boots",
"Spellbooks",
+ "Treasure",
"Something",
#endif
NULL
TV_JUNK,
TV_BOTTLE,
TV_SKELETON,
+ TV_CORPSE,
TV_SWORD,
TV_HAFTED,
TV_POLEARM,
TV_CROWN,
TV_BOOTS,
TV_LIFE_BOOK, /* Hack -- all spellbooks */
+ TV_GOLD,
0,
0,
};
if (TV_LIFE_BOOK == group_tval)
{
/* Hack -- All spell books */
- if (TV_LIFE_BOOK <= k_ptr->tval && k_ptr->tval <= TV_HISSATSU_BOOK)
+ if (TV_LIFE_BOOK <= k_ptr->tval && k_ptr->tval <= TV_HEX_BOOK)
{
/* Add the object */
object_idx[object_cnt++] = i;
if (n_alive_total)
{
- fprintf(fff, "--------- -----------\n");
#ifdef JP
- fprintf(fff, " ¹ç·× À¸Â¸: %3dÂÎ\n", n_alive_total);
+ fputs("--------- -----------\n", fff);
+ fprintf(fff, " ¹ç·× À¸Â¸: %3dÂÎ\n\n", n_alive_total);
#else
- fprintf(fff, " Total alive: %3d\n", n_alive_total);
+ fputs("------------- ----------\n", fff);
+ fprintf(fff, " Total alive: %3d\n\n", n_alive_total);
+#endif
+ }
+ else
+ {
+#ifdef JP
+ fputs("¸½ºß¤Ï´ûÃΤÎÀ¸Â¸¥æ¥Ë¡¼¥¯¤Ï¤¤¤Þ¤»¤ó¡£\n", fff);
+#else
+ fputs("No known uniques alive.\n", fff);
#endif
- fputc('\n', fff);
}
- else fputs("¸½ºß¤Ï´ûÃΤÎÀ¸Â¸¥æ¥Ë¡¼¥¯¤Ï¤¤¤Þ¤»¤ó¡£\n", fff);
/* Scan the monster races */
for (k = 0; k < n; k++)
#endif
else
#ifdef JP
- fprintf(fff,"¤¢¤Ê¤¿¤Ï%ldÂΤÎŨ¤òÅݤ·¤Æ¤¤¤ë¡£\n\n", Total);
+ fprintf(fff,"¤¢¤Ê¤¿¤Ï%ldÂΤÎŨ¤òÅݤ·¤Æ¤¤¤ë¡£\n\n", (long int)Total);
#else
- fprintf(fff,"You have defeated %ld %s.\n\n", Total, (Total == 1) ? "enemy" : "enemies");
+ fprintf(fff,"You have defeated %ld %s.\n\n", (long int)Total, (Total == 1) ? "enemy" : "enemies");
#endif
}
fprintf(fff,"----------------------------------------------\n");
#ifdef JP
- fprintf(fff," ¹ç·×: %lu ÂΤòÅݤ·¤¿¡£\n", Total);
+ fprintf(fff," ¹ç·×: %lu ÂΤòÅݤ·¤¿¡£\n", (unsigned long int)Total);
#else
fprintf(fff," Total: %lu creature%s killed.\n",
- Total, (Total == 1 ? "" : "s"));
+ (unsigned long int)Total, (Total == 1 ? "" : "s"));
#endif
if (direct_r_idx < 0) prt("Group", 4, 0);
prt("Name", 4, max + 3);
if (p_ptr->wizard || visual_only) prt("Idx", 4, 62);
- prt("Sym ", 4, 67);
- if (!visual_only) prt(" Kills", 4, 72);
+ prt("Sym", 4, 68);
+ if (!visual_only) prt("Kills", 4, 73);
#endif
for (i = 0; i < 78; i++)
byte cursor = ((k_ptr->aware || visual_only) ? TERM_L_BLUE : TERM_BLUE);
- if (k_ptr->flavor)
+ if (!visual_only && k_ptr->flavor)
{
/* Appearance of this object is shuffled */
flavor_k_ptr = &k_info[k_ptr->flavor];
attr = ((i + object_top == object_cur) ? cursor : attr);
- if (!k_ptr->flavor || k_ptr->aware)
+ if (!k_ptr->flavor || (!visual_only && k_ptr->aware))
{
/* Tidy name */
strip_name(o_name, k_idx);
/* Hack -- Handle stuff */
handle_stuff();
- if (!screen_object(o_ptr, FALSE))
+ if (!screen_object(o_ptr, SCROBJ_FAKE_OBJECT | SCROBJ_FORCE_DETAIL))
{
#ifdef JP
msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£");
object_kind *k_ptr = &k_info[direct_k_idx];
object_kind *flavor_k_ptr;
- if (k_ptr->flavor)
+ if (!visual_only && k_ptr->flavor)
{
/* Appearance of this object is shuffled */
flavor_k_ptr = &k_info[k_ptr->flavor];
/* Get the current object */
k_ptr = &k_info[object_idx[object_cur]];
- if (k_ptr->flavor)
+ if (!visual_only && k_ptr->flavor)
{
/* Appearance of this object is shuffled */
flavor_k_ptr = &k_info[k_ptr->flavor];
char desc[1024];
char buf[1024];
+ char day_buf[10];
FILE *fff;
#endif
+ if (day < MAX_DAYS) sprintf(day_buf, "%d", day);
+ else strcpy(day_buf, "*****");
+
/* Message */
#ifdef JP
- msg_format("%d ÆüÌÜ,»þ¹ï¤Ï%d:%02d %s¤Ç¤¹¡£",
- day, (hour % 12 == 0) ? 12 : (hour % 12),
+ 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.",
- day, (hour % 12 == 0) ? 12 : (hour % 12),
+ 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
OSDN Git Service
