自動拾い/自動破壊キーワードのヘルプが最新仕様に追従していなかったので

修正. なお, 以下の修正を含む.
* "equpment" -> "equipment".

diff --git a/autopick.txt b/autopick.txt
index 6a6f3e9..d71a813 100644 (file)
--- a/autopick.txt
+++ b/autopick.txt
@@ -115,8 +115,12 @@
 #                            ǽÎϽ¤Àµ¤¬Ìµ¤¤¾ì¹ç¤Ï¾¤Î¿ôÃͤ¬+n°Ê¾å¤Ê¤éÂоݤˤʤê¤Þ¤¹¡£
 #      ¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´ÁõÈ÷¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¾å¼Á¤Î¡Á          : {¾å¼Á}¤ÎÁõÈ÷¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÁõÈ÷¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦Ê¤ΡÁ            : {ÊÂ}¤ÎÁõÈ÷¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¥ì¥¢¤Ê¡Á          : ¥É¥é¥´¥óËɶñÅù¤ÎÄÁ¤·¤¤¥Ù¡¼¥¹¥¢¥¤¥Æ¥à¤ÎÁõÈ÷¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¤¢¤ê¤Õ¤ì¤¿¡Á      : ¥É¥é¥´¥óËɶñÅù°Ê³°¤ÎÉáÄ̤Υ١¼¥¹¥¢¥¤¥Æ¥à¤ÎÁõÈ÷¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¾Þ¶â¼ó¤Î¡Á        : ¾Þ¶â¼ó¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î¡Á¡§ ¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î»àÂΡ¢¹ü¡¢Ä¦Áü¤¬Âоݤˤʤê¤Þ¤¹¡£
 #      ¡¦¿Í´Ö¤Î¡Á          : ¿Í´Ö¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£(°­ËâËâË¡¤Ç»ÈÍÑ)
@@ -126,16 +130,17 @@
 #      ¡¦nºýÌܤΠ          : n¤¬1¤«¤é4¤Î¤È¤­¡¢nºýÌܤÎËâË¡½ñ¤¬Âоݤˤʤê¤Þ¤¹¡£
 #    
 #      ¡Á¤ÎÉôʬ¤Ç¤Ï¡¢¥¢¥¤¥Æ¥à¤Î¼ïÎà¤òɽ¤¹°Ê²¼¤Î¤è¤¦¤Ê¥­¡¼¥ï¡¼¥É¤¬ÆÃÊÌ°·¤¤¤Ë¤Ê¤ê¤Þ¤¹
