[Refactor] #40416 Separated aura-counterattack.c/h from monster-attack-player.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index e07433f..88a96b1 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -424,6 +424,7 @@
     <ClCompile Include="..\..\src\spell\process-effect.c" />\r
     <ClCompile Include="..\..\src\spell\spells-execution.c" />\r
     <ClCompile Include="..\..\src\spell\technic-info-table.c" />\r
+    <ClCompile Include="..\..\src\combat\aura-counterattack.c" />\r
     <ClInclude Include="..\..\src\birth\auto-roller.h" />\r
     <ClInclude Include="..\..\src\birth\birth-body-spec.h" />\r
     <ClInclude Include="..\..\src\birth\birth-select-class.h" />\r
@@ -803,6 +804,7 @@
     <ClInclude Include="..\..\src\world\world-movement-processor.h" />\r
     <ClInclude Include="..\..\src\world\world-turn-processor.h" />\r
     <ClInclude Include="..\src\locele\japanese.h" />\r
+    <ClInclude Include="..\..\src\combat\aura-counterattack.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\system\angband.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 0395e35..d194795 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1058,6 +1058,9 @@
     <ClCompile Include="..\..\src\combat\monster-attack-status.c">
       <Filter>combat</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\combat\aura-counterattack.c">
+      <Filter>combat</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
@@ -2266,6 +2269,9 @@
     <ClInclude Include="..\..\src\combat\monster-attack-status.h">
       <Filter>combat</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\combat\aura-counterattack.h">
+      <Filter>combat</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index bacb4f1..ef2a034 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -353,6 +353,7 @@ hengband_SOURCES = \
        \
        combat/player-attack-util.h \
        combat/attack-power-table.c combat/attack-power-table.h \
+       combat/aura-counterattack.c combat/aura-counterattack.h \
        combat/hallucination-attacks-table.c combat/hallucination-attacks-table.h \
        combat/monster-attack-types.c combat/monster-attack-types.h \
        combat/martial-arts-table.c combat/martial-arts-table.h \

