OSDN Git Service

[Refactor] #935 Moved hp-mp-* from core/ to hpmp/
authorHourier <grapefox.whitelucifer.0408@gmail.com>
Mon, 26 Apr 2021 14:09:50 +0000 (23:09 +0900)
committerHourier <grapefox.whitelucifer.0408@gmail.com>
Tue, 27 Apr 2021 13:48:57 +0000 (22:48 +0900)
36 files changed:
Hengband/Hengband/Hengband.vcxproj
Hengband/Hengband/Hengband.vcxproj.filters
src/Makefile.am
src/blue-magic/blue-magic-caster.cpp
src/cmd-action/cmd-mane.cpp
src/cmd-item/cmd-eat.cpp
src/core/hp-mp-regenerator.h [deleted file]
src/dungeon/dungeon-processor.cpp
src/effect/effect-monster-spirit.cpp
src/effect/effect-player-oldies.cpp
src/effect/effect-player-resist-hurt.cpp
src/hpmp/hp-mp-processor.cpp [moved from src/core/hp-mp-processor.cpp with 93% similarity]
src/hpmp/hp-mp-processor.h [moved from src/core/hp-mp-processor.h with 100% similarity]
src/hpmp/hp-mp-regenerator.cpp [moved from src/core/hp-mp-regenerator.cpp with 99% similarity]
src/hpmp/hp-mp-regenerator.h [new file with mode: 0644]
src/inventory/recharge-processor.cpp
src/mind/mind-elementalist.cpp
src/mind/mind-mindcrafter.cpp
src/mind/mind-warrior-mage.cpp
src/mutation/mutation-processor.cpp
src/object-activation/activation-bolt-ball.cpp
src/object-activation/activation-others.cpp
src/object-activation/activation-resistance.cpp
src/player-attack/blood-sucking-processor.cpp
src/racial/racial-vampire.cpp
src/realm/realm-crusade.cpp
src/realm/realm-death.cpp
src/realm/realm-nature.cpp
src/realm/realm-song.cpp
src/specific-object/blade-turner.cpp
src/spell-kind/spells-random.cpp
src/spell/spells-staff-only.cpp
src/spell/spells-status.cpp
src/spell/spells-summon.cpp
src/status/shape-changer.cpp
src/world/world-turn-processor.cpp

index e4148c6..312ba79 100644 (file)
     <ClCompile Include="..\..\src\inventory\pack-overflow.cpp" />\r
     <ClCompile Include="..\..\src\io\input-key-processor.cpp" />\r
     <ClCompile Include="..\..\src\core\game-closer.cpp" />\r
-    <ClCompile Include="..\..\src\core\hp-mp-processor.cpp" />\r
-    <ClCompile Include="..\..\src\core\hp-mp-regenerator.cpp" />\r
+    <ClCompile Include="..\..\src\hpmp\hp-mp-processor.cpp" />\r
+    <ClCompile Include="..\..\src\hpmp\hp-mp-regenerator.cpp" />\r
     <ClCompile Include="..\..\src\core\magic-effects-timeout-reducer.cpp" />\r
     <ClCompile Include="..\..\src\core\stuff-handler.cpp" />\r
     <ClCompile Include="..\..\src\core\turn-compensator.cpp" />\r
     <ClInclude Include="..\..\src\inventory\pack-overflow.h" />\r
     <ClInclude Include="..\..\src\io\input-key-processor.h" />\r
     <ClInclude Include="..\..\src\core\game-closer.h" />\r
-    <ClInclude Include="..\..\src\core\hp-mp-processor.h" />\r
-    <ClInclude Include="..\..\src\core\hp-mp-regenerator.h" />\r
+    <ClInclude Include="..\..\src\hpmp\hp-mp-processor.h" />\r
+    <ClInclude Include="..\..\src\hpmp\hp-mp-regenerator.h" />\r
     <ClInclude Include="..\..\src\core\magic-effects-timeout-reducer.h" />\r
     <ClInclude Include="..\..\src\core\special-internal-keys.h" />\r
     <ClInclude Include="..\..\src\core\stuff-handler.h" />\r
index aec6e08..c2cdf5c 100644 (file)
     <ClCompile Include="..\..\src\core\turn-compensator.cpp">\r
       <Filter>core</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\core\hp-mp-regenerator.cpp">\r
-      <Filter>core</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\src\core\hp-mp-processor.cpp">\r
-      <Filter>core</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\mutation\mutation-processor.cpp">\r
       <Filter>mutation</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\system\player-type-definition.cpp">\r
       <Filter>system</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\hpmp\hp-mp-processor.cpp">\r
+      <Filter>hpmp</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\hpmp\hp-mp-regenerator.cpp">\r
+      <Filter>hpmp</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\combat\shoot.h">\r
     <ClInclude Include="..\..\src\core\turn-compensator.h">\r
       <Filter>core</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\core\hp-mp-regenerator.h">\r
-      <Filter>core</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\src\core\hp-mp-processor.h">\r
-      <Filter>core</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\mutation\mutation-processor.h">\r
       <Filter>mutation</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\player-status\player-hand-types.h">\r
       <Filter>player-status</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\hpmp\hp-mp-processor.h">\r
+      <Filter>hpmp</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\hpmp\hp-mp-regenerator.h">\r
+      <Filter>hpmp</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\..\src\wall.bmp" />\r
     <Filter Include="player-status">\r
       <UniqueIdentifier>{ff73fd79-e082-4a2c-8c5b-9457c30d9e74}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="hpmp">\r
+      <UniqueIdentifier>{fb766b4b-8783-4d07-9474-059259afe7c6}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\src\angband.rc" />\r
index 3afd206..0f1a6e5 100644 (file)
@@ -148,8 +148,6 @@ hengband_SOURCES = \
        core/disturbance.cpp core/disturbance.h \
        core/game-closer.cpp core/game-closer.h \
        core/game-play.cpp core/game-play.h \
-       core/hp-mp-processor.cpp core/hp-mp-processor.h \
-       core/hp-mp-regenerator.cpp core/hp-mp-regenerator.h \
        core/magic-effects-timeout-reducer.cpp core/magic-effects-timeout-reducer.h \
        core/object-compressor.cpp core/object-compressor.h \
        core/player-processor.cpp core/player-processor.h \
@@ -256,6 +254,9 @@ hengband_SOURCES = \
        grid/stair.cpp grid/stair.h \
        grid/trap.cpp grid/trap.h \
        \
+       hpmp/hp-mp-processor.cpp hpmp/hp-mp-processor.h \
+       hpmp/hp-mp-regenerator.cpp hpmp/hp-mp-regenerator.h \
+       \
        info-reader/artifact-reader.cpp info-reader/artifact-reader.h \
        info-reader/dungeon-info-tokens-table.cpp info-reader/dungeon-info-tokens-table.h \
        info-reader/dungeon-reader.cpp info-reader/dungeon-reader.h \
index 0126364..fb34e93 100644 (file)
@@ -11,9 +11,9 @@
 #include "blue-magic/blue-magic-summon.h"
 #include "blue-magic/blue-magic-util.h"
 #include "blue-magic/learnt-info.h"
-#include "core/hp-mp-processor.h"
 #include "floor/cave.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-ability-flags.h"
 #include "monster-race/race-flags-resistance.h"
index d7bad32..9db6d57 100644 (file)
@@ -12,7 +12,6 @@
 #include "action/action-limited.h"
 #include "cmd-action/cmd-spell.h"
 #include "core/asking-player.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
@@ -21,6 +20,7 @@
 #include "game-option/disturbance-options.h"
 #include "game-option/text-display-options.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "mind/mind-mage.h"
index 701f446..0c41434 100644 (file)
@@ -5,12 +5,12 @@
  */
 
 #include "cmd-item/cmd-eat.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/floor-object.h"
+#include "hpmp/hp-mp-processor.h"
 #include "inventory/inventory-object.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
