From 89256c8766809faeea2578cb8af065fb3428751a Mon Sep 17 00:00:00 2001
From: mogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Fri, 31 May 2002 18:27:24 +0000
Subject: [PATCH] =?utf8?q?=E3=82=AD=E3=83=BC=E3=83=AF=E3=83=BC=E3=83=89?=
 =?utf8?q?=E3=81=AE=E9=A0=86=E7=95=AA=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97?=
 =?utf8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=E3=80=82=20=E3=80=8C=E3=82=A8=E3=82=B4=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=E5=80=A43=E4=BB=A5=E4=B8=8A=E3=81=AE=E6=AD=A6=E5=99=A8=E3=80=8D?=
 =?utf8?q?=E2=86=92=E3=80=8C=E4=BF=AE=E6=AD=A3=E5=80=A43=E4=BB=A5=E4=B8=8A?=
 =?utf8?q?=E3=81=AE=E3=82=A8=E3=82=B4=E6=AD=A6=E5=99=A8=E3=80=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 autopick.txt       |  12 +--
 autopick_eng.txt   |  10 +--
 lib/help/jpref.txt |  14 ++--
 lib/help/pref.txt  |  10 +--
 src/autopick.c     | 220 ++++++++++++++++++++++++++---------------------------
 5 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/autopick.txt b/autopick.txt
index ed18efdb2..f79d2b70b 100644
--- a/autopick.txt
+++ b/autopick.txt
@@ -101,15 +101,15 @@
 #      ¡¦Ì¤´ÕÄê¤Î¡Á        : ´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦´ÕÄêºÑ¤ß¤Î¡Á      : ´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦*´ÕÄê*ºÑ¤ß¤Î¡Á    : ´°Á´¤Ë´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¥À¥¤¥¹Ìܤΰ㤦¡Á  : »¦Ù¤¤ÎÉð´ïÅù¤Ç¥À¥¤¥¹¤ÎÌܤ¬Ä̾ï¤È°Û¤Ê¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¥À¥¤¥¹ÌÜn°Ê¾å¤Î¡Á : ¥À¥¤¥¹¿ô¡ßÌÌ¿ô¤¬ n °Ê¾å¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦½¤ÀµÃÍn°Ê¾å¤Î¡Á   : ǽÎϽ¤ÀµÃͤ¬(+n)°Ê¾å¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #                            ǽÎϽ¤Àµ¤¬Ìµ¤¤¾ì¹ç¤Ï¾¤Î¿ôÃͤ¬+n°Ê¾å¤Ê¤éÂоݤˤʤê¤Þ¤¹¡£
+#      ¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¾Þ¶â¼ó¤Î¡Á        : ¾Þ¶â¼ó¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î¡Á¡§ ¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î»àÂΡ¢¹ü¡¢Ä¦Áü¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¿Í´Ö¤Î¡Á          : ¿Í´Ö¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£(°­ËâËâË¡¤Ç»ÈÍÑ)
@@ -157,8 +157,8 @@
 #
 #         [! ~ (]
 #         [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
-#          [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ] [̤ȽÌÀ¤Î] [̵²ÁÃͤÎ]
 #          [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]
+#          [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ] [̤ȽÌÀ¤Î]
 #          [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
 #	   [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
 #          [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|Ëɶñ|Ìð|¸÷¸»|ËâË¡¥¢¥¤¥Æ¥à|
diff --git a/autopick_eng.txt b/autopick_eng.txt
index 1387fcdd3..dd36f578d 100644
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -66,14 +66,14 @@
 #      unidentified      : Unidentified items match.
 #      identified        : Identified items match.
 #      *identified*      : *Identified* items match.
+#      dice boosted      : Weapons with boosted damage dice match.
+#      more than N dice  : Weapons with dice (dd * ds) better than +N match.
+#      more bonus than N : Items which has more magical bonus than (+N) match.
+#      worthless         : Items which you cannot sell match.
 #      artifacts         : Artifacts items match.
 #      ego               : Ego items match.
 #      nameless          : Non ego/non artifact items match.
 #      unaware           : Items with unknown effects match.
-#      worthless         : Items which you cannot sell match.
-#      dice boosted      : Weapons with boosted damage dice match.
-#      more than N dice  : Weapons with dice (dd * ds) better than +N match.
-#      more bonus than N : Items which has more magical bonus than (+N) match.
 #      wanted            : Wanted monster's corpses or skeletons match.
 #      unique monster's  : Unique monster's corpses, skeletons or statues match.
 #      human             : Human corpses or skeletons match.
