[Refactor] #1599 Defined mod_afraidness() and replaced the calls

diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index e97726e..d0aa20f 100644 (file)
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -68,7 +68,7 @@ bool exe_eat_food_type_object(player_type *player_ptr, object_type *o_ptr)
     case SV_FOOD_BLINDNESS:
         return !has_resist_blind(player_ptr) && bss.mod_blindness(randint0(200) + 200);
     case SV_FOOD_PARANOIA:
-        return !has_resist_fear(player_ptr) && bss.afraidness(player_ptr->afraid + randint0(10) + 10);
+        return !has_resist_fear(player_ptr) && bss.mod_afraidness(randint0(10) + 10);
     case SV_FOOD_CONFUSION:
         return !has_resist_conf(player_ptr) && bss.mod_confusion(randint0(10) + 10);
     case SV_FOOD_HALLUCINATION:

diff --git a/src/core/magic-effects-timeout-reducer.cpp b/src/core/magic-effects-timeout-reducer.cpp
index d8b0484..1728751 100644 (file)
--- a/src/core/magic-effects-timeout-reducer.cpp
+++ b/src/core/magic-effects-timeout-reducer.cpp
@@ -135,7 +135,7 @@ void reduce_magic_effects_timeout(player_type *player_ptr)
     }
 
     if (player_ptr->afraid) {
-        (void)bss.afraidness(player_ptr->afraid - dec_count);
+        (void)bss.mod_afraidness(-dec_count);
     }
 
     if (player_ptr->fast) {

diff --git a/src/effect/effect-monster-charm.cpp b/src/effect/effect-monster-charm.cpp
index 851b7cb..7660e4d 100644 (file)
--- a/src/effect/effect-monster-charm.cpp
+++ b/src/effect/effect-monster-charm.cpp
@@ -226,7 +226,7 @@ static void effect_monster_domination_corrupted_addition(player_type *player_ptr
         if (any_bits(em_ptr->r_ptr->flags3, RF3_NO_FEAR)) {
             em_ptr->note = _("には効果がなかった。", " is unaffected.");
         } else {
-            (void)bss.afraidness(player_ptr->afraid + em_ptr->dam);
+            (void)bss.mod_afraidness(em_ptr->dam);
         }
 
         return;

diff --git a/src/effect/effect-monster-psi.cpp b/src/effect/effect-monster-psi.cpp
index c4f67fe..f32b926 100644 (file)
--- a/src/effect/effect-monster-psi.cpp
+++ b/src/effect/effect-monster-psi.cpp
@@ -113,7 +113,7 @@ static void effect_monster_psi_reflect_extra_effect(player_type *player_ptr, eff
         if (any_bits(em_ptr->r_ptr->flags3, RF3_NO_FEAR)) {
             em_ptr->note = _("には効果がなかった。", " is unaffected.");
         } else {
-            (void)bss.afraidness(player_ptr->afraid + 3 + randint1(em_ptr->dam));
+            (void)bss.mod_afraidness(3 + randint1(em_ptr->dam));
         }
 
         return;

diff --git a/src/effect/effect-player-resist-hurt.cpp b/src/effect/effect-player-resist-hurt.cpp
index 5f0f5e8..77169e3 100644 (file)
--- a/src/effect/effect-player-resist-hurt.cpp
+++ b/src/effect/effect-player-resist-hurt.cpp
@@ -691,6 +691,6 @@ void effect_player_abyss(player_type *player_ptr, effect_player_type *ep_ptr)
     }
 
     if (!has_resist_fear(player_ptr)) {
-        (void)bss.afraidness(player_ptr->afraid + randint1(10));
+        (void)bss.mod_afraidness(randint1(10));
     }
 }

diff --git a/src/inventory/inventory-curse.cpp b/src/inventory/inventory-curse.cpp
index 6ccf85f..01d73ae 100644 (file)
--- a/src/inventory/inventory-curse.cpp
+++ b/src/inventory/inventory-curse.cpp
@@ -317,7 +317,7 @@ static void curse_cowardice(player_type *player_ptr)
 
     disturb(player_ptr, false, true);
     msg_print(_("とても暗い... とても恐い！", "It's so dark... so scary!"));
-    (void)BadStatusSetter(player_ptr).afraidness(player_ptr->afraid + 13 + randint1(26));
+    (void)BadStatusSetter(player_ptr).mod_afraidness(13 + randint1(26));
 }
 
 /*!

diff --git a/src/monster-attack/monster-attack-status.cpp b/src/monster-attack/monster-attack-status.cpp
index 8ce2939..671fb81 100644 (file)
--- a/src/monster-attack/monster-attack-status.cpp
+++ b/src/monster-attack/monster-attack-status.cpp
@@ -65,7 +65,7 @@ void process_terrify_attack(player_type *player_ptr, monap_type *monap_ptr)
         return;
     }
 
-    if (BadStatusSetter(player_ptr).afraidness(player_ptr->afraid + 3 + randint1(monap_ptr->rlev))) {
+    if (BadStatusSetter(player_ptr).mod_afraidness(3 + randint1(monap_ptr->rlev))) {
         monap_ptr->obvious = true;
     }
 }

diff --git a/src/mspell/mspell-status.cpp b/src/mspell/mspell-status.cpp
index d5e321b..669841d 100644 (file)
--- a/src/mspell/mspell-status.cpp
+++ b/src/mspell/mspell-status.cpp
@@ -240,7 +240,7 @@ MonsterSpellResult spell_RF5_SCARE(MONSTER_IDX m_idx, player_type *player_ptr, M
             _("しかし恐怖に侵されなかった。", "You refuse to be frightened."), resist, saving_throw, TARGET_TYPE);
 
         if (!resist && !saving_throw) {
-            (void)BadStatusSetter(player_ptr).afraidness(player_ptr->afraid + randint0(4) + 4);
+            (void)BadStatusSetter(player_ptr).mod_afraidness(randint0(4) + 4);
         }
 
         update_smart_learn(player_ptr, m_idx, DRS_FEAR);

diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp
index c066d30..24247ce 100644 (file)
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -131,7 +131,7 @@ void process_world_aux_mutation(player_type *player_ptr)
         if (!has_resist_fear(player_ptr)) {
             disturb(player_ptr, false, true);
             msg_print(_("とても暗い... とても恐い！", "It's so dark... so scary!"));
-            (void)bss.afraidness(player_ptr->afraid + 13 + randint1(26));
+            (void)bss.mod_afraidness(13 + randint1(26));
         }
     }
 

diff --git a/src/spell/spells-summon.cpp b/src/spell/spells-summon.cpp
index e2f3447..6c8ca5a 100644 (file)
--- a/src/spell/spells-summon.cpp
+++ b/src/spell/spells-summon.cpp
@@ -456,7 +456,7 @@ void cast_invoke_spirits(player_type *player_ptr, DIRECTION dir)
         chg_virtue(player_ptr, V_UNLIFE, 1);
     } else if (die < 14) {
         msg_print(_("名状し難い邪悪な存在があなたの心を通り過ぎて行った...", "An unnamable evil brushes against your mind..."));
-        (void)bss.afraidness(player_ptr->afraid + randint1(4) + 4);
+        (void)bss.mod_afraidness(randint1(4) + 4);
     } else if (die < 26) {
         msg_print(_("あなたの頭に大量の幽霊たちの騒々しい声が押し寄せてきた...", "Your head is invaded by a horde of gibbering spectral voices..."));
         (void)bss.mod_confusion(randint1(4) + 4);

diff --git a/src/status/bad-status-setter.cpp b/src/status/bad-status-setter.cpp
index 35c534d..562ddce 100644 (file)
--- a/src/status/bad-status-setter.cpp
+++ b/src/status/bad-status-setter.cpp
@@ -266,6 +266,11 @@ bool BadStatusSetter::afraidness(const TIME_EFFECT tmp_v)
     return true;
 }
 
+bool BadStatusSetter::mod_afraidness(const TIME_EFFECT tmp_v)
+{
+    return this->afraidness(this->player_ptr->afraid + tmp_v);
+}
+
 /*!
  * @brief 麻痺の継続時間をセットする / Set "paralyzed", notice observable changes
  * @param v 継続時間

diff --git a/src/status/bad-status-setter.h b/src/status/bad-status-setter.h
index 885528e..89f96d6 100644 (file)
--- a/src/status/bad-status-setter.h
+++ b/src/status/bad-status-setter.h
@@ -21,6 +21,7 @@ public:
     bool poison(const TIME_EFFECT tmp_v);
     bool mod_poison(const TIME_EFFECT tmp_v);
     bool afraidness(const TIME_EFFECT tmp_v);
+    bool mod_afraidness(const TIME_EFFECT tmp_v);
     bool paralysis(const TIME_EFFECT tmp_v);
     bool hallucination(const TIME_EFFECT tmp_v);
     bool slowness(const TIME_EFFECT tmp_v, bool do_dec);