-#      ¡¦¥¢¥¤¥Æ¥à : ¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦Éð´ï : Éð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦Ëɶñ : Ëɶñ¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦Ìð : Ìð¡¢¥¯¥í¥¹¥Ü¥¦¤ÎÌð¡¢ÀС¢ÃƤ¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦¸÷¸» : ¤¿¤¤¤Þ¤Ä¤ä¥é¥ó¥¿¥óÅù¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦ËâË¡¥¢¥¤¥Æ¥à : ´¬Êª¡¦¾ó¡¦ËâË¡ËÀ¡¦¥í¥Ã¥É¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦¤¬¤é¤¯¤¿ : Àޤ줿ËÀ¤äÁüÅù¤ÎÌò¤ËΩ¤¿¤Ê¤¤¤â¤Î¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦ËâË¡½ñ : ËâË¡½ñ¡¢Éð·Ý¤Î½ñ¡¢²Î½¸¤¬Âоݤˤʤê¤Þ¤¹¡£
-#      ¡¦ÆÀ°ÕÉð´ï : ¥×¥ê¡¼¥¹¥È¡¢½¤¹ÔÁΡ¢Ëâ½Ã»È¤¤¡¢Îýµ¤½Ñ»Õ¡¢µ³Ê¼¡¢Ç¦¼Ô¤Ë¤È¤Ã¤Æ¡¢
-#                   ÆÃÊ̤˰·¤¤¤ä¤¹¤¤¼ïÎà¤ÎÉð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¥¢¥¤¥Æ¥à          : ¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦Éð´ï              : Éð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦Ëɶñ              : Ëɶñ¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦Ìð                : Ìð¡¢¥¯¥í¥¹¥Ü¥¦¤ÎÌð¡¢ÀС¢ÃƤ¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¸÷¸»              : ¤¿¤¤¤Þ¤Ä¤ä¥é¥ó¥¿¥óÅù¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦ËâË¡¥¢¥¤¥Æ¥à      : ´¬Êª¡¦¾ó¡¦ËâË¡ËÀ¡¦¥í¥Ã¥É¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦¤¬¤é¤¯¤¿          : Àޤ줿ËÀ¤äÁüÅù¤ÎÌò¤ËΩ¤¿¤Ê¤¤¤â¤Î¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦»àÂΤä¹ü          : ¥â¥ó¥¹¥¿¡¼¤Î»àÂΤä¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦ËâË¡½ñ            : ËâË¡½ñ¡¢Éð·Ý¤Î½ñ¡¢²Î½¸¤¬Âоݤˤʤê¤Þ¤¹¡£
+#      ¡¦ÆÀ°ÕÉð´ï          : ¥×¥ê¡¼¥¹¥È¡¢½¤¹ÔÁΡ¢Ëâ½Ã»È¤¤¡¢Îýµ¤½Ñ»Õ¡¢µ³Ê¼¡¢Ç¦¼Ô¤Ë¤È¤Ã¤Æ¡¢
+#                            ÆÃÊ̤˰·¤¤¤ä¤¹¤¤¼ïÎà¤ÎÉð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
 #
 #      ¾¤ËÉô°ÌÊ̤ÎÁõÈ÷ÉʤòÂоݤȤ¹¤ë¥­¡¼¥ï¡¼¥É: ½â¡¢µÝ¡¢»ØÎØ¡¢¥¢¥ß¥å
 #      ¥ì¥Ã¥È¡¢³»¡¢¥¯¥í¡¼¥¯¡¢³õ¡¢äƼꡢ·¤ ¤¬»ÈÍѤǤ­¤Þ¤¹¡£
@@ -165,13 +170,14 @@
 #         [! ~ ; (]
 #         [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î]
 #          [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
+#          [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [¾å¼Á¤Î] [̵ÌäÎ] [ʤÎ] 
+#          [̵²ÁÃͤÎ] [¥ì¥¢¤Ê] [¤¢¤ê¤Õ¤ì¤¿]
 #          [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]
-#          [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ]
 #          [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
-#         [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
-#          [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|Ëɶñ|Ìð|¸÷¸»|ËâË¡¥¢¥¤¥Æ¥à|
-#           ¤¬¤é¤¯¤¿|ËâË¡½ñ|Æß´ï|½â|µÝ|»ØÎØ|¥¢¥ß¥å¥ì¥Ã¥È|³»|¥¯¥í¡¼¥¯|
-#           ³õ|äƼê|·¤] :]
+#          [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
+#          [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|ÆÀ°ÕÉð´ï|Ëɶñ|Ìð|ËâË¡¥¢¥¤¥Æ¥à|
+#           ¤¬¤é¤¯¤¿|»àÂΤä¹ü|ËâË¡½ñ|Æß´ï|½â|µÝ|»ØÎØ|¥¢¥ß¥å¥ì¥Ã¥È|¸÷¸»|³»|
+#           ¥¯¥í¡¼¥¯|³õ|äƼê|·¤] :]
 #         [[^]¤½¤Î¾¤Îʸ»úÎó] [#¼«Æ°¹ï¤ßʸ»úÎó]
 #    
 #      ¡ù Tips

diff --git a/autopick_eng.txt b/autopick_eng.txt
index 4e40fed..cd51f71 100644 (file)
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -80,7 +80,11 @@
 #      worthless         : Items which you cannot sell match.
 #      artifacts         : Artifact items match.
 #      ego               : Ego items match.
+#      good              : {good} items match.
 #      nameless          : Non ego/non artifact items match.
+#      average           : {average} items match.
+#      rare              : Rare equipment such as Dragon armors etc. match.
+#      common            : Any equipments except 'rare' equipment 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.
@@ -100,6 +104,7 @@
 #      magical devices   : Wands, staffs, rods and scrolls match.
 #      lights            : Light sources match.
 #      junks             : Junk items like Shard of Pottery or etc. match.
