[Refactor] #2322 dis-氏のコメントに従い、player-status-base.h に定義された*_value() を*_bonus() に置換した

diff --git a/src/player-ability/player-charisma.cpp b/src/player-ability/player-charisma.cpp
index 0ed6941..61b0f8d 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::stance_value()
+int16_t PlayerCharisma::stance_bonus()
 {
     int16_t result = 0;
 
@@ -56,7 +56,7 @@ int16_t PlayerCharisma::stance_value()
  * * 変異MUT3_WART_SKINで減算(-2)
  * * 変異MUT3_SCALESで減算(-1)
  */
-int16_t PlayerCharisma::mutation_value()
+int16_t PlayerCharisma::mutation_bonus()
 {
     int16_t result = 0;
 
@@ -81,7 +81,7 @@ int16_t PlayerCharisma::mutation_value()
     return result;
 }
 
-int16_t PlayerCharisma::set_exception_value(int16_t value)
+int16_t PlayerCharisma::set_exception_bonus(int16_t value)
 {
     int16_t result = value;
 

diff --git a/src/player-ability/player-charisma.h b/src/player-ability/player-charisma.h
index 21012e9..fa18bcb 100644 (file)
--- a/src/player-ability/player-charisma.h
+++ b/src/player-ability/player-charisma.h
@@ -12,8 +12,8 @@ public:
 
 protected:
     void set_locals() override;
-    int16_t stance_value() override;
-    int16_t mutation_value() override;
-    int16_t set_exception_value(int16_t value) override;
+    int16_t stance_bonus() override;
+    int16_t mutation_bonus() override;
+    int16_t set_exception_bonus(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 412c9bc..4bac551 100644 (file)
--- a/src/player-ability/player-constitution.cpp
+++ b/src/player-ability/player-constitution.cpp
@@ -48,7 +48,7 @@ int16_t PlayerConstitution::race_bonus()
  * * 一時効果による耐久力修正値
  * * 呪術の肉体強化で加算(+4)
  */
-int16_t PlayerConstitution::time_effect_value()
+int16_t PlayerConstitution::time_effect_bonus()
 {
     int16_t result = 0;
 
@@ -72,7 +72,7 @@ int16_t PlayerConstitution::time_effect_value()
  * * 朱雀の構えで減算(-2)
  * * ネオ・つよしスペシャル中で加算(+4)
  */
-int16_t PlayerConstitution::stance_value()
+int16_t PlayerConstitution::stance_bonus()
 {
     int16_t result = 0;
 
@@ -105,7 +105,7 @@ int16_t PlayerConstitution::stance_value()
  * * 変異MUT3_XTRA_FATで加算(+2)
  * * 変異MUT3_FLESH_ROTで減算(-2)
  */
-int16_t PlayerConstitution::mutation_value()
+int16_t PlayerConstitution::mutation_bonus()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-constitution.h b/src/player-ability/player-constitution.h
index 240756a..868160f 100644 (file)
--- a/src/player-ability/player-constitution.h
+++ b/src/player-ability/player-constitution.h
@@ -10,7 +10,7 @@ public:
 protected:
     void set_locals() override;
     int16_t race_bonus() override;
-    int16_t time_effect_value() override;
-    int16_t stance_value() override;
-    int16_t mutation_value() override;
+    int16_t time_effect_bonus() override;
+    int16_t stance_bonus() override;
+    int16_t mutation_bonus() override;
 };

diff --git a/src/player-ability/player-dexterity.cpp b/src/player-ability/player-dexterity.cpp
index 7005cfb..a64ca2e 100644 (file)
--- a/src/player-ability/player-dexterity.cpp
+++ b/src/player-ability/player-dexterity.cpp
@@ -48,7 +48,7 @@ int16_t PlayerDexterity::race_bonus()
  * * 一時効果による器用さ修正値
  * * 呪術の肉体強化で加算(+4)
  */
-int16_t PlayerDexterity::time_effect_value()
+int16_t PlayerDexterity::time_effect_bonus()
 {
     int16_t result = 0;
 
@@ -71,7 +71,7 @@ int16_t PlayerDexterity::time_effect_value()
  * * 玄武の構えで減算(-2)
  * * 朱雀の構えで加算(+2)
  */
-int16_t PlayerDexterity::stance_value()
+int16_t PlayerDexterity::stance_bonus()
 {
     int16_t result = 0;
 
@@ -100,7 +100,7 @@ int16_t PlayerDexterity::stance_value()
  * * 変異MUT3_LIMBERで加算(+3)
  * * 変異MUT3_ARTHRITISで減算(-3)
  */
-int16_t PlayerDexterity::mutation_value()
+int16_t PlayerDexterity::mutation_bonus()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-dexterity.h b/src/player-ability/player-dexterity.h
index 989a368..48b4cac 100644 (file)
--- a/src/player-ability/player-dexterity.h
+++ b/src/player-ability/player-dexterity.h
@@ -10,7 +10,7 @@ public:
 protected:
     void set_locals() override;
     int16_t race_bonus() override;
-    int16_t time_effect_value() override;
-    int16_t stance_value() override;
-    int16_t mutation_value() override;
+    int16_t time_effect_bonus() override;
+    int16_t stance_bonus() override;
+    int16_t mutation_bonus() override;
 };

diff --git a/src/player-ability/player-intelligence.cpp b/src/player-ability/player-intelligence.cpp
index ac38451..274c60f 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::stance_value()
+int16_t PlayerIntelligence::stance_bonus()
 {
     int16_t result = 0;
 
@@ -63,7 +63,7 @@ int16_t PlayerIntelligence::stance_value()
  * * 変異MUT3_HYPER_INTで加算(+4)
  * * 変異MUT3_MORONICで減算(-4)
  */
-int16_t PlayerIntelligence::mutation_value()
+int16_t PlayerIntelligence::mutation_bonus()
 {
     int16_t result = 0;
     if (this->player_ptr->muta.any()) {

diff --git a/src/player-ability/player-intelligence.h b/src/player-ability/player-intelligence.h
index b0d32a0..12c6021 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 stance_value() override;
-    int16_t mutation_value() override;
+    int16_t stance_bonus() override;
+    int16_t mutation_bonus() override;
 };

diff --git a/src/player-ability/player-strength.cpp b/src/player-ability/player-strength.cpp
index 84a1e6d..3b99f83 100644 (file)
--- a/src/player-ability/player-strength.cpp
+++ b/src/player-ability/player-strength.cpp
@@ -50,7 +50,7 @@ int16_t PlayerStrength::race_bonus()
  * * 呪術の肉体強化で加算(+4)
  * * ネオ・つよしスペシャル中で加算(+4)
  */
-int16_t PlayerStrength::time_effect_value()
+int16_t PlayerStrength::time_effect_bonus()
 {
     int16_t result = 0;
 
@@ -80,7 +80,7 @@ int16_t PlayerStrength::time_effect_value()
  * * 白虎の構えで加算(+2)
  * * 朱雀の構えで減算(-2)
  */
-int16_t PlayerStrength::stance_value()
+int16_t PlayerStrength::stance_bonus()
 {
     int16_t result = 0;
 
@@ -106,7 +106,7 @@ int16_t PlayerStrength::stance_value()
  * * 変異MUT3_HYPER_STRで加算(+4)
  * * 変異MUT3_PUNYで減算(-4)
  */
-int16_t PlayerStrength::mutation_value()
+int16_t PlayerStrength::mutation_bonus()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-strength.h b/src/player-ability/player-strength.h
index 0db3cbd..06a4e59 100644 (file)
--- a/src/player-ability/player-strength.h
+++ b/src/player-ability/player-strength.h
@@ -10,7 +10,7 @@ public:
 protected:
     void set_locals() override;
     int16_t race_bonus() override;
-    int16_t time_effect_value() override;
-    int16_t stance_value() override;
-    int16_t mutation_value() override;
+    int16_t time_effect_bonus() override;
+    int16_t stance_bonus() override;
+    int16_t mutation_bonus() override;
 };

diff --git a/src/player-ability/player-wisdom.cpp b/src/player-ability/player-wisdom.cpp
index cd41a14..413506e 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::stance_value()
+int16_t PlayerWisdom::stance_bonus()
 {
     int16_t result = 0;
 
@@ -61,7 +61,7 @@ int16_t PlayerWisdom::stance_value()
  * * 変異MUT3_HYPER_INTで加算(+4)
  * * 変異MUT3_MORONICで減算(-4)
  */
-int16_t PlayerWisdom::mutation_value()
+int16_t PlayerWisdom::mutation_bonus()
 {
     int16_t result = 0;
 

diff --git a/src/player-ability/player-wisdom.h b/src/player-ability/player-wisdom.h
index f88e90b..8b4894f 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 stance_value() override;
-    int16_t mutation_value() override;
+    int16_t stance_bonus() override;
+    int16_t mutation_bonus() override;
 };

diff --git a/src/player-status/player-infravision.cpp b/src/player-status/player-infravision.cpp
index 2f58e72..58f8e29 100644 (file)
--- a/src/player-status/player-infravision.cpp
+++ b/src/player-status/player-infravision.cpp
@@ -41,7 +41,7 @@ int16_t PlayerInfravision::race_bonus()
  * @details
  * * 変異MUT3_INFRAVISによる加算(+3)
  */
-int16_t PlayerInfravision::mutation_value()
+int16_t PlayerInfravision::mutation_bonus()
 {
     int16_t bonus = 0;
     if (this->player_ptr->muta.has(PlayerMutationType::INFRAVIS)) {
@@ -57,7 +57,7 @@ int16_t PlayerInfravision::mutation_value()
  * @details
  * * 魔法効果tim_infraによる加算(+3)
  */
-int16_t PlayerInfravision::time_effect_value()
+int16_t PlayerInfravision::time_effect_bonus()
 {
     int16_t bonus = 0;
     if (this->player_ptr->tim_infra) {

diff --git a/src/player-status/player-infravision.h b/src/player-status/player-infravision.h
index 43a9ac1..1da20b8 100644 (file)
--- a/src/player-status/player-infravision.h
+++ b/src/player-status/player-infravision.h
@@ -8,6 +8,6 @@ public:
 protected:
     void set_locals() override;
     int16_t race_bonus() override;
-    int16_t time_effect_value() override;
-    int16_t mutation_value() override;
+    int16_t time_effect_bonus() override;
+    int16_t mutation_bonus() override;
 };

diff --git a/src/player-status/player-speed.cpp b/src/player-status/player-speed.cpp
index 2b4cc3e..da0dfa1 100644 (file)
--- a/src/player-status/player-speed.cpp
+++ b/src/player-status/player-speed.cpp
@@ -165,9 +165,9 @@ int16_t PlayerSpeed::special_weapon_set_value()
  * ** 装備品にTR_SPEEDがあれば加算(+pval+1
  * ** セットで加速増減があるものを計算
  */
-int16_t PlayerSpeed::equipments_value()
+int16_t PlayerSpeed::equipments_bonus()
 {
-    int16_t bonus = PlayerStatusBase::equipments_value();
+    int16_t bonus = PlayerStatusBase::equipments_bonus();
     bonus += this->special_weapon_set_value();
     return bonus;
 }
@@ -182,7 +182,7 @@ int16_t PlayerSpeed::equipments_value()
  * ** 食い過ぎなら減算(-10)
  * ** 光速移動中は+999(最終的に+99になる)
  */
-int16_t PlayerSpeed::time_effect_value()
+int16_t PlayerSpeed::time_effect_bonus()
 {
     int16_t bonus = 0;
     if (is_fast(this->player_ptr)) {
@@ -216,7 +216,7 @@ int16_t PlayerSpeed::time_effect_value()
  * @details
  * ** 朱雀の構えなら加算(+10)
  */
-int16_t PlayerSpeed::stance_value()
+int16_t PlayerSpeed::stance_bonus()
 {
     int16_t bonus = 0;
     if (PlayerClass(player_ptr).monk_stance_is(MonkStanceType::SUZAKU)) {
@@ -234,7 +234,7 @@ int16_t PlayerSpeed::stance_value()
  * ** 変異MUT3_XTRA_LEGなら加算(+3)
  * ** 変異MUT3_SHORT_LEGなら減算(-3)
  */
-int16_t PlayerSpeed::mutation_value()
+int16_t PlayerSpeed::mutation_bonus()
 {
     int16_t bonus = 0;
     const auto &muta = this->player_ptr->muta;
@@ -259,7 +259,7 @@ int16_t PlayerSpeed::mutation_value()
  * @details
  * * 騎乗中ならばモンスターの加速に準拠、ただし騎乗技能値とモンスターレベルによるキャップ処理あり
  */
-int16_t PlayerSpeed::riding_value()
+int16_t PlayerSpeed::riding_bonus()
 {
     auto *riding_m_ptr = &(this->player_ptr)->current_floor_ptr->m_list[this->player_ptr->riding];
     int16_t speed = riding_m_ptr->mspeed;
@@ -295,7 +295,7 @@ int16_t PlayerSpeed::riding_value()
  * @details
  * * 所持品の重量による減速処理。乗馬時は別計算。
  */
-int16_t PlayerSpeed::inventory_weight_value()
+int16_t PlayerSpeed::inventory_weight_bonus()
 {
     int16_t bonus = 0;
     auto weight = calc_inventory_weight(this->player_ptr);
@@ -322,7 +322,7 @@ int16_t PlayerSpeed::inventory_weight_value()
  * @details
  * * 探索中なら減算(-10)
  */
-int16_t PlayerSpeed::action_value()
+int16_t PlayerSpeed::action_bonus()
 {
     int16_t bonus = 0;
     if (this->player_ptr->action == ACTION_SEARCH) {
@@ -355,15 +355,15 @@ BIT_FLAGS PlayerSpeed::equipments_flags(tr_type check_flag)
  * * 非乗馬時 - ここまでの修正値合算をそのまま使用
  * * 乗馬時 - 乗馬の速度と重量減衰のみを計算
  */
-int16_t PlayerSpeed::set_exception_value(int16_t value)
+int16_t PlayerSpeed::set_exception_bonus(int16_t value)
 {
     if (!this->player_ptr->riding) {
         return value;
     }
 
     value = this->default_value;
-    value += this->riding_value();
-    value += this->inventory_weight_value();
-    value += this->action_value();
+    value += this->riding_bonus();
+    value += this->inventory_weight_bonus();
+    value += this->action_bonus();
     return value;
 }

diff --git a/src/player-status/player-speed.h b/src/player-status/player-speed.h
index 7a609d2..0c9a528 100644 (file)
--- a/src/player-status/player-speed.h
+++ b/src/player-status/player-speed.h
@@ -10,14 +10,14 @@ protected:
     int16_t race_bonus() override;
     int16_t class_bonus() override;
     int16_t personality_bonus() override;
-    int16_t equipments_value() override;
-    int16_t time_effect_value() override;
-    int16_t stance_value() override;
-    int16_t mutation_value() override;
-    int16_t riding_value() override;
-    int16_t inventory_weight_value() override;
-    int16_t action_value() override;
+    int16_t equipments_bonus() override;
+    int16_t time_effect_bonus() override;
+    int16_t stance_bonus() override;
+    int16_t mutation_bonus() override;
+    int16_t riding_bonus() override;
+    int16_t inventory_weight_bonus() override;
+    int16_t action_bonus() override;
     BIT_FLAGS equipments_flags(tr_type check_flag) override;
     int16_t special_weapon_set_value();
-    int16_t set_exception_value(int16_t value) override;
+    int16_t set_exception_bonus(int16_t value) override;
 };

diff --git a/src/player-status/player-status-base.cpp b/src/player-status/player-status-base.cpp
index b389e34..1e53343 100644 (file)
--- a/src/player-status/player-status-base.cpp
+++ b/src/player-status/player-status-base.cpp
@@ -29,18 +29,18 @@ int16_t PlayerStatusBase::get_value()
     this->set_locals(); /* 計算前に値のセット。派生クラスの値がセットされる。*/
     int16_t pow = this->default_value;
 
-    pow += this->action_value();
-    pow += this->stance_value();
-    pow += this->class_base_value();
+    pow += this->action_bonus();
+    pow += this->stance_bonus();
+    pow += this->class_base_bonus();
     pow += this->class_bonus();
-    pow += this->equipments_value();
-    pow += this->inventory_weight_value();
-    pow += this->mutation_value();
+    pow += this->equipments_bonus();
+    pow += this->inventory_weight_bonus();
+    pow += this->mutation_bonus();
     pow += this->personality_bonus();
     pow += this->race_bonus();
-    pow += this->riding_value();
-    pow += this->time_effect_value();
-    pow = this->set_exception_value(pow);
+    pow += this->riding_bonus();
+    pow += this->time_effect_bonus();
+    pow = this->set_exception_bonus(pow);
 
     if ((pow > this->max_value)) {
         pow = this->max_value;
@@ -69,15 +69,15 @@ BIT_FLAGS PlayerStatusBase::get_all_flags()
         set_bits(flags, FLAG_CAUSE_RACE);
     }
 
-    if (this->stance_value() != 0) {
+    if (this->stance_bonus() != 0) {
         set_bits(flags, FLAG_CAUSE_STANCE);
     }
 
-    if (this->mutation_value() != 0) {
+    if (this->mutation_bonus() != 0) {
         set_bits(flags, FLAG_CAUSE_MUTATION);
     }
 
-    if (this->time_effect_value() != 0) {
+    if (this->time_effect_bonus() != 0) {
         set_bits(flags, FLAG_CAUSE_MAGIC_TIME_EFFECT);
     }
 
@@ -85,15 +85,15 @@ BIT_FLAGS PlayerStatusBase::get_all_flags()
         set_bits(flags, FLAG_CAUSE_PERSONALITY);
     }
 
-    if (this->riding_value() != 0) {
+    if (this->riding_bonus() != 0) {
         set_bits(flags, FLAG_CAUSE_RIDING);
     }
 
-    if (this->inventory_weight_value() != 0) {
+    if (this->inventory_weight_bonus() != 0) {
         set_bits(flags, FLAG_CAUSE_INVEN_PACK);
     }
 
-    if (this->action_value() != 0) {
+    if (this->action_bonus() != 0) {
         set_bits(flags, FLAG_CAUSE_ACTION);
     }
 
@@ -116,15 +116,15 @@ BIT_FLAGS PlayerStatusBase::get_good_flags()
         set_bits(flags, FLAG_CAUSE_RACE);
     }
 
-    if (this->stance_value() > 0) {
+    if (this->stance_bonus() > 0) {
         set_bits(flags, FLAG_CAUSE_STANCE);
     }
 
-    if (this->mutation_value() > 0) {
+    if (this->mutation_bonus() > 0) {
         set_bits(flags, FLAG_CAUSE_MUTATION);
     }
 
-    if (this->time_effect_value() > 0) {
+    if (this->time_effect_bonus() > 0) {
         set_bits(flags, FLAG_CAUSE_MAGIC_TIME_EFFECT);
     }
 
@@ -132,15 +132,15 @@ BIT_FLAGS PlayerStatusBase::get_good_flags()
         set_bits(flags, FLAG_CAUSE_PERSONALITY);
     }
 
-    if (this->riding_value() > 0) {
+    if (this->riding_bonus() > 0) {
         set_bits(flags, FLAG_CAUSE_RIDING);
     }
 
-    if (this->inventory_weight_value() > 0) {
+    if (this->inventory_weight_bonus() > 0) {
         set_bits(flags, FLAG_CAUSE_INVEN_PACK);
     }
 
-    if (this->action_value() > 0) {
+    if (this->action_bonus() > 0) {
         set_bits(flags, FLAG_CAUSE_ACTION);
     }
 
@@ -163,15 +163,15 @@ BIT_FLAGS PlayerStatusBase::get_bad_flags()
         set_bits(flags, FLAG_CAUSE_RACE);
     }
 
-    if (this->stance_value() < 0) {
+    if (this->stance_bonus() < 0) {
         set_bits(flags, FLAG_CAUSE_STANCE);
     }
 
-    if (this->mutation_value() < 0) {
+    if (this->mutation_bonus() < 0) {
         set_bits(flags, FLAG_CAUSE_MUTATION);
     }
 
-    if (this->time_effect_value() < 0) {
+    if (this->time_effect_bonus() < 0) {
         set_bits(flags, FLAG_CAUSE_MAGIC_TIME_EFFECT);
     }
 
@@ -179,15 +179,15 @@ BIT_FLAGS PlayerStatusBase::get_bad_flags()
         set_bits(flags, FLAG_CAUSE_PERSONALITY);
     }
 
-    if (this->riding_value() < 0) {
+    if (this->riding_bonus() < 0) {
         set_bits(flags, FLAG_CAUSE_RIDING);
     }
 
-    if (this->inventory_weight_value() < 0) {
+    if (this->inventory_weight_bonus() < 0) {
         set_bits(flags, FLAG_CAUSE_INVEN_PACK);
     }
 
-    if (this->action_value() < 0) {
+    if (this->action_bonus() < 0) {
         set_bits(flags, FLAG_CAUSE_ACTION);
     }
 
@@ -255,7 +255,7 @@ BIT_FLAGS PlayerStatusBase::equipments_bad_flags(tr_type check_flag)
  * @brief this->tr_flagを持つ装備品のpval合計値を返す
  * @return 該当するfalgを持つ全装備のpvalの合計値
  */
-int16_t PlayerStatusBase::equipments_value()
+int16_t PlayerStatusBase::equipments_bonus()
 {
     this->set_locals(); /* 計算前に値のセット。派生クラスの値がセットされる。*/
     int16_t bonus = 0;
@@ -284,7 +284,7 @@ int16_t PlayerStatusBase::class_bonus()
     return 0;
 }
 
-int16_t PlayerStatusBase::class_base_value()
+int16_t PlayerStatusBase::class_base_bonus()
 {
     return 0;
 }
@@ -294,32 +294,32 @@ int16_t PlayerStatusBase::personality_bonus()
     return 0;
 }
 
-int16_t PlayerStatusBase::time_effect_value()
+int16_t PlayerStatusBase::time_effect_bonus()
 {
     return 0;
 }
 
-int16_t PlayerStatusBase::stance_value()
+int16_t PlayerStatusBase::stance_bonus()
 {
     return 0;
 }
 
-int16_t PlayerStatusBase::mutation_value()
+int16_t PlayerStatusBase::mutation_bonus()
 {
     return 0;
 }
 
-int16_t PlayerStatusBase::riding_value()
+int16_t PlayerStatusBase::riding_bonus()
 {
     return 0;
 }
 
-int16_t PlayerStatusBase::inventory_weight_value()
+int16_t PlayerStatusBase::inventory_weight_bonus()
 {
     return 0;
 }
 
-int16_t PlayerStatusBase::action_value()
+int16_t PlayerStatusBase::action_bonus()
 {
     return 0;
 }
@@ -331,7 +331,7 @@ int16_t PlayerStatusBase::action_value()
  * * 派生クラスで必要とされる例外処理でoverrideされる
  * @return 直接変更された値。このままmin-max処理され最終的なvalueになる。
  */
-int16_t PlayerStatusBase::set_exception_value(int16_t value)
+int16_t PlayerStatusBase::set_exception_bonus(int16_t value)
 {
     return value;
 }

diff --git a/src/player-status/player-status-base.h b/src/player-status/player-status-base.h
index eabea89..f35dc94 100644 (file)
--- a/src/player-status/player-status-base.h
+++ b/src/player-status/player-status-base.h
@@ -23,16 +23,16 @@ protected:
     virtual void set_locals();
     virtual int16_t race_bonus();
     virtual int16_t class_bonus();
-    virtual int16_t class_base_value();
+    virtual int16_t class_base_bonus();
     virtual int16_t personality_bonus();
-    virtual int16_t equipments_value();
-    virtual int16_t time_effect_value();
-    virtual int16_t stance_value();
-    virtual int16_t mutation_value();
-    virtual int16_t riding_value();
-    virtual int16_t inventory_weight_value();
-    virtual int16_t action_value();
-    virtual int16_t set_exception_value(int16_t value);
+    virtual int16_t equipments_bonus();
+    virtual int16_t time_effect_bonus();
+    virtual int16_t stance_bonus();
+    virtual int16_t mutation_bonus();
+    virtual int16_t riding_bonus();
+    virtual int16_t inventory_weight_bonus();
+    virtual int16_t action_bonus();
+    virtual int16_t set_exception_bonus(int16_t value);
     virtual BIT_FLAGS equipments_flags(tr_type check_flag);
     virtual BIT_FLAGS equipments_bad_flags(tr_type check_flag);
 };

diff --git a/src/player-status/player-stealth.cpp b/src/player-status/player-stealth.cpp
index 9d382f7..ee71a04 100644 (file)
--- a/src/player-status/player-stealth.cpp
+++ b/src/player-status/player-stealth.cpp
@@ -52,7 +52,7 @@ int16_t PlayerStealth::personality_bonus()
  * @details
  * * 職業による加算
  */
-int16_t PlayerStealth::class_base_value()
+int16_t PlayerStealth::class_base_bonus()
 {
     const player_class_info *c_ptr = &class_info[enum2i(this->player_ptr->pclass)];
     return c_ptr->c_stl + (c_ptr->x_stl * this->player_ptr->lev / 10);
@@ -88,7 +88,7 @@ int16_t PlayerStealth::class_bonus()
  * * 変異MUT3_XTRA_NOISで減算(-3)
  * * 変異MUT3_MOTIONで加算(+1)
  */
-int16_t PlayerStealth::mutation_value()
+int16_t PlayerStealth::mutation_bonus()
 {
     int16_t bonus = 0;
     const auto &muta = this->player_ptr->muta;
@@ -111,7 +111,7 @@ int16_t PlayerStealth::mutation_value()
  * * 狂戦士化で減算(-7)
  * * 隠密の歌で加算(+999)
  */
-int16_t PlayerStealth::time_effect_value()
+int16_t PlayerStealth::time_effect_bonus()
 {
     int16_t bonus = 0;
     if (this->player_ptr->realm1 == REALM_HEX) {
@@ -143,7 +143,7 @@ bool PlayerStealth::is_aggravated_s_fairy()
  * @details
  * * セクシーギャルでない影フェアリーがTRC_AGGRAVATE持ちの時、別処理でTRC_AGGRAVATEを無効にする代わりに減算(-3か3未満なら(現在値+2)/2)
  */
-int16_t PlayerStealth::set_exception_value(int16_t value)
+int16_t PlayerStealth::set_exception_bonus(int16_t value)
 {
     if (this->is_aggravated_s_fairy()) {
         value = std::min<int16_t>(value - 3, (value + 2) / 2);

diff --git a/src/player-status/player-stealth.h b/src/player-status/player-stealth.h
index cdd41d7..0d19abd 100644 (file)
--- a/src/player-status/player-stealth.h
+++ b/src/player-status/player-stealth.h
@@ -11,10 +11,10 @@ protected:
     void set_locals() override;
     int16_t race_bonus() override;
     int16_t class_bonus() override;
-    int16_t class_base_value() override;
+    int16_t class_base_bonus() override;
     int16_t personality_bonus() override;
-    int16_t time_effect_value() override;
-    int16_t mutation_value() override;
-    int16_t set_exception_value(int16_t value) override;
+    int16_t time_effect_bonus() override;
+    int16_t mutation_bonus() override;
+    int16_t set_exception_bonus(int16_t value) override;
     bool is_aggravated_s_fairy();
 };