[Refactor] ソースコード内BattleForm表記をStance表記に統一

表記ブレの解決。renameのみで動作変更なし。

diff --git a/src/player-ability/player-charisma.cpp b/src/player-ability/player-charisma.cpp
index 7323f54..57275cc 100644 (file)
--- a/src/player-ability/player-charisma.cpp
+++ b/src/player-ability/player-charisma.cpp
@@ -34,7 +34,7 @@ void PlayerCharisma::set_locals()
  * * 型による魅力修正値
  * * 降鬼陣で加算(+5)
  */
-int16_t PlayerCharisma::battleform_value()
+int16_t PlayerCharisma::stance_value()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-charisma.h b/src/player-ability/player-charisma.h
index 72df0c4..0e85028 100644 (file)
--- a/src/player-ability/player-charisma.h
+++ b/src/player-ability/player-charisma.h
@@ -12,7 +12,7 @@ public:
 
 protected:
     void set_locals() override;
-    int16_t battleform_value() override;
+    int16_t stance_value() override;
     int16_t mutation_value() override;
     int16_t set_exception_value(int16_t value) override;
     int16_t set_exception_use_status(int16_t value) override;

diff --git a/src/player-ability/player-constitution.cpp b/src/player-ability/player-constitution.cpp
index e963579..8e027bf 100644 (file)
--- a/src/player-ability/player-constitution.cpp
+++ b/src/player-ability/player-constitution.cpp
@@ -72,7 +72,7 @@ int16_t PlayerConstitution::time_effect_value()
  * * 朱雀の構えで減算(-2)
  * * ネオ・つよしスペシャル中で加算(+4)
  */
-int16_t PlayerConstitution::battleform_value()
+int16_t PlayerConstitution::stance_value()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-constitution.h b/src/player-ability/player-constitution.h
index 580e4ed..2ccf63c 100644 (file)
--- a/src/player-ability/player-constitution.h
+++ b/src/player-ability/player-constitution.h
@@ -11,6 +11,6 @@ protected:
     void set_locals() override;
     int16_t race_value() override;
     int16_t time_effect_value() override;
-    int16_t battleform_value() override;
+    int16_t stance_value() override;
     int16_t mutation_value() override;
 };

diff --git a/src/player-ability/player-dexterity.cpp b/src/player-ability/player-dexterity.cpp
index ecb381f..f206df8 100644 (file)
--- a/src/player-ability/player-dexterity.cpp
+++ b/src/player-ability/player-dexterity.cpp
@@ -71,7 +71,7 @@ int16_t PlayerDexterity::time_effect_value()
  * * 玄武の構えで減算(-2)
  * * 朱雀の構えで加算(+2)
  */
-int16_t PlayerDexterity::battleform_value()
+int16_t PlayerDexterity::stance_value()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-dexterity.h b/src/player-ability/player-dexterity.h
index 31ea1ac..c109841 100644 (file)
--- a/src/player-ability/player-dexterity.h
+++ b/src/player-ability/player-dexterity.h
@@ -11,6 +11,6 @@ protected:
     void set_locals() override;
     int16_t race_value() override;
     int16_t time_effect_value() override;
-    int16_t battleform_value() override;
+    int16_t stance_value() override;
     int16_t mutation_value() override;
 };

diff --git a/src/player-ability/player-intelligence.cpp b/src/player-ability/player-intelligence.cpp
index 7d35e35..96c0f9c 100644 (file)
--- a/src/player-ability/player-intelligence.cpp
+++ b/src/player-ability/player-intelligence.cpp
@@ -37,7 +37,7 @@ void PlayerIntelligence::set_locals()
  * * 玄武の構えで減算(-1)
  * * 朱雀の構えで加算(+1)
  */
-int16_t PlayerIntelligence::battleform_value()
+int16_t PlayerIntelligence::stance_value()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-intelligence.h b/src/player-ability/player-intelligence.h
index 0873444..a250886 100644 (file)
--- a/src/player-ability/player-intelligence.h
+++ b/src/player-ability/player-intelligence.h
@@ -9,6 +9,6 @@ public:
 
 protected:
     void set_locals() override;
-    int16_t battleform_value() override;
+    int16_t stance_value() override;
     int16_t mutation_value() override;
 };

diff --git a/src/player-ability/player-strength.cpp b/src/player-ability/player-strength.cpp
index caa2cea..199a4d2 100644 (file)
--- a/src/player-ability/player-strength.cpp
+++ b/src/player-ability/player-strength.cpp
@@ -80,7 +80,7 @@ int16_t PlayerStrength::time_effect_value()
  * * 白虎の構えで加算(+2)
  * * 朱雀の構えで減算(-2)
  */
