自動拾いの、コード整理、ヘルプ修正。

diff --git a/autopick_eng.txt b/autopick_eng.txt
index 2ad955d..d9ac761 100644 (file)
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -66,6 +66,8 @@
 #      unidentified      : Unidentified items match.
 #      identified        : Identified items match.
 #      *identified*      : *Identified* items 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.
@@ -84,11 +86,10 @@
 #
 #      items             : All items match. Use it with an adjective for 
 #                          readability (i.e. "unaware items").
-#      artifacts         : All artifacts match.
 #      weapons           : All weapons including missile weapons match.
 #      armors            : All armors match.
 #      missiles          : Arrows, bolts, and shots match.
-#      magical devices   : Wands, staffs and rods match.
+#      magical devices   : Wands, staffs, rods and scrolls match.
 #      lights            : Light sources match.
 #      junks             : Junk items like Shard of Pottery or etc. match.
 #      spellbooks        : All books match.

diff --git a/lib/help/jpref.txt b/lib/help/jpref.txt
index e4eab1d..5c82cab 100644 (file)
--- a/lib/help/jpref.txt
+++ b/lib/help/jpref.txt
@@ -306,6 +306,8 @@ picktype.prf 
 ¡¦Ì¤´ÕÄê¤Î¡Á        : ´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦´ÕÄêºÑ¤ß¤Î¡Á      : ´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦*´ÕÄê*ºÑ¤ß¤Î¡Á    : ´°Á´¤Ë´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
@@ -322,7 +324,6 @@ picktype.prf 
 ¡Á¤ÎÉôʬ¤Ç¤Ï¡¢¥¢¥¤¥Æ¥à¤Î¼ïÎà¤òɽ¤¹°Ê²¼¤Î¤è¤¦¤Ê¥­¡¼¥ï¡¼¥É¤¬ÆÃÊÌ°·¤¤¤Ë¤Ê¤ê¤Þ¤¹
 
 ¡¦¥¢¥¤¥Æ¥à          : ¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È  : ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Éð´ï              : Éð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Ëɶñ              : Ëɶñ¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Ìð                : Ìð¡¢¥¯¥í¥¹¥Ü¥¦¤ÎÌð¡¢ÀС¢ÃƤ¬Âоݤˤʤê¤Þ¤¹¡£

diff --git a/lib/help/pref.txt b/lib/help/pref.txt
index cbcc570..c38a906 100644 (file)
--- a/lib/help/pref.txt
+++ b/lib/help/pref.txt
@@ -283,6 +283,8 @@ Keywords:
   unidentified      : Unidentified items match.
   identified        : Identified items match.
   *identified*      : *Identified* items 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.
@@ -301,11 +303,10 @@ Keywords:
 
   items             : All items match. Use it with an adjective for 
                       readability (i.e. "unaware items").
-  artifacts         : All artifacts match.
   weapons           : All weapons including missile weapons match.
   armors            : All armors match.
   missiles          : Arrows, bolts, and shots match.
-  magical devices   : Wands, staffs and rods match.
+  magical devices   : Wands, staffs, rods and scrolls match.
   lights            : Light sources match.
   junks             : Junk items like Shard of Pottery or etc. match.
   spellbooks        : All books match.

diff --git a/src/autopick.c b/src/autopick.c
index ab60553..a556835 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -15,48 +15,48 @@
 /*
  * Macros for Keywords
  */
-#define FLG_ALL 0
-#define FLG_COLLECTING 1
-#define FLG_UNIDENTIFIED 2
-#define FLG_IDENTIFIED 3
+#define FLG_ALL             0
+#define FLG_COLLECTING     1
+#define FLG_UNIDENTIFIED    2
+#define FLG_IDENTIFIED     3
 #define FLG_STAR_IDENTIFIED 4
