OSDN Git Service

生い立ち設定ファイル読み込みで, 読み込みに成功しても有効な"H:<str>"行
[hengband/hengband.git] / src / mspells3.c
index 9be8123..2efe100 100644 (file)
@@ -1,15 +1,15 @@
 /* File: mspells3.c */
 
-/* Purpose: Mane code */
-
 /*
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
  *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies.  Other copyrights may also apply.
  */
 
+/* Purpose: Imitation code */
+
 #include "angband.h"
 
 #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130)
@@ -385,36 +385,7 @@ cptr            p = "
        }
        }
 
-       if (mode == 1)
-       {
-               f4 = ((RF4_BOLT_MASK | RF4_BEAM_MASK) & ~(RF4_ROCKET));
-               f5 = RF5_BOLT_MASK | RF5_BEAM_MASK;
-               f6 = RF6_BOLT_MASK | RF6_BEAM_MASK;
-       }
-       else if (mode == 2)
-       {
-               f4 = (RF4_BALL_MASK & ~(RF4_BREATH_MASK));
-               f5 = (RF5_BALL_MASK & ~(RF5_BREATH_MASK));
-               f6 = (RF6_BALL_MASK & ~(RF6_BREATH_MASK));
-       }
-       else if (mode == 3)
-       {
-               f4 = RF4_BREATH_MASK;
-               f5 = RF5_BREATH_MASK;
-               f6 = RF6_BREATH_MASK;
-       }
-       else if (mode == 4)
-       {
-               f4 = RF4_SUMMON_MASK;
-               f5 = RF5_SUMMON_MASK;
-               f6 = RF6_SUMMON_MASK;
-       }
-       else if (mode == 5)
-       {
-               f4 = ~(RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_SUMMON_MASK | RF4_INDIRECT_MASK | RF4_RIDING_MASK);
-               f5 = ~(RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_SUMMON_MASK | RF5_INDIRECT_MASK | RF5_RIDING_MASK);
-               f6 = (~(RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_SUMMON_MASK | RF6_INDIRECT_MASK | RF6_RIDING_MASK)) | (RF6_TRAPS | RF6_DARKNESS);
-       }
+       set_rf_masks(&f4, &f5, &f6, mode);
 
        for (i = 0, num = 0; i < 32; i++)
        {
@@ -447,13 +418,13 @@ cptr            p = "
        }
 
        /* Build a prompt (accept all spells) */
