From: deskull <deskull@users.sourceforge.jp>
Date: Wed, 12 Aug 2020 07:59:12 +0000 (+0900)
Subject: [Refactor] #40514 set_personality_flags() 整理の上削除． have_good_luck() を追加． / Deleted... 
X-Git-Tag: vmacos3.0.0-alpha52~687
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=50ad3428cd44e6bdf8c2611e912bdacab1e30d7a;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #40514 set_personality_flags() 整理の上削除． have_good_luck() を追加． / Deleted after organizing set_personality_flags(). Add have_good_luck().
---

diff --git a/src/cmd-io/cmd-dump.c b/src/cmd-io/cmd-dump.c
index cbfdd1e06..ef52078e9 100644
--- a/src/cmd-io/cmd-dump.c
+++ b/src/cmd-io/cmd-dump.c
@@ -35,6 +35,7 @@
 #include "view/display-messages.h"
 #include "view/display-player.h" // 暫定。後で消す.
 #include "world/world.h"
+#include "player/player-status-flags.h"
 
 /*!
  * @brief 画面を再描画するコマンドのメインルーチン
@@ -234,7 +235,7 @@ void do_cmd_feeling(player_type *creature_ptr)
 		return;
 	}
 
-	if (creature_ptr->muta3 & MUT3_GOOD_LUCK)
+	if (have_good_luck(creature_ptr))
 		msg_print(do_cmd_feeling_text_lucky[creature_ptr->feeling]);
 	else if (is_echizen(creature_ptr))
 		msg_print(do_cmd_feeling_text_combat[creature_ptr->feeling]);
diff --git a/src/io/mutations-dump.c b/src/io/mutations-dump.c
index 736390ad1..a3c98560b 100644
--- a/src/io/mutations-dump.c
+++ b/src/io/mutations-dump.c
@@ -6,6 +6,7 @@
 
 #include "io/mutations-dump.h"
 #include "mutation/mutation-flag-types.h"
+#include "player/player-status-flags.h"
 
 /*!
  * @brief ファイルポインタを通じて突然変異の一覧を出力する
@@ -304,7 +305,7 @@ void dump_mutations(player_type *creature_ptr, FILE *out_file)
         if (creature_ptr->muta3 & MUT3_MOTION)
             fprintf(out_file, _(" あなたの動作は正確で力強い。(隠密+1)\n", " Your movements are precise and forceful (+1 STL).\n"));
 
-        if (creature_ptr->muta3 & MUT3_GOOD_LUCK)
+        if (have_good_luck(creature_ptr))
             fprintf(out_file, _(" あなたは白いオーラにつつまれている。\n", " There is a white aura surrounding you.\n"));
 
         if (creature_ptr->muta3 & MUT3_BAD_LUCK)
diff --git a/src/object-enchant/apply-magic.c b/src/object-enchant/apply-magic.c
index 96fd49cdb..71b1c78c0 100644
--- a/src/object-enchant/apply-magic.c
+++ b/src/object-enchant/apply-magic.c
@@ -32,6 +32,8 @@
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "world/world.h"
+#include "player/player-status-flags.h"
+
 
 /*!
  * @brief 生成されたベースアイテムに魔法的な強化を与えるメインルーチン
@@ -59,7 +61,7 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
     if ((owner_ptr->pseikaku != PERSONALITY_MUNCHKIN) && (f2 > d_info[owner_ptr->dungeon_idx].obj_great))
         f2 = d_info[owner_ptr->dungeon_idx].obj_great;
 
-    if (owner_ptr->muta3 & MUT3_GOOD_LUCK) {
+    if (have_good_luck(owner_ptr)) {
         f1 += 5;
         f2 += 2;
     } else if (owner_ptr->muta3 & MUT3_BAD_LUCK) {
@@ -100,7 +102,7 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
     for (int i = 0; i < rolls; i++) {
         if (make_artifact(owner_ptr, o_ptr))
             break;
-        if ((owner_ptr->muta3 & MUT3_GOOD_LUCK) && one_in_(77)) {
+        if (have_good_luck(owner_ptr) && one_in_(77)) {
             if (make_artifact(owner_ptr, o_ptr))
                 break;
         }
diff --git a/src/perception/simple-perception.c b/src/perception/simple-perception.c
index b26c94776..cd16e8666 100644
--- a/src/perception/simple-perception.c
+++ b/src/perception/simple-perception.c
@@ -24,6 +24,7 @@
 #include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "view/display-messages.h"
+#include "player/player-status-flags.h"
 
 /*!
  * @brief 擬似鑑定を実際に行い判定を反映する
@@ -279,7 +280,7 @@ void sense_inventory1(player_type *creature_ptr)
         if ((i < INVEN_RARM) && (0 != randint0(5)))
             continue;
 
-        if ((creature_ptr->muta3 & MUT3_GOOD_LUCK) && !randint0(13)) {
+        if (have_good_luck(creature_ptr) && !randint0(13)) {
             heavy = TRUE;
         }
 
diff --git a/src/player/player-personality.c b/src/player/player-personality.c
index e2fb27109..eee3349da 100644
--- a/src/player/player-personality.c
+++ b/src/player/player-personality.c
@@ -141,9 +141,3 @@ const player_personality personality_info[MAX_PERSONALITIES] =
 };
 
 const player_personality *ap_ptr;
-
-void set_personality_flags(player_type *creature_ptr)
-{
-    if (creature_ptr->pseikaku == PERSONALITY_LUCKY)
-        creature_ptr->muta3 |= MUT3_GOOD_LUCK;
-}
diff --git a/src/player/player-personality.h b/src/player/player-personality.h
index 0b3f64ece..32ea57945 100644
--- a/src/player/player-personality.h
+++ b/src/player/player-personality.h
@@ -29,5 +29,3 @@ typedef struct player_personality {
 
 extern const player_personality personality_info[MAX_PERSONALITIES];
 extern const player_personality *ap_ptr;
-
-extern void set_personality_flags(player_type *creature_ptr);
diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index 23a6d2fc8..a3f1f6ff3 100644
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -2185,3 +2185,5 @@ bool is_not_monk_weapon(player_type *creature_ptr, int i)
     OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval;
     return (creature_ptr->pclass == CLASS_MONK) || (creature_ptr->pclass == CLASS_FORCETRAINER) && (!s_info[creature_ptr->pclass].w_max[tval][sval]);
 }
+
+bool have_good_luck(player_type *creature_ptr) { return (creature_ptr->pseikaku == PERSONALITY_LUCKY) || (creature_ptr->muta3 |= MUT3_GOOD_LUCK); };
diff --git a/src/player/player-status-flags.h b/src/player/player-status-flags.h
index 4c1598180..72aaf9f94 100644
--- a/src/player/player-status-flags.h
+++ b/src/player/player-status-flags.h
@@ -79,5 +79,4 @@ bool is_disable_two_handed_bonus(player_type *creature_ptr, int i);
 bool is_not_ninja_weapon(player_type *creature_ptr, int i);
 bool is_not_monk_weapon(player_type *creature_ptr, int i);
 void is_icky_wield_weapon(player_type *creature_ptr, int i);
-
-
+bool have_good_luck(player_type *creature_ptr);
diff --git a/src/player/player-status.c b/src/player/player-status.c
index 7ebd00be0..9f8aaa25d 100644
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -717,7 +717,6 @@ void calc_bonuses(player_type *creature_ptr)
     }
 
     calc_class_status(creature_ptr);
-    set_personality_flags(creature_ptr);
     calc_equipment_status(creature_ptr);
 
     if (old_mighty_throw != creature_ptr->mighty_throw) {
diff --git a/src/player/selfinfo.c b/src/player/selfinfo.c
index 13af77610..fffb95b70 100644
--- a/src/player/selfinfo.c
+++ b/src/player/selfinfo.c
@@ -31,6 +31,7 @@
 #include "status/element-resistance.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"
+#include "player/player-status-flags.h"
 
 /*!
  * @brief 自己分析処理(Nethackからのアイデア) / self-knowledge... idea from nethack.
@@ -755,7 +756,7 @@ void self_knowledge(player_type *creature_ptr)
         if (creature_ptr->muta3 & MUT3_MOTION) {
             info[i++] = _("あなたの動作は正確で力強い。(隠密+1)", "Your movements are precise and forceful (+1 STL).");
         }
-        if (creature_ptr->muta3 & MUT3_GOOD_LUCK) {
+        if (have_good_luck(creature_ptr)) {
             info[i++] = _("あなたは白いオーラにつつまれている。", "There is a white aura surrounding you.");
         }
         if (creature_ptr->muta3 & MUT3_BAD_LUCK) {