-#include "player/attack-defense-types.h"
 #include "player-info/avatar.h"
+#include "player/attack-defense-types.h"
 #include "player/digestion-processor.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-race-types.h"
-#include "player/special-defense-types.h"
 #include "player/player-status-flags.h"
+#include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
 #include "spell/spells-status.h"
 #include "status/action-setter.h"
@@ -192,7 +192,7 @@ bool exe_eat_charge_of_magic_device(player_type *creature_ptr, object_type *o_pt
         return FALSE;
 
     if (is_specific_player_race(creature_ptr, RACE_SKELETON) || is_specific_player_race(creature_ptr, RACE_GOLEM)
-            || is_specific_player_race(creature_ptr, RACE_ZOMBIE) || is_specific_player_race(creature_ptr, RACE_SPECTRE)) {
+        || is_specific_player_race(creature_ptr, RACE_ZOMBIE) || is_specific_player_race(creature_ptr, RACE_SPECTRE)) {
         concptr staff;
 
         if (o_ptr->tval == TV_STAFF && (item < 0) && (o_ptr->number > 1)) {
@@ -342,8 +342,7 @@ void exe_eat_food(player_type *creature_ptr, INVENTORY_IDX item)
 
         if (creature_ptr->food < PY_FOOD_ALERT) /* Hungry */
             msg_print(_("あなたの飢えは新鮮な血によってのみ満たされる!", "Your hunger can only be satisfied with fresh blood!"));
-    } else if (player_race_life(creature_ptr) != PlayerRaceLife::LIVING
-        || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING)) {
+    } else if (player_race_life(creature_ptr) != PlayerRaceLife::LIVING || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING)) {
         msg_print(_("生者の食物はあなたにとってほとんど栄養にならない。", "The food of mortals is poor sustenance for you."));
         set_food(creature_ptr, creature_ptr->food + ((o_ptr->pval) / 20));
     } else {
diff --git a/src/core/hp-mp-regenerator.h b/src/core/hp-mp-regenerator.h
deleted file mode 100644 (file)
index 96a5695..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "system/angband.h"
-
-extern int wild_regen;
-
-typedef struct player_type player_type;
-void regenhp(player_type *creature_ptr, int percent);
-void regenmana(player_type* creature_ptr, MANA_POINT upkeep_factor, MANA_POINT regen_amount);
-void regenmagic(player_type* creature_ptr, int regen_amount);
-void regenerate_monsters(player_type* player_ptr);
-void regenerate_captured_monsters(player_type* creature_ptr);
index ef81cf6..be1c446 100644 (file)
@@ -2,7 +2,6 @@
 #include "cmd-building/cmd-building.h"
 #include "cmd-io/cmd-dump.h"
 #include "core/disturbance.h"
-#include "core/hp-mp-regenerator.h"
 #include "core/object-compressor.h"
 #include "core/player-processor.h"
 #include "core/player-redraw-types.h"
 #include "floor/floor-leaver.h"
 #include "floor/floor-save-util.h"
 #include "floor/floor-save.h"
+#include "game-option/cheat-options.h"
 #include "game-option/map-screen-options.h"
 #include "game-option/play-record-options.h"
-#include "game-option/cheat-options.h"
+#include "hpmp/hp-mp-regenerator.h"
 #include "io/cursor.h"
 #include "io/input-key-requester.h"
 #include "io/write-diary.h"
index cb02c58..5555f2e 100644 (file)
@@ -1,17 +1,17 @@
 #include "effect/effect-monster-spirit.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "effect/effect-monster-util.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "monster-race/monster-race.h"
+#include "monster-race/race-ability-mask.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
-#include "monster-race/race-ability-mask.h"
 #include "monster/monster-describer.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status-setter.h"
 #include "monster/monster-status.h"
-#include "monster/monster-info.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
 #include "system/player-type-definition.h"
 
 process_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-        auto ability_flags = em_ptr->r_ptr->ability_flags;
-        bool has_mana = ability_flags.reset(RF_ABILITY_NOMAGIC_MASK).any();
-       if (!has_mana)
-       {
-               if (em_ptr->see_s_msg)
-                       msg_format(_("%sには効果がなかった。", "%s is unaffected."), em_ptr->m_name);
-
-               em_ptr->dam = 0;
-               return PROCESS_CONTINUE;
-       }
-
-       if (em_ptr->who <= 0)
-       {
-               msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), em_ptr->m_name);
-               (void)hp_player(caster_ptr, em_ptr->dam);
-               em_ptr->dam = 0;
-               return PROCESS_CONTINUE;
-       }
-
-       if (em_ptr->m_caster_ptr->hp >= em_ptr->m_caster_ptr->maxhp)
-       {
-               em_ptr->dam = 0;
-               return PROCESS_CONTINUE;
-       }
-
-       em_ptr->m_caster_ptr->hp += em_ptr->dam;
-       if (em_ptr->m_caster_ptr->hp > em_ptr->m_caster_ptr->maxhp)
-               em_ptr->m_caster_ptr->hp = em_ptr->m_caster_ptr->maxhp;
-
-       if (caster_ptr->health_who == em_ptr->who)
-               caster_ptr->redraw |= (PR_HEALTH);
-
-       if (caster_ptr->riding == em_ptr->who)
-               caster_ptr->redraw |= (PR_UHEALTH);
-
-       if (em_ptr->see_s_msg)
-       {
-               monster_desc(caster_ptr, em_ptr->killer, em_ptr->m_caster_ptr, 0);
-               msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), em_ptr->killer);
-       }
-
-       em_ptr->dam = 0;
-       return PROCESS_CONTINUE;
+    if (em_ptr->seen)
+        em_ptr->obvious = TRUE;
+    auto ability_flags = em_ptr->r_ptr->ability_flags;
+    bool has_mana = ability_flags.reset(RF_ABILITY_NOMAGIC_MASK).any();
+    if (!has_mana) {
+        if (em_ptr->see_s_msg)
+            msg_format(_("%sには効果がなかった。", "%s is unaffected."), em_ptr->m_name);
+
+        em_ptr->dam = 0;
+        return PROCESS_CONTINUE;
+    }
+
+    if (em_ptr->who <= 0) {
+        msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), em_ptr->m_name);
+        (void)hp_player(caster_ptr, em_ptr->dam);
+        em_ptr->dam = 0;
+        return PROCESS_CONTINUE;
+    }
+
+    if (em_ptr->m_caster_ptr->hp >= em_ptr->m_caster_ptr->maxhp) {
+        em_ptr->dam = 0;
+        return PROCESS_CONTINUE;
+    }
+
+    em_ptr->m_caster_ptr->hp += em_ptr->dam;
+    if (em_ptr->m_caster_ptr->hp > em_ptr->m_caster_ptr->maxhp)
+        em_ptr->m_caster_ptr->hp = em_ptr->m_caster_ptr->maxhp;
+
+    if (caster_ptr->health_who == em_ptr->who)
+        caster_ptr->redraw |= (PR_HEALTH);
+
+    if (caster_ptr->riding == em_ptr->who)
+        caster_ptr->redraw |= (PR_UHEALTH);
+
+    if (em_ptr->see_s_msg) {
+        monster_desc(caster_ptr, em_ptr->killer, em_ptr->m_caster_ptr, 0);
+        msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), em_ptr->killer);
+    }
+
+    em_ptr->dam = 0;
+    return PROCESS_CONTINUE;
 }
 
