From 481e6630805bb190aaab26d997388ff3e97335cf Mon Sep 17 00:00:00 2001 From: mogami Date: Tue, 20 Aug 2002 13:10:39 +0000 Subject: [PATCH] =?utf8?q?=E7=A2=BA=E8=AA=8D=E3=81=AE=E5=BE=8C=E6=8B=BE?= =?utf8?q?=E3=81=86=E8=A8=AD=E5=AE=9A=E6=96=87=E5=AD=97=E3=82=92'*'?= =?utf8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=81=AE=E3=81=AF=E5=A4=B1=E6=95=97?= =?utf8?q?=E3=81=A0=E3=81=A3=E3=81=9F=E3=80=82=E3=80=8C*=E9=91=91=E5=AE=9A?= =?utf8?q?*=E6=B8=88=E3=81=BF=E3=81=AE=E3=80=8D=E3=81=A8=E3=81=84=E3=81=86?= =?utf8?q?=E3=82=AD=E3=83=BC=E3=83=AF=E3=83=BC=E3=83=89=E3=82=92=20?= =?utf8?q?=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=80=82=E3=81=9D?= =?utf8?q?=E3=81=93=E3=81=A7=E6=96=87=E5=AD=97=E3=82=92':'=E3=81=AB?= =?utf8?q?=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- autopick.txt | 4 ++-- autopick_eng.txt | 4 ++-- lib/help/jpref.txt | 4 ++-- lib/help/pref.txt | 4 ++-- src/autopick.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/autopick.txt b/autopick.txt index ce666e135..9b163894c 100644 --- a/autopick.txt +++ b/autopick.txt @@ -80,7 +80,7 @@ # # ¡¦¡Ö!¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï¤½¤Î¥¢¥¤¥Æ¥à¤ò¼«Æ°Åª¤ËÇ˲õ¤·¤Þ¤¹¡£ # ¡¦¡Ö~¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¤¤âÇ˲õ¤â¤»¤º¤Ë¾²¤Ë»Ä¤·¤Þ¤¹¡£ -# ¡¦¡Ö*¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£ +# ¡¦¡Ö:¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£ # # ¤µ¤é¤Ë¡¢¤³¤ì¤é¤Ë²Ã¤¨¤Æ¡¢¡Ö(¡×¤òÉÕ¤±²Ã¤¨¤ë»ö¤Ç¥Þ¥Ã¥×¥³¥Þ¥ó¥ÉÃæ¤Ç # ¤Î¤½¤Î¥¢¥¤¥Æ¥à¤Îɽ¼¨¤òÍ޻ߤ¹¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£(°Ê²¼¤ÎTips¤ò»²¾È¤· @@ -161,7 +161,7 @@ # # ³Æ¹Ô¤Î½ñ¼°¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ # -# [! ~ * (] +# [! ~ : (] # [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î] # [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î] # [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î] diff --git a/autopick_eng.txt b/autopick_eng.txt index 5db849285..789dcb74d 100644 --- a/autopick_eng.txt +++ b/autopick_eng.txt @@ -53,7 +53,7 @@ # a kind of object. Starting a line with '!' indicates that you # wish to destroy this kind of object. Starting a line with '~' # indicates that you wish to leave this kind of object on the -# floor. Starting a line with '*' indicates that you wish to +# floor. Starting a line with ':' indicates that you wish to # force the game to ask you if you want to pick the item up or # not. Otherwise, your character will automatically attempt to # pick up the object. @@ -172,7 +172,7 @@ # # Strict syntax of each line is below. # -# [! ~ * (] +# [! ~ : (] # [[all] [collecting] # [unaware] [unidentified] [identified] [*identified*] # [dice boosted] [more than N dice] [more bonus than N] diff --git a/lib/help/jpref.txt b/lib/help/jpref.txt index 5e321b28f..dd11386dd 100644 --- a/lib/help/jpref.txt +++ b/lib/help/jpref.txt @@ -284,7 +284,7 @@ avoid_abort ¡¦¡Ö!¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï¤½¤Î¥¢¥¤¥Æ¥à¤ò¼«Æ°Åª¤ËÇ˲õ¤·¤Þ¤¹¡£ ¡¦¡Ö~¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¤¤âÇ˲õ¤â¤»¤º¤Ë¾²¤Ë»Ä¤·¤Þ¤¹¡£ -¡¦¡Ö*¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£ +¡¦¡Ö:¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£ ¤µ¤é¤Ë¡¢¤³¤ì¤é¤Ë²Ã¤¨¤Æ¡¢¡Ö(¡×¤òÉÕ¤±²Ã¤¨¤ë»ö¤Ç¥Þ¥Ã¥×¥³¥Þ¥ó¥ÉÃæ¤Ç¤Î¤½¤Î ¥¢¥¤¥Æ¥à¤Îɽ¼¨¤òÍ޻ߤ¹¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£(°Ê²¼¤ÎTips¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£) @@ -362,7 +362,7 @@ picktype.prf ¤Î¥­¡¼¥ï¡¼¥É¤Ï°ì¹Ô¤Ëʤ٤ƽñ¤¯»ö¤ÇξÊý¤ÎÀ©¸Â¤òŬÍѤµ¤»¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£ ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¥­¡¼¥ï¡¼¥É¤Î½çÈ֤⼫ͳ¤Ç¤¹¡£ - [! ~ * (] + [! ~ : (] [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î] [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î] [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î] diff --git a/lib/help/pref.txt b/lib/help/pref.txt index 4323e73f9..04f52a94c 100644 --- a/lib/help/pref.txt +++ b/lib/help/pref.txt @@ -266,7 +266,7 @@ Command letter: of object. Starting a line with '!' indicates that you wish to destroy this kind of object. Starting a line with '~' indicates that you wish to leave this kind of object on the floor. Starting a - line with '*' indicates that you wish to force the game to ask you + line with ':' indicates that you wish to force the game to ask you if you want to pick the item up or not. Otherwise, your character will automatically attempt to pick up the object. There is an additional command letter '('. It indicates that @@ -384,7 +384,7 @@ Special Notes: Strict syntax of each line is below. - [! ~ * (] + [! ~ : (] [[all] [collecting] [unaware] [unidentified] [identified] [*identified*] [dice boosted] [more than N dice] [more bonus than N] diff --git a/src/autopick.c b/src/autopick.c index e73afc93d..a22e89381 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -191,7 +191,7 @@ cptr autopick_line_from_entry(autopick_type *entry) *buf = '\0'; if (!(entry->action & DO_DISPLAY)) strcat(buf, "("); - if (entry->action & DO_QUERY_AUTOPICK) strcat(buf, "*"); + if (entry->action & DO_QUERY_AUTOPICK) strcat(buf, ":"); if (entry->action & DO_AUTODESTROY) strcat(buf, "!"); if (entry->action & DONT_AUTOPICK) strcat(buf, "~"); @@ -349,7 +349,7 @@ bool autopick_new_entry(autopick_type *entry, cptr str) act |= DONT_AUTOPICK; str++; } - else if ((act & DO_AUTOPICK) && *str == '*') + else if ((act & DO_AUTOPICK) && *str == ':') { act &= ~DO_AUTOPICK; act |= DO_QUERY_AUTOPICK; @@ -3059,7 +3059,7 @@ void do_cmd_edit_autopick(void) if (lines_list[cy + 1]) cy++; cx = 0; break; - case '*': + case ':': if (!autopick_new_entry(entry, lines_list[cy])) { if (old_key != key) repeated_clearing = FALSE; -- 2.11.0