各種抹殺による個別モンスターの抵抗判定を関数としてまとめた. 考え方は

XAngbandから. 関連して, 以下の修正と変更を含む.
* テレパシー等で見えていても盲目ならば抵抗メッセージを出さない仕様を
  削除.
* 抹殺で消えたモンスターがいない場合は徳が変動しないように変更.
* 英語版で "アンデッド消滅" が "Mass Genocide" になっていたバグ修正.
* 抹殺系関数のplayer_castはbool型に変更.

diff --git a/src/externs.h b/src/externs.h
index aef6ec6..bf194df 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1039,9 +1039,10 @@ extern bool speed_monsters(void);
 extern bool slow_monsters(void);
 extern bool sleep_monsters(void);
 extern void aggravate_monsters(int who);
-extern bool symbol_genocide(int power, int player_cast);
-extern bool mass_genocide(int power, int player_cast);
-extern bool mass_genocide_undead(int power, int player_cast);
+extern bool genocide_aux(int m_idx, int power, bool player_cast, int dam_side, cptr spell_name);
+extern bool symbol_genocide(int power, bool player_cast);
+extern bool mass_genocide(int power, bool player_cast);
+extern bool mass_genocide_undead(int power, bool player_cast);
 extern bool probing(void);
 extern bool banish_evil(int dist);
 extern bool dispel_evil(int dam);

diff --git a/src/spells1.c b/src/spells1.c
index 2ce8db4..478a8e4 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -5558,7 +5558,6 @@ note = "
                /* GENOCIDE */
                case GF_GENOCIDE:
                {
-                       bool angry = FALSE;
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
@@ -5573,56 +5572,22 @@ note = "
                                break;
                        }
 
-                       if (((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (c_ptr->m_idx == p_ptr->riding)) || p_ptr->inside_arena || p_ptr->inside_quest)
-                       {
-                               dam = 0;
-                               angry = TRUE;
-                       }
-                       else
-                       {
-                               if ((r_ptr->level > randint0(dam)) || (m_ptr->mflag2 & MFLAG2_NOGENO))
-                               {
-                                       dam = 0;
-                                       angry = TRUE;
-                               }
-                               else
-                               {
-                                       delete_monster_idx(c_ptr->m_idx);
 #ifdef JP
-                                       msg_format("%s¤Ï¾ÃÌǤ·¤¿¡ª",m_name);
+                       if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, "¥â¥ó¥¹¥¿¡¼¾ÃÌÇ"))
 #else
-                                       msg_format("%^s disappered!",m_name);
+                       if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, "Genocide One"))
 #endif
-
-#ifdef JP
-                                       take_hit(DAMAGE_GENO, randint1((r_ptr->level+1)/2), "¥â¥ó¥¹¥¿¡¼¾ÃÌǤμöʸ¤ò¾§¤¨¤¿ÈèÏ«", -1);
-#else
-                                       take_hit(DAMAGE_GENO, randint1((r_ptr->level+1)/2), "the strain of casting Genocide One", -1);
-#endif
-                                       dam = 0;
-
-                                       chg_virtue(V_VITALITY, -1);
-
-                                       skipped = TRUE;
-
-                                       /* Redraw */
-                                       p_ptr->redraw |= (PR_HP);
-
-                                       /* Window stuff */
-                                       p_ptr->window |= (PW_PLAYER);
-                                       return TRUE;
-                               }
-                       }
-                       if (angry)
                        {
 #ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
+                               if (seen_msg) msg_format("%s¤Ï¾ÃÌǤ·¤¿¡ª", m_name);
 #else
-                               note = "is unaffected!";
+                               if (seen_msg) msg_format("%^s disappered!", m_name);
 #endif
-                               get_angry = TRUE;
-                               if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
+                               chg_virtue(V_VITALITY, -1);
+                               return TRUE;
                        }
+
+                       skipped = TRUE;
                        break;
                }
 

diff --git a/src/spells2.c b/src/spells2.c
index 1c794f3..823abb3 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4644,162 +4644,171 @@ void aggravate_monsters(int who)
 }
 
 
-
 /*
- * Delete all non-unique/non-quest monsters of a given "type" from the level
+ * Delete a non-unique/non-quest monster
  */