-
 process_result effect_monster_mind_blast(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-       if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
-
-       if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) ||
-               (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
-               (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10))
-       {
-               if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF))
-               {
-                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
-               }
-
-               em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               em_ptr->dam = 0;
-       }
-       else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND)
-       {
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-               em_ptr->note = _("には完全な耐性がある!", " is immune.");
-               em_ptr->dam = 0;
-       }
-       else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND)
-       {
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-               em_ptr->note = _("には耐性がある。", " resists.");
-               em_ptr->dam /= 3;
-       }
-       else
-       {
-               em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-               em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
-
-               if (em_ptr->who > 0) em_ptr->do_conf = randint0(4) + 4;
-               else em_ptr->do_conf = randint0(8) + 8;
-       }
-
-       return PROCESS_CONTINUE;
+    if (em_ptr->seen)
+        em_ptr->obvious = TRUE;
+    if (!em_ptr->who)
+        msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
+
+    if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) || (em_ptr->r_ptr->flags3 & RF3_NO_CONF)
+        || (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10)) {
+        if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF)) {
+            if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
+        }
+
+        em_ptr->note = _("には効果がなかった。", " is unaffected.");
+        em_ptr->dam = 0;
+    } else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND) {
+        if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+            em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+        em_ptr->note = _("には完全な耐性がある!", " is immune.");
+        em_ptr->dam = 0;
+    } else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND) {
+        if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+            em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
+        em_ptr->note = _("には耐性がある。", " resists.");
+        em_ptr->dam /= 3;
+    } else {
+        em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+        em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+
+        if (em_ptr->who > 0)
+            em_ptr->do_conf = randint0(4) + 4;
+        else
+            em_ptr->do_conf = randint0(8) + 8;
+    }
+
+    return PROCESS_CONTINUE;
 }
 
-
 process_result effect_monster_brain_smash(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-       if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
-
-       if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) ||
-               (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
-               (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10))
-       {
-               if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF))
-               {
-                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
-                               em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
-               }
-
-               em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               em_ptr->dam = 0;
-       }
-       else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND)
-       {
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
-                       em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-
-               em_ptr->note = _("には完全な耐性がある!", " is immune.");
-               em_ptr->dam = 0;
-       }
-       else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND)
-       {
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
-                       em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-
-               em_ptr->note = _("には耐性がある!", " resists!");
-               em_ptr->dam /= 3;
-       }
-       else
-       {
-               em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-               em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
-               if (em_ptr->who > 0)
-               {
-                       em_ptr->do_conf = randint0(4) + 4;
-                       em_ptr->do_stun = randint0(4) + 4;
-               }
-               else
-               {
-                       em_ptr->do_conf = randint0(8) + 8;
-                       em_ptr->do_stun = randint0(8) + 8;
-               }
-
-               (void)set_monster_slow(caster_ptr, em_ptr->g_ptr->m_idx, monster_slow_remaining(em_ptr->m_ptr) + 10);
-       }
-
-       return PROCESS_CONTINUE;
+    if (em_ptr->seen)
+        em_ptr->obvious = TRUE;
+    if (!em_ptr->who)
+        msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
+
+    if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) || (em_ptr->r_ptr->flags3 & RF3_NO_CONF)
+        || (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10)) {
+        if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF)) {
+            if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
+        }
+
+        em_ptr->note = _("には効果がなかった。", " is unaffected.");
+        em_ptr->dam = 0;
+    } else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND) {
+        if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+            em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+
+        em_ptr->note = _("には完全な耐性がある!", " is immune.");
+        em_ptr->dam = 0;
+    } else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND) {
+        if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+            em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
+
+        em_ptr->note = _("には耐性がある!", " resists!");
+        em_ptr->dam /= 3;
+    } else {
+        em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+        em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+        if (em_ptr->who > 0) {
+            em_ptr->do_conf = randint0(4) + 4;
+            em_ptr->do_stun = randint0(4) + 4;
+        } else {
+            em_ptr->do_conf = randint0(8) + 8;
+            em_ptr->do_stun = randint0(8) + 8;
+        }
+
+        (void)set_monster_slow(caster_ptr, em_ptr->g_ptr->m_idx, monster_slow_remaining(em_ptr->m_ptr) + 10);
+    }
+
+    return PROCESS_CONTINUE;
 }
index a3a4a76..45c6918 100644 (file)
@@ -1,7 +1,7 @@
 #include "effect/effect-player-oldies.h"
-#include "core/hp-mp-processor.h"
 #include "effect/effect-player-util.h"
 #include "game-option/birth-options.h"
+#include "hpmp/hp-mp-processor.h"
 #include "monster-race/race-indice-types.h"
 #include "player/eldritch-horror.h"
 #include "status/bad-status-setter.h"
index add619e..6a568ab 100644 (file)
@@ -1,11 +1,11 @@
 #include "effect/effect-player-resist-hurt.h"
 #include "artifact/fixed-art-types.h"
 #include "blue-magic/blue-magic-checker.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "effect/effect-player-util.h"
+#include "hpmp/hp-mp-processor.h"
 #include "inventory/inventory-damage.h"
 #include "inventory/inventory-slot-types.h"
 #include "mind/mind-mirror-master.h"
similarity index 93%
rename from src/core/hp-mp-processor.cpp
rename to src/hpmp/hp-mp-processor.cpp
index c725ff0..6550464 100644 (file)
@@ -1,6 +1,5 @@
-#include "core/hp-mp-processor.h"
+#include "hpmp/hp-mp-processor.h"
 #include "cmd-action/cmd-pet.h"
-#include "core/hp-mp-regenerator.h"
 #include "core/player-redraw-types.h"
 #include "core/window-redrawer.h"
 #include "flavor/flavor-describer.h"
@@ -8,20 +7,24 @@
 #include "floor/pattern-walk.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-regenerator.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "object-enchant/object-ego.h"
+#include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
-#include "player/attack-defense-types.h"
+#include "object/object-flags.h"
 #include "player-info/avatar.h"
+#include "player/attack-defense-types.h"
 #include "player/digestion-processor.h"
 #include "player/player-damage.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"
-#include "player/special-defense-types.h"
 #include "player/player-status-flags.h"
+#include "player/player-status-resist.h"
+#include "player/special-defense-types.h"
 #include "status/bad-status-setter.h"
 #include "status/element-resistance.h"
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 #include "world/world.h"
-#include "player/player-status-resist.h"
-#include "util/bit-flags-calculator.h"
-#include "object/object-flags.h"
-#include "object-enchant/tr-types.h"
 
 /*!
  * @brief 地形によるダメージを与える / Deal damage from feature.
@@ -157,23 +156,23 @@ void process_player_hp_mp(player_type *creature_ptr)
     }
 
     if (has_flag(f_ptr->flags, FF_LAVA) && !is_invuln(creature_ptr) && !has_immune_fire(creature_ptr)) {
-        cave_no_regen = deal_damege_by_feat(creature_ptr, g_ptr, _("熱で火傷した!", "The heat burns you!"), _("で火傷した!", "burns you!"),
-            calc_fire_damage_rate, NULL);
+        cave_no_regen = deal_damege_by_feat(
+            creature_ptr, g_ptr, _("熱で火傷した!", "The heat burns you!"), _("で火傷した!", "burns you!"), calc_fire_damage_rate, NULL);
     }
 
     if (has_flag(f_ptr->flags, FF_COLD_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_cold(creature_ptr)) {
-        cave_no_regen = deal_damege_by_feat(creature_ptr, g_ptr, _("冷気に覆われた!", "The cold engulfs you!"), _("に凍えた!", "frostbites you!"),
-            calc_cold_damage_rate, NULL);
+        cave_no_regen = deal_damege_by_feat(
+            creature_ptr, g_ptr, _("冷気に覆われた!", "The cold engulfs you!"), _("に凍えた!", "frostbites you!"), calc_cold_damage_rate, NULL);
     }
 
     if (has_flag(f_ptr->flags, FF_ELEC_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_elec(creature_ptr)) {
-        cave_no_regen = deal_damege_by_feat(creature_ptr, g_ptr, _("電撃を受けた!", "The electricity shocks you!"), _("に感電した!", "shocks you!"),
-            calc_elec_damage_rate, NULL);
+        cave_no_regen = deal_damege_by_feat(
+            creature_ptr, g_ptr, _("電撃を受けた!", "The electricity shocks you!"), _("に感電した!", "shocks you!"), calc_elec_damage_rate, NULL);
     }
 
     if (has_flag(f_ptr->flags, FF_ACID_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_acid(creature_ptr)) {
-        cave_no_regen = deal_damege_by_feat(creature_ptr, g_ptr, _("酸が飛び散った!", "The acid melts you!"), _("に溶かされた!", "melts you!"),
-            calc_acid_damage_rate, NULL);
+        cave_no_regen = deal_damege_by_feat(
+            creature_ptr, g_ptr, _("酸が飛び散った!", "The acid melts you!"), _("に溶かされた!", "melts you!"), calc_acid_damage_rate, NULL);
     }
 
     if (has_flag(f_ptr->flags, FF_POISON_PUDDLE) && !is_invuln(creature_ptr)) {
similarity index 99%
rename from src/core/hp-mp-regenerator.cpp
rename to src/hpmp/hp-mp-regenerator.cpp
index 55a7b08..ee0055c 100644 (file)
@@ -1,4 +1,4 @@
-#include "core/hp-mp-regenerator.h"
+#include "hpmp/hp-mp-regenerator.h"
 #include "cmd-item/cmd-magiceat.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
@@ -8,12 +8,12 @@
 #include "monster-race/race-flags2.h"
 #include "monster/monster-status.h"
 #include "player/attack-defense-types.h"
-#include "player/special-defense-types.h"
 #include "player/player-status-table.h"
+#include "player/special-defense-types.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
+#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 
 /*!<広域マップ移動時の自然回復処理カウンタ(広域マップ1マス毎に20回処理を基本とする)*/