@@ -167,8 +167,8 @@
 #      
 #      [! ~ (]
 #      [[all] [collecting] [unidentified] [identified] [*identified*] 
-#       [artifact] [ego] [nameless] [unaware] [worthless] 
 #       [dice boosted] [more than N dice] [more bonus than N] 
+#       [worthless] [artifact] [ego] [nameless] [unaware] 
 #       [wanted] [unique monster's] [human] [unreadable] 
 #       [first realm's] [second realm's] [first] [second] [third] [fourth] 
 #       [items | weapons | armors | missiles | magical devices | 
diff --git a/lib/help/jpref.txt b/lib/help/jpref.txt
index 0dd8711a6..89efd2995 100644
--- a/lib/help/jpref.txt
+++ b/lib/help/jpref.txt
@@ -306,15 +306,15 @@ picktype.prf 
 ¡¦Ì¤´ÕÄê¤Î¡Á        : ´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦´ÕÄêºÑ¤ß¤Î¡Á      : ´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦*´ÕÄê*ºÑ¤ß¤Î¡Á    : ´°Á´¤Ë´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¥À¥¤¥¹Ìܤΰ㤦¡Á  : »¦Ù¤¤ÎÉð´ïÅù¤Ç¥À¥¤¥¹¤ÎÌܤ¬Ä̾ï¤È°Û¤Ê¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¥À¥¤¥¹ÌÜn°Ê¾å¤Î¡Á : ¥À¥¤¥¹¿ô¡ßÌÌ¿ô¤¬ n °Ê¾å¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦½¤ÀµÃÍn°Ê¾å¤Î¡Á   : ǽÎϽ¤ÀµÃͤ¬(+n)°Ê¾å¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
                       ǽÎϽ¤Àµ¤¬Ìµ¤¤¾ì¹ç¤Ï¾¤Î¿ôÃͤ¬+n°Ê¾å¤Ê¤éÂоݤˤʤê¤Þ¤¹¡£
+¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¾Þ¶â¼ó¤Î¡Á        : ¾Þ¶â¼ó¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î¡Á¡§ ¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î»àÂΡ¢¹ü¡¢Ä¦Áü¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¿Í´Ö¤Î¡Á          : ¿Í´Ö¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£(°­ËâËâË¡¤Ç»ÈÍÑ)
@@ -363,10 +363,10 @@ picktype.prf 
 
    [! ~ (]
    [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
-    [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ] [̤ȽÌÀ¤Î] [̵²ÁÃͤÎ]
     [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]
+    [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ] [̤ȽÌÀ¤Î]
     [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
-	   [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
+    [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
     [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|Ëɶñ|Ìð|¸÷¸»|ËâË¡¥¢¥¤¥Æ¥à|
      ¤¬¤é¤¯¤¿|ËâË¡½ñ|Æß´ï|½â|µÝ|»ØÎØ|¥¢¥ß¥å¥ì¥Ã¥È|³»|¥¯¥í¡¼¥¯|
      ³õ|äƼê|·¤] :]
diff --git a/lib/help/pref.txt b/lib/help/pref.txt
index 9f676307f..66b0721d3 100644
--- a/lib/help/pref.txt
+++ b/lib/help/pref.txt
@@ -283,14 +283,14 @@ Keywords:
   unidentified      : Unidentified items match.
   identified        : Identified items match.
   *identified*      : *Identified* items match.
+  dice boosted      : Weapons with boosted damage dice match.
+  more than N dice  : Weapons with dice (dd * ds) better than +N match.
+  more bonus than N : Items which has more magical bonus than (+N) match.
+  worthless         : Items which you cannot sell match.
   artifact          : Artifacts items match.
   ego               : Ego items match.
   nameless          : Non ego/non artifact items match.
   unaware           : Items with unknown effects match.
-  worthless         : Items which you cannot sell match.
-  dice boosted      : Weapons with boosted damage dice match.
-  more than N dice  : Weapons with dice (dd * ds) better than +N match.
-  more bonus than N : Items which has more magical bonus than (+N) match.
   wanted            : Wanted monster's corpses or skeletons match.
   unique monster's  : Unique monster's corpses, skeletons or statues match.
   human             : Human corpses or skeletons match.
@@ -384,8 +384,8 @@ Special Notes:
   
   [! ~ (]
   [[all] [collecting] [unidentified] [identified] [*identified*] 
-   [artifact] [ego] [nameless] [unaware] [worthless] 
    [dice boosted] [more than N dice] [more bonus than N] 
+   [worthless] [artifact] [ego] [nameless] [unaware] 
    [wanted] [unique monster's] [human] [unreadable] 
    [first realm's] [second realm's] [first] [second] [third] [fourth] 
    [items | weapons | armors | missiles | magical devices | 
diff --git a/src/autopick.c b/src/autopick.c
index 2c01ef622..48ab39176 100644
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -20,16 +20,16 @@
 #define FLG_UNIDENTIFIED    2
 #define FLG_IDENTIFIED	    3
 #define FLG_STAR_IDENTIFIED 4
-#define FLG_ARTIFACT	    5
-#define FLG_EGO		    6
-#define FLG_NAMELESS	    7
-#define FLG_UNAWARE	    8
-#define FLG_WORTHLESS	    9
-#define FLG_BOOSTED	    10
-#define FLG_MORE_THAN	    11
-#define FLG_DICE	    12
-#define FLG_MORE_BONUS	    13
-#define FLG_MORE_BONUS2	    14
+#define FLG_BOOSTED	    5
+#define FLG_MORE_THAN	    6
+#define FLG_DICE	    7
+#define FLG_MORE_BONUS	    8
+#define FLG_MORE_BONUS2	    9
+#define FLG_WORTHLESS	    10
+#define FLG_ARTIFACT	    11
+#define FLG_EGO		    12
+#define FLG_NAMELESS	    13
+#define FLG_UNAWARE	    14
 #define FLG_WANTED	    15
 #define FLG_UNIQUE	    16
 #define FLG_HUMAN	    17
@@ -67,16 +67,16 @@
 #define KEY_UNIDENTIFIED "̤´ÕÄê¤Î"
 #define KEY_IDENTIFIED "´ÕÄêºÑ¤ß¤Î"
 #define KEY_STAR_IDENTIFIED "*´ÕÄê*ºÑ¤ß¤Î"
-#define KEY_ARTIFACT "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È"
-#define KEY_EGO "¥¨¥´"
-#define KEY_NAMELESS "̵ÌäÎ"
-#define KEY_UNAWARE "̤ȽÌÀ¤Î"
-#define KEY_WORTHLESS "̵²ÁÃͤÎ"
 #define KEY_BOOSTED "¥À¥¤¥¹Ìܤΰ㤦"
 #define KEY_MORE_THAN  "¥À¥¤¥¹ÌÜ"
 #define KEY_DICE  "°Ê¾å¤Î"
 #define KEY_MORE_BONUS  "½¤ÀµÃͤ¬"
 #define KEY_MORE_BONUS2  "°Ê¾å¤Î"
+#define KEY_WORTHLESS "̵²ÁÃͤÎ"
+#define KEY_ARTIFACT "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È"
+#define KEY_EGO "¥¨¥´"
+#define KEY_NAMELESS "̵ÌäÎ"
+#define KEY_UNAWARE "̤ȽÌÀ¤Î"
 #define KEY_WANTED "¾Þ¶â¼ó¤Î"
 #define KEY_UNIQUE "¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î"
 #define KEY_HUMAN "¿Í´Ö¤Î"
@@ -113,16 +113,16 @@
 #define KEY_UNIDENTIFIED "unidentified"
 #define KEY_IDENTIFIED "identified"
 #define KEY_STAR_IDENTIFIED "*identified*"
-#define KEY_ARTIFACT "artifact"
-#define KEY_EGO "ego"
-#define KEY_NAMELESS "nameless"
-#define KEY_UNAWARE "unaware"
-#define KEY_WORTHLESS "worthless"
 #define KEY_BOOSTED "dice boosted"
 #define KEY_MORE_THAN  "more than"
 #define KEY_DICE  " dice"
 #define KEY_MORE_BONUS  "more bonus than"
 #define KEY_MORE_BONUS2  ""
+#define KEY_WORTHLESS "worthless"
+#define KEY_ARTIFACT "artifact"
+#define KEY_EGO "ego"
+#define KEY_NAMELESS "nameless"
+#define KEY_UNAWARE "unaware"
 #define KEY_WANTED "wanted"
 #define KEY_UNIQUE "unique monster's"
 #define KEY_HUMAN "human"
@@ -195,11 +195,6 @@ cptr autopick_line_from_entry(autopick_type *entry)
 	if (IS_FLG(FLG_UNIDENTIFIED)) ADD_KEY(KEY_UNIDENTIFIED);
 	if (IS_FLG(FLG_IDENTIFIED)) ADD_KEY(KEY_IDENTIFIED);
 	if (IS_FLG(FLG_STAR_IDENTIFIED)) ADD_KEY(KEY_STAR_IDENTIFIED);
-	if (IS_FLG(FLG_ARTIFACT)) ADD_KEY(KEY_ARTIFACT);
-	if (IS_FLG(FLG_EGO)) ADD_KEY(KEY_EGO);
-	if (IS_FLG(FLG_NAMELESS)) ADD_KEY(KEY_NAMELESS);
-	if (IS_FLG(FLG_UNAWARE)) ADD_KEY(KEY_UNAWARE);
-	if (IS_FLG(FLG_WORTHLESS)) ADD_KEY(KEY_WORTHLESS);
 	if (IS_FLG(FLG_BOOSTED)) ADD_KEY(KEY_BOOSTED);
 
 	if (IS_FLG(FLG_MORE_THAN))
@@ -216,6 +211,11 @@ cptr autopick_line_from_entry(autopick_type *entry)
 		ADD_KEY(KEY_MORE_BONUS2);
 	}
 
+	if (IS_FLG(FLG_WORTHLESS)) ADD_KEY(KEY_WORTHLESS);
+	if (IS_FLG(FLG_ARTIFACT)) ADD_KEY(KEY_ARTIFACT);
+	if (IS_FLG(FLG_EGO)) ADD_KEY(KEY_EGO);
+	if (IS_FLG(FLG_NAMELESS)) ADD_KEY(KEY_NAMELESS);
+	if (IS_FLG(FLG_UNAWARE)) ADD_KEY(KEY_UNAWARE);
 	if (IS_FLG(FLG_WANTED)) ADD_KEY(KEY_WANTED);
 	if (IS_FLG(FLG_UNIQUE)) ADD_KEY(KEY_UNIQUE);
 	if (IS_FLG(FLG_HUMAN)) ADD_KEY(KEY_HUMAN);
@@ -353,11 +353,6 @@ bool autopick_new_entry(autopick_type *entry, cptr str)
 	if (MATCH_KEY(KEY_UNIDENTIFIED)) ADD_FLG(FLG_UNIDENTIFIED);
 	if (MATCH_KEY(KEY_IDENTIFIED)) ADD_FLG(FLG_IDENTIFIED);
 	if (MATCH_KEY(KEY_STAR_IDENTIFIED)) ADD_FLG(FLG_STAR_IDENTIFIED);
-	if (MATCH_KEY(KEY_ARTIFACT)) ADD_FLG(FLG_ARTIFACT);
-	if (MATCH_KEY(KEY_EGO)) ADD_FLG(FLG_EGO);
-	if (MATCH_KEY(KEY_NAMELESS)) ADD_FLG(FLG_NAMELESS);
-	if (MATCH_KEY(KEY_UNAWARE)) ADD_FLG(FLG_UNAWARE);
-	if (MATCH_KEY(KEY_WORTHLESS)) ADD_FLG(FLG_WORTHLESS);
 	if (MATCH_KEY(KEY_BOOSTED)) ADD_FLG(FLG_BOOSTED);
 
 	/*** Weapons whose dd*ds is more than nn ***/
@@ -412,6 +407,11 @@ bool autopick_new_entry(autopick_type *entry, cptr str)
 			ptr = prev_ptr;
 	}
 
+	if (MATCH_KEY(KEY_WORTHLESS)) ADD_FLG(FLG_WORTHLESS);
+	if (MATCH_KEY(KEY_ARTIFACT)) ADD_FLG(FLG_ARTIFACT);
+	if (MATCH_KEY(KEY_EGO)) ADD_FLG(FLG_EGO);
+	if (MATCH_KEY(KEY_NAMELESS)) ADD_FLG(FLG_NAMELESS);
+	if (MATCH_KEY(KEY_UNAWARE)) ADD_FLG(FLG_UNAWARE);
 	if (MATCH_KEY(KEY_WANTED)) ADD_FLG(FLG_WANTED);
 	if (MATCH_KEY(KEY_UNIQUE)) ADD_FLG(FLG_UNIQUE);
 	if (MATCH_KEY(KEY_HUMAN)) ADD_FLG(FLG_HUMAN);
@@ -521,50 +521,6 @@ int is_autopick(object_type *o_ptr)
 		    (!object_known_p(o_ptr) || !(o_ptr->ident & IDENT_MENTAL)))
 			continue;
 
-		/*** Artifact object ***/
-		if (IS_FLG(FLG_ARTIFACT))
-		{
-			if (!object_known_p(o_ptr) || (!o_ptr->name1 && !o_ptr->art_name))
-				continue;
-		}
-
-		/*** Ego object ***/
-		if (IS_FLG(FLG_EGO))
-		{
-			if (!object_known_p(o_ptr) || !o_ptr->name2)
-				continue;
-		}
-
-		/*** Nameless ***/
-		if (IS_FLG(FLG_NAMELESS))
-		{
-			switch (o_ptr->tval)
-			{
-			case TV_WHISTLE:
-			case TV_SHOT: case TV_ARROW: case TV_BOLT: case TV_BOW:
-			case TV_DIGGING: case TV_HAFTED: case TV_POLEARM: case TV_SWORD: 
-			case TV_BOOTS: case TV_GLOVES: case TV_HELM: case TV_CROWN:
-			case TV_SHIELD: case TV_CLOAK:
-			case TV_SOFT_ARMOR: case TV_HARD_ARMOR: case TV_DRAG_ARMOR:
-			case TV_LITE: case TV_AMULET: case TV_RING: case TV_CARD:
-				if ((!object_known_p(o_ptr) || o_ptr->inscription
-				     || o_ptr->name1 || o_ptr->name2 || o_ptr->art_name))
-					continue;
-				break;
-			default:
-				/* don't match */
-				continue;
-			}
-		}
-
-		/*** Unaware items ***/
-		if (IS_FLG(FLG_UNAWARE) && object_aware_p(o_ptr))
-			continue;
-
-		/*** Worthless items ***/
-		if (IS_FLG(FLG_WORTHLESS) && object_value(o_ptr) > 0)
-			continue;
-
 		/*** Dice boosted (weapon of slaying) ***/
 		if (IS_FLG(FLG_BOOSTED))
 		{
@@ -612,6 +568,50 @@ int is_autopick(object_type *o_ptr)
 			}
 		}
 				
+		/*** Worthless items ***/
+		if (IS_FLG(FLG_WORTHLESS) && object_value(o_ptr) > 0)
+			continue;
+
+		/*** Artifact object ***/
+		if (IS_FLG(FLG_ARTIFACT))
+		{
+			if (!object_known_p(o_ptr) || (!o_ptr->name1 && !o_ptr->art_name))
+				continue;
+		}
+
+		/*** Ego object ***/
+		if (IS_FLG(FLG_EGO))
+		{
+			if (!object_known_p(o_ptr) || !o_ptr->name2)
+				continue;
+		}
+
+		/*** Nameless ***/
+		if (IS_FLG(FLG_NAMELESS))
+		{
+			switch (o_ptr->tval)
+			{
+			case TV_WHISTLE:
+			case TV_SHOT: case TV_ARROW: case TV_BOLT: case TV_BOW:
+			case TV_DIGGING: case TV_HAFTED: case TV_POLEARM: case TV_SWORD: 
+			case TV_BOOTS: case TV_GLOVES: case TV_HELM: case TV_CROWN:
+			case TV_SHIELD: case TV_CLOAK:
+			case TV_SOFT_ARMOR: case TV_HARD_ARMOR: case TV_DRAG_ARMOR:
+			case TV_LITE: case TV_AMULET: case TV_RING: case TV_CARD:
+				if ((!object_known_p(o_ptr) || o_ptr->inscription
+				     || o_ptr->name1 || o_ptr->name2 || o_ptr->art_name))
+					continue;
+				break;
+			default:
+				/* don't match */
+				continue;
+			}
+		}
+
+		/*** Unaware items ***/
+		if (IS_FLG(FLG_UNAWARE) && object_aware_p(o_ptr))
+			continue;
+
 		/*** Wanted monster's corpse/skeletons ***/
 		if (IS_FLG(FLG_WANTED) &&
 		    (o_ptr->tval != TV_CORPSE || !object_is_shoukinkubi(o_ptr)))
@@ -1059,35 +1059,6 @@ static void describe_autopick(char *buff, autopick_type *entry)
 	if (IS_FLG(FLG_STAR_IDENTIFIED))
 		before_str[before_n++] = "´°Á´¤Ë´ÕÄêºÑ¤ß¤Î";
 
-	/*** Artifact ***/
-	if (IS_FLG(FLG_ARTIFACT))
-	{
-		before_str[before_n++] = "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î";
-		body_str = "ÁõÈ÷";
-	}
-
-	/*** Ego ***/
-	if (IS_FLG(FLG_EGO))
-	{
-		before_str[before_n++] = "¥¨¥´¥¢¥¤¥Æ¥à¤Î";
-		body_str = "ÁõÈ÷";
-	}
-
-	/*** Nameless ***/
-	if (IS_FLG(FLG_NAMELESS))
-	{
-		before_str[before_n++] = "¥¨¥´¤Ç¤â¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ç¤â¤Ê¤¤";
-		body_str = "ÁõÈ÷";
-	}
-
-	/*** Unaware items ***/
-	if (IS_FLG(FLG_UNAWARE))
-		before_str[before_n++] = "̤´ÕÄê¤Ç¤½¤Î¸ú²Ì¤âȽÌÀ¤·¤Æ¤¤¤Ê¤¤";
-
-	/*** Worthless items ***/
-	if (IS_FLG(FLG_WORTHLESS))
-		before_str[before_n++] = "Ź¤Ç̵²ÁÃͤÈȽÄꤵ¤ì¤ë";
-
 	/*** Dice boosted (weapon of slaying) ***/
 	if (IS_FLG(FLG_BOOSTED))
 	{
@@ -1118,6 +1089,35 @@ static void describe_autopick(char *buff, autopick_type *entry)
 		before_str[before_n++] = ")°Ê¾å¤Î";
 	}
 
+	/*** Worthless items ***/
+	if (IS_FLG(FLG_WORTHLESS))
+		before_str[before_n++] = "Ź¤Ç̵²ÁÃͤÈȽÄꤵ¤ì¤ë";
+
+	/*** Artifact ***/
+	if (IS_FLG(FLG_ARTIFACT))
+	{
+		before_str[before_n++] = "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î";
+		body_str = "ÁõÈ÷";
+	}
+
+	/*** Ego ***/
+	if (IS_FLG(FLG_EGO))
+	{
+		before_str[before_n++] = "¥¨¥´¥¢¥¤¥Æ¥à¤Î";
+		body_str = "ÁõÈ÷";
+	}
+
+	/*** Nameless ***/
+	if (IS_FLG(FLG_NAMELESS))
+	{
+		before_str[before_n++] = "¥¨¥´¤Ç¤â¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ç¤â¤Ê¤¤";
+		body_str = "ÁõÈ÷";
+	}
+
+	/*** Unaware items ***/
+	if (IS_FLG(FLG_UNAWARE))
+		before_str[before_n++] = "̤´ÕÄê¤Ç¤½¤Î¸ú²Ì¤âȽÌÀ¤·¤Æ¤¤¤Ê¤¤";
+
 	/*** Wanted monster's corpse/skeletons ***/
 	if (IS_FLG(FLG_WANTED))
 	{
@@ -1298,6 +1298,13 @@ static void describe_autopick(char *buff, autopick_type *entry)
 	if (IS_FLG(FLG_STAR_IDENTIFIED))
 		before_str[before_n++] = "fully identified";
 
+	/*** Worthless items ***/
+	if (IS_FLG(FLG_WORTHLESS))
+	{
+		before_str[before_n++] = "worthless";
+		which_str[which_n++] = "can not be sold at stores";
+	}
+
 	/*** Artifacto ***/
 	if (IS_FLG(FLG_ARTIFACT))
 	{
@@ -1324,13 +1331,6 @@ static void describe_autopick(char *buff, autopick_type *entry)
 		whose_str[whose_n++] = "basic abilities are not known";
 	}
 
-	/*** Worthless items ***/
-	if (IS_FLG(FLG_WORTHLESS))
-	{
-		before_str[before_n++] = "worthless";
-		which_str[which_n++] = "can not be sold at stores";
-	}
-
 	/*** Dice boosted (weapon of slaying) ***/
 	if (IS_FLG(FLG_BOOSTED))
 	{
-- 
2.11.0