X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Feffect%2Feffect-monster-spirit.cpp;h=b581dffde0220d58baf0667318e4d57afc37b2e5;hb=91d4519e2312ace0f5342efb8a5421222aa51d2d;hp=84913423c07656544cb49e254b4a963c27e940aa;hpb=092f3d35536b364877cde34794dcb146436c49aa;p=hengbandforosx%2Fhengbandosx.git

diff --git a/src/effect/effect-monster-spirit.cpp b/src/effect/effect-monster-spirit.cpp
index 84913423c..b581dffde 100644
--- a/src/effect/effect-monster-spirit.cpp
+++ b/src/effect/effect-monster-spirit.cpp
@@ -1,160 +1,147 @@
 #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 "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/grid-type-definition.h"
+#include "system/monster-race-definition.h"
+#include "system/monster-type-definition.h"
+#include "system/player-type-definition.h"
 #include "view/display-messages.h"
 
-process_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)
+process_result effect_monster_drain_mana(PlayerType *player_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(player_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 (player_ptr->health_who == em_ptr->who)
+        player_ptr->redraw |= (PR_HEALTH);
+
+    if (player_ptr->riding == em_ptr->who)
+        player_ptr->redraw |= (PR_UHEALTH);
+
+    if (em_ptr->see_s_msg) {
+        monster_desc(player_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)
+process_result effect_monster_mind_blast(PlayerType *player_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(player_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(player_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(player_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)
+process_result effect_monster_brain_smash(PlayerType *player_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(player_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(player_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(player_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(player_ptr, em_ptr->g_ptr->m_idx, monster_slow_remaining(em_ptr->m_ptr) + 10);
+    }
+
+    return PROCESS_CONTINUE;
 }