diff --git a/src/hpmp/hp-mp-regenerator.h b/src/hpmp/hp-mp-regenerator.h
new file mode 100644 (file)
index 0000000..e7ea4e4
--- /dev/null
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "system/angband.h"
+
+extern int wild_regen;
+
+typedef struct player_type player_type;
+void regenhp(player_type *creature_ptr, int percent);
+void regenmana(player_type *creature_ptr, MANA_POINT upkeep_factor, MANA_POINT regen_amount);
+void regenmagic(player_type *creature_ptr, int regen_amount);
+void regenerate_monsters(player_type *player_ptr);
+void regenerate_captured_monsters(player_type *creature_ptr);
index 363f865..51915f4 100644 (file)
@@ -1,9 +1,9 @@
 #include "inventory/recharge-processor.h"
 #include "core/disturbance.h"
-#include "core/hp-mp-regenerator.h"
 #include "core/window-redrawer.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
+#include "hpmp/hp-mp-regenerator.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-hook/hook-checker.h"
 #include "object/object-kind.h"
index 2bde8f7..c179b0c 100644 (file)
@@ -8,7 +8,6 @@
 #include "cmd-action/cmd-spell.h"
 #include "cmd-io/cmd-gameoption.h"
 #include "core/asking-player.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
@@ -24,6 +23,7 @@
 #include "game-option/text-display-options.h"
 #include "grid/feature-flag-types.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "io/command-repeater.h"
 #include "io/input-key-acceptor.h"
 #include "io/input-key-requester.h"
index 1ea1967..940a9ab 100644 (file)
@@ -1,6 +1,5 @@
 #include "mind/mind-mindcrafter.h"
 #include "autopick/autopick.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
@@ -10,6 +9,7 @@
 #include "flavor/object-flavor-types.h"
 #include "floor/floor-object.h"
 #include "game-option/auto-destruction-options.h"
+#include "hpmp/hp-mp-processor.h"
 #include "mind/mind-mindcrafter.h"
 #include "mind/mind-numbers.h"
 #include "object-enchant/item-feeling.h"
index b2d37e7..25dee43 100644 (file)
@@ -1,6 +1,6 @@
 #include "mind/mind-warrior-mage.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
+#include "hpmp/hp-mp-processor.h"
 #include "player/player-damage.h"
 #include "system/player-type-definition.h"
 #include "view/display-messages.h"
index 183506b..2d2fb7f 100644 (file)
@@ -1,10 +1,10 @@
 #include "mutation/mutation-processor.h"
 #include "core/asking-player.h"
 #include "core/disturbance.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "floor/geometry.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "inventory/inventory-object.h"
 #include "inventory/inventory-slot-types.h"
 #include "io/input-key-requester.h"
@@ -40,9 +40,9 @@
 #include "store/store-util.h"
 #include "store/store.h"
 #include "system/floor-type-definition.h"
-#include "system/object-type-definition.h"
 #include "system/monster-race-definition.h"
 #include "system/monster-type-definition.h"
+#include "system/object-type-definition.h"
 #include "system/player-type-definition.h"
 #include "target/target-checker.h"
 #include "target/target-setter.h"
index 2bc923a..c4745cd 100644 (file)
@@ -1,10 +1,10 @@
 #include "object-activation/activation-bolt-ball.h"
-#include "core/hp-mp-processor.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
 #include "floor/cave.h"
 #include "floor/floor-util.h"
 #include "grid/feature-flag-types.h"
+#include "hpmp/hp-mp-processor.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-specific-bolt.h"
 #include "spell/spell-types.h"
index f69ff01..e71d6a8 100644 (file)
@@ -8,11 +8,11 @@
 #include "artifact/fixed-art-types.h"
 #include "cmd-io/cmd-save.h"
 #include "core/asking-player.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
 #include "game-option/special-options.h"
+#include "hpmp/hp-mp-processor.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-indice-types.h"
@@ -248,7 +248,10 @@ bool activate_fully_identification(player_type *user_ptr)
  * @param user_ptr プレーヤーへの参照ポインタ
  * @return 発動に成功したらTRUE
  */
