[Refactor] #37353 mult_hissatsu() to melee1.c.

diff --git a/src/externs.h b/src/externs.h
index 7aecf1f..a530a4f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1253,7 +1253,6 @@ extern HIT_POINT monspell_bluemage_damage(int SPELL_NUM, PLAYER_LEVEL plev, int
 /* hissatsu.c */
 extern void do_cmd_hissatsu(void);
 extern void do_cmd_gain_hissatsu(void);
-extern MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, BIT_FLAGS mode);
 
 
 /*

diff --git a/src/hissatsu.c b/src/hissatsu.c
index c856678..fe893de 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -13,7 +13,6 @@
 #include "angband.h"
 #include "monsterrace-hook.h"
 #include "player-status.h"
-#include "melee.h"
 
 #define TECHNIC_HISSATSU (REALM_HISSATSU - MIN_TECHNIC)
 
@@ -446,190 +445,3 @@ void do_cmd_gain_hissatsu(void)
 }
 
 
-/*!
- * @brief 剣術のスレイ倍率計算を行う /
- * Calcurate magnification of hissatsu technics
- * @param mult 剣術のスレイ効果以前に算出している多要素の倍率(/10倍)
- * @param flgs 剣術に使用する武器のスレイフラグ配列
- * @param m_ptr 目標となるモンスターの構造体参照ポインタ
- * @param mode 剣術のスレイ型ID
- * @return スレイの倍率(/10倍)
- */
-MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, BIT_FLAGS mode)
-{
-       monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
-       /* Burning Strike (Fire) */
-       if (mode == HISSATSU_FIRE)
-       {
-               /* Notice immunity */
-               if (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)
-               {
-                       if (is_original_ap_and_seen(m_ptr))
-                       {
-                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK);
-                       }
-               }
-
-               /* Otherwise, take the damage */
-               else if (have_flag(flgs, TR_BRAND_FIRE))
-               {
-                       if (r_ptr->flags3 & RF3_HURT_FIRE)
-                       {
-                               if (mult < 70) mult = 70;
-                               if (is_original_ap_and_seen(m_ptr))
-                               {
-                                       r_ptr->r_flags3 |= RF3_HURT_FIRE;
-                               }
-                       }
-                       else if (mult < 35) mult = 35;
-               }
-               else
-               {
-                       if (r_ptr->flags3 & RF3_HURT_FIRE)
-                       {
-                               if (mult < 50) mult = 50;
-                               if (is_original_ap_and_seen(m_ptr))
-                               {
-                                       r_ptr->r_flags3 |= RF3_HURT_FIRE;
-                               }
-                       }
-                       else if (mult < 25) mult = 25;
-               }
-       }
-
-       /* Serpent's Tongue (Poison) */
-       if (mode == HISSATSU_POISON)
-       {
-               /* Notice immunity */
-               if (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)
-               {
-                       if (is_original_ap_and_seen(m_ptr))
-                       {
-                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK);
-                       }
-               }
-
-               /* Otherwise, take the damage */
-               else if (have_flag(flgs, TR_BRAND_POIS))
-               {
-                       if (mult < 35) mult = 35;
-               }
-               else
-               {
-                       if (mult < 25) mult = 25;
-               }
-       }
-
-       /* Zammaken (Nonliving Evil) */
-       if (mode == HISSATSU_ZANMA)
-       {
-               if (!monster_living(m_ptr->r_idx) && (r_ptr->flags3 & RF3_EVIL))
-               {
-                       if (mult < 15) mult = 25;
-                       else if (mult < 50) mult = MIN(50, mult+20);
-               }
-       }
-
-       /* Rock Smash (Hurt Rock) */
-       if (mode == HISSATSU_HAGAN)
-       {
-               if (r_ptr->flags3 & RF3_HURT_ROCK)
-               {
-                       if (is_original_ap_and_seen(m_ptr))
-                       {
-                               r_ptr->r_flags3 |= RF3_HURT_ROCK;
-                       }
-                       if (mult == 10) mult = 40;
-                       else if (mult < 60) mult = 60;
-               }
-       }
-
-       /* Midare-Setsugekka (Cold) */
-       if (mode == HISSATSU_COLD)
-       {
-               /* Notice immunity */
-               if (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)
-               {
-                       if (is_original_ap_and_seen(m_ptr))
-                       {
-                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK);
-                       }
-               }
-               /* Otherwise, take the damage */
-               else if (have_flag(flgs, TR_BRAND_COLD))
-               {
-                       if (r_ptr->flags3 & RF3_HURT_COLD)
-                       {
-                               if (mult < 70) mult = 70;
-                               if (is_original_ap_and_seen(m_ptr))
-                               {
-                                       r_ptr->r_flags3 |= RF3_HURT_COLD;
-                               }
-                       }
-                       else if (mult < 35) mult = 35;
-               }
-               else
-               {
-                       if (r_ptr->flags3 & RF3_HURT_COLD)
-                       {
-                               if (mult < 50) mult = 50;
-                               if (is_original_ap_and_seen(m_ptr))
-                               {
-                                       r_ptr->r_flags3 |= RF3_HURT_COLD;
-                               }
-                       }
-                       else if (mult < 25) mult = 25;
-               }
-       }
-
-       /* Lightning Eagle (Elec) */
-       if (mode == HISSATSU_ELEC)
-       {
-               /* Notice immunity */
-               if (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK)
-               {
-                       if (is_original_ap_and_seen(m_ptr))
-                       {
-                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK);
-                       }
-               }
-
-               /* Otherwise, take the damage */
-               else if (have_flag(flgs, TR_BRAND_ELEC))
-               {
-                       if (mult < 70) mult = 70;
-               }
-               else
-               {
-                       if (mult < 50) mult = 50;
-               }
-       }
-
-       /* Bloody Maelstrom */
-       if ((mode == HISSATSU_SEKIRYUKA) && p_ptr->cut && monster_living(m_ptr->r_idx))
-       {
-               MULTIPLY tmp = MIN(100, MAX(10, p_ptr->cut / 10));
-               if (mult < tmp) mult = tmp;
-       }
-
-       /* Keiun-Kininken */
-       if (mode == HISSATSU_UNDEAD)
-       {
-               if (r_ptr->flags3 & RF3_UNDEAD)
-               {
-                       if (is_original_ap_and_seen(m_ptr))
-                       {
-                               r_ptr->r_flags3 |= RF3_UNDEAD;
-                       }
-                       if (mult == 10) mult = 70;
-                       else if (mult < 140) mult = MIN(140, mult+60);
-               }
-               if (mult == 10) mult = 40;
-               else if (mult < 60) mult = MIN(60, mult+30);
-       }
-
-       if (mult > 150) mult = 150;
-
-       return mult;
-}