-bool symbol_genocide(int power, int player_cast)
+bool genocide_aux(int m_idx, int power, bool player_cast, int dam_side, cptr spell_name)
 {
-       int     i;
-       char    typ;
-       bool    result = FALSE;
-       int     msec = delay_factor * delay_factor * delay_factor;
-
-       /* Prevent genocide in quest levels */
-       if (p_ptr->inside_quest && !random_quest_number(dun_level))
-       {
-               return (FALSE);
-       }
-
-       /* Mega-Hack -- Get a monster symbol */
-#ifdef JP
-while(!get_com("¤É¤Î¼ïÎà(ʸ»ú)¤Î¥â¥ó¥¹¥¿¡¼¤òËõ»¦¤·¤Þ¤¹¤«: ", &typ, FALSE));
-#else
-       while(!get_com("Choose a monster race (by symbol) to genocide: ", &typ, FALSE));
-#endif
+       int          msec = delay_factor * delay_factor * delay_factor;
+       monster_type *m_ptr = &m_list[m_idx];
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+       bool         resist = FALSE;
 
+       if (is_pet(m_ptr) && !player_cast) return FALSE;
 
-       /* Delete the monsters of that "type" */
-       for (i = 1; i < m_max; i++)
-       {
-               monster_type    *m_ptr = &m_list[i];
-               monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-               bool angry = FALSE;
-               char m_name[80];
-
-               /* Paranoia -- Skip dead monsters */
-               if (!m_ptr->r_idx) continue;
-
-               /* Skip "wrong" monsters */
-               if (r_ptr->d_char != typ) continue;
+       /* Hack -- Skip Unique Monsters or Quest Monsters */
+       if (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) resist = TRUE;
 
-               if (is_pet(m_ptr) && !player_cast) continue;
+       else if (r_ptr->flags7 & RF7_UNIQUE2) resist = TRUE;
 
-               /* Hack -- Skip Unique Monsters */
-               if (r_ptr->flags1 & (RF1_UNIQUE)) angry = TRUE;
+       else if (m_idx == p_ptr->riding) resist = TRUE;
 
-               /* Hack -- Skip Quest Monsters */
-               else if (r_ptr->flags1 & RF1_QUESTOR) angry = TRUE;
+       else if (player_cast && (r_ptr->level > randint0(power))) resist = TRUE;
 
-               else if (r_ptr->flags7 & RF7_UNIQUE2) angry = TRUE;
+       else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) resist = TRUE;
 
-               else if (i == p_ptr->riding) angry = TRUE;
+       /* Delete the monster */
+       else delete_monster_idx(m_idx);
 
-               else if (player_cast && (r_ptr->level > randint0(power))) angry = TRUE;
-
-               else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) angry = TRUE;
-
-               /* Delete the monster */
-               else delete_monster_idx(i);
+       if (resist && player_cast)
+       {
+               bool see_m = is_seen(m_ptr);
+               char m_name[80];
 
-               if (angry && player_cast)
+               monster_desc(m_name, m_ptr, 0);
+               if (see_m)
                {
-                       bool see_m = is_seen(m_ptr);
-
-                       monster_desc(m_name, m_ptr, 0);
-                       if (see_m && !p_ptr->blind)
-                       {
 #ifdef JP
-msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name);
+                       msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name);
 #else
-                               msg_format("%^s is unaffected.", m_name);
+                       msg_format("%^s is unaffected.", m_name);
 #endif
+               }
+               if (m_ptr->csleep)
+               {
+                       m_ptr->csleep = 0;
+                       if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE);
+                       if (m_ptr->ml)
+                       {
+                               /* Redraw (later) if needed */
+                               if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+                               if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
                        }
-                       if (m_ptr->csleep)
+                       if (see_m)
                        {
-                               m_ptr->csleep = 0;
-                               if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE);
-                               if (m_ptr->ml)
-                               {
-                                       /* Redraw (later) if needed */
-                                       if (p_ptr->health_who == i) p_ptr->redraw |= (PR_HEALTH);
-                                       if (p_ptr->riding == i) p_ptr->redraw |= (PR_UHEALTH);
-                               }
-                               if (see_m && !p_ptr->blind)
-                               {
 #ifdef JP
-msg_format("%^s¤¬Ìܤò³Ð¤Þ¤·¤¿¡£", m_name);
+                               msg_format("%^s¤¬Ìܤò³Ð¤Þ¤·¤¿¡£", m_name);
 #else
-                                       msg_format("%^s wakes up.", m_name);
+                               msg_format("%^s wakes up.", m_name);
 #endif
-                               }
                        }
-                       if (is_friendly(m_ptr) && !is_pet(m_ptr))
+               }
+               if (is_friendly(m_ptr) && !is_pet(m_ptr))
+               {
+                       if (see_m)
                        {
-                               if (see_m && !p_ptr->blind)
-                               {
 #ifdef JP
-                                       msg_format("%s¤ÏÅܤä¿¡ª", m_name);
+                               msg_format("%s¤ÏÅܤä¿¡ª", m_name);
 #else
-                                       msg_format("%^s gets angry!", m_name);
+                               msg_format("%^s gets angry!", m_name);
 #endif
-                               }
-                               set_hostile(m_ptr);
                        }
-                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
+                       set_hostile(m_ptr);
                }
+               if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
+       }
 
-               if (player_cast)
-               {
-                       /* Take damage */
+       if (player_cast)
+       {
+               /* Take damage */
 #ifdef JP
-take_hit(DAMAGE_GENO, randint1(4), "Ëõ»¦¤Î¼öʸ¤ò¾§¤¨¤¿ÈèÏ«", -1);
+               take_hit(DAMAGE_GENO, randint1(dam_side), format("%^s¤Î¼öʸ¤ò¾§¤¨¤¿ÈèÏ«", spell_name), -1);
 #else
-                       take_hit(DAMAGE_GENO, randint1(4), "the strain of casting Genocide", -1);
+               take_hit(DAMAGE_GENO, randint1(dam_side), format("the strain of casting %^s", spell_name), -1);
 #endif
+       }
 
-               }
+       /* Visual feedback */
+       move_cursor_relative(py, px);
 
-               /* Visual feedback */
-               move_cursor_relative(py, px);
+       /* Redraw */
+       p_ptr->redraw |= (PR_HP);
 
-               /* Redraw */
-               p_ptr->redraw |= (PR_HP);
+       /* Window stuff */
+       p_ptr->window |= (PW_PLAYER);
 
-               /* Window stuff */
-               p_ptr->window |= (PW_PLAYER);
+       /* Handle */
+       handle_stuff();
+
+       /* Fresh */
+       Term_fresh();
+
+       /* Delay */
+       Term_xtra(TERM_XTRA_DELAY, msec);
+
+       return !resist;
+}
+
+
+/*
+ * Delete all non-unique/non-quest monsters of a given "type" from the level
+ */
+bool symbol_genocide(int power, bool player_cast)
+{
+       int  i;
+       char typ;
+       bool result = FALSE;
+
+       /* Prevent genocide in quest levels */
+       if (p_ptr->inside_quest && !random_quest_number(dun_level))
+       {
+               return (FALSE);
+       }
 
-               /* Handle */
-               handle_stuff();
+       /* Mega-Hack -- Get a monster symbol */
+#ifdef JP
+       while (!get_com("¤É¤Î¼ïÎà(ʸ»ú)¤Î¥â¥ó¥¹¥¿¡¼¤òËõ»¦¤·¤Þ¤¹¤«: ", &typ, FALSE)) ;
+#else
+       while (!get_com("Choose a monster race (by symbol) to genocide: ", &typ, FALSE)) ;
+#endif
+
+       /* Delete the monsters of that "type" */
+       for (i = 1; i < m_max; i++)
+       {
+               monster_type *m_ptr = &m_list[i];
+               monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
-               /* Fresh */
-               Term_fresh();
+               /* Paranoia -- Skip dead monsters */
+               if (!m_ptr->r_idx) continue;
 
-               /* Delay */
-               Term_xtra(TERM_XTRA_DELAY, msec);
+               /* Skip "wrong" monsters */
+               if (r_ptr->d_char != typ) continue;
 
                /* Take note */
-               result = TRUE;
+#ifdef JP
+               result |= genocide_aux(i, power, player_cast, 4, "Ëõ»¦");
+#else
+               result |= genocide_aux(i, power, player_cast, 4, "Genocide");
+#endif
        }
+
        if (result)
        {
                chg_virtue(V_VITALITY, -2);
                chg_virtue(V_CHANCE, -1);
        }
 
-       return (result);
+       return result;
 }
 
 
 /*
  * Delete all nearby (non-unique) monsters
  */