-#define FLG_NAMELESS 5
-#define FLG_UNAWARE 6
-#define FLG_WORTHLESS 7
-#define FLG_BOOSTED 8
-#define FLG_MORE_THAN 9
-#define FLG_DICE 10
-#define FLG_WANTED 11
-#define FLG_UNIQUE 12
-#define FLG_HUMAN 13
-#define FLG_UNREADABLE 14
-#define FLG_REALM1 15
-#define FLG_REALM2 16
-#define FLG_FIRST 17
-#define FLG_SECOND 18
-#define FLG_THIRD 19
-#define FLG_FOURTH 20
-#define FLG_ITEMS 21
-#define FLG_XXX1 22 /* unused */
-#define FLG_WEAPONS 23
-#define FLG_ARMORS 24
-#define FLG_MISSILES 25
-#define FLG_DEVICES 26
-#define FLG_LIGHTS 27
-#define FLG_JUNKS 28
-#define FLG_SPELLBOOKS 29
-#define FLG_HAFTED 30
-#define FLG_SHIELDS 31
-#define FLG_BOWS 32
-#define FLG_RINGS 33
-#define FLG_AMULETS 34
-#define FLG_SUITS 35
-#define FLG_CLOAKS 36
-#define FLG_HELMS 37
-#define FLG_GLOVES 38
-#define FLG_BOOTS 39
-#define FLG_EGO 40
-#define FLG_ARTIFACT 41
+#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_WANTED         13
+#define FLG_UNIQUE         14
+#define FLG_HUMAN          15
+#define FLG_UNREADABLE     16
+#define FLG_REALM1         17
+#define FLG_REALM2         18
+#define FLG_FIRST          19
+#define FLG_SECOND         20
+#define FLG_THIRD          21
+#define FLG_FOURTH         22
+
+#define FLG_ITEMS          30
+#define FLG_WEAPONS        31
+#define FLG_ARMORS         32
+#define FLG_MISSILES       33
+#define FLG_DEVICES        34
+#define FLG_LIGHTS         35
+#define FLG_JUNKS          36
+#define FLG_SPELLBOOKS     37
+#define FLG_HAFTED         38
+#define FLG_SHIELDS        39
+#define FLG_BOWS           40
+#define FLG_RINGS          41
+#define FLG_AMULETS        42
+#define FLG_SUITS          43
+#define FLG_CLOAKS         44
+#define FLG_HELMS          45
+#define FLG_GLOVES         46
+#define FLG_BOOTS           47
 
 #ifdef JP
 
@@ -65,6 +65,8 @@
 #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 "̵²ÁÃͤÎ"
@@ -82,7 +84,6 @@
 #define KEY_THIRD "3ºýÌܤÎ"
 #define KEY_FOURTH "4ºýÌܤÎ"
 #define KEY_ITEMS "¥¢¥¤¥Æ¥à"
-#define KEY_XXX1 ""
 #define KEY_WEAPONS "Éð´ï"
 #define KEY_ARMORS "Ëɶñ"
 #define KEY_MISSILES "Ìð"
@@ -100,8 +101,6 @@
 #define KEY_HELMS "³õ"
 #define KEY_GLOVES "äƼê"
 #define KEY_BOOTS "·¤"
-#define KEY_EGO "¥¨¥´"
-#define KEY_ARTIFACT "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È"
 
 #else 
 
@@ -110,6 +109,8 @@
 #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"
@@ -127,7 +128,6 @@
 #define KEY_THIRD "third"
 #define KEY_FOURTH "fourth"
 #define KEY_ITEMS "items"
-#define KEY_XXX1
 #define KEY_WEAPONS "weapons"
 #define KEY_ARMORS "armors"
 #define KEY_MISSILES "missiles"
@@ -145,8 +145,6 @@
 #define KEY_HELMS "helms"
 #define KEY_GLOVES "gloves"
 #define KEY_BOOTS "boots"
-#define KEY_EGO "ego"
-#define KEY_ARTIFACT "artifact"
 
 #endif /* JP */
 
@@ -1062,7 +1060,7 @@ static void describe_autopick(char *buff, autopick_type *entry)
        /*** Unreadable spellbooks ***/
        if (IS_FLG(FLG_UNREADABLE))
        {
-               before_str[before_n++] = "Îΰ褬°Û¤Ê¤ë°Ù¤Ë¤¢¤Ê¤¿¤Ë¤ÏÆɤá¤Ê¤¤";
+               before_str[before_n++] = "¤¢¤Ê¤¿¤¬Æɤá¤Ê¤¤Îΰè¤Î";
                body_str = "ËâË¡½ñ";
        }