-bool activate_identification(player_type *user_ptr) { return ident_spell(user_ptr, FALSE, TV_NONE); }
+bool activate_identification(player_type *user_ptr)
+{
+    return ident_spell(user_ptr, FALSE, TV_NONE);
+}
 
 bool activate_pesticide(player_type *user_ptr)
 {
index 1cb808b..acf9849 100644 (file)
@@ -1,5 +1,5 @@
 #include "object-activation/activation-resistance.h"
-#include "core/hp-mp-processor.h"
+#include "hpmp/hp-mp-processor.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/spell-types.h"
 #include "status/bad-status-setter.h"
index d938981..cd16755 100644 (file)
@@ -6,8 +6,8 @@
 
 #include "player-attack/blood-sucking-processor.h"
 #include "artifact/fixed-art-types.h"
-#include "core/hp-mp-processor.h"
 #include "game-option/cheat-options.h"
+#include "hpmp/hp-mp-processor.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race-hook.h"
 #include "object-enchant/tr-types.h"
index 67bd6e2..b8e5470 100644 (file)
@@ -1,9 +1,9 @@
 #include "racial/racial-vampire.h"
-#include "core/hp-mp-processor.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
 #include "floor/geometry.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "player/digestion-processor.h"
 #include "spell-kind/spells-specific-bolt.h"
 #include "system/floor-type-definition.h"
index 3e4a852..64d5b6c 100644 (file)
@@ -1,10 +1,10 @@
 #include "realm/realm-crusade.h"
 #include "cmd-action/cmd-spell.h"
-#include "core/hp-mp-processor.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
 #include "floor/cave.h"
 #include "floor/floor-util.h"
+#include "hpmp/hp-mp-processor.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "player/player-class.h"
index 998c1db..65edee4 100644 (file)
@@ -1,8 +1,8 @@
 #include "realm/realm-death.h"
 #include "cmd-action/cmd-spell.h"
-#include "core/hp-mp-processor.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
+#include "hpmp/hp-mp-processor.h"
 #include "player-info/avatar.h"
 #include "player/digestion-processor.h"
 #include "player/player-damage.h"
@@ -237,8 +237,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode
         if (name)
             return _("エントロピーの球", "Orb of Entropy");
         if (desc)
-            return _(
-                "生命のある者のHPと最大HP双方にダメージを与える効果のある球を放つ。", "Fires a ball which reduces both HP and MaxHP of living monsters.");
+            return _("生命のある者のHPと最大HP双方にダメージを与える効果のある球を放つ。", "Fires a ball which reduces both HP and MaxHP of living monsters.");
 
         {
             DICE_NUMBER dice = 3;
index e23c8c3..0fdea2d 100644 (file)
@@ -1,10 +1,10 @@
 #include "realm/realm-nature.h"
 #include "cmd-action/cmd-spell.h"
-#include "core/hp-mp-processor.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"
+#include "hpmp/hp-mp-processor.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "object/object-generator.h"
index 3e67fbf..53625ff 100644 (file)
@@ -1,10 +1,10 @@
 #include "cmd-action/cmd-spell.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
+#include "hpmp/hp-mp-processor.h"
 #include "player/attack-defense-types.h"
 #include "player/player-class.h"
 #include "realm/realm-song-numbers.h"
index 45161ed..6c76171 100644 (file)
@@ -1,5 +1,5 @@
 #include "specific-object/blade-turner.h"
-#include "core/hp-mp-processor.h"
+#include "hpmp/hp-mp-processor.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell/spell-types.h"
 #include "status/bad-status-setter.h"
index 20ff082..472c22d 100644 (file)
@@ -5,9 +5,9 @@
  */
 
 #include "spell-kind/spells-random.h"
-#include "core/hp-mp-processor.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
+#include "hpmp/hp-mp-processor.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "mutation/mutation-investor-remover.h"
@@ -160,7 +160,8 @@ bool activate_ty_curse(player_type *target_ptr, bool stop_ty, int *count)
         case 8:
         case 9:
         case 18:
-            (*count) += summon_specific(target_ptr, 0, target_ptr->y, target_ptr->x, floor_ptr->dun_level, SUMMON_NONE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
+            (*count) += summon_specific(
+                target_ptr, 0, target_ptr->y, target_ptr->x, floor_ptr->dun_level, SUMMON_NONE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
             if (!one_in_(6))
                 break;
             /* Fall through */
@@ -316,7 +317,8 @@ void wild_magic(player_type *caster_ptr, int spell)
     case 34:
     case 35:
         for (int counter = 0; counter < 8; counter++) {
-            (void)summon_specific(caster_ptr, 0, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3) / 2, static_cast<summon_type>(type), (PM_ALLOW_GROUP | PM_NO_PET));
+            (void)summon_specific(
+                caster_ptr, 0, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3) / 2, static_cast<summon_type>(type), (PM_ALLOW_GROUP | PM_NO_PET));
         }
 
         break;
index 870f1ce..d0ccbb1 100644 (file)
@@ -1,7 +1,7 @@
 #include "spell/spells-staff-only.h"
-#include "core/hp-mp-processor.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-processor.h"
+#include "hpmp/hp-mp-processor.h"
 #include "player/player-damage.h"
 #include "spell-kind/spells-sight.h"
 #include "spell/spell-types.h"
index d9b2507..6c03e4d 100644 (file)
@@ -7,7 +7,6 @@
 #include "spell/spells-status.h"
 #include "cmd-action/cmd-spell.h"
 #include "cmd-item/cmd-magiceat.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
@@ -20,6 +19,7 @@
 #include "floor/geometry.h"
 #include "grid/feature-flag-types.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "inventory/inventory-object.h"
 #include "inventory/inventory-slot-types.h"
 #include "mind/mind-force-trainer.h"
@@ -27,8 +27,8 @@
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "player/attack-defense-types.h"
 #include "player-info/avatar.h"
+#include "player/attack-defense-types.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
 #include "spell-kind/spells-launcher.h"
@@ -110,7 +110,10 @@ bool sleep_monster(player_type *caster_ptr, DIRECTION dir, int power)
  * @return 作用が実際にあった場合TRUEを返す
  * @details 威力はプレイヤーレベル*2に固定
  */
-bool stasis_monster(player_type *caster_ptr, DIRECTION dir) { return (fire_ball_hide(caster_ptr, GF_STASIS, dir, caster_ptr->lev * 2, 0)); }
+bool stasis_monster(player_type *caster_ptr, DIRECTION dir)
+{
+    return (fire_ball_hide(caster_ptr, GF_STASIS, dir, caster_ptr->lev * 2, 0));
+}
 
 /*!
  * @brief 邪悪なモンスター拘束(STASIS)処理
@@ -119,7 +122,10 @@ bool stasis_monster(player_type *caster_ptr, DIRECTION dir) { return (fire_ball_
  * @return 作用が実際にあった場合TRUEを返す
  * @details 威力はプレイヤーレベル*2に固定
  */
-bool stasis_evil(player_type *caster_ptr, DIRECTION dir) { return (fire_ball_hide(caster_ptr, GF_STASIS_EVIL, dir, caster_ptr->lev * 2, 0)); }
+bool stasis_evil(player_type *caster_ptr, DIRECTION dir)
+{
+    return (fire_ball_hide(caster_ptr, GF_STASIS_EVIL, dir, caster_ptr->lev * 2, 0));
+}
 
 /*!
  * @brief モンスター混乱処理
index fb70450..f064e4b 100644 (file)
@@ -1,9 +1,9 @@
 #include "spell/spells-summon.h"
-#include "core/hp-mp-processor.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"
 #include "floor/line-of-sight.h"
 #include "game-option/birth-options.h"
+#include "hpmp/hp-mp-processor.h"
 #include "inventory/inventory-object.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/smart-learn-types.h"
-#include "object/item-use-flags.h"
 #include "object/item-tester-hooker.h"
+#include "object/item-use-flags.h"
 #include "player-info/avatar.h"
-#include "spell/spells-diceroll.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-floor.h"
 #include "spell-kind/spells-genocide.h"
@@ -23,8 +22,9 @@
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-sight.h"
 #include "spell-kind/spells-specific-bolt.h"
-#include "spell/spells-status.h"
 #include "spell/spell-types.h"
+#include "spell/spells-diceroll.h"
+#include "spell/spells-status.h"
 #include "spell/summon-types.h"
 #include "status/bad-status-setter.h"
 #include "sv-definition/sv-other-types.h"
 #include "view/display-messages.h"
 
 /*!
-* @brief トランプ魔法独自の召喚処理を行う / Handle summoning and failure of trump spells
-* @param num summon_specific()関数を呼び出す回数
-* @param pet ペット化として召喚されるか否か
-* @param y 召喚位置のy座標
-* @param x 召喚位置のx座標
-* @param lev 召喚レベル
-* @param type 召喚条件ID
-* @param mode モンスター生成条件フラグ
-* @return モンスターが(敵対も含めて)召還されたならばTRUEを返す。
-*/
+ * @brief トランプ魔法独自の召喚処理を行う / Handle summoning and failure of trump spells
+ * @param num summon_specific()関数を呼び出す回数
+ * @param pet ペット化として召喚されるか否か
+ * @param y 召喚位置のy座標
+ * @param x 召喚位置のx座標
+ * @param lev 召喚レベル
+ * @param type 召喚条件ID
+ * @param mode モンスター生成条件フラグ
+ * @return モンスターが(敵対も含めて)召還されたならばTRUEを返す。
+ */
 bool trump_summoning(player_type *caster_ptr, int num, bool pet, POSITION y, POSITION x, DEPTH lev, summon_type type, BIT_FLAGS mode)
 {
-       /* Default level */
-       PLAYER_LEVEL plev = caster_ptr->lev;
-       if (!lev) lev = plev * 2 / 3 + randint1(plev / 2);
-
-       MONSTER_IDX who;
-       if (pet)
-       {
-               /* Become pet */
-               mode |= PM_FORCE_PET;
-
-               /* Only sometimes allow unique monster */
-               if (mode & PM_ALLOW_UNIQUE)
-               {
-                       /* Forbid often */
-                       if (randint1(50 + plev) >= plev / 10)
-                               mode &= ~PM_ALLOW_UNIQUE;
-               }
-
-               /* Player is who summons */
-               who = -1;
-       }
-       else
-       {
-               /* Prevent taming, allow unique monster */
-               mode |= PM_NO_PET;
-
-               /* Behave as if they appear by themselfs */
-               who = 0;
-       }
-
-       bool success = FALSE;
-       for (int i = 0; i < num; i++)
-       {
-               if (summon_specific(caster_ptr, who, y, x, lev, type, mode))
-                       success = TRUE;
-       }
-
-       if (!success)
-       {
-               msg_print(_("誰もあなたのカードの呼び声に答えない。", "Nobody answers to your Trump call."));
-       }
-
-       return success;
-}
+    /* Default level */
+    PLAYER_LEVEL plev = caster_ptr->lev;
+    if (!lev)
+        lev = plev * 2 / 3 + randint1(plev / 2);
+
+    MONSTER_IDX who;
+    if (pet) {
+        /* Become pet */
+        mode |= PM_FORCE_PET;
+
+        /* Only sometimes allow unique monster */
+        if (mode & PM_ALLOW_UNIQUE) {
+            /* Forbid often */
+            if (randint1(50 + plev) >= plev / 10)
+                mode &= ~PM_ALLOW_UNIQUE;
+        }
 
+        /* Player is who summons */
+        who = -1;
+    } else {
+        /* Prevent taming, allow unique monster */
+        mode |= PM_NO_PET;
+
+        /* Behave as if they appear by themselfs */
+        who = 0;
+    }
+
+    bool success = FALSE;
+    for (int i = 0; i < num; i++) {
+        if (summon_specific(caster_ptr, who, y, x, lev, type, mode))
+            success = TRUE;
+    }
+
+    if (!success) {
+        msg_print(_("誰もあなたのカードの呼び声に答えない。", "Nobody answers to your Trump call."));
+    }
+
+    return success;
+}
 
 bool cast_summon_demon(player_type *caster_ptr, int power)
 {
-       u32b flg = 0L;
-       bool pet = !one_in_(3);
-       if (pet) flg |= PM_FORCE_PET;
-       else flg |= PM_NO_PET;
-       if (!(pet && (caster_ptr->lev < 50))) flg |= PM_ALLOW_GROUP;
-
-       if (!summon_specific(caster_ptr, (pet ? -1 : 0), caster_ptr->y, caster_ptr->x, power, SUMMON_DEMON, flg))
-               return TRUE;
-
-       msg_print(_("硫黄の悪臭が充満した。", "The area fills with a stench of sulphur and brimstone."));
-       if (pet)
-       {
-               msg_print(_("「ご用でございますか、ご主人様」", "'What is thy bidding... Master?'"));
-       }
-       else
-       {
-               msg_print(_("「卑しき者よ、我は汝の下僕にあらず! お前の魂を頂くぞ!」",
-                       "'NON SERVIAM! Wretch! I shall feast on thy mortal soul!'"));
-       }
-
-       return TRUE;
+    u32b flg = 0L;
+    bool pet = !one_in_(3);
+    if (pet)
+        flg |= PM_FORCE_PET;
+    else
+        flg |= PM_NO_PET;
+    if (!(pet && (caster_ptr->lev < 50)))
+        flg |= PM_ALLOW_GROUP;
+
+    if (!summon_specific(caster_ptr, (pet ? -1 : 0), caster_ptr->y, caster_ptr->x, power, SUMMON_DEMON, flg))
+        return TRUE;
+
+    msg_print(_("硫黄の悪臭が充満した。", "The area fills with a stench of sulphur and brimstone."));
+    if (pet) {
+        msg_print(_("「ご用でございますか、ご主人様」", "'What is thy bidding... Master?'"));
+    } else {
+        msg_print(_("「卑しき者よ、我は汝の下僕にあらず! お前の魂を頂くぞ!」", "'NON SERVIAM! Wretch! I shall feast on thy mortal soul!'"));
+    }
+
+    return TRUE;
 }
 
 bool cast_summon_undead(player_type *creature_ptr, int power)
 {
-       bool pet = one_in_(3);
-       summon_type type = (creature_ptr->lev > 47 ? SUMMON_HI_UNDEAD : SUMMON_UNDEAD);
-
-       BIT_FLAGS mode = 0L;
-       if (!pet || ((creature_ptr->lev > 24) && one_in_(3))) mode |= PM_ALLOW_GROUP;
-       if (pet) mode |= PM_FORCE_PET;
-       else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
-
-       if (summon_specific(creature_ptr, (pet ? -1 : 0), creature_ptr->y, creature_ptr->x, power, type, mode))
-       {
-               msg_print(_("冷たい風があなたの周りに吹き始めた。それは腐敗臭を運んでいる...",
-                       "Cold winds begin to blow around you, carrying with them the stench of decay..."));
-               if (pet)
-                       msg_print(_("古えの死せる者共があなたに仕えるため土から甦った!",
-                               "Ancient, long-dead forms arise from the ground to serve you!"));
-               else
-                       msg_print(_("死者が甦った。眠りを妨げるあなたを罰するために!",
-                               "'The dead arise... to punish you for disturbing them!'"));
-       }
-       return TRUE;
+    bool pet = one_in_(3);
+    summon_type type = (creature_ptr->lev > 47 ? SUMMON_HI_UNDEAD : SUMMON_UNDEAD);
+
+    BIT_FLAGS mode = 0L;
+    if (!pet || ((creature_ptr->lev > 24) && one_in_(3)))
+        mode |= PM_ALLOW_GROUP;
+    if (pet)
+        mode |= PM_FORCE_PET;
+    else
+        mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
+
+    if (summon_specific(creature_ptr, (pet ? -1 : 0), creature_ptr->y, creature_ptr->x, power, type, mode)) {
+        msg_print(_("冷たい風があなたの周りに吹き始めた。それは腐敗臭を運んでいる...",
+            "Cold winds begin to blow around you, carrying with them the stench of decay..."));
+        if (pet)
+            msg_print(_("古えの死せる者共があなたに仕えるため土から甦った!", "Ancient, long-dead forms arise from the ground to serve you!"));
+        else
+            msg_print(_("死者が甦った。眠りを妨げるあなたを罰するために!", "'The dead arise... to punish you for disturbing them!'"));
+    }
+    return TRUE;
 }
 
-
 bool cast_summon_hound(player_type *creature_ptr, int power)
 {
-       BIT_FLAGS mode = PM_ALLOW_GROUP;
-       bool pet = !one_in_(5);
-       if (pet) mode |= PM_FORCE_PET;
-       else mode |= PM_NO_PET;
-
-       if (summon_specific(creature_ptr, (pet ? -1 : 0), creature_ptr->y, creature_ptr->x, power, SUMMON_HOUND, mode))
-       {
-               if (pet)
-                       msg_print(_("ハウンドがあなたの下僕として出現した。", "A group of hounds appear as your servants."));
-               else
-                       msg_print(_("ハウンドはあなたに牙を向けている!", "A group of hounds appear as your enemies!"));
-       }
-
-       return TRUE;
-}
+    BIT_FLAGS mode = PM_ALLOW_GROUP;
+    bool pet = !one_in_(5);
+    if (pet)
+        mode |= PM_FORCE_PET;
+    else
+        mode |= PM_NO_PET;
 
+    if (summon_specific(creature_ptr, (pet ? -1 : 0), creature_ptr->y, creature_ptr->x, power, SUMMON_HOUND, mode)) {
+        if (pet)
+            msg_print(_("ハウンドがあなたの下僕として出現した。", "A group of hounds appear as your servants."));
+        else
+            msg_print(_("ハウンドはあなたに牙を向けている!", "A group of hounds appear as your enemies!"));
+    }
+
+    return TRUE;
+}
 
 bool cast_summon_elemental(player_type *creature_ptr, int power)
 {
-       bool pet = one_in_(3);
-       BIT_FLAGS mode = 0L;
-       if (!(pet && (creature_ptr->lev < 50))) mode |= PM_ALLOW_GROUP;
-       if (pet) mode |= PM_FORCE_PET;
-       else mode |= PM_NO_PET;
-
-       if (summon_specific(creature_ptr, (pet ? -1 : 0), creature_ptr->y, creature_ptr->x, power, SUMMON_ELEMENTAL, mode))
-       {
-               msg_print(_("エレメンタルが現れた...", "An elemental materializes..."));
-               if (pet)
-                       msg_print(_("あなたに服従しているようだ。", "It seems obedient to you."));
-               else
-                       msg_print(_("それをコントロールできなかった!", "You fail to control it!"));
-       }
-
-       return TRUE;
-}
+    bool pet = one_in_(3);
+    BIT_FLAGS mode = 0L;
+    if (!(pet && (creature_ptr->lev < 50)))
+        mode |= PM_ALLOW_GROUP;
+    if (pet)
+        mode |= PM_FORCE_PET;
+    else
+        mode |= PM_NO_PET;
 
