POWERFUL monsters can already invoke elemental balls as same damage as mana balls.

diff --git a/src/mspells1.c b/src/mspells1.c
index 0048b65..30c3759 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1310,6 +1310,7 @@ bool make_attack_spell(int m_idx)
        u32b mode = 0L;
        int s_num_6 = (easy_band ? 2 : 6);
        int s_num_4 = (easy_band ? 1 : 4);
+       int rad = 0; //For elemental spells
 
        /* Target location */
        int x = px;
@@ -2348,19 +2349,23 @@ else msg_format("%^s
                {
                        disturb(1, 0);
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       else msg_format("%^s¤¬¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                        if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                        else msg_format("%^s casts an acid ball.", m_name);
 #endif
-
-                       dam = (randint1(rlev * 3) + 15) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_ACID, dam, 2, FALSE, MS_BALL_ACID, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 3) + 15);
+                       }
+                       breath(y, x, m_idx, GF_ACID, dam, rad, FALSE, MS_BALL_ACID, learnable);
                        update_smart_learn(m_idx, DRS_ACID);
                        break;
                }
@@ -2368,21 +2373,26 @@ else msg_format("%^s
                /* RF5_BA_ELEC */
                case 128+1:
                {
+                       int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
                        disturb(1, 0);
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       else msg_format("%^s¤¬¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                        if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                        else msg_format("%^s casts a lightning ball.", m_name);
 #endif
-
-                       dam = (randint1(rlev * 3 / 2) + 8) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_ELEC, dam, 2, FALSE, MS_BALL_ELEC, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 3 / 2) + 8);
+                       }
+                       breath(y, x, m_idx, GF_ELEC, dam, rad, FALSE, MS_BALL_ELEC, learnable);
                        update_smart_learn(m_idx, DRS_ELEC);
                        break;
                }
@@ -2390,6 +2400,7 @@ else msg_format("%^s
                /* RF5_BA_FIRE */
                case 128+2:
                {
+                       int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
                        disturb(1, 0);
 
                        if (m_ptr->r_idx == MON_ROLENTO)
@@ -2409,20 +2420,25 @@ else msg_format("%^s
                        else
                        {
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                               if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                               else msg_format("%^s¤¬¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                                if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                                else msg_format("%^s casts a fire ball.", m_name);
 #endif
                        }
 
-                       dam = (randint1(rlev * 7 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_FIRE, dam, 2, FALSE, MS_BALL_FIRE, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 7 / 2) + 10);
+                       }
+                       breath(y, x, m_idx, GF_FIRE, dam, rad, FALSE, MS_BALL_FIRE, learnable);
                        update_smart_learn(m_idx, DRS_FIRE);
                        break;
                }
@@ -2430,21 +2446,26 @@ else msg_format("%^s
                /* RF5_BA_COLD */
                case 128+3:
                {
+                       int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
                        disturb(1, 0);
 #ifdef JP
-if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
+                       else msg_format("%^s¤¬¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
                        if (blind) msg_format("%^s mumbles.", m_name);
-#endif
-
-#ifdef JP
-else msg_format("%^s¤¬¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
-#else
                        else msg_format("%^s casts a frost ball.", m_name);
 #endif
-
-                       dam = (randint1(rlev * 3 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-                       breath(y, x, m_idx, GF_COLD, dam, 2, FALSE, MS_BALL_COLD, learnable);
+                       if (r_ptr->flags2 & RF2_POWERFUL)
+                       {
+                               rad = 4;
+                               dam = (rlev * 4) + 50 + damroll(10, 10);
+                       }
+                       else
+                       {
+                               rad = 2;
+                               dam = (randint1(rlev * 3 / 2) + 10);
+                       }
+                       breath(y, x, m_idx, GF_COLD, dam, rad, FALSE, MS_BALL_COLD, learnable);
                        update_smart_learn(m_idx, DRS_COLD);
                        break;
                }

diff --git a/src/mspells2.c b/src/mspells2.c
index 3e7ec22..130ebe4 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -291,6 +291,7 @@ bool monst_spell_monst(int m_idx)
        u32b u_mode = 0L;
        int s_num_6 = (easy_band ? 2 : 6);
        int s_num_4 = (easy_band ? 1 : 4);
+       int rad = 0; //For elemental balls
 
        byte spell[96], num = 0;
 
@@ -1931,9 +1932,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 3) + 15) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, GF_ACID, dam, 2, FALSE, MS_BALL_ACID, learnable);
-
+               if (r_ptr->flags2 & RF2_POWERFUL)
+               {
+                       rad = 4;
+                       dam = (rlev * 4) + 50 + damroll(10, 10);
+               }
+               else
+               {
+                       rad = 2;
+                       dam = (randint1(rlev * 3) + 15);
+               }
+               monst_breath_monst(m_idx, y, x, GF_ACID, dam, rad, FALSE, MS_BALL_ACID, learnable);
                break;
 
        /* RF5_BA_ELEC */
@@ -1969,9 +1978,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 3 / 2) + 8) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, GF_ELEC, dam, 2, FALSE, MS_BALL_ELEC, learnable);
-
+               if (r_ptr->flags2 & RF2_POWERFUL)
+               {
+                       rad = 4;
+                       dam = (rlev * 4) + 50 + damroll(10, 10);
+               }
+               else
+               {
+                       rad = 2;
+                       dam = (randint1(rlev * 3 / 2) + 8);
+               }
+               monst_breath_monst(m_idx, y, x, GF_ELEC, dam, rad, FALSE, MS_BALL_ELEC, learnable);
                break;
 
        /* RF5_BA_FIRE */
@@ -2024,9 +2041,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 7 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, GF_FIRE, dam, 2, FALSE, MS_BALL_FIRE, learnable);
-
+               if (r_ptr->flags2 & RF2_POWERFUL)
+               {
+                       rad = 4;
+                       dam = (rlev * 4) + 50 + damroll(10, 10);
+               }
+               else
+               {
+                       rad = 2;
+                       dam = (randint1(rlev * 7 / 2) + 10);
+               }
+               monst_breath_monst(m_idx, y, x, GF_FIRE, dam, rad, FALSE, MS_BALL_FIRE, learnable);
                break;
 
        /* RF5_BA_COLD */
@@ -2062,9 +2087,17 @@ bool monst_spell_monst(int m_idx)
                        }
                }
 
-               dam = (randint1(rlev * 3 / 2) + 10) * ((r_ptr->flags2 & RF2_POWERFUL) ? 2 : 1);
-               monst_breath_monst(m_idx, y, x, GF_COLD, dam, 2, FALSE, MS_BALL_COLD, learnable);
-
+               if (r_ptr->flags2 & RF2_POWERFUL)
+               {
+                       rad = 4;
+                       dam = (rlev * 4) + 50 + damroll(10, 10);
+               }
+               else
+               {
+                       rad = 2;
+                       dam = (randint1(rlev * 3 / 2) + 10);
+               }
+               monst_breath_monst(m_idx, y, x, GF_COLD, dam, rad, FALSE, MS_BALL_COLD, learnable);
                break;
 
        /* RF5_BA_POIS */