キーワードの順番が自由になったのに対応して更新。

diff --git a/autopick.txt b/autopick.txt
index e79dc05..51ce508 100644 (file)
--- a/autopick.txt
+++ b/autopick.txt
@@ -98,6 +98,7 @@
 #      °Ê²¼¤Î¤è¤¦¤Ê¥­¡¼¥ï¡¼¥É¤Ç»Ï¤Þ¤ë¤â¤Î¤ÏÆÃÊÌ°·¤¤¤Ë¤Ê¤ê¤Þ¤¹¡£
 #      ¡¦¤¹¤Ù¤Æ¤Î¡Á        : ¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¼ý½¸Ãæ¤Î¡Á        : ´û¤ËƱ¤¸¼ïÎà¤Îʪ¤ò»ý¤Ã¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦Ì¤´ÕÄê¤Î¡Á        : ´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦´ÕÄêºÑ¤ß¤Î¡Á      : ´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦*´ÕÄê*ºÑ¤ß¤Î¡Á    : ´°Á´¤Ë´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
@@ -109,7 +110,6 @@
 #      ¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¾Þ¶â¼ó¤Î¡Á        : ¾Þ¶â¼ó¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î¡Á¡§ ¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î»àÂΡ¢¹ü¡¢Ä¦Áü¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¿Í´Ö¤Î¡Á          : ¿Í´Ö¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£(°­ËâËâË¡¤Ç»ÈÍÑ)
@@ -156,9 +156,10 @@
 #      (°Ê²¼¤Î½çÈ֤ǽñ¤¤¤¿¾ì¹ç¤À¤±ÆÃÊÌ°·¤¤¤µ¤ì¤Þ¤¹)
 #
 #         [! ~ (]
-#         [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
+#         [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î]
+#          [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
 #          [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]
-#          [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ] [̤ȽÌÀ¤Î]
+#          [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ]
 #          [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
 #         [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
 #          [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|Ëɶñ|Ìð|¸÷¸»|ËâË¡¥¢¥¤¥Æ¥à|
@@ -168,8 +169,8 @@
 #    
 #      ¡ù Tips
 #      ¡ù   ̤´ÕÄê¤Î ¤ä ¥À¥¤¥¹Ìܤΰ㤦 Åù¤Î¥­¡¼¥ï¡¼¥É¤Ï°ì¹Ô¤Ëʤ٤ƽñ¤¯
-#      ¡ù   »ö¤ÇξÊý¤ÎÀ©¸Â¤òŬÍѤµ¤»¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£¤¿¤À¤·¡¢½çÈÖ¤¬·è¤Ã¤Æ
-#      ¡ù   ¤¤¤ë¤Î¤ÇÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+#      ¡ù   »ö¤ÇξÊý¤ÎÀ©¸Â¤òŬÍѤµ¤»¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£
+#      ¡ù   ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¥­¡¼¥ï¡¼¥É¤Î½çÈ֤⼫ͳ¤Ç¤¹¡£
 #      ¡ù 
 #    
 #    

diff --git a/autopick_eng.txt b/autopick_eng.txt
index 541dd03..0445e72 100644 (file)
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -63,6 +63,7 @@
 #
 #      all               : All items match.
 #      collecting        : Matches if you already have that same item.
+#      unaware           : Items with unknown effects match.
 #      unidentified      : Unidentified items match.
 #      identified        : Identified items match.
 #      *identified*      : *Identified* items match.
@@ -73,7 +74,6 @@
 #      artifacts         : Artifacts items match.
 #      ego               : Ego items match.
 #      nameless          : Non ego/non artifact items match.
-#      unaware           : Items with unknown effects 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.
@@ -166,9 +166,10 @@
 #      Strict syntax of each line is below.
 #      
 #      [! ~ (]
-#      [[all] [collecting] [unidentified] [identified] [*identified*] 
+#      [[all] [collecting]
+#       [unaware] [unidentified] [identified] [*identified*] 
 #       [dice boosted] [more than N dice] [more bonus than N] 
-#       [worthless] [artifact] [ego] [nameless] [unaware] 
+#       [worthless] [artifact] [ego] [nameless] 
 #       [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 abf0823..c6fa2f7 100644 (file)