-bool mass_genocide(int power, int player_cast)
+bool mass_genocide(int power, bool player_cast)
 {
-       int     i;
-       bool    result = FALSE;
-       int     msec = delay_factor * delay_factor * delay_factor;
-
+       int  i;
+       bool result = FALSE;
 
        /* Prevent mass genocide in quest levels */
        if (p_ptr->inside_quest && !random_quest_number(dun_level))
@@ -4810,10 +4819,7 @@ bool mass_genocide(int power, int player_cast)
        /* Delete the (nearby) monsters */
        for (i = 1; i < m_max; i++)
        {
-               monster_type    *m_ptr = &m_list[i];
-               monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-               bool angry = FALSE;
-               char m_name[80];
+               monster_type *m_ptr = &m_list[i];
 
                /* Paranoia -- Skip dead monsters */
                if (!m_ptr->r_idx) continue;
@@ -4821,102 +4827,12 @@ bool mass_genocide(int power, int player_cast)
                /* Skip distant monsters */
                if (m_ptr->cdis > MAX_SIGHT) continue;
 
-               if (is_pet(m_ptr) && !player_cast) continue;
-
-               /* Hack -- Skip unique monsters */
-               if (r_ptr->flags1 & (RF1_UNIQUE)) angry = TRUE;
-
-               /* Hack -- Skip Quest Monsters */
-               else if (r_ptr->flags1 & RF1_QUESTOR) angry = TRUE;
-
-               else if (r_ptr->flags7 & RF7_UNIQUE2) angry = TRUE;
-
-               else if (i == p_ptr->riding) angry = TRUE;
-
-               else if (player_cast && (r_ptr->level > randint0(power))) angry = TRUE;
-
-               else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) angry = TRUE;
-
-               /* Delete the monster */
-               else delete_monster_idx(i);
-
-               if (angry && player_cast)
-               {
-                       bool see_m = is_seen(m_ptr);
-
-                       monster_desc(m_name, m_ptr, 0);
-                       if (see_m && !p_ptr->blind)
-                       {
-#ifdef JP
-msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name);
-#else
-                               msg_format("%^s is unaffected.", m_name);
-#endif
-                       }
-                       if (m_ptr->csleep)
-                       {
-                               m_ptr->csleep = 0;
-                               if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE);
-                               if (m_ptr->ml)
-                               {
-                                       /* Redraw (later) if needed */
-                                       if (p_ptr->health_who == i) p_ptr->redraw |= (PR_HEALTH);
-                                       if (p_ptr->riding == i) p_ptr->redraw |= (PR_UHEALTH);
-                               }
-                               if (see_m && !p_ptr->blind)
-                               {
-#ifdef JP
-msg_format("%^s¤¬Ìܤò³Ð¤Þ¤·¤¿¡£", m_name);
-#else
-                                       msg_format("%^s wakes up.", m_name);
-#endif
-                               }
-                       }
-                       if (is_friendly(m_ptr) && !is_pet(m_ptr))
-                       {
-                               if (see_m && !p_ptr->blind)
-                               {
-#ifdef JP
-                                       msg_format("%s¤ÏÅܤä¿¡ª", m_name);
-#else
-                                       msg_format("%^s gets angry!", m_name);
-#endif
-                               }
-                               set_hostile(m_ptr);
-                       }
-                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
-               }
-
-               if (player_cast)
-               {
-                       /* Hack -- visual feedback */
+               /* Note effect */
 #ifdef JP
-take_hit(DAMAGE_GENO, randint1(3), "¼þÊÕËõ»¦¤Î¼öʸ¤ò¾§¤¨¤¿ÈèÏ«", -1);
+               result |= genocide_aux(i, power, player_cast, 3, "¼þÊÕËõ»¦");
 #else
-                       take_hit(DAMAGE_GENO, randint1(3), "the strain of casting Mass Genocide", -1);
+               result |= genocide_aux(i, power, player_cast, 3, "Mass Genocide");
 #endif
-
-               }
-
-               move_cursor_relative(py, px);
-
-               /* Redraw */
-               p_ptr->redraw |= (PR_HP);
-
-               /* Window stuff */
-               p_ptr->window |= (PW_PLAYER);
-
-               /* Handle */
-               handle_stuff();
-
-               /* Fresh */
-               Term_fresh();
-
-               /* Delay */
-               Term_xtra(TERM_XTRA_DELAY, msec);
-
-               /* Note effect */
-               result = TRUE;
        }
 
        if (result)
@@ -4925,7 +4841,7 @@ take_hit(DAMAGE_GENO, randint1(3), "
                chg_virtue(V_CHANCE, -1);
        }
 
-       return (result);
+       return result;
 }
 
 