+    if (summon_specific(creature_ptr, (pet ? -1 : 0), creature_ptr->y, creature_ptr->x, power, SUMMON_ELEMENTAL, mode)) {
+        msg_print(_("エレメンタルが現れた...", "An elemental materializes..."));
+        if (pet)
+            msg_print(_("あなたに服従しているようだ。", "It seems obedient to you."));
+        else
+            msg_print(_("それをコントロールできなかった!", "You fail to control it!"));
+    }
+
+    return TRUE;
+}
 
 bool cast_summon_octopus(player_type *creature_ptr)
 {
-       BIT_FLAGS mode = PM_ALLOW_GROUP;
-       bool pet = !one_in_(5);
-       if (pet) mode |= PM_FORCE_PET;
-       if (summon_named_creature(creature_ptr, 0, creature_ptr->y, creature_ptr->x, MON_JIZOTAKO, mode))
-       {
-               if (pet)
-                       msg_print(_("蛸があなたの下僕として出現した。", "A group of octopuses appear as your servants."));
-               else
-                       msg_print(_("蛸はあなたを睨んでいる!", "A group of octopuses appear as your enemies!"));
-       }
-
-       return TRUE;
-}
+    BIT_FLAGS mode = PM_ALLOW_GROUP;
+    bool pet = !one_in_(5);
+    if (pet)
+        mode |= PM_FORCE_PET;
+    if (summon_named_creature(creature_ptr, 0, creature_ptr->y, creature_ptr->x, MON_JIZOTAKO, mode)) {
+        if (pet)
+            msg_print(_("蛸があなたの下僕として出現した。", "A group of octopuses appear as your servants."));
+        else
+            msg_print(_("蛸はあなたを睨んでいる!", "A group of octopuses appear as your enemies!"));
+    }
 