-int16_t PlayerStrength::battleform_value()
+int16_t PlayerStrength::stance_value()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-strength.h b/src/player-ability/player-strength.h
index 96745bf..47455f4 100644 (file)
--- a/src/player-ability/player-strength.h
+++ b/src/player-ability/player-strength.h
@@ -11,6 +11,6 @@ protected:
     void set_locals() override;
     int16_t race_value() override;
     int16_t time_effect_value() override;
-    int16_t battleform_value() override;
+    int16_t stance_value() override;
     int16_t mutation_value() override;
 };

diff --git a/src/player-ability/player-wisdom.cpp b/src/player-ability/player-wisdom.cpp
index b6f3f2e..51a3608 100644 (file)
--- a/src/player-ability/player-wisdom.cpp
+++ b/src/player-ability/player-wisdom.cpp
@@ -35,7 +35,7 @@ void PlayerWisdom::set_locals()
  * * 玄武の構えで減算(-1)
  * * 朱雀の構えで加算(+1)
  */
-int16_t PlayerWisdom::battleform_value()
+int16_t PlayerWisdom::stance_value()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-wisdom.h b/src/player-ability/player-wisdom.h
index 18412f5..563b190 100644 (file)
--- a/src/player-ability/player-wisdom.h
+++ b/src/player-ability/player-wisdom.h
@@ -9,6 +9,6 @@ public:
 
 protected:
     void set_locals() override;
-    int16_t battleform_value() override;
+    int16_t stance_value() override;
     int16_t mutation_value() override;
 };

diff --git a/src/player-base/player-class.cpp b/src/player-base/player-class.cpp
index 36173d8..60b5a2e 100644 (file)
--- a/src/player-base/player-class.cpp
+++ b/src/player-base/player-class.cpp
@@ -176,7 +176,7 @@ TrFlags PlayerClass::tr_flags() const
     return flags;
 }
 
