･ﾚ･ﾃ･ﾈﾇ戓ﾋ､ﾎﾋ簍｡､ﾇ･讌ﾋ｡ｼ･ｯ･筵ｹ･ｿ｡ｼ､ﾋｲﾇ､ｭ､ﾊ､､､隍ｦ､ﾋｽ､ﾀｵ｡｣

diff --git a/src/cmd5.c b/src/cmd5.c
index db0bb4f..ef1b3bb 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -3823,7 +3823,7 @@ else msg_print("<
                fire_ball(GF_CHARM, 0, 20+plev, 3+plev/20);
                break;
        case 27: /* True Discharge Minion */
-               discharge_minion(TRUE);
+               discharge_minion();
                break;
        case 28: /* Summon Greater Demon */
        {

diff --git a/src/externs.h b/src/externs.h
index 688130b..d2ccf9d 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1016,7 +1016,7 @@ extern bool item_tester_hook_recharge(object_type *o_ptr);
 extern bool project_hook(int typ, int dir, int dam, int flg);
 extern bool project_hack(int typ, int dam);
 extern bool eat_magic(int power);
-extern void discharge_minion(bool force);
+extern void discharge_minion(void);
 extern void kawarimi(bool success);
 
 /* spells3.c */

diff --git a/src/spells2.c b/src/spells2.c
index 26467d3..b829197 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -5584,7 +5584,7 @@ msg_format("%^s
 }
 
 
-void discharge_minion(bool force)
+void discharge_minion(void)
 {
        int i;
        bool okay = TRUE;
@@ -5613,20 +5613,18 @@ void discharge_minion(bool force)
                if (!m_ptr->r_idx || !is_pet(m_ptr)) continue;
                r_ptr = &r_info[m_ptr->r_idx];
 
-               if (!force)
+               /* Uniques resist discharging */
+               if (r_ptr->flags1 & RF1_UNIQUE)
                {
-                       if (r_ptr->level/2+randint(r_ptr->level/2) > p_ptr->lev/2+randint(p_ptr->lev/2))
-                       {
-                               char m_name[80];
-                               monster_desc(m_name, m_ptr, 0x00);
+                       char m_name[80];
+                       monster_desc(m_name, m_ptr, 0x00);
 #ifdef JP
-                               msg_format("%s¤ÏÇúÇˤµ¤ì¤ë¤Î¤ò·ù¤¬¤ê¡¢¾¡¼ê¤Ë¼«Ê¬¤ÎÀ¤³¦¤Ø¤Èµ¢¤Ã¤¿¡£", m_name);
+                       msg_format("%s¤ÏÇúÇˤµ¤ì¤ë¤Î¤ò·ù¤¬¤ê¡¢¾¡¼ê¤Ë¼«Ê¬¤ÎÀ¤³¦¤Ø¤Èµ¢¤Ã¤¿¡£", m_name);
 #else
-                               msg_format("%^s resists to be blasted, and run away.", m_name);
+                       msg_format("%^s resists to be blasted, and run away.", m_name);
 #endif
-                               delete_monster_idx(i);
-                               continue;
-                       }
+                       delete_monster_idx(i);
+                       continue;
                }
                dam = m_ptr->hp / 2;
                if (dam > 100) dam = (dam-100)/2 + 100;