+    return TRUE;
+}
 
 /*!
-* @brief 悪魔領域のグレーターデーモン召喚に利用可能な死体かどうかを返す。 / An "item_tester_hook" for offer
-* @param o_ptr オブジェクト構造体の参照ポインタ
-* @return 生贄に使用可能な死体ならばTRUEを返す。
-*/
+ * @brief 悪魔領域のグレーターデーモン召喚に利用可能な死体かどうかを返す。 / An "item_tester_hook" for offer
+ * @param o_ptr オブジェクト構造体の参照ポインタ
+ * @return 生贄に使用可能な死体ならばTRUEを返す。
+ */
 bool item_tester_offer(player_type *creature_ptr, object_type *o_ptr)
 {
     /* Unused */
     (void)creature_ptr;
 
-       if (o_ptr->tval != TV_CORPSE) return FALSE;
-       if (o_ptr->sval != SV_CORPSE) return FALSE;
-       if (angband_strchr("pht", r_info[o_ptr->pval].d_char)) return TRUE;
-       return FALSE;
+    if (o_ptr->tval != TV_CORPSE)
+        return FALSE;
+    if (o_ptr->sval != SV_CORPSE)
+        return FALSE;
+    if (angband_strchr("pht", r_info[o_ptr->pval].d_char))
+        return TRUE;
+    return FALSE;
 }
 
-
 /*!
-* @brief 悪魔領域のグレーターデーモン召喚を処理する / Daemon spell Summon Greater Demon
-* @return 処理を実行したならばTRUEを返す。
-*/
+ * @brief 悪魔領域のグレーターデーモン召喚を処理する / Daemon spell Summon Greater Demon
+ * @return 処理を実行したならばTRUEを返す。
+ */
 bool cast_summon_greater_demon(player_type *caster_ptr)
 {
-       item_tester_hook = item_tester_offer;
-       concptr q = _("どの死体を捧げますか? ", "Sacrifice which corpse? ");
-       concptr s = _("捧げられる死体を持っていない。", "You have nothing to scrifice.");
-       OBJECT_IDX item;
-       object_type *o_ptr;
-       o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_NONE);
-       if (!o_ptr) return FALSE;
-
-       PLAYER_LEVEL plev = caster_ptr->lev;
-       int summon_lev = plev * 2 / 3 + r_info[o_ptr->pval].level;
-
-       if (summon_specific(caster_ptr, -1, caster_ptr->y, caster_ptr->x, summon_lev, SUMMON_HI_DEMON, (PM_ALLOW_GROUP | PM_FORCE_PET)))
-       {
-               msg_print(_("硫黄の悪臭が充満した。", "The area fills with a stench of sulphur and brimstone."));
-               msg_print(_("「ご用でございますか、ご主人様」", "'What is thy bidding... Master?'"));
-               vary_item(caster_ptr, item, -1);
-       }
-       else
-       {
-               msg_print(_("悪魔は現れなかった。", "No Greater Demon arrives."));
-       }
-
-       return TRUE;
-}
+    item_tester_hook = item_tester_offer;
+    concptr q = _("どの死体を捧げますか? ", "Sacrifice which corpse? ");
+    concptr s = _("捧げられる死体を持っていない。", "You have nothing to scrifice.");
+    OBJECT_IDX item;
+    object_type *o_ptr;
+    o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_NONE);
+    if (!o_ptr)
+        return FALSE;
 
+    PLAYER_LEVEL plev = caster_ptr->lev;
+    int summon_lev = plev * 2 / 3 + r_info[o_ptr->pval].level;
+
+    if (summon_specific(caster_ptr, -1, caster_ptr->y, caster_ptr->x, summon_lev, SUMMON_HI_DEMON, (PM_ALLOW_GROUP | PM_FORCE_PET))) {
+        msg_print(_("硫黄の悪臭が充満した。", "The area fills with a stench of sulphur and brimstone."));
+        msg_print(_("「ご用でございますか、ご主人様」", "'What is thy bidding... Master?'"));
+        vary_item(caster_ptr, item, -1);
+    } else {
+        msg_print(_("悪魔は現れなかった。", "No Greater Demon arrives."));
+    }
+
+    return TRUE;
+}
 
 /*!
  * @brief 同族召喚(援軍)処理
@@ -263,12 +254,12 @@ bool cast_summon_greater_demon(player_type *caster_ptr)
  */
 bool summon_kin_player(player_type *creature_ptr, DEPTH level, POSITION y, POSITION x, BIT_FLAGS mode)
 {
-       bool pet = (bool)(mode & PM_FORCE_PET);
-       if (!pet) mode |= PM_NO_PET;
-       return summon_specific(creature_ptr, (pet ? -1 : 0), y, x, level, SUMMON_KIN, mode);
+    bool pet = (bool)(mode & PM_FORCE_PET);
+    if (!pet)
+        mode |= PM_NO_PET;
+    return summon_specific(creature_ptr, (pet ? -1 : 0), y, x, level, SUMMON_KIN, mode);
 }
 