diff --git a/src/melee1.c b/src/melee1.c
index 87ccd43..86c17da 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -179,6 +179,194 @@ static MULTIPLY mult_brand(MULTIPLY mult, const BIT_FLAGS* flgs, const monster_t
 }
 
 /*!
+ * @brief 剣術のスレイ倍率計算を行う /
+ * Calcurate magnification of hissatsu technics
+ * @param mult 剣術のスレイ効果以前に算出している多要素の倍率(/10倍)
+ * @param flgs 剣術に使用する武器のスレイフラグ配列
+ * @param m_ptr 目標となるモンスターの構造体参照ポインタ
+ * @param mode 剣術のスレイ型ID
+ * @return スレイの倍率(/10倍)
+ */
+static MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, BIT_FLAGS mode)
+{
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
+       /* Burning Strike (Fire) */
+       if (mode == HISSATSU_FIRE)
+       {
+               /* Notice immunity */
+               if (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)
+               {
+                       if (is_original_ap_and_seen(m_ptr))
+                       {
+                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK);
+                       }
+               }
+
+               /* Otherwise, take the damage */
+               else if (have_flag(flgs, TR_BRAND_FIRE))
+               {
+                       if (r_ptr->flags3 & RF3_HURT_FIRE)
+                       {
+                               if (mult < 70) mult = 70;
+                               if (is_original_ap_and_seen(m_ptr))
+                               {
+                                       r_ptr->r_flags3 |= RF3_HURT_FIRE;
+                               }
+                       }
+                       else if (mult < 35) mult = 35;
+               }
+               else
+               {
+                       if (r_ptr->flags3 & RF3_HURT_FIRE)
+                       {
+                               if (mult < 50) mult = 50;
+                               if (is_original_ap_and_seen(m_ptr))
+                               {
+                                       r_ptr->r_flags3 |= RF3_HURT_FIRE;
+                               }
+                       }
+                       else if (mult < 25) mult = 25;
+               }
+       }
+
+       /* Serpent's Tongue (Poison) */
+       if (mode == HISSATSU_POISON)
+       {
+               /* Notice immunity */
+               if (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)
+               {
+                       if (is_original_ap_and_seen(m_ptr))
+                       {
+                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK);
+                       }
+               }
+
+               /* Otherwise, take the damage */
+               else if (have_flag(flgs, TR_BRAND_POIS))
+               {
+                       if (mult < 35) mult = 35;
+               }
+               else
+               {
+                       if (mult < 25) mult = 25;
+               }
+       }
+
+       /* Zammaken (Nonliving Evil) */
+       if (mode == HISSATSU_ZANMA)
+       {
+               if (!monster_living(m_ptr->r_idx) && (r_ptr->flags3 & RF3_EVIL))
+               {
+                       if (mult < 15) mult = 25;
+                       else if (mult < 50) mult = MIN(50, mult + 20);
+               }
+       }
+
+       /* Rock Smash (Hurt Rock) */
+       if (mode == HISSATSU_HAGAN)
+       {
+               if (r_ptr->flags3 & RF3_HURT_ROCK)
+               {
+                       if (is_original_ap_and_seen(m_ptr))
+                       {
+                               r_ptr->r_flags3 |= RF3_HURT_ROCK;
+                       }
+                       if (mult == 10) mult = 40;
+                       else if (mult < 60) mult = 60;
+               }
+       }
+
+       /* Midare-Setsugekka (Cold) */
+       if (mode == HISSATSU_COLD)
+       {
+               /* Notice immunity */
+               if (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)
+               {
+                       if (is_original_ap_and_seen(m_ptr))
+                       {
+                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK);
+                       }
+               }
+               /* Otherwise, take the damage */
+               else if (have_flag(flgs, TR_BRAND_COLD))
+               {
+                       if (r_ptr->flags3 & RF3_HURT_COLD)
+                       {
+                               if (mult < 70) mult = 70;
+                               if (is_original_ap_and_seen(m_ptr))
+                               {
+                                       r_ptr->r_flags3 |= RF3_HURT_COLD;
+                               }
+                       }
+                       else if (mult < 35) mult = 35;
+               }
+               else
+               {
+                       if (r_ptr->flags3 & RF3_HURT_COLD)
+                       {
+                               if (mult < 50) mult = 50;
+                               if (is_original_ap_and_seen(m_ptr))
+                               {
+                                       r_ptr->r_flags3 |= RF3_HURT_COLD;
+                               }
+                       }
+                       else if (mult < 25) mult = 25;
+               }
+       }
+
+       /* Lightning Eagle (Elec) */
+       if (mode == HISSATSU_ELEC)
+       {
+               /* Notice immunity */
+               if (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK)
+               {
+                       if (is_original_ap_and_seen(m_ptr))
+                       {
+                               r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK);
+                       }
+               }
+
+               /* Otherwise, take the damage */
+               else if (have_flag(flgs, TR_BRAND_ELEC))
+               {
+                       if (mult < 70) mult = 70;
+               }
+               else
+               {
+                       if (mult < 50) mult = 50;
+               }
+       }
+
+       /* Bloody Maelstrom */
+       if ((mode == HISSATSU_SEKIRYUKA) && p_ptr->cut && monster_living(m_ptr->r_idx))
+       {
+               MULTIPLY tmp = MIN(100, MAX(10, p_ptr->cut / 10));
+               if (mult < tmp) mult = tmp;
+       }
+
+       /* Keiun-Kininken */
+       if (mode == HISSATSU_UNDEAD)
+       {
+               if (r_ptr->flags3 & RF3_UNDEAD)
+               {
+                       if (is_original_ap_and_seen(m_ptr))
+                       {
+                               r_ptr->r_flags3 |= RF3_UNDEAD;
+                       }
+                       if (mult == 10) mult = 70;
+                       else if (mult < 140) mult = MIN(140, mult + 60);
+               }
+               if (mult == 10) mult = 40;
+               else if (mult < 60) mult = MIN(60, mult + 30);
+       }
+
+       if (mult > 150) mult = 150;
+
+       return mult;
+}
+
+/*!
  * @brief ダメージにスレイ要素を加える総合処理ルーチン /
  * Extract the "total damage" from a given object hitting a given monster.
  * @param o_ptr 使用武器オブジェクトの構造体参照ポインタ