[Refactor] #3264 BASE_STATUS 型エイリアスを削除した

[hengbandforosx/hengbandosx.git] / src / action / racial-execution.cpp

diff --git a/src/action/racial-execution.cpp b/src/action/racial-execution.cpp
index ea44551..00e933c 100644 (file)
--- a/src/action/racial-execution.cpp
+++ b/src/action/racial-execution.cpp
@@ -9,12 +9,15 @@
 #include "core/asking-player.h"
 #include "game-option/disturbance-options.h"
 #include "inventory/inventory-slot-types.h"
+#include "player-base/player-class.h"
+#include "player-info/race-info.h"
 #include "player-status/player-energy.h"
 #include "racial/racial-switcher.h"
 #include "racial/racial-util.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"
+#include "timed-effect/player-confusion.h"
 #include "timed-effect/player-stun.h"
 #include "timed-effect/timed-effects.h"
 #include "view/display-messages.h"
@@ -25,13 +28,15 @@
  * @param command 発動するレイシャルのID
  * @return 処理を実際に実行した場合はTRUE、キャンセルした場合FALSEを返す。
  */
-bool exe_racial_power(player_type *player_ptr, const int32_t command)
+bool exe_racial_power(PlayerType *player_ptr, const int32_t command)
 {
-    if (command <= -3)
+    if (command <= -3) {
         return switch_class_racial_execution(player_ptr, command);
+    }
 
-    if (player_ptr->mimic_form)
+    if (player_ptr->mimic_form != MimicKindType::NONE) {
         return switch_mimic_racial_execution(player_ptr);
+    }
 
     return switch_race_racial_execution(player_ptr, command);
 }
@@ -41,68 +46,77 @@ bool exe_racial_power(player_type *player_ptr, const int32_t command)
  * @param rpi_ptr 発動したいレイシャル・パワー情報の構造体参照ポインタ
  * @return 成功率(%)を返す
  */
-PERCENTAGE racial_chance(player_type *player_ptr, rpi_type *rpi_ptr)
+PERCENTAGE racial_chance(PlayerType *player_ptr, rpi_type *rpi_ptr)
 {
-    if ((player_ptr->lev < rpi_ptr->min_level) || player_ptr->confused)
+    if ((player_ptr->lev < rpi_ptr->min_level) || player_ptr->effects()->confusion()->is_confused()) {
         return 0;
+    }
 
     PERCENTAGE difficulty = rpi_ptr->fail;
-    if (difficulty == 0)
+    if (difficulty == 0) {
         return 100;
+    }
 
     auto player_stun = player_ptr->effects()->stun();
     if (player_stun->is_stunned()) {
         difficulty += player_stun->current();
     } else if (player_ptr->lev > rpi_ptr->min_level) {
         PERCENTAGE lev_adj = (PERCENTAGE)((player_ptr->lev - rpi_ptr->min_level) / 3);
-        if (lev_adj > 10)
+        if (lev_adj > 10) {
             lev_adj = 10;
+        }
 
         difficulty -= lev_adj;
     }
 
-    auto special_easy = player_ptr->pclass == PlayerClassType::IMITATOR;
-    special_easy &= player_ptr->inventory_list[INVEN_NECK].name1 == ART_GOGO_PENDANT;
+    auto special_easy = PlayerClass(player_ptr).equals(PlayerClassType::IMITATOR);
+    special_easy &= player_ptr->inventory_list[INVEN_NECK].is_specific_artifact(FixedArtifactId::GOGO_PENDANT);
     special_easy &= rpi_ptr->racial_name.compare("倍返し") == 0;
     if (special_easy) {
         difficulty -= 12;
     }
 
-    if (difficulty < 5)
+    if (difficulty < 5) {
         difficulty = 5;
+    }
 
     difficulty = difficulty / 2;
-    const BASE_STATUS stat = player_ptr->stat_cur[rpi_ptr->stat];
-    int sum = 0;
-    for (int i = 1; i <= stat; i++) {
+    const auto stat = player_ptr->stat_cur[rpi_ptr->stat];
+    auto sum = 0;
+    for (auto i = 1; i <= stat; i++) {
         int val = i - difficulty;
-        if (val > 0)
+        if (val > 0) {
             sum += (val <= difficulty) ? val : difficulty;
+        }
     }
 
-    if (difficulty == 0)
+    if (difficulty == 0) {
         return 100;
-    else
+    } else {
         return ((sum * 100) / difficulty) / stat;
+    }
 }
 
-static void adjust_racial_power_difficulty(player_type *player_ptr, rpi_type *rpi_ptr, int *difficulty)
+static void adjust_racial_power_difficulty(PlayerType *player_ptr, rpi_type *rpi_ptr, int *difficulty)
 {
-    if (*difficulty == 0)
+    if (*difficulty == 0) {
         return;
+    }
 
     auto player_stun = player_ptr->effects()->stun();
     if (player_stun->is_stunned()) {
         *difficulty += player_stun->current();
     } else if (player_ptr->lev > rpi_ptr->min_level) {
         int lev_adj = ((player_ptr->lev - rpi_ptr->min_level) / 3);
-        if (lev_adj > 10)
+        if (lev_adj > 10) {
             lev_adj = 10;
+        }
         *difficulty -= lev_adj;
     }
 
-    if (*difficulty < 5)
+    if (*difficulty < 5) {
         *difficulty = 5;
+    }
 }
 
 /*!
@@ -110,7 +124,7 @@ static void adjust_racial_power_difficulty(player_type *player_ptr, rpi_type *rp
  * @param rpi_ptr 発動したいレイシャル・パワー情報の構造体参照ポインタ
  * @return racial_level_check_result
  */
-racial_level_check_result check_racial_level(player_type *player_ptr, rpi_type *rpi_ptr)
+racial_level_check_result check_racial_level(PlayerType *player_ptr, rpi_type *rpi_ptr)
 {
     PLAYER_LEVEL min_level = rpi_ptr->min_level;
     int use_stat = rpi_ptr->stat;
@@ -140,11 +154,13 @@ racial_level_check_result check_racial_level(player_type *player_ptr, rpi_type *
 
     adjust_racial_power_difficulty(player_ptr, rpi_ptr, &difficulty);
     energy.set_player_turn_energy(100);
-    if (randint1(player_ptr->stat_cur[use_stat]) >= ((difficulty / 2) + randint1(difficulty / 2)))
+    if (randint1(player_ptr->stat_cur[use_stat]) >= ((difficulty / 2) + randint1(difficulty / 2))) {
         return RACIAL_SUCCESS;
+    }
 
-    if (flush_failure)
+    if (flush_failure) {
         flush();
+    }
 
     msg_print(_("充分に集中できなかった。", "You've failed to concentrate hard enough."));
     return RACIAL_FAILURE;