-
 /*!
  * @brief サイバーデーモンの召喚
  * @param player_ptr プレーヤーへの参照ポインタ
@@ -279,75 +270,74 @@ bool summon_kin_player(player_type *creature_ptr, DEPTH level, POSITION y, POSIT
  */
 int summon_cyber(player_type *creature_ptr, MONSTER_IDX who, POSITION y, POSITION x)
 {
-       /* Summoned by a monster */
-       BIT_FLAGS mode = PM_ALLOW_GROUP;
-       floor_type *floor_ptr = creature_ptr->current_floor_ptr;
-       if (who > 0)
-       {
-               monster_type *m_ptr = &floor_ptr->m_list[who];
-               if (is_pet(m_ptr)) mode |= PM_FORCE_PET;
-       }
-
-       int max_cyber = (easy_band ? 1 : (floor_ptr->dun_level / 50) + randint1(2));
-       if (max_cyber > 4) max_cyber = 4;
-
-       int count = 0;
-       for (int i = 0; i < max_cyber; i++)
-       {
-               count += summon_specific(creature_ptr, who, y, x, 100, SUMMON_CYBER, mode);
-       }
-
-       return count;
-}
+    /* Summoned by a monster */
+    BIT_FLAGS mode = PM_ALLOW_GROUP;
+    floor_type *floor_ptr = creature_ptr->current_floor_ptr;
+    if (who > 0) {
+        monster_type *m_ptr = &floor_ptr->m_list[who];
+        if (is_pet(m_ptr))
+            mode |= PM_FORCE_PET;
+    }
 
+    int max_cyber = (easy_band ? 1 : (floor_ptr->dun_level / 50) + randint1(2));
+    if (max_cyber > 4)
+        max_cyber = 4;
+
+    int count = 0;
+    for (int i = 0; i < max_cyber; i++) {
+        count += summon_specific(creature_ptr, who, y, x, 100, SUMMON_CYBER, mode);
+    }
+
+    return count;
+}
 
 void mitokohmon(player_type *kohmon_ptr)
 {
-       int count = 0;
-       concptr sukekakusan = "";
-       if (summon_named_creature(kohmon_ptr, 0, kohmon_ptr->y, kohmon_ptr->x, MON_SUKE, PM_FORCE_PET))
-       {
-               msg_print(_("『助さん』が現れた。", "Suke-san apperars."));
-               sukekakusan = "Suke-san";
-               count++;
-       }
-
-       if (summon_named_creature(kohmon_ptr, 0, kohmon_ptr->y, kohmon_ptr->x, MON_KAKU, PM_FORCE_PET))
-       {
-               msg_print(_("『格さん』が現れた。", "Kaku-san appears."));
-               sukekakusan = "Kaku-san";
-               count++;
-       }
-
-       if (!count)
-       {
-               for (int i = kohmon_ptr->current_floor_ptr->m_max - 1; i > 0; i--)
-               {
-                       monster_type *m_ptr;
-                       m_ptr = &kohmon_ptr->current_floor_ptr->m_list[i];
-                       if (!monster_is_valid(m_ptr)) continue;
-                       if (!((m_ptr->r_idx == MON_SUKE) || (m_ptr->r_idx == MON_KAKU))) continue;
-                       if (!los(kohmon_ptr, m_ptr->fy, m_ptr->fx, kohmon_ptr->y, kohmon_ptr->x)) continue;
-                       if (!projectable(kohmon_ptr, m_ptr->fy, m_ptr->fx, kohmon_ptr->y, kohmon_ptr->x)) continue;
-                       count++;
-                       break;
-               }
-       }
-
-       if (count == 0)
-       {
-               msg_print(_("しかし、何も起きなかった。", "Nothing happens."));
-               return;
-       }
-
-       msg_format(_("「者ども、ひかえおろう!!!このお方をどなたとこころえる。」",
-               "%^s says 'WHO do you think this person is! Bow your head, down to your knees!'"), sukekakusan);
-       sukekaku = TRUE;
-       stun_monsters(kohmon_ptr, 120);
-       confuse_monsters(kohmon_ptr, 120);
-       turn_monsters(kohmon_ptr, 120);
-       stasis_monsters(kohmon_ptr, 120);
-       sukekaku = FALSE;
+    int count = 0;
+    concptr sukekakusan = "";
+    if (summon_named_creature(kohmon_ptr, 0, kohmon_ptr->y, kohmon_ptr->x, MON_SUKE, PM_FORCE_PET)) {
+        msg_print(_("『助さん』が現れた。", "Suke-san apperars."));
+        sukekakusan = "Suke-san";
+        count++;
+    }
+
+    if (summon_named_creature(kohmon_ptr, 0, kohmon_ptr->y, kohmon_ptr->x, MON_KAKU, PM_FORCE_PET)) {
+        msg_print(_("『格さん』が現れた。", "Kaku-san appears."));
+        sukekakusan = "Kaku-san";
+        count++;
+    }
+
+    if (!count) {
+        for (int i = kohmon_ptr->current_floor_ptr->m_max - 1; i > 0; i--) {
+            monster_type *m_ptr;
+            m_ptr = &kohmon_ptr->current_floor_ptr->m_list[i];
+            if (!monster_is_valid(m_ptr))
+                continue;
+            if (!((m_ptr->r_idx == MON_SUKE) || (m_ptr->r_idx == MON_KAKU)))
+                continue;
+            if (!los(kohmon_ptr, m_ptr->fy, m_ptr->fx, kohmon_ptr->y, kohmon_ptr->x))
+                continue;
+            if (!projectable(kohmon_ptr, m_ptr->fy, m_ptr->fx, kohmon_ptr->y, kohmon_ptr->x))
+                continue;
+            count++;
+            break;
+        }
+    }
+
+    if (count == 0) {
+        msg_print(_("しかし、何も起きなかった。", "Nothing happens."));
+        return;
+    }
+
+    msg_format(
+        _("「者ども、ひかえおろう!!!このお方をどなたとこころえる。」", "%^s says 'WHO do you think this person is! Bow your head, down to your knees!'"),
+        sukekakusan);
+    sukekaku = TRUE;
+    stun_monsters(kohmon_ptr, 120);
+    confuse_monsters(kohmon_ptr, 120);
+    turn_monsters(kohmon_ptr, 120);
+    stasis_monsters(kohmon_ptr, 120);
+    sukekaku = FALSE;
 }
 
 /*!
index c926e13..ee72941 100644 (file)
@@ -3,12 +3,12 @@
 #include "birth/birth-body-spec.h"
 #include "birth/birth-stat.h"
 #include "core/disturbance.h"
-#include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
 #include "mutation/mutation-investor-remover.h"
 #include "player-info/avatar.h"
 #include "player/player-class.h"
index 8929117..6a4066e 100644 (file)
@@ -2,8 +2,6 @@
 #include "cmd-building/cmd-building.h"
 #include "cmd-io/cmd-save.h"
 #include "core/disturbance.h"
-#include "core/hp-mp-processor.h"
-#include "core/hp-mp-regenerator.h"
 #include "core/magic-effects-timeout-reducer.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor-events.h"
@@ -15,6 +13,8 @@
 #include "game-option/text-display-options.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
+#include "hpmp/hp-mp-processor.h"
+#include "hpmp/hp-mp-regenerator.h"
 #include "inventory/inventory-curse.h"
 #include "inventory/recharge-processor.h"
 #include "io/write-diary.h"