@@ -4933,12 +4849,10 @@ take_hit(DAMAGE_GENO, randint1(3), "
 /*
  * Delete all nearby (non-unique) undead
  */
-bool mass_genocide_undead(int power, int player_cast)
+bool mass_genocide_undead(int power, bool player_cast)
 {
-       int     i;
-       bool    result = FALSE;
-       int     msec = delay_factor * delay_factor * delay_factor;
-
+       int  i;
+       bool result = FALSE;
 
        /* Prevent mass genocide in quest levels */
        if (p_ptr->inside_quest && !random_quest_number(dun_level))
@@ -4949,10 +4863,8 @@ bool mass_genocide_undead(int power, int player_cast)
        /* Delete the (nearby) monsters */
        for (i = 1; i < m_max; i++)
        {
-               monster_type    *m_ptr = &m_list[i];
-               monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-               bool angry = FALSE;
-               char m_name[80];
+               monster_type *m_ptr = &m_list[i];
+               monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
                /* Paranoia -- Skip dead monsters */
                if (!m_ptr->r_idx) continue;
@@ -4962,102 +4874,12 @@ bool mass_genocide_undead(int power, int player_cast)
                /* Skip distant monsters */
                if (m_ptr->cdis > MAX_SIGHT) continue;
 
-               if (is_pet(m_ptr) && !player_cast) continue;
-
-               /* Hack -- Skip unique monsters */
-               if (r_ptr->flags1 & (RF1_UNIQUE)) angry = TRUE;
-
-               /* Hack -- Skip Quest Monsters */
-               else if (r_ptr->flags1 & RF1_QUESTOR) angry = TRUE;
-
-               else if (r_ptr->flags7 & RF7_UNIQUE2) angry = TRUE;
-
-               else if (i == p_ptr->riding) angry = TRUE;
-
-               else if (player_cast && (r_ptr->level > randint0(power))) angry = TRUE;
-
-               else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) angry = TRUE;
-
-               /* Delete the monster */
-               else delete_monster_idx(i);
-
-               if (angry && player_cast)
-               {
-                       bool see_m = is_seen(m_ptr);
-
-                       monster_desc(m_name, m_ptr, 0);
-                       if (see_m && !p_ptr->blind)
-                       {
-#ifdef JP
-msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name);
-#else
-                               msg_format("%^s is unaffected.", m_name);
-#endif
-                       }
-                       if (m_ptr->csleep)
-                       {
-                               m_ptr->csleep = 0;
-                               if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE);
-                               if (m_ptr->ml)
-                               {
-                                       /* Redraw (later) if needed */
-                                       if (p_ptr->health_who == i) p_ptr->redraw |= (PR_HEALTH);
-                                       if (p_ptr->riding == i) p_ptr->redraw |= (PR_UHEALTH);
-                               }
-                               if (see_m && !p_ptr->blind)
-                               {
-#ifdef JP
-msg_format("%^s¤¬Ìܤò³Ð¤Þ¤·¤¿¡£", m_name);
-#else
-                                       msg_format("%^s wakes up.", m_name);
-#endif
-                               }
-                       }
-                       if (is_friendly(m_ptr) && !is_pet(m_ptr))
-                       {
-                               if (see_m && !p_ptr->blind)
-                               {
-#ifdef JP
-                                       msg_format("%s¤ÏÅܤä¿¡ª", m_name);
-#else
-                                       msg_format("%^s gets angry!", m_name);
-#endif
-                               }
-                               set_hostile(m_ptr);
-                       }
-                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
-               }
-
-               if (player_cast)
-               {
-                       /* Hack -- visual feedback */
+               /* Note effect */
 #ifdef JP
-take_hit(DAMAGE_GENO, randint1(3), "¥¢¥ó¥Ç¥Ã¥É¾ÃÌǤμöʸ¤ò¾§¤¨¤¿ÈèÏ«", -1);
+               result |= genocide_aux(i, power, player_cast, 3, "¥¢¥ó¥Ç¥Ã¥É¾ÃÌÇ");
 #else
-                       take_hit(DAMAGE_GENO, randint1(3), "the strain of casting Mass Genocide", -1);
+               result |= genocide_aux(i, power, player_cast, 3, "Annihilate Undead");
 #endif
-
-               }
-
-               move_cursor_relative(py, px);
-
-               /* Redraw */
-               p_ptr->redraw |= (PR_HP);
-
-               /* Window stuff */
-               p_ptr->window |= (PW_PLAYER);
-
-               /* Handle */
-               handle_stuff();
-
-               /* Fresh */
-               Term_fresh();
-
-               /* Delay */
-               Term_xtra(TERM_XTRA_DELAY, msec);
-
-               /* Note effect */
-               result = TRUE;
        }
 
        if (result)
@@ -5066,7 +4888,7 @@ take_hit(DAMAGE_GENO, randint1(3), "
                chg_virtue(V_CHANCE, -1);
        }
 
-       return (result);
+       return result;
 }