+#      corpses or skeletons : Corpses or skeletons of monsters match.
 #      spellbooks        : All books match.
 #      favorite weapons  : Weapons suitable for your class (for Priest, Monk,
 #                          BeastMaster, ForceTrainer, Cavalry, and Ninja)
@@ -176,13 +181,15 @@
 #      [! ~ ; (]
 #      [[all] [collecting]
 #       [unaware] [unidentified] [identified] [*identified*] 
+#       [artifact] [ego] [good] [nameless] [average]
+#       [worthless] [rare] [common]
 #       [dice boosted] [more than N dice] [more bonus than N] 
-#       [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 | 
-#        lights | junks | spellbooks | hafted weapons | shields | bows | 
-#        rings | amulets | suits | cloaks | helms | gloves | boots] :]
+#       [items | weapons | favorite weapons | armors | missiles |
+#        magical devices | lights | junks | corpses or skeletons | spellbooks |
+#        hafted weapons | shields | bows | rings | amulets | suits | cloaks |
+#        helms | gloves | boots] :]
 #      [[^]part-of-item-name] [#auto-inscription-string]
 #    
 #    

diff --git a/lib/help/editor.txt b/lib/help/editor.txt
index 8452f65..727e2b2 100644 (file)
--- a/lib/help/editor.txt
+++ b/lib/help/editor.txt
@@ -166,7 +166,7 @@ Keywords:
   nameless          : Non ego/non artifact items match.
   average           : {average} items match.
   rare              : Rare equipment such as Dragon armors etc. match.
-  common            : Any equipments except 'rare' equpment match.
+  common            : Any equipments except 'rare' equipment 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.
@@ -186,6 +186,7 @@ Keywords:
   magical devices   : Wands, staffs, rods and scrolls match.
   lights            : Light sources match.
   junks             : Junk items like Shard of Pottery or etc. match.
+  corpses or skeletons : Corpses or skeletons of monsters match.
   spellbooks        : All books match.
   favorite weapons  : Weapons suitable for your class (for Priest, Monk,
                       BeastMaster, ForceTrainer, Cavalry, and Ninja)
@@ -267,9 +268,10 @@ Special Notes:
    [dice boosted] [more than N dice] [more bonus than N] 
    [wanted] [unique monster's] [human] [unreadable] 
    [first realm's] [second realm's] [first] [second] [third] [fourth] 
-   [items | weapons | armors | missiles | magical devices | 
-    lights | junks | spellbooks | hafted weapons | shields | bows | 
-    rings | amulets | suits | cloaks | helms | gloves | boots] :]
+   [items | weapons | favorite weapons | armors | missiles |
+    magical devices | lights | junks | corpses or skeletons | spellbooks |
+    hafted weapons | shields | bows | rings | amulets | suits | cloaks |
+    helms | gloves | boots] :]
   [[^]part-of-item-name] [#auto-inscription-string]
 
 

diff --git a/lib/help/jeditor.txt b/lib/help/jeditor.txt
index 3e7c266..bb9f6ad 100644 (file)
--- a/lib/help/jeditor.txt
+++ b/lib/help/jeditor.txt
@@ -487,8 +487,8 @@ picktype.prf 
   [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
   [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
   [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|ÆÀ°ÕÉð´ï|Ëɶñ|Ìð|ËâË¡¥¢¥¤¥Æ¥à|
-   ¤¬¤é¤¯¤¿|ËâË¡½ñ|Æß´ï|½â|µÝ|»ØÎØ|¥¢¥ß¥å¥ì¥Ã¥È|¸÷¸»|³»|¥¯¥í¡¼¥¯|
-   ³õ|äƼê|·¤] :]
+   ¤¬¤é¤¯¤¿|»àÂΤä¹ü|ËâË¡½ñ|Æß´ï|½â|µÝ|»ØÎØ|¥¢¥ß¥å¥ì¥Ã¥È|¸÷¸»|³»|
+   ¥¯¥í¡¼¥¯|³õ|äƼê|·¤] :]
  [[^]¤½¤Î¾¤Îʸ»úÎó] [#¼«Æ°¹ï¤ßʸ»úÎó]