-TrFlags PlayerClass::form_tr_flags() const
+TrFlags PlayerClass::stance_tr_flags() const
 {
     TrFlags flags;
 

diff --git a/src/player-base/player-class.h b/src/player-base/player-class.h
index fa8a8d1..28c2827 100644 (file)
--- a/src/player-base/player-class.h
+++ b/src/player-base/player-class.h
@@ -18,7 +18,7 @@ public:
     virtual ~PlayerClass() = default;
 
     TrFlags tr_flags() const;
-    TrFlags form_tr_flags() const;
+    TrFlags stance_tr_flags() const;
 
     bool has_stun_immunity() const;
     bool is_wizard() const;

diff --git a/src/player-status/player-speed.cpp b/src/player-status/player-speed.cpp
index a516d9b..0d27b5f 100644 (file)
--- a/src/player-status/player-speed.cpp
+++ b/src/player-status/player-speed.cpp
@@ -198,7 +198,7 @@ int16_t PlayerSpeed::time_effect_value()
  * @details
  * ** 朱雀の構えなら加算(+10)
  */
-int16_t PlayerSpeed::battleform_value()
+int16_t PlayerSpeed::stance_value()
 {
     int16_t result = 0;
     if (PlayerClass(player_ptr).monk_stance_is(MonkStance::SUZAKU))

diff --git a/src/player-status/player-speed.h b/src/player-status/player-speed.h
index 933b832..a7b1e3a 100644 (file)
--- a/src/player-status/player-speed.h
+++ b/src/player-status/player-speed.h
@@ -12,7 +12,7 @@ protected:
     int16_t personality_value() override;
     int16_t equipments_value() override;
     int16_t time_effect_value() override;
-    int16_t battleform_value() override;
+    int16_t stance_value() override;
     int16_t mutation_value() override;
     int16_t riding_value() override;
     int16_t inventory_weight_value() override;

diff --git a/src/player-status/player-status-base.cpp b/src/player-status/player-status-base.cpp
index d7cd8f1..4b9bbb1 100644 (file)
--- a/src/player-status/player-status-base.cpp
+++ b/src/player-status/player-status-base.cpp
@@ -30,7 +30,7 @@ int16_t PlayerStatusBase::get_value()
     int16_t pow = this->default_value;
 
     pow += this->action_value();
-    pow += this->battleform_value();
+    pow += this->stance_value();
     pow += this->class_base_value();
     pow += this->class_value();
     pow += this->equipments_value();
@@ -67,8 +67,8 @@ BIT_FLAGS PlayerStatusBase::get_all_flags()
     if (this->race_value() != 0)
         set_bits(result, FLAG_CAUSE_RACE);
 
-    if (this->battleform_value() != 0)
-        set_bits(result, FLAG_CAUSE_BATTLE_FORM);
+    if (this->stance_value() != 0)
+        set_bits(result, FLAG_CAUSE_STANCE);
 
     if (this->mutation_value() != 0)
         set_bits(result, FLAG_CAUSE_MUTATION);
@@ -106,8 +106,8 @@ BIT_FLAGS PlayerStatusBase::get_good_flags()
     if (this->race_value() > 0)
         set_bits(result, FLAG_CAUSE_RACE);
 
-    if (this->battleform_value() > 0)
-        set_bits(result, FLAG_CAUSE_BATTLE_FORM);
+    if (this->stance_value() > 0)
+        set_bits(result, FLAG_CAUSE_STANCE);
 
     if (this->mutation_value() > 0)
         set_bits(result, FLAG_CAUSE_MUTATION);
@@ -145,8 +145,8 @@ BIT_FLAGS PlayerStatusBase::get_bad_flags()
     if (this->race_value() < 0)
         set_bits(result, FLAG_CAUSE_RACE);
 
-    if (this->battleform_value() < 0)
-        set_bits(result, FLAG_CAUSE_BATTLE_FORM);
+    if (this->stance_value() < 0)
+        set_bits(result, FLAG_CAUSE_STANCE);
 
     if (this->mutation_value() < 0)
         set_bits(result, FLAG_CAUSE_MUTATION);
@@ -265,7 +265,7 @@ int16_t PlayerStatusBase::time_effect_value()
 {
     return 0;
 }
-int16_t PlayerStatusBase::battleform_value()
+int16_t PlayerStatusBase::stance_value()
 {
     return 0;
 }

diff --git a/src/player-status/player-status-base.h b/src/player-status/player-status-base.h
index da17a21..677df31 100644 (file)
--- a/src/player-status/player-status-base.h
+++ b/src/player-status/player-status-base.h
@@ -27,7 +27,7 @@ protected:
     virtual int16_t personality_value();
     virtual int16_t equipments_value();
     virtual int16_t time_effect_value();
-    virtual int16_t battleform_value();
+    virtual int16_t stance_value();
     virtual int16_t mutation_value();
     virtual int16_t riding_value();
     virtual int16_t inventory_weight_value();

diff --git a/src/player/player-status-flags.cpp b/src/player/player-status-flags.cpp
index f38ab37..5b69f59 100644 (file)
--- a/src/player/player-status-flags.cpp
+++ b/src/player/player-status-flags.cpp
@@ -63,8 +63,8 @@ BIT_FLAGS common_cause_flags(player_type *player_ptr, tr_type tr_flag)
         set_bits(result, FLAG_CAUSE_CLASS);
     }
 
-    if (PlayerClass(player_ptr).form_tr_flags().has(tr_flag)) {
-        set_bits(result, FLAG_CAUSE_BATTLE_FORM);
+    if (PlayerClass(player_ptr).stance_tr_flags().has(tr_flag)) {
+        set_bits(result, FLAG_CAUSE_STANCE);
     }
 
     return result;

diff --git a/src/player/player-status-flags.h b/src/player/player-status-flags.h
index 827bbc9..e753d4b 100644 (file)
--- a/src/player/player-status-flags.h
+++ b/src/player/player-status-flags.h
@@ -23,7 +23,7 @@ enum flag_cause : uint32_t {
     FLAG_CAUSE_PERSONALITY = 0x01U << 14, /*!< 性格上の体得 */
     FLAG_CAUSE_MAGIC_TIME_EFFECT = 0x01U << 15, /*!< 魔法による時限効果 */
     FLAG_CAUSE_MUTATION = 0x01U << 16, /*!< 変異による効果 */
-    FLAG_CAUSE_BATTLE_FORM = 0x01U << 17, /*!< 構えによる効果 */
+    FLAG_CAUSE_STANCE = 0x01U << 17, /*!< 構えによる効果 */
     FLAG_CAUSE_RIDING = 0x01U << 18, /*!< 乗馬による効果 */
     FLAG_CAUSE_INVEN_PACK = 0x01U << 19, /*!< その他インベントリによる効果 重量超過等 */
     FLAG_CAUSE_ACTION = 0x01U << 20, /*!< ACTIONによる効果 探索モード等 */

diff --git a/src/player/temporary-resistances.cpp b/src/player/temporary-resistances.cpp
index 404ad11..dcffabd 100644 (file)
--- a/src/player/temporary-resistances.cpp
+++ b/src/player/temporary-resistances.cpp
@@ -24,7 +24,7 @@
 void tim_player_flags(player_type *player_ptr, TrFlags &flags)
 {
     BIT_FLAGS tmp_effect_flag = FLAG_CAUSE_MAGIC_TIME_EFFECT;
-    set_bits(tmp_effect_flag, FLAG_CAUSE_BATTLE_FORM);
+    set_bits(tmp_effect_flag, FLAG_CAUSE_STANCE);
     BIT_FLAGS race_class_flag = FLAG_CAUSE_CLASS;
     set_bits(race_class_flag, FLAG_CAUSE_RACE);