+       (void)strnfmt(out_val, 78, 
 #ifdef JP
-(void) strnfmt(out_val, 78, "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¾§¤¨¤Þ¤¹¤«¡©",
+                     "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¾§¤¨¤Þ¤¹¤«¡©",
 #else
-       (void)strnfmt(out_val, 78, "(%c-%c, *=List, ESC=exit) Use which %s? ",
+                     "(%c-%c, *=List, ESC=exit) Use which %s? ",
 #endif
-
-               I2A(0), I2A(num - 1), p);
+                     I2A(0), I2A(num - 1), p);
 
        if (use_menu) screen_save();
 
@@ -473,7 +444,6 @@ cptr            p = "
                                {
                                        screen_load();
                                        return (FALSE);
-                                       break;
                                }
 
                                case '8':
@@ -560,7 +530,7 @@ put_str("MP 
                                /* Dump the spells */
                                for (i = 0; i < num; i++)
                                {
-                                       int shouhimana;
+                                       int need_mana;
 
                                        prt("", y + i + 1, x);
                                        if (!p_ptr->magic_num2[spellnum[i]]) continue;
@@ -574,26 +544,17 @@ put_str("MP 
                                        if (plev > spell.level) chance -= 3 * (plev - spell.level);
                                        else chance += (spell.level - plev);
 
-                                       chance += p_ptr->to_m_chance;
-
                                        /* Reduce failure rate by INT/WIS adjustment */
                                        chance -= 3 * (adj_mag_stat[p_ptr->stat_ind[A_INT]] - 1);
 
-                                       if (p_ptr->heavy_spell) chance += 20;
-                                       if(p_ptr->dec_mana && p_ptr->easy_spell) chance-=4;
-                                       else if (p_ptr->easy_spell) chance-=3;
-                                       else if (p_ptr->dec_mana) chance-=2;
+                                       chance = mod_spell_chance_1(chance);
 
-                                       shouhimana = monster_powers[spellnum[i]].smana;
-                                       if (p_ptr->dec_mana)
-                                       {
-                                               shouhimana = (shouhimana + 1) * 3 / 4;
-                                       }
+                                       need_mana = mod_need_mana(monster_powers[spellnum[i]].smana, 0, REALM_NONE);
 
                                        /* Not enough mana to cast */
-                                       if (shouhimana > p_ptr->csp)
+                                       if (need_mana > p_ptr->csp)
                                        {
-                                               chance += 5 * (shouhimana - p_ptr->csp);
+                                               chance += 5 * (need_mana - p_ptr->csp);
                                        }
 
                                        /* Extract the minimum failure rate */
@@ -609,9 +570,7 @@ put_str("MP 
                                        /* Always a 5 percent chance of working */
                                        if (chance > 95) chance = 95;
 
-                                       if(p_ptr->dec_mana) chance--;
-                                       if (p_ptr->heavy_spell) chance += 5;
-                                       chance = MAX(chance,0);
+                                       chance = mod_spell_chance_2(chance);
 
                                        /* Get info */
                                        learned_info(comment, spellnum[i]);
@@ -629,7 +588,7 @@ put_str("MP 
 
                                        /* Dump the spell --(-- */
                                        strcat(psi_desc, format(" %-26s %3d %3d%%%s",
-                                               spell.name, shouhimana,
+                                               spell.name, need_mana,
                                                chance, comment));
                                        prt(psi_desc, y + i + 1, x);
                                }
@@ -681,7 +640,7 @@ put_str("MP 
 
                        /* Prompt */
 #ifdef JP
-(void) strnfmt(tmp_val, 78, "%s¤ÎËâË¡¤ò¾§¤¨¤Þ¤¹¤«¡©", monster_powers[spellnum[i]].name);
+                       (void) strnfmt(tmp_val, 78, "%s¤ÎËâË¡¤ò¾§¤¨¤Þ¤¹¤«¡©", monster_powers[spellnum[i]].name);
 #else
                        (void)strnfmt(tmp_val, 78, "Use %s? ", monster_powers[spellnum[i]].name);
 #endif
@@ -699,14 +658,10 @@ put_str("MP 
        if (redraw) screen_load();
 
        /* Show choices */
-       if (show_choices)
-       {
-               /* Update */
-               p_ptr->window |= (PW_SPELL);
+       p_ptr->window |= (PW_SPELL);
 
-               /* Window stuff */
-               window_stuff();
-       }
+       /* Window stuff */
+       window_stuff();
 
        /* Abort if needed */
        if (!flag) return (FALSE);
@@ -736,7 +691,6 @@ static bool cast_learned_spell(int spell, bool success)
        int     summon_lev = p_ptr->lev * 2 / 3 + randint1(p_ptr->lev/2);
        int             hp = p_ptr->chp;
        int             damage = 0;
-       bool    unique_okay = FALSE;
        bool   pet = success;
        bool   no_trump = FALSE;
        u32b p_mode, u_mode = 0L, g_mode;
@@ -770,45 +724,14 @@ msg_print("
                break;
        case MS_DISPEL:
        {
-               monster_type *m_ptr;
-               char m_name[80];
+               int m_idx;
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               if (!cave[target_row][target_col].m_idx) break;
-               if (!los(py, px, target_row, target_col)) break;
-               m_ptr = &m_list[cave[target_row][target_col].m_idx];
-               monster_desc(m_name, m_ptr, 0);
-               if (m_ptr->invulner)
-               {
-                       m_ptr->invulner = 0;
-#ifdef JP
-msg_format("%s¤Ï¤â¤¦ÌµÅ¨¤Ç¤Ï¤Ê¤¤¡£", m_name);
-#else
-                       msg_format("%^s is no longer invulnerable.", m_name);
-#endif
-                       m_ptr->energy_need += ENERGY_NEED();
-               }
-               if (m_ptr->fast)
-               {
-                       m_ptr->fast = 0;
-#ifdef JP
-msg_format("%s¤Ï¤â¤¦²Ã®¤µ¤ì¤Æ¤¤¤Ê¤¤¡£", m_name);
-#else
-                       msg_format("%^s is no longer fast.", m_name);
-#endif
-               }
-               if (m_ptr->slow)
-               {
-                       m_ptr->slow = 0;
-#ifdef JP
-msg_format("%s¤Ï¤â¤¦¸ºÂ®¤µ¤ì¤Æ¤¤¤Ê¤¤¡£", m_name);
-#else
-                       msg_format("%^s is no longer slow.", m_name);
-#endif
-               }
-               p_ptr->redraw |= (PR_HEALTH);
-               if (p_ptr->riding == cave[target_row][target_col].m_idx) p_ptr->redraw |= (PR_UHEALTH);
-
+               m_idx = cave[target_row][target_col].m_idx;
+               if (!m_idx) break;
+               if (!player_has_los_bold(target_row, target_col)) break;
+               if (!projectable(py, px, target_row, target_col)) break;
+               dispel_monster_status(m_idx);
                break;
        }
        case MS_ROCKET:
@@ -1393,10 +1316,10 @@ msg_print("̵
                (void)set_invuln(randint1(4) + 4, FALSE);
                break;
        case MS_BLINK:
-               teleport_player(10);
+               teleport_player(10, 0L);
                break;
        case MS_TELEPORT:
-               teleport_player(plev * 5);
+               teleport_player(plev * 5, 0L);
                break;
        case MS_WORLD:
                world_player = TRUE;
@@ -1432,16 +1355,17 @@ msg_print("̵
                if (!target_set(TARGET_KILL)) return FALSE;
                if (!cave[target_row][target_col].m_idx) break;
                if (!player_has_los_bold(target_row, target_col)) break;
+               if (!projectable(py, px, target_row, target_col)) break;
                m_ptr = &m_list[cave[target_row][target_col].m_idx];
                r_ptr = &r_info[m_ptr->r_idx];
                monster_desc(m_name, m_ptr, 0);
-               if (r_ptr->flags3 & (RF3_RES_TELE))
+               if (r_ptr->flagsr & RFR_RES_TELE)
                {
-                       if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags3 & (RF3_RES_ALL)))
+                       if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
                        {
-                               r_ptr->r_flags3 |= RF3_RES_TELE;
+                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
 #ifdef JP
-msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª", m_name);
+                               msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª", m_name);
 #else
                                msg_format("%s is unaffected!", m_name);
 #endif
@@ -1450,9 +1374,9 @@ msg_format("%s
                        }
                        else if (r_ptr->level > randint1(100))
                        {
-                               r_ptr->r_flags3 |= RF3_RES_TELE;
+                               if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
 #ifdef JP
-msg_format("%s¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª", m_name);
+                               msg_format("%s¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª", m_name);
 #else
                                msg_format("%s resists!", m_name);
 #endif
@@ -1466,7 +1390,7 @@ msg_format("%s
                msg_format("You command %s to return.", m_name);
 #endif
 
-               teleport_to_player(cave[target_row][target_col].m_idx, 100);
+               teleport_monster_to(cave[target_row][target_col].m_idx, py, px, 100, TELEPORT_PASSIVE);
                break;
        }
        case MS_TELE_AWAY:
@@ -1476,49 +1400,35 @@ msg_format("%s
                break;
        case MS_TELE_LEVEL:
        {
+               int target_m_idx;
                monster_type *m_ptr;
                monster_race *r_ptr;
                char m_name[80];
 
                if (!target_set(TARGET_KILL)) return FALSE;
-               if (!cave[target_row][target_col].m_idx) break;
-               if (!los(py, px, target_row, target_col)) break;
-               m_ptr = &m_list[cave[target_row][target_col].m_idx];
+               target_m_idx = cave[target_row][target_col].m_idx;
+               if (!target_m_idx) break;
+               if (!player_has_los_bold(target_row, target_col)) break;
+               if (!projectable(py, px, target_row, target_col)) break;
+               m_ptr = &m_list[target_m_idx];
                r_ptr = &r_info[m_ptr->r_idx];
                monster_desc(m_name, m_ptr, 0);
 #ifdef JP
-msg_format("%s¤Î­¤ò»Ø¤µ¤·¤¿¡£", m_name);
-#else
-                       msg_format("You gesture at %s's feet.", m_name);
-#endif
-
-               if ((r_ptr->flags3 & RF3_RES_TELE) || (r_ptr->flags1 & RF1_QUESTOR) || (r_ptr->level + randint1(50) > plev + randint1(60)))
-               {
-#ifdef JP
-msg_print("¤·¤«¤·¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª");
+               msg_format("%^s¤Î­¤ò»Ø¤µ¤·¤¿¡£", m_name);
 #else
-                       msg_format("%s are unaffected!", m_name);
+               msg_format("You gesture at %^s's feet.", m_name);
 #endif
 
-               }
-               else if (one_in_(2))
-               {
-#ifdef JP
-msg_format("%s¤Ï¾²¤òÆͤ­ÇˤäÆÄÀ¤ó¤Ç¤¤¤Ã¤¿¡£", m_name);
-#else
-                       msg_format("%s sinks through the floor.", m_name);
-#endif
-                       delete_monster_idx(cave[target_row][target_col].m_idx);
-               }
-               else
+               if ((r_ptr->flagsr & (RFR_EFF_RES_NEXU_MASK | RFR_RES_TELE)) ||
+                       (r_ptr->flags1 & RF1_QUESTOR) || (r_ptr->level + randint1(50) > plev + randint1(60)))
                {
 #ifdef JP
-msg_format("%s¤ÏÅ·°æ¤òÆͤ­ÇˤäÆÃè¤ØÉ⤤¤Æ¤¤¤Ã¤¿¡£",m_name);
+                       msg_print("¤·¤«¤·¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª");
 #else
-                       msg_format("%s rises up through the ceiling.", m_name);
+                       msg_format("%^s is unaffected!", m_name);
 #endif
-                       delete_monster_idx(cave[target_row][target_col].m_idx);
                }
+               else teleport_level(target_m_idx);
                break;
        }
        case MS_PSY_SPEAR:
@@ -1578,7 +1488,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿Ãç´Ö¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿Ãç´Ö¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned fellows are angry!");
 #endif
@@ -1603,7 +1513,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("The summoned Cyberdemon are angry!");
 #endif
@@ -1627,7 +1537,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥â¥ó¥¹¥¿¡¼¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥â¥ó¥¹¥¿¡¼¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("The summoned monster is angry!");
 #endif
@@ -1651,7 +1561,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥â¥ó¥¹¥¿¡¼¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥â¥ó¥¹¥¿¡¼¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned monsters are angry!");
 #endif
@@ -1675,7 +1585,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥¢¥ê¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥¢¥ê¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned ants are angry!");
 #endif
@@ -1699,7 +1609,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿ÃØéá¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿ÃØéá¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned spiders are angry!");
 #endif
@@ -1723,7 +1633,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥Ï¥¦¥ó¥É¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥Ï¥¦¥ó¥É¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned hounds are angry!");
 #endif
@@ -1747,7 +1657,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥Ò¥É¥é¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥Ò¥É¥é¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned hydras are angry!");
 #endif
@@ -1771,7 +1681,7 @@ msg_print("ŷ
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿Å·»È¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿Å·»È¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned angels are angry!");
 #endif
@@ -1795,7 +1705,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥Ç¡¼¥â¥ó¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥Ç¡¼¥â¥ó¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned demons are angry!");
 #endif
@@ -1819,7 +1729,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥¢¥ó¥Ç¥Ã¥É¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥¢¥ó¥Ç¥Ã¥É¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned undeads are angry!");
 #endif
@@ -1843,7 +1753,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥É¥é¥´¥ó¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥É¥é¥´¥ó¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned dragons are angry!");
 #endif
@@ -1867,7 +1777,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¾åµé¥¢¥ó¥Ç¥Ã¥É¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¾åµé¥¢¥ó¥Ç¥Ã¥É¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned greater undeads are angry!");
 #endif
@@ -1891,7 +1801,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¸ÅÂå¥É¥é¥´¥ó¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¸ÅÂå¥É¥é¥´¥ó¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned ancient dragons are angry!");
 #endif
@@ -1915,7 +1825,7 @@ msg_print("
                        {
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥¢¥ó¥Ð¡¼¤Î²¦Â²¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥¢¥ó¥Ð¡¼¤Î²¦Â²¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned Lords of Amber are angry!");
 #endif
@@ -1940,7 +1850,7 @@ msg_print("
                                count++;
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned special opponents are angry!");
 #endif
@@ -1951,7 +1861,7 @@ msg_print("Summoned special opponents are angry!");
                                count++;
                                if (!pet)
 #ifdef JP
-msg_print("¾¤´Ô¤µ¤ì¤¿¾åµé¥¢¥ó¥Ç¥Ã¥É¤ÏÅܤäƤ¤¤ë¡ª");
+msg_print("¾¤´­¤µ¤ì¤¿¾åµé¥¢¥ó¥Ç¥Ã¥É¤ÏÅܤäƤ¤¤ë¡ª");
 #else
 msg_print("Summoned greater undeads are angry!");
 #endif
@@ -1990,7 +1900,7 @@ bool do_cmd_cast_learned(void)
        int             plev = p_ptr->lev;
        monster_power   spell;
        bool            cast;
-       int             shouhimana;
+       int             need_mana;
 
 
        /* not if confused */
@@ -2010,15 +1920,10 @@ msg_print("
 
        spell = monster_powers[n];
 
-       shouhimana = spell.smana;
-
-       if (p_ptr->dec_mana)
-       {
-               shouhimana = (shouhimana + 1) * 3 / 4;
-       }
+       need_mana = mod_need_mana(spell.smana, 0, REALM_NONE);
 
        /* Verify "dangerous" spells */
-       if (shouhimana > p_ptr->csp)
+       if (need_mana > p_ptr->csp)
        {
                /* Warning */
 #ifdef JP
@@ -2046,20 +1951,15 @@ if (!get_check("
        if (plev > spell.level) chance -= 3 * (plev - spell.level);
        else chance += (spell.level - plev);
 
-       chance += p_ptr->to_m_chance;
-
        /* Reduce failure rate by INT/WIS adjustment */
        chance -= 3 * (adj_mag_stat[p_ptr->stat_ind[A_INT]] - 1);
 
-       if (p_ptr->heavy_spell) chance += 20;
-       if(p_ptr->dec_mana && p_ptr->easy_spell) chance-=4;
-       else if (p_ptr->easy_spell) chance-=3;
-       else if (p_ptr->dec_mana) chance-=2;
+       chance = mod_spell_chance_1(chance);
 
        /* Not enough mana to cast */
-       if (shouhimana > p_ptr->csp)
+       if (need_mana > p_ptr->csp)
        {
-               chance += 5 * (shouhimana - p_ptr->csp);
+               chance += 5 * (need_mana - p_ptr->csp);
        }
 
        /* Extract the minimum failure rate */
@@ -2075,9 +1975,7 @@ if (!get_check("
        /* Always a 5 percent chance of working */
        if (chance > 95) chance = 95;
 
-       if(p_ptr->dec_mana) chance--;
-       if (p_ptr->heavy_spell) chance += 5;
-       chance = MAX(chance,0);
+       chance = mod_spell_chance_2(chance);
 
        /* Failed spell */
        if (randint0(100) < chance)
@@ -2106,14 +2004,14 @@ msg_print("
        }
 
        /* Sufficient mana */
-       if (shouhimana <= p_ptr->csp)
+       if (need_mana <= p_ptr->csp)
        {
                /* Use some mana */
-               p_ptr->csp -= shouhimana;
+               p_ptr->csp -= need_mana;
        }
        else
        {
-               int oops = shouhimana;
+               int oops = need_mana;
 
                /* No mana left */
                p_ptr->csp = 0;
@@ -2164,6 +2062,7 @@ msg_print("
 void learn_spell(int monspell)
 {
        if (p_ptr->action != ACTION_LEARN) return;
+       if (monspell < 0) return; /* Paranoia */
        if (p_ptr->magic_num2[monspell]) return;
        if (p_ptr->confused || p_ptr->blind || p_ptr->image || p_ptr->stun || p_ptr->paralyzed) return;
        if (randint1(p_ptr->lev + 70) > monster_powers[monspell].level + 40)
@@ -2183,3 +2082,45 @@ void learn_spell(int monspell)
                p_ptr->redraw |= (PR_STATE);
        }
 }
+
+
+/*
+ * Extract monster spells mask for the given mode
+ */
+void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, int mode)
+{
+       switch (mode)
+       {
+               case MONSPELL_TYPE_BOLT:
+                       *f4 = ((RF4_BOLT_MASK | RF4_BEAM_MASK) & ~(RF4_ROCKET));
+                       *f5 = RF5_BOLT_MASK | RF5_BEAM_MASK;
+                       *f6 = RF6_BOLT_MASK | RF6_BEAM_MASK;
+                       break;
+
+               case MONSPELL_TYPE_BALL:
+                       *f4 = (RF4_BALL_MASK & ~(RF4_BREATH_MASK));
+                       *f5 = (RF5_BALL_MASK & ~(RF5_BREATH_MASK));
+                       *f6 = (RF6_BALL_MASK & ~(RF6_BREATH_MASK));
+                       break;
+
+               case MONSPELL_TYPE_BREATH:
+                       *f4 = RF4_BREATH_MASK;
+                       *f5 = RF5_BREATH_MASK;
+                       *f6 = RF6_BREATH_MASK;
+                       break;
+
+               case MONSPELL_TYPE_SUMMON:
+                       *f4 = RF4_SUMMON_MASK;
+                       *f5 = RF5_SUMMON_MASK;
+                       *f6 = RF6_SUMMON_MASK;
+                       break;
+
+               case MONSPELL_TYPE_OTHER:
+                       *f4 = RF4_ATTACK_MASK & ~(RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_INDIRECT_MASK);
+                       *f5 = RF5_ATTACK_MASK & ~(RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_INDIRECT_MASK);
+                       *f6 = RF6_ATTACK_MASK & ~(RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_INDIRECT_MASK);
+                       break;
+       }
+
+       return;
+}