diff --git a/src/combat/aura-counterattack.c b/src/combat/aura-counterattack.c
new file mode 100644 (file)
index 0000000..47d13d3
--- /dev/null
+++ b/src/combat/aura-counterattack.c
@@ -0,0 +1,211 @@
+/*!
+ * @brief モンスターから直接攻撃を受けた時に、プレーヤーのオーラダメージで反撃する処理
+ * @date 2020/05/31
+ * @author Hourier
+ */
+
+#include "combat/aura-counterattack.h"
+#include "effect/effect-characteristics.h"
+#include "floor/floor.h"
+#include "monster/monster-status.h"
+#include "object/object-hook.h"
+#include "realm/realm-hex.h"
+#include "spell/process-effect.h"
+#include "spell/spells-type.h"
+#include "spell/spells3.h"
+
+static void aura_fire_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!target_ptr->sh_fire || !monap_ptr->alive || target_ptr->is_dead)
+        return;
+
+    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
+    if ((r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK) != 0) {
+        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK);
+
+        return;
+    }
+
+    HIT_POINT dam = damroll(2, 6);
+    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
+    msg_format(_("%^sは突然熱くなった！", "%^s is suddenly very hot!"), monap_ptr->m_name);
+    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は灰の山になった。", " turns into a pile of ash."))) {
+        monap_ptr->blinked = FALSE;
+        monap_ptr->alive = FALSE;
+    }
+}
+
+static void aura_elec_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!target_ptr->sh_elec || !monap_ptr->alive || target_ptr->is_dead)
+        return;
+
+    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
+    if ((r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK) != 0) {
+        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK);
+
+        return;
+    }
+
+    HIT_POINT dam = damroll(2, 6);
+    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
+    msg_format(_("%^sは電撃をくらった！", "%^s gets zapped!"), monap_ptr->m_name);
+    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は燃え殻の山になった。", " turns into a pile of cinder."))) {
+        monap_ptr->blinked = FALSE;
+        monap_ptr->alive = FALSE;
+    }
+}
+
+static void aura_cold_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!target_ptr->sh_cold || !monap_ptr->alive || target_ptr->is_dead)
+        return;
+
+    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
+    if ((r_ptr->flagsr & RFR_EFF_IM_COLD_MASK) != 0) {
+        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK);
+
+        return;
+    }
+
+    HIT_POINT dam = damroll(2, 6);
+    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
+    msg_format(_("%^sは冷気をくらった！", "%^s is very cold!"), monap_ptr->m_name);
+    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は凍りついた。", " was frozen."))) {
+        monap_ptr->blinked = FALSE;
+        monap_ptr->alive = FALSE;
+    }
+}
+
+static void aura_shards_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!target_ptr->dustrobe || !monap_ptr->alive || target_ptr->is_dead)
+        return;
+
+    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
+    if ((r_ptr->flagsr & RFR_EFF_RES_SHAR_MASK) != 0) {
+        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_RES_SHAR_MASK);
+    } else {
+        HIT_POINT dam = damroll(2, 6);
+        dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
+        msg_format(_("%^sは鏡の破片をくらった！", "%^s gets zapped!"), monap_ptr->m_name);
+        if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("はズタズタになった。", " had torn to pieces."))) {
+            monap_ptr->blinked = FALSE;
+            monap_ptr->alive = FALSE;
+        }
+    }
+
+    if (is_mirror_grid(&target_ptr->current_floor_ptr->grid_array[target_ptr->y][target_ptr->x]))
+        teleport_player(target_ptr, 10, TELEPORT_SPONTANEOUS);
+}
+
+static void aura_holy_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!target_ptr->tim_sh_holy || !monap_ptr->alive || target_ptr->is_dead)
+        return;
+
+    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
+    if ((r_ptr->flags3 & RF3_EVIL) == 0)
+        return;
+
+    if ((r_ptr->flagsr & RFR_RES_ALL) != 0) {
+        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+            r_ptr->r_flagsr |= RFR_RES_ALL;
+
+        return;
+    }
+
+    HIT_POINT dam = damroll(2, 6);
+    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
+    msg_format(_("%^sは聖なるオーラで傷ついた！", "%^s is injured by holy power!"), monap_ptr->m_name);
+    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) {
+        monap_ptr->blinked = FALSE;
+        monap_ptr->alive = FALSE;
+    }
+
+    if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+        r_ptr->r_flags3 |= RF3_EVIL;
+}
+
+static void aura_force_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!target_ptr->tim_sh_touki || !monap_ptr->alive || target_ptr->is_dead)
+        return;
+
+    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
+    if ((r_ptr->flagsr & RFR_RES_ALL) != 0) {
+        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+            r_ptr->r_flagsr |= RFR_RES_ALL;
+
+        return;
+    }
+
+    HIT_POINT dam = damroll(2, 6);
+    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
+    msg_format(_("%^sが鋭い闘気のオーラで傷ついた！", "%^s is injured by the Force"), monap_ptr->m_name);
+    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) {
+        monap_ptr->blinked = FALSE;
+        monap_ptr->alive = FALSE;
+    }
+}
+
+static void aura_shadow_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!hex_spelling(target_ptr, HEX_SHADOW_CLOAK) || !monap_ptr->alive || target_ptr->is_dead)
+        return;
+
+    HIT_POINT dam = 1;
+    object_type *o_armed_ptr = &target_ptr->inventory_list[INVEN_RARM];
+    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
+    if (((r_ptr->flagsr & RFR_RES_ALL) != 0) || ((r_ptr->flagsr & RFR_RES_DARK) != 0)) {
+        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
+            r_ptr->r_flagsr |= (RFR_RES_ALL | RFR_RES_DARK);
+
+        return;
+    }
+
+    if (o_armed_ptr->k_idx) {
+        int basedam = ((o_armed_ptr->dd + target_ptr->to_dd[0]) * (o_armed_ptr->ds + target_ptr->to_ds[0] + 1));
+        dam = basedam / 2 + o_armed_ptr->to_d + target_ptr->to_d[0];
+    }
+
+    o_armed_ptr = &target_ptr->inventory_list[INVEN_BODY];
+    if ((o_armed_ptr->k_idx) && object_is_cursed(o_armed_ptr))
+        dam *= 2;
+
+    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
+    msg_format(_("影のオーラが%^sに反撃した！", "Enveloping shadows attack %^s."), monap_ptr->m_name);
+    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) {
+        monap_ptr->blinked = FALSE;
+        monap_ptr->alive = FALSE;
+        return;
+    }
+
+    BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+    EFFECT_ID typ[4][2] = { { INVEN_HEAD, GF_OLD_CONF }, { INVEN_LARM, GF_OLD_SLEEP }, { INVEN_HANDS, GF_TURN_ALL }, { INVEN_FEET, GF_OLD_SLOW } };
+
+    /* Some cursed armours gives an extra effect */
+    for (int j = 0; j < 4; j++) {
+        o_armed_ptr = &target_ptr->inventory_list[typ[j][0]];
+        if ((o_armed_ptr->k_idx) && object_is_cursed(o_armed_ptr) && object_is_armour(o_armed_ptr))
+            project(target_ptr, 0, 0, monap_ptr->m_ptr->fy, monap_ptr->m_ptr->fx, (target_ptr->lev * 2), typ[j][1], flg, -1);
+    }
+}
+
+void process_aura_counterattack(player_type *target_ptr, monap_type *monap_ptr)
+{
+    if (!monap_ptr->touched)
+        return;
+
+    aura_fire_by_monster_attack(target_ptr, monap_ptr);
+    aura_elec_by_monster_attack(target_ptr, monap_ptr);
+    aura_cold_by_monster_attack(target_ptr, monap_ptr);
+    aura_shards_by_monster_attack(target_ptr, monap_ptr);
+    aura_holy_by_monster_attack(target_ptr, monap_ptr);
+    aura_force_by_monster_attack(target_ptr, monap_ptr);
+    aura_shadow_by_monster_attack(target_ptr, monap_ptr);
+}

