[Refactor] enum classの型名変更 MonkStance -> MonkStanceType

#1824にて議論されていたフォーマット統一処理。
MonkStanceをMonkStanceTypeに名称変更する。

diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp
index e85ab30..5c2726d 100644 (file)
--- a/src/hpmp/hp-mp-processor.cpp
+++ b/src/hpmp/hp-mp-processor.cpp
@@ -339,7 +339,7 @@ void process_player_hp_mp(player_type *player_ptr)
         if (player_ptr->regenerate) {
             regen_amount = regen_amount * 2;
         }
-        if (!PlayerClass(player_ptr).monk_stance_is(MonkStance::NONE) || !PlayerClass(player_ptr).samurai_stance_is(SamuraiStanceType::NONE)) {
+        if (!PlayerClass(player_ptr).monk_stance_is(MonkStanceType::NONE) || !PlayerClass(player_ptr).samurai_stance_is(SamuraiStanceType::NONE)) {
             regen_amount /= 2;
         }
         if (player_ptr->cursed.has(CurseTraitType::SLOW_REGEN)) {

diff --git a/src/load/player-attack-loader.cpp b/src/load/player-attack-loader.cpp
index e0a6081..6838f4f 100644 (file)
--- a/src/load/player-attack-loader.cpp
+++ b/src/load/player-attack-loader.cpp
@@ -22,7 +22,7 @@ void rd_special_attack(player_type *player_ptr)
 
 void rd_special_action(player_type *player_ptr)
 {
-    if (!PlayerClass(player_ptr).monk_stance_is(MonkStance::NONE)) {
+    if (!PlayerClass(player_ptr).monk_stance_is(MonkStanceType::NONE)) {
         player_ptr->action = ACTION_MONK_STANCE;
         return;
     }

diff --git a/src/load/player-class-specific-data-loader.cpp b/src/load/player-class-specific-data-loader.cpp
index c6baf73..c74b2b3 100644 (file)
--- a/src/load/player-class-specific-data-loader.cpp
+++ b/src/load/player-class-specific-data-loader.cpp
@@ -181,7 +181,7 @@ void PlayerClassSpecificDataLoader::operator()(std::shared_ptr<monk_data_type> &
         // 古いセーブファイルの修行僧のデータは magic_num には保存されていないので読み捨てる
         load_old_savfile_magic_num();
     } else {
-        monk_data->stance = i2enum<MonkStance>(rd_byte());
+        monk_data->stance = i2enum<MonkStanceType>(rd_byte());
     }
 }
 

diff --git a/src/mind/mind-monk.cpp b/src/mind/mind-monk.cpp
index 4c24bd1..36b9935 100644 (file)
--- a/src/mind/mind-monk.cpp
+++ b/src/mind/mind-monk.cpp
@@ -14,7 +14,7 @@
 #include "util/int-char-converter.h"
 #include "view/display-messages.h"
 
-static void set_stance(player_type *player_ptr, const MonkStance new_stance)
+static void set_stance(player_type *player_ptr, const MonkStanceType new_stance)
 {
     set_action(player_ptr, ACTION_MONK_STANCE);
     PlayerClass pc(player_ptr);
@@ -51,7 +51,7 @@ bool choose_monk_stance(player_type *player_ptr)
     prt("", 1, 0);
     prt(_("        どの構えをとりますか？", "        Choose Stance: "), 1, 14);
 
-    auto new_stance = MonkStance::NONE;
+    auto new_stance = MonkStanceType::NONE;
     while (true) {
         char choice = inkey();
         if (choice == ESCAPE) {
@@ -69,16 +69,16 @@ bool choose_monk_stance(player_type *player_ptr)
         }
         
         if ((choice == 'b') || (choice == 'B')) {
-            new_stance = MonkStance::GENBU;
+            new_stance = MonkStanceType::GENBU;
             break;
         } else if (((choice == 'c') || (choice == 'C')) && (player_ptr->lev > 29)) {
-            new_stance = MonkStance::BYAKKO;
+            new_stance = MonkStanceType::BYAKKO;
             break;
         } else if (((choice == 'd') || (choice == 'D')) && (player_ptr->lev > 34)) {
-            new_stance = MonkStance::SEIRYU;
+            new_stance = MonkStanceType::SEIRYU;
             break;
         } else if (((choice == 'e') || (choice == 'E')) && (player_ptr->lev > 39)) {
-            new_stance = MonkStance::SUZAKU;
+            new_stance = MonkStanceType::SUZAKU;
             break;
         }
     }

diff --git a/src/mind/monk-attack.cpp b/src/mind/monk-attack.cpp
index e84d09e..f54ee2e 100644 (file)
--- a/src/mind/monk-attack.cpp
+++ b/src/mind/monk-attack.cpp
@@ -73,13 +73,13 @@ static int calc_stun_resistance(player_attack_type *pa_ptr)
 static int calc_max_blow_selection_times(player_type *player_ptr)
 {
     PlayerClass pc(player_ptr);
-    if (pc.monk_stance_is(MonkStance::BYAKKO))
+    if (pc.monk_stance_is(MonkStanceType::BYAKKO))
         return (player_ptr->lev < 3 ? 1 : player_ptr->lev / 3);
 
-    if (pc.monk_stance_is(MonkStance::SUZAKU))
+    if (pc.monk_stance_is(MonkStanceType::SUZAKU))
         return 1;
 
-    if (pc.monk_stance_is(MonkStance::GENBU))
+    if (pc.monk_stance_is(MonkStanceType::GENBU))
         return 1;
 
     return player_ptr->lev < 7 ? 1 : player_ptr->lev / 7;
@@ -162,7 +162,7 @@ static int process_monk_additional_effect(player_attack_type *pa_ptr, int *stun_
 static WEIGHT calc_monk_attack_weight(player_type *player_ptr)
 {
     WEIGHT weight = 8;
-    if (PlayerClass(player_ptr).monk_stance_is(MonkStance::SUZAKU))
+    if (PlayerClass(player_ptr).monk_stance_is(MonkStanceType::SUZAKU))
         weight = 4;
 
     if ((player_ptr->pclass == PlayerClassType::FORCETRAINER) && (get_current_ki(player_ptr) != 0)) {

diff --git a/src/player-ability/player-constitution.cpp b/src/player-ability/player-constitution.cpp
index f7fb194..b9ccd3e 100644 (file)
--- a/src/player-ability/player-constitution.cpp
+++ b/src/player-ability/player-constitution.cpp
@@ -81,11 +81,11 @@ int16_t PlayerConstitution::stance_value()
         result += 5;
     }
 
-    if (pc.monk_stance_is(MonkStance::BYAKKO)) {
+    if (pc.monk_stance_is(MonkStanceType::BYAKKO)) {
         result -= 3;
-    } else if (pc.monk_stance_is(MonkStance::GENBU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::GENBU)) {
         result += 3;
-    } else if (pc.monk_stance_is(MonkStance::SUZAKU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::SUZAKU)) {
         result -= 2;
     }
     if (this->player_ptr->tsuyoshi) {

diff --git a/src/player-ability/player-dexterity.cpp b/src/player-ability/player-dexterity.cpp
index 5a15a0d..4048751 100644 (file)
--- a/src/player-ability/player-dexterity.cpp
+++ b/src/player-ability/player-dexterity.cpp
@@ -80,11 +80,11 @@ int16_t PlayerDexterity::stance_value()
         result += 5;
     }
 
-    if (pc.monk_stance_is(MonkStance::BYAKKO)) {
+    if (pc.monk_stance_is(MonkStanceType::BYAKKO)) {
         result += 2;
-    } else if (pc.monk_stance_is(MonkStance::GENBU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::GENBU)) {
         result -= 2;
-    } else if (pc.monk_stance_is(MonkStance::SUZAKU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::SUZAKU)) {
         result += 2;
     }
 

diff --git a/src/player-ability/player-intelligence.cpp b/src/player-ability/player-intelligence.cpp
index 1e29f77..d99a309 100644 (file)
--- a/src/player-ability/player-intelligence.cpp
+++ b/src/player-ability/player-intelligence.cpp
@@ -46,9 +46,9 @@ int16_t PlayerIntelligence::stance_value()
         result += 5;
     }
 
-    if (pc.monk_stance_is(MonkStance::GENBU)) {
+    if (pc.monk_stance_is(MonkStanceType::GENBU)) {
         result -= 1;
-    } else if (pc.monk_stance_is(MonkStance::SUZAKU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::SUZAKU)) {
         result += 1;
     }
 

diff --git a/src/player-ability/player-strength.cpp b/src/player-ability/player-strength.cpp
index 861203e..af0cdfd 100644 (file)
--- a/src/player-ability/player-strength.cpp
+++ b/src/player-ability/player-strength.cpp
@@ -89,9 +89,9 @@ int16_t PlayerStrength::stance_value()
         result += 5;
     }
 
-    if (pc.monk_stance_is(MonkStance::BYAKKO)) {
+    if (pc.monk_stance_is(MonkStanceType::BYAKKO)) {
         result += 2;
-    } else if (pc.monk_stance_is(MonkStance::SUZAKU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::SUZAKU)) {
         result -= 2;
     }
 

diff --git a/src/player-ability/player-wisdom.cpp b/src/player-ability/player-wisdom.cpp
index 9e65344..ad71dee 100644 (file)
--- a/src/player-ability/player-wisdom.cpp
+++ b/src/player-ability/player-wisdom.cpp
@@ -44,9 +44,9 @@ int16_t PlayerWisdom::stance_value()
         result += 5;
     }
 
-    if (pc.monk_stance_is(MonkStance::GENBU)) {
+    if (pc.monk_stance_is(MonkStanceType::GENBU)) {
         result -= 1;
-    } else if (pc.monk_stance_is(MonkStance::SUZAKU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::SUZAKU)) {
         result += 1;
     }
 

diff --git a/src/player-base/player-class.cpp b/src/player-base/player-class.cpp
index 8249af9..16ab938 100644 (file)
--- a/src/player-base/player-class.cpp
+++ b/src/player-base/player-class.cpp
@@ -203,13 +203,13 @@ TrFlags PlayerClass::stance_tr_flags() const
     }
 
     switch (this->get_monk_stance()) {
-    case MonkStance::GENBU:
+    case MonkStanceType::GENBU:
         flags.set(TR_REFLECT);
         break;
-    case MonkStance::SUZAKU:
+    case MonkStanceType::SUZAKU:
         flags.set(TR_LEVITATION);
         break;
-    case MonkStance::SEIRYU:
+    case MonkStanceType::SEIRYU:
         flags.set({ TR_RES_ACID, TR_RES_ELEC, TR_RES_FIRE, TR_RES_COLD, TR_RES_POIS });
         flags.set({ TR_SH_FIRE, TR_SH_ELEC, TR_SH_COLD });
         flags.set(TR_LEVITATION);
@@ -302,22 +302,22 @@ void PlayerClass::set_samurai_stance(SamuraiStanceType stance) const
     samurai_data->stance = stance;
 }
 
-MonkStance PlayerClass::get_monk_stance() const
+MonkStanceType PlayerClass::get_monk_stance() const
 {
     auto monk_data = this->get_specific_data<monk_data_type>();
     if (!monk_data) {
-        return MonkStance::NONE;
+        return MonkStanceType::NONE;
     }
 
     return monk_data->stance;
 }
 
-bool PlayerClass::monk_stance_is(MonkStance stance) const
+bool PlayerClass::monk_stance_is(MonkStanceType stance) const
 {
     return this->get_monk_stance() == stance;
 }
 
-void PlayerClass::set_monk_stance(MonkStance stance) const
+void PlayerClass::set_monk_stance(MonkStanceType stance) const
 {
     auto monk_data = this->get_specific_data<monk_data_type>();
     if (!monk_data) {

diff --git a/src/player-base/player-class.h b/src/player-base/player-class.h
index 3b85ff3..18261e6 100644 (file)
--- a/src/player-base/player-class.h
+++ b/src/player-base/player-class.h
@@ -10,7 +10,7 @@
 #include <variant>
 
 enum class SamuraiStanceType : uint8_t;
-enum class MonkStance : uint8_t;
+enum class MonkStanceType : uint8_t;
 
 class PlayerClass {
 public:
@@ -29,9 +29,9 @@ public:
     bool samurai_stance_is(SamuraiStanceType stance) const;
     void set_samurai_stance(SamuraiStanceType stance) const;
 
-    MonkStance get_monk_stance() const;
-    bool monk_stance_is(MonkStance stance) const;
-    void set_monk_stance(MonkStance stance) const;
+    MonkStanceType get_monk_stance() const;
+    bool monk_stance_is(MonkStanceType stance) const;
+    void set_monk_stance(MonkStanceType stance) const;
 
     void init_specific_data();
     template <typename T>

diff --git a/src/player-info/monk-data-type.h b/src/player-info/monk-data-type.h
index 2896fa9..2a7be8f 100644 (file)
--- a/src/player-info/monk-data-type.h
+++ b/src/player-info/monk-data-type.h
@@ -2,7 +2,7 @@
 
 #include "system/angband.h"
 
-enum class MonkStance : uint8_t {
+enum class MonkStanceType : uint8_t {
     NONE = 0,
     GENBU = 1, //!< 玄武の構え
     BYAKKO = 2, //!< 白虎の構え
@@ -11,5 +11,5 @@ enum class MonkStance : uint8_t {
 };
 
 struct monk_data_type {
-    MonkStance stance{};
+    MonkStanceType stance{};
 };

diff --git a/src/player-status/player-speed.cpp b/src/player-status/player-speed.cpp
index c58b691..bd859e3 100644 (file)
--- a/src/player-status/player-speed.cpp
+++ b/src/player-status/player-speed.cpp
@@ -201,7 +201,7 @@ int16_t PlayerSpeed::time_effect_value()
 int16_t PlayerSpeed::stance_value()
 {
     int16_t result = 0;
-    if (PlayerClass(player_ptr).monk_stance_is(MonkStance::SUZAKU))
+    if (PlayerClass(player_ptr).monk_stance_is(MonkStanceType::SUZAKU))
         result += 10;
     return result;
 }

diff --git a/src/player/digestion-processor.cpp b/src/player/digestion-processor.cpp
index c0d3339..b30095e 100644 (file)
--- a/src/player/digestion-processor.cpp
+++ b/src/player/digestion-processor.cpp
@@ -37,7 +37,7 @@ void starve_player(player_type *player_ptr)
         if (player_ptr->regenerate)
             digestion += 20;
         PlayerClass pc(player_ptr);
-        if (!pc.monk_stance_is(MonkStance::NONE) || !pc.samurai_stance_is(SamuraiStanceType::NONE))
+        if (!pc.monk_stance_is(MonkStanceType::NONE) || !pc.samurai_stance_is(SamuraiStanceType::NONE))
             digestion += 20;
         if (player_ptr->cursed.has(CurseTraitType::FAST_DIGEST))
             digestion += 30;

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 56974f4..9345ee1 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -313,7 +313,7 @@ static void update_bonuses(player_type *player_ptr)
 
     player_ptr->lite = has_lite(player_ptr);
 
-    if (!PlayerClass(player_ptr).monk_stance_is(MonkStance::NONE)) {
+    if (!PlayerClass(player_ptr).monk_stance_is(MonkStanceType::NONE)) {
         if (none_bits(empty_hands_status, EMPTY_HAND_MAIN)) {
             set_action(player_ptr, ACTION_NONE);
         }
@@ -1475,13 +1475,13 @@ static int16_t calc_num_blow(player_type *player_ptr, int i)
             num_blow /= 2;
 
         PlayerClass pc(player_ptr);
-        if (pc.monk_stance_is(MonkStance::GENBU)) {
+        if (pc.monk_stance_is(MonkStanceType::GENBU)) {
             num_blow -= 2;
             if ((player_ptr->pclass == PlayerClassType::MONK) && (player_ptr->lev > 42))
                 num_blow--;
             if (num_blow < 0)
                 num_blow = 0;
-        } else if (pc.monk_stance_is(MonkStance::SUZAKU)) {
+        } else if (pc.monk_stance_is(MonkStanceType::SUZAKU)) {
             num_blow /= 2;
         }
 
@@ -1686,11 +1686,11 @@ static ARMOUR_CLASS calc_to_ac(player_type *player_ptr, bool is_real_value)
     }
 
     PlayerClass pc(player_ptr);
-    if (pc.monk_stance_is(MonkStance::GENBU)) {
+    if (pc.monk_stance_is(MonkStanceType::GENBU)) {
         ac += (player_ptr->lev * player_ptr->lev) / 50;
-    } else if (pc.monk_stance_is(MonkStance::BYAKKO)) {
+    } else if (pc.monk_stance_is(MonkStanceType::BYAKKO)) {
         ac -= 40;
-    } else if (pc.monk_stance_is(MonkStance::SEIRYU)) {
+    } else if (pc.monk_stance_is(MonkStanceType::SEIRYU)) {
         ac -= 50;
     } else if (pc.samurai_stance_is(SamuraiStanceType::KOUKIJIN)) {
         ac -= 50;
@@ -2033,7 +2033,7 @@ static short calc_to_damage(player_type *player_ptr, INVENTORY_IDX slot, bool is
     }
 
     // 朱雀の構えをとっているとき、格闘ダメージに -(レベル)/6 の修正を得る。
-    if (PlayerClass(player_ptr).monk_stance_is(MonkStance::SUZAKU)) {
+    if (PlayerClass(player_ptr).monk_stance_is(MonkStanceType::SUZAKU)) {
         if (is_martial_arts_mode(player_ptr) && calc_hand == PLAYER_HAND_MAIN) {
             damage -= (player_ptr->lev / 6);
         }
@@ -2256,7 +2256,7 @@ static short calc_to_hit(player_type *player_ptr, INVENTORY_IDX slot, bool is_re
     hit -= calc_double_weapon_penalty(player_ptr, slot);
 
     // 朱雀の構えをとっているとき、格闘命中に -(レベル)/3 の修正を得る。
-    if (PlayerClass(player_ptr).monk_stance_is(MonkStance::SUZAKU)) {
+    if (PlayerClass(player_ptr).monk_stance_is(MonkStanceType::SUZAKU)) {
         if (is_martial_arts_mode(player_ptr) && calc_hand == PLAYER_HAND_MAIN) {
             hit -= (player_ptr->lev / 3);
         }

diff --git a/src/status/action-setter.cpp b/src/status/action-setter.cpp
index 8348163..4b5b899 100644 (file)
--- a/src/status/action-setter.cpp
+++ b/src/status/action-setter.cpp
@@ -57,7 +57,7 @@ void set_action(player_type *player_ptr, uint8_t typ)
     }
     case ACTION_MONK_STANCE: {
         msg_print(_("構えをといた。", "You stop assuming the special stance."));
-        PlayerClass(player_ptr).set_monk_stance(MonkStance::NONE);
+        PlayerClass(player_ptr).set_monk_stance(MonkStanceType::NONE);
         break;
     }
     case ACTION_SAMURAI_STANCE: {

diff --git a/src/status/bad-status-setter.cpp b/src/status/bad-status-setter.cpp
index 97aa941..342c8da 100644 (file)
--- a/src/status/bad-status-setter.cpp
+++ b/src/status/bad-status-setter.cpp
@@ -120,7 +120,7 @@ bool BadStatusSetter::confusion(const TIME_EFFECT tmp_v)
             }
             if (this->player_ptr->action == ACTION_MONK_STANCE) {
                 msg_print(_("構えがとけた。", "You lose your stance."));
-                PlayerClass(player_ptr).set_monk_stance(MonkStance::NONE);
+                PlayerClass(player_ptr).set_monk_stance(MonkStanceType::NONE);
                 this->player_ptr->update |= PU_BONUS;
                 this->player_ptr->redraw |= PR_STATE;
                 this->player_ptr->action = ACTION_NONE;

diff --git a/src/view/display-player-middle.cpp b/src/view/display-player-middle.cpp
index 6c104da..998d9b4 100644 (file)
--- a/src/view/display-player-middle.cpp
+++ b/src/view/display-player-middle.cpp
@@ -72,7 +72,7 @@ static void display_sub_hand(player_type *player_ptr)
         return;
 
     PlayerClass pc(player_ptr);
-    if (pc.monk_stance_is(MonkStance::NONE)) {
+    if (pc.monk_stance_is(MonkStanceType::NONE)) {
         display_player_one_line(ENTRY_POSTURE, _("構えなし", "none"), TERM_YELLOW);
         return;
     }

diff --git a/src/view/status-first-page.cpp b/src/view/status-first-page.cpp
index df3364e..832690f 100644 (file)
--- a/src/view/status-first-page.cpp
+++ b/src/view/status-first-page.cpp
@@ -83,9 +83,9 @@ static bool calc_weapon_damage_limit(player_type *player_ptr, int hand, int *dam
     if (player_ptr->pclass == PlayerClassType::FORCETRAINER)
         level = std::max<short>(1, level - 3);
     PlayerClass pc(player_ptr);
-    if (pc.monk_stance_is(MonkStance::BYAKKO))
+    if (pc.monk_stance_is(MonkStanceType::BYAKKO))
         *basedam = monk_ave_damage[level][1];
-    else if (pc.monk_stance_is(MonkStance::GENBU) || pc.monk_stance_is(MonkStance::SUZAKU))
+    else if (pc.monk_stance_is(MonkStanceType::GENBU) || pc.monk_stance_is(MonkStanceType::SUZAKU))
         *basedam = monk_ave_damage[level][2];
     else
         *basedam = monk_ave_damage[level][0];

diff --git a/src/window/main-window-stat-poster.cpp b/src/window/main-window-stat-poster.cpp
index dc7c4a8..e5d14a6 100644 (file)
--- a/src/window/main-window-stat-poster.cpp
+++ b/src/window/main-window-stat-poster.cpp
@@ -191,18 +191,18 @@ void print_state(player_type *player_ptr)
     }
     case ACTION_MONK_STANCE: {
         if (auto stance = PlayerClass(player_ptr).get_monk_stance();
-            stance != MonkStance::NONE) {
+            stance != MonkStanceType::NONE) {
             switch (stance) {
-            case MonkStance::GENBU:
+            case MonkStanceType::GENBU:
                 attr = TERM_GREEN;
                 break;
-            case MonkStance::BYAKKO:
+            case MonkStanceType::BYAKKO:
                 attr = TERM_WHITE;
                 break;
-            case MonkStance::SEIRYU:
+            case MonkStanceType::SEIRYU:
                 attr = TERM_L_BLUE;
                 break;
-            case MonkStance::SUZAKU:
+            case MonkStanceType::SUZAKU:
                 attr = TERM_L_RED;
                 break;
             default: