「スピードモンスターの魔法棒」の価値を$1に変更。

「回復モンスターの魔法棒」は魔獣使いと騎兵では leave_special で簡易自動破壊を防止。

diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index 65f48bd..8332900 100644 (file)
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -2955,7 +2955,7 @@ N:276:
 E:Haste Monster
 G:-:d
 I:65:1:6
-W:20:0:10:0
+W:20:0:10:1
 A:20/1
 P:0:1d1:0:0:0
 D:$It hastes a monster when you use it.

diff --git a/lib/help/joption.txt b/lib/help/joption.txt
index 8233550..f8e8960 100644 (file)
--- a/lib/help/joption.txt
+++ b/lib/help/joption.txt
@@ -599,9 +599,9 @@ MP
 ***** <leave_special>
 ¼ï²/¿¦¶È¤ÇÆÃÊ̤ËɬÍפʥ¢¥¤¥Æ¥à¤Ï²õ¤µ¤Ê¤¤  [leave_special]
     Ä̾ï¤Ï̵²ÁÃͤǤ¢¤ë¤Ë¤â´Ø¤ï¤é¤ºÆÃÄê¤Î¿¦¶È¤ä¼ï²¤Î¾ì¹ç¤Î¤ßÌò¤ËΩ¤Ä¥¢
-    ¥¤¥Æ¥à¤ò¼«Æ°Ç˲õ¤ÎÂоݤˤ·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¥¢¡¼¥Á¥ã¡¼¤Î¾ì¹ç¤Ï¹ü¡¢
-    ¥Ð¥ë¥í¥°¤Î¾ì¹ç¤Ï¿Í´Ö¥¿¥¤¥×¤Î»àÂΡ¢Ç¦¼Ô¤Î¾ì¹ç¤Ï°Å°Ç¤Î¸÷¸»Åù¤¬¤¢¤Æ¤Ï
-    ¤Þ¤ê¤Þ¤¹¡£
+    ¥¤¥Æ¥à¤ò¼«Æ°Ç˲õ¤ÎÂоݤˤ·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¥¢¡¼¥Á¥ã¡¼¤Ï¹ü¡¢¥Ð¥ë¥í
+    ¥°¤Ï¿Í´Ö¥¿¥¤¥×¤Î»àÂΡ¢Ç¦¼Ô¤Ï°Å°Ç¤Î¸÷¸»¡¢Ëâ½Ã»È¤¤¤äµ³Ê¼¤Ï²óÉü¥â¥ó¥¹
+    ¥¿¡¼¤ÎËâË¡ËÀ¤¬¤¢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£
 
 
 ***** <PlayRecord>

diff --git a/lib/help/option.txt b/lib/help/option.txt
index b9ec9ef..7c6cb78 100644 (file)
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -585,8 +585,9 @@ Auto-destroyer leaves junk    [leave_junk]
 Auto-destroyer leaves items your race/class needs  [leave_special]
     This option protects specific items which are normally worthless,
     but very important for specific classes or races.  These include
-    bones for Archers, ego light source of darkness for Ninja,
-    humanoid corpses for Balrogs, etc...
+    bones for Archers, ego light sources of darkness for Ninja, Wands
+    of Heal Monster for BeastMaster and Cavalry, and humanoid corpses
+    for Balrogs, etc...
 
 
 ***** <PlayRecord>

diff --git a/src/autopick.c b/src/autopick.c
index 80f1aa6..594bb64 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -936,15 +936,6 @@ static bool is_opt_confirm_destroy(object_type *o_ptr)
 
        if (leave_special)
        {
-#if 0
-               if (p_ptr->prace == RACE_SKELETON)
-               {
-                       if (o_ptr->tval == TV_SKELETON ||
-                           (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))
-                               return FALSE;
-               }
-               else 
-#endif
                if (p_ptr->prace == RACE_DEMON)
                {
                        if (o_ptr->tval == TV_CORPSE &&
@@ -965,6 +956,13 @@ static bool is_opt_confirm_destroy(object_type *o_ptr)
                            o_ptr->name2 == EGO_LITE_DARKNESS)
                                return FALSE;
                }
+               else if (p_ptr->pclass == CLASS_BEASTMASTER ||
+                        p_ptr->pclass == CLASS_CAVALRY)
+               {
+                       if (o_ptr->tval == TV_WAND &&
+                           o_ptr->sval == SV_WAND_HEAL_MONSTER)
+                               return FALSE;
+               }
        }
        
        if (o_ptr->tval == TV_GOLD) return FALSE;