diff --git a/src/combat/aura-counterattack.h b/src/combat/aura-counterattack.h
new file mode 100644 (file)
index 0000000..88ca6ec
--- /dev/null
+++ b/src/combat/aura-counterattack.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "system/angband.h"
+#include "combat/monster-attack-util.h"
+
+void process_aura_counterattack(player_type *target_ptr, monap_type *monap_ptr);

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index b0e4a5c..dfa94e2 100644 (file)
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -15,6 +15,7 @@
 #include "combat/monster-attack-effect.h"
 #include "combat/monster-attack-switcher.h"
 #include "combat/monster-attack-util.h"
+#include "combat/aura-counterattack.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"
@@ -219,202 +220,6 @@ static void calc_player_stun(player_type *target_ptr, monap_type *monap_ptr)
         (void)set_stun(target_ptr, target_ptr->stun + stun_plus);
 }
 
-static void aura_fire_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!target_ptr->sh_fire || !monap_ptr->alive || target_ptr->is_dead)
-        return;
-
-    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
-    if ((r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK) != 0) {
-        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK);
-
-        return;
-    }
-
-    HIT_POINT dam = damroll(2, 6);
-    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
-    msg_format(_("%^sは突然熱くなった！", "%^s is suddenly very hot!"), monap_ptr->m_name);
-    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は灰の山になった。", " turns into a pile of ash."))) {
-        monap_ptr->blinked = FALSE;
-        monap_ptr->alive = FALSE;
-    }
-}
-
-static void aura_elec_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!target_ptr->sh_elec || !monap_ptr->alive || target_ptr->is_dead)
-        return;
-
-    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
-    if ((r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK) != 0) {
-        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK);
-
-        return;
-    }
-
-    HIT_POINT dam = damroll(2, 6);
-    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
-    msg_format(_("%^sは電撃をくらった！", "%^s gets zapped!"), monap_ptr->m_name);
-    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は燃え殻の山になった。", " turns into a pile of cinder."))) {
-        monap_ptr->blinked = FALSE;
-        monap_ptr->alive = FALSE;
-    }
-}
-
-static void aura_cold_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!target_ptr->sh_cold || !monap_ptr->alive || target_ptr->is_dead)
-        return;
-
-    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
-    if ((r_ptr->flagsr & RFR_EFF_IM_COLD_MASK) != 0) {
-        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK);
-        
-        return;
-    }
-
-    HIT_POINT dam = damroll(2, 6);
-    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
-    msg_format(_("%^sは冷気をくらった！", "%^s is very cold!"), monap_ptr->m_name);
-    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は凍りついた。", " was frozen."))) {
-        monap_ptr->blinked = FALSE;
-        monap_ptr->alive = FALSE;
-    }
-}
-
-static void aura_shards_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!target_ptr->dustrobe || !monap_ptr->alive || target_ptr->is_dead)
-        return;
-
-    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
-    if ((r_ptr->flagsr & RFR_EFF_RES_SHAR_MASK) != 0) {
-        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-            r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_RES_SHAR_MASK);
-    } else {
-        HIT_POINT dam = damroll(2, 6);
-        dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
-        msg_format(_("%^sは鏡の破片をくらった！", "%^s gets zapped!"), monap_ptr->m_name);
-        if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("はズタズタになった。", " had torn to pieces."))) {
-            monap_ptr->blinked = FALSE;
-            monap_ptr->alive = FALSE;
-        }
-    }
-
-    if (is_mirror_grid(&target_ptr->current_floor_ptr->grid_array[target_ptr->y][target_ptr->x]))
-        teleport_player(target_ptr, 10, TELEPORT_SPONTANEOUS);
-}
-
-static void aura_holy_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!target_ptr->tim_sh_holy || !monap_ptr->alive || target_ptr->is_dead)
-        return;
-
-    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
-    if ((r_ptr->flags3 & RF3_EVIL) == 0)
-        return;
-
-    if ((r_ptr->flagsr & RFR_RES_ALL) != 0) {
-        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-            r_ptr->r_flagsr |= RFR_RES_ALL;
-
-        return;
-    }
-
-    HIT_POINT dam = damroll(2, 6);
-    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
-    msg_format(_("%^sは聖なるオーラで傷ついた！", "%^s is injured by holy power!"), monap_ptr->m_name);
-    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) {
-        monap_ptr->blinked = FALSE;
-        monap_ptr->alive = FALSE;
-    }
-
-    if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-        r_ptr->r_flags3 |= RF3_EVIL;
-}
-
-static void aura_force_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!target_ptr->tim_sh_touki || !monap_ptr->alive || target_ptr->is_dead)
-        return;
-
-    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
-    if ((r_ptr->flagsr & RFR_RES_ALL) != 0) {
-        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-            r_ptr->r_flagsr |= RFR_RES_ALL;
-
-        return;
-    }
-
-    HIT_POINT dam = damroll(2, 6);
-    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
-    msg_format(_("%^sが鋭い闘気のオーラで傷ついた！", "%^s is injured by the Force"), monap_ptr->m_name);
-    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) {
-        monap_ptr->blinked = FALSE;
-        monap_ptr->alive = FALSE;
-    }
-}
-
-static void aura_shadow_by_monster_attack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!hex_spelling(target_ptr, HEX_SHADOW_CLOAK) || !monap_ptr->alive || target_ptr->is_dead)
-        return;
-
-    HIT_POINT dam = 1;
-    object_type *o_armed_ptr = &target_ptr->inventory_list[INVEN_RARM];
-    monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx];
-    if (((r_ptr->flagsr & RFR_RES_ALL) != 0) || ((r_ptr->flagsr & RFR_RES_DARK) != 0)) {
-        if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr))
-            r_ptr->r_flagsr |= (RFR_RES_ALL | RFR_RES_DARK);
-
-        return;
-    }
-
-    if (o_armed_ptr->k_idx) {
-        int basedam = ((o_armed_ptr->dd + target_ptr->to_dd[0]) * (o_armed_ptr->ds + target_ptr->to_ds[0] + 1));
-        dam = basedam / 2 + o_armed_ptr->to_d + target_ptr->to_d[0];
-    }
-
-    o_armed_ptr = &target_ptr->inventory_list[INVEN_BODY];
-    if ((o_armed_ptr->k_idx) && object_is_cursed(o_armed_ptr))
-        dam *= 2;
-
-    dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE);
-    msg_format(_("影のオーラが%^sに反撃した！", "Enveloping shadows attack %^s."), monap_ptr->m_name);
-    if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) {
-        monap_ptr->blinked = FALSE;
-        monap_ptr->alive = FALSE;
-        return;
-    }
-
-    BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
-    EFFECT_ID typ[4][2] = { { INVEN_HEAD, GF_OLD_CONF }, { INVEN_LARM, GF_OLD_SLEEP }, { INVEN_HANDS, GF_TURN_ALL }, { INVEN_FEET, GF_OLD_SLOW } };
-
-    /* Some cursed armours gives an extra effect */
-    for (int j = 0; j < 4; j++) {
-        o_armed_ptr = &target_ptr->inventory_list[typ[j][0]];
-        if ((o_armed_ptr->k_idx) && object_is_cursed(o_armed_ptr) && object_is_armour(o_armed_ptr))
-            project(target_ptr, 0, 0, monap_ptr->m_ptr->fy, monap_ptr->m_ptr->fx, (target_ptr->lev * 2), typ[j][1], flg, -1);
-    }
-}
-
-void process_aura_counterattack(player_type *target_ptr, monap_type *monap_ptr)
-{
-    if (!monap_ptr->touched)
-        return;
-
-    aura_fire_by_monster_attack(target_ptr, monap_ptr);
-    aura_elec_by_monster_attack(target_ptr, monap_ptr);
-    aura_cold_by_monster_attack(target_ptr, monap_ptr);
-    aura_shards_by_monster_attack(target_ptr, monap_ptr);
-    aura_holy_by_monster_attack(target_ptr, monap_ptr);
-    aura_force_by_monster_attack(target_ptr, monap_ptr);
-    aura_shadow_by_monster_attack(target_ptr, monap_ptr);
-}
-
 /*!
  * @brief モンスターからプレイヤーへの打撃処理 / Attack the player via physical attacks.
  * @param m_idx 打撃を行うモンスターのID