[Refactor] enum classの型名変更 MUTA -> PlayerMutationType

[hengbandforosx/hengbandosx.git] / src / player-ability / player-dexterity.cpp

diff --git a/src/player-ability/player-dexterity.cpp b/src/player-ability/player-dexterity.cpp
index fcae38c..21fed23 100644 (file)
--- a/src/player-ability/player-dexterity.cpp
+++ b/src/player-ability/player-dexterity.cpp
@@ -31,22 +31,12 @@ void PlayerDexterity::set_locals()
 /*!
  * @brief 器用さ補正計算 - 種族
  * @return 器用さ補正値
- * @details
- * * 種族による器用さ修正値。
- * * エントは別途レベル26,41,46到達ごとに減算(-1)
  */
 int16_t PlayerDexterity::race_value()
 {
     int16_t result = PlayerBasicStatistics::race_value();
 
-    if (PlayerRace(this->player_ptr).equals(PlayerRaceType::ENT)) {
-        if (this->player_ptr->lev > 25)
-            result--;
-        if (this->player_ptr->lev > 40)
-            result--;
-        if (this->player_ptr->lev > 45)
-            result--;
-    }
+    result += PlayerRace(this->player_ptr).additional_dexterity();
 
     return result;
 }
@@ -81,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;
 
@@ -114,15 +104,15 @@ int16_t PlayerDexterity::mutation_value()
 {
     int16_t result = 0;
 
-    if (this->player_ptr->muta.has(MUTA::IRON_SKIN)) {
+    if (this->player_ptr->muta.has(PlayerMutationType::IRON_SKIN)) {
         result -= 1;
     }
 
-    if (this->player_ptr->muta.has(MUTA::LIMBER)) {
+    if (this->player_ptr->muta.has(PlayerMutationType::LIMBER)) {
         result += 3;
     }
 
-    if (this->player_ptr->muta.has(MUTA::ARTHRITIS)) {
+    if (this->player_ptr->muta.has(PlayerMutationType::ARTHRITIS)) {
         result -= 3;
     }