「収集中」を改良、「kvalが同じ」だけでなく実際に重ねられるものだけがマッチするようにした。。

diff --git a/autopick.txt b/autopick.txt
index 9159f51..d6c1706 100644 (file)
--- a/autopick.txt
+++ b/autopick.txt
@@ -246,11 +246,13 @@
 # *´ÕÄê*ºÑ¤ß¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò°ìÅÙ¾²¤ËÍî¤È¤·¤Æ½¦¤¦¤ÈÂÑÀ­¼«Æ°¹ï¤ß'%'¤ò¤¹¤ë¡£
 ~*´ÕÄê*ºÑ¤ß¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È#%
 
-# ´û¤Ë»ý¤Ã¤Æ¤¤¤ë¼ïÎà¤ÎÌô¡¢´¬Êª¡¢¥í¥Ã¥É¤Ï½Å¤Í¤é¤ì¤ë¤Î¤ÇÁ´¤Æ½¦¤¦¡£
+# ´û¤Ë»ý¤Ã¤Æ¤¤¤ë¼ïÎà¤ÎÌô¡¢´¬Êª¡¢¥í¥Ã¥ÉÅù¤Ï½Å¤Í¤é¤ì¤ë¤Î¤ÇÁ´¤Æ½¦¤¦¡£
 
 ¼ý½¸Ãæ¤ÎÌô
 ¼ý½¸Ãæ¤Î´¬Êª
 ¼ý½¸Ãæ¤Î¥í¥Ã¥É
+¼ý½¸Ãæ¤ÎÌð
+(¼ý½¸Ãæ¤Î¥¢¥¤¥Æ¥à
 
 # ¤è¤¯½¦¤¦Êª
 ´ÕÄê¤Î¥í¥Ã¥É#!k!!

diff --git a/autopick_eng.txt b/autopick_eng.txt
index 2bfbd84..aef1220 100644 (file)
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -254,6 +254,8 @@ unidentified lights:^Phial#!!
 collecting rod
 collecting potion
 collecting scroll
+collecting missiles
+(collecting items
 
 #
 # good items

diff --git a/src/cmd1.c b/src/cmd1.c
index 9231ea3..95d8164 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1278,7 +1278,7 @@ int is_autopick(object_type *o_ptr)
                        /* Check if there is a same item */
                        for (j = 0; j < INVEN_PACK; j++)
                        {
-                               if (inventory[j].k_idx == o_ptr->k_idx)
+                               if (object_similar(&inventory[j], o_ptr))
                                        return i;
                        }
                }