From 2d33b5d1065ebc1031c7da2dcc949bc4809f1dc3 Mon Sep 17 00:00:00 2001 From: mogami Date: Fri, 12 Apr 2002 14:25:09 +0000 Subject: [PATCH] =?utf8?q?=E3=81=BE=E3=81=A0=E6=AE=8B=E3=81=A3=E3=81=A6?= =?utf8?q?=E3=81=84=E3=81=9F=E5=86=8D=E6=8F=8F=E7=94=BB=E3=83=90=E3=82=B0(?= =?utf8?q?^L)=E4=BF=AE=E6=AD=A3=E3=80=82=20=E8=8B=B1=E8=AA=9E=E7=89=88?= =?utf8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB=E3=82=A8=E3=83=A9?= =?utf8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3=E3=80=82=E8=8B=B1=E8=AA=9E=E3=83=A1?= =?utf8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E7=B4=B0=E3=81=8B=E3=81=84?= =?utf8?q?=E3=81=A8=E3=81=93=E4=BF=AE=E6=AD=A3=E3=80=82=20^I=20^L=E3=81=A7?= =?utf8?q?=E3=82=AD=E3=83=BC=E3=83=AF=E3=83=BC=E3=83=89=E3=80=8C=E6=AD=A6?= =?utf8?q?=E5=99=A8=E3=80=8D=E3=81=8C=E6=8C=BF=E5=85=A5=E3=81=95=E3=82=8C?= =?utf8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?= =?utf8?q?=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index f440d0cf0..6f0e81fda 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -970,7 +970,7 @@ static void describe_autopick(char *buff, autopick_type *entry) /*** Collecting items ***/ /*** Which can be absorbed into a slot as a bundle ***/ if (IS_FLG(FLG_COLLECTING)) - which_str[which_n++] = "can be absorbed into an existing slot"; + which_str[which_n++] = "can be absorbed into an existing inventory slot"; /*** Unidentified ***/ if (IS_FLG(FLG_UNIDENTIFIED)) @@ -988,7 +988,7 @@ static void describe_autopick(char *buff, autopick_type *entry) if (IS_FLG(FLG_NAMELESS)) { body_str = "equipment"; - which_str[which_n++] = "is neither an ego-item nor an artifact"; + which_str[which_n++] = "is neither ego-item nor artifact"; } /*** Unaware items ***/ @@ -1146,11 +1146,11 @@ static void describe_autopick(char *buff, autopick_type *entry) } if (act & DONT_AUTOPICK) - strcpy(buff, "leave on floor "); + strcpy(buff, "Leave on floor "); else if (act & DO_AUTODESTROY) - strcpy(buff, "destroy "); + strcpy(buff, "Destroy "); else - strcpy(buff, "pickup "); + strcpy(buff, "Pickup "); if (insc) strncat(buff, format("and inscribe \"%s\" on ", insc), 80); @@ -1209,13 +1209,12 @@ static void describe_autopick(char *buff, autopick_type *entry) if (act & DO_DISPLAY) { if (act & DONT_AUTOPICK) - strcat(buff, "And display it when you press 'N' in the full map('N')."); + strcat(buff, " Display these items when you press 'N' in the full map('M')."); else if (act & DO_AUTODESTROY) - strcat(buff, "And display it when you press 'K' in the full map('N')."); + strcat(buff, " Display these items when you press 'K' in the full map('M')."); else - strcat(buff, "And display it when you press 'M' in the full map('N')."); + strcat(buff, " Display these items when you press 'M' in the full map('M')."); } - strcat(buff, " It will be displayed in the full map."); else strcat(buff, " Not displayed in the full map."); #endif /* JP */ @@ -1498,10 +1497,16 @@ void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) if ((o_ptr->tval == TV_CORPSE || o_ptr->tval == TV_STATUE) && (r_info[o_ptr->pval].flags1 & RF1_UNIQUE)) + { + REM_FLG(FLG_WORTHLESS); ADD_FLG(FLG_UNIQUE); + } if (o_ptr->tval == TV_CORPSE && strchr("pht", r_info[o_ptr->pval].d_char)) + { + REM_FLG(FLG_WORTHLESS); ADD_FLG(FLG_HUMAN); + } if (o_ptr->tval >= TV_LIFE_BOOK && !check_book_realm(o_ptr->tval, o_ptr->sval)) @@ -1544,6 +1549,9 @@ void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) ADD_FLG(FLG_SPELLBOOKS); else if (o_ptr->tval == TV_HAFTED) ADD_FLG(FLG_HAFTED); + else if (o_ptr->tval == TV_POLEARM || o_ptr->tval == TV_SWORD + || o_ptr->tval == TV_DIGGING) + ADD_FLG(FLG_WEAPONS); else if (o_ptr->tval == TV_SHIELD) ADD_FLG(FLG_SHIELDS); else if (o_ptr->tval == TV_BOW) @@ -1825,9 +1833,9 @@ void do_cmd_edit_autopick() prt("q ¤Ç½ªÎ»¡¢hjkl2468 ¤Ç°ÜÆ°¡¢^Q a i ¤ÇÆþÎϥ⡼¥É", 0, 0); #else if (edit_mode) - prt("Press ^Q ESC to command mode, any letter to input", 0, 0); + prt("Press ^Q ESC to command mode, any letters to insert", 0, 0); else - prt("Press q to quit, hjkl2468 to move, ^Q a i to edit mode", 0, 0); + prt("Press q to quit, hjkl2468 to move, ^Q a i to insert mode", 0, 0); #endif /* Display current position */ prt (format("(%d,%d)", cx, cy), 0, 70); @@ -1845,7 +1853,7 @@ void do_cmd_edit_autopick() #ifdef JP prt("¤³¤Î¹Ô¤Ï¥³¥á¥ó¥È¤Ç¤¹¡£", hgt - 3 + 1, 0); #else - prt("This line is comment", hgt - 3 + 1, 0); + prt("This line is comment.", hgt - 3 + 1, 0); #endif } else if (lines_list[cy][1] == ':') @@ -2142,7 +2150,7 @@ void do_cmd_edit_autopick() cx = 0; /* Now dirty */ - dirty_line = cy; + dirty_line = -2; } break; case '\n': case '\r': -- 2.11.0