--- a/lib/help/jpref.txt
+++ b/lib/help/jpref.txt
@@ -303,6 +303,7 @@ picktype.prf 
 
 ¡¦¤¹¤Ù¤Æ¤Î¡Á        : ¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¼ý½¸Ãæ¤Î¡Á        : ´û¤ËƱ¤¸¼ïÎà¤Îʪ¤ò»ý¤Ã¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Ì¤´ÕÄê¤Î¡Á        : ´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦´ÕÄêºÑ¤ß¤Î¡Á      : ´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦*´ÕÄê*ºÑ¤ß¤Î¡Á    : ´°Á´¤Ë´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
@@ -314,7 +315,6 @@ picktype.prf 
 ¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¾Þ¶â¼ó¤Î¡Á        : ¾Þ¶â¼ó¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î¡Á¡§ ¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î»àÂΡ¢¹ü¡¢Ä¦Áü¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦¿Í´Ö¤Î¡Á          : ¿Í´Ö¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£(°­ËâËâË¡¤Ç»ÈÍÑ)
@@ -357,14 +357,14 @@ picktype.prf 
 --- ¸·Ì©¤Ê½ñ¼° ---
 
 ³Æ¹Ô¤Î¸·Ì©¤Ê½ñ¼°¤Ï°Ê²¼¤Î¤è¤¦¤Ê½çÈ֤Ǥ¹¡£Ì¤´ÕÄê¤Î ¤ä ¥À¥¤¥¹Ìܤΰ㤦 Åù
-¤Î¥­¡¼¥ï¡¼¥É¤Ï°ì¹Ô¤Ëʤ٤ƽñ¤¯»ö¤ÇξÊý¤ÎÀ©¸Â¤òŬÍѤµ¤»¤ë»ö¤¬½ÐÍè¤Þ¤¹¤¬¡¢
-½çÈÖ¤¬·è¤Ã¤Æ¤¤¤ë¤Î¤ÇÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Ê²¼¤Î½çÈ֤ǽñ¤¤¤¿¾ì¹ç¤À¤±ÆÃÊÌ°·
-¤¤¤µ¤ì¤Þ¤¹¡£
+¤Î¥­¡¼¥ï¡¼¥É¤Ï°ì¹Ô¤Ëʤ٤ƽñ¤¯»ö¤ÇξÊý¤ÎÀ©¸Â¤òŬÍѤµ¤»¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£
+¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¥­¡¼¥ï¡¼¥É¤Î½çÈ֤⼫ͳ¤Ç¤¹¡£
 
    [! ~ (]
-   [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
+   [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î]
+    [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
     [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]
-    [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ] [̤ȽÌÀ¤Î]
+    [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ]
     [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
     [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
     [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|Ëɶñ|Ìð|¸÷¸»|ËâË¡¥¢¥¤¥Æ¥à|

diff --git a/lib/help/pref.txt b/lib/help/pref.txt
index 8861a49..298c4db 100644 (file)
--- a/lib/help/pref.txt
+++ b/lib/help/pref.txt
@@ -280,6 +280,7 @@ Keywords:
 
   all               : All items match.
   collecting        : Matches if you already have that same item.
+  unaware           : Items with unknown effects match.
   unidentified      : Unidentified items match.
   identified        : Identified items match.
   *identified*      : *Identified* items match.
@@ -290,7 +291,6 @@ Keywords:
   artifact          : Artifacts items match.
   ego               : Ego items match.
   nameless          : Non ego/non artifact items match.
-  unaware           : Items with unknown effects 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.
@@ -383,9 +383,10 @@ Special Notes:
   Strict syntax of each line is below.
   
   [! ~ (]
-  [[all] [collecting] [unidentified] [identified] [*identified*] 
+  [[all] [collecting]
+   [unaware] [unidentified] [identified] [*identified*] 
    [dice boosted] [more than N dice] [more bonus than N] 
-   [worthless] [artifact] [ego] [nameless] [unaware] 
+   [worthless] [artifact] [ego] [nameless] 
    [wanted] [unique monster's] [human] [unreadable] 
    [first realm's] [second realm's] [first] [second] [third] [fourth] 
    [items | weapons | armors | missiles | magical devices |