[Refactor] #1469 Separated gain_exp_skilled() from gain_exp_from_hex()

diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp
index e50b560..d649b35 100644 (file)
--- a/src/spell-realm/spells-hex.cpp
+++ b/src/spell-realm/spells-hex.cpp
@@ -230,18 +230,11 @@ void RealmHex::gain_exp_from_hex()
             continue;
         }
 
-        auto *floor_ptr = this->caster_ptr->current_floor_ptr;
-        if (this->caster_ptr->spell_exp[spell] < SPELL_EXP_SKILLED) {
-            auto gain_condition = one_in_(2);
-            gain_condition &= floor_ptr->dun_level > 4;
-            gain_condition &= (floor_ptr->dun_level + 10) > this->caster_ptr->lev;
-            if (gain_condition) {
-                this->caster_ptr->spell_exp[spell]++;
-            }
-
+        if (this->gain_exp_skilled(spell)) {
             continue;
         }
 
+        auto *floor_ptr = this->caster_ptr->current_floor_ptr;
         if (this->caster_ptr->spell_exp[spell] < SPELL_EXP_EXPERT) {
             auto gain_condition = one_in_(5);
             gain_condition &= (floor_ptr->dun_level + 5) > this->caster_ptr->lev;
@@ -264,6 +257,23 @@ void RealmHex::gain_exp_from_hex()
     }
 }
 
+bool RealmHex::gain_exp_skilled(const int spell)
+{
+    if (this->caster_ptr->spell_exp[spell] >= SPELL_EXP_SKILLED) {
+        return false;
+    }
+
+    auto *floor_ptr = this->caster_ptr->current_floor_ptr;
+    auto gain_condition = one_in_(2);
+    gain_condition &= floor_ptr->dun_level > 4;
+    gain_condition &= (floor_ptr->dun_level + 10) > this->caster_ptr->lev;
+    if (gain_condition) {
+        this->caster_ptr->spell_exp[spell]++;
+    }
+    
+    return true;
+}
+
 /*!
  * @brief プレイヤーの呪術詠唱枠がすでに最大かどうかを返す
  * @return すでに全枠を利用しているならTRUEを返す

diff --git a/src/spell-realm/spells-hex.h b/src/spell-realm/spells-hex.h
index b7c4fa0..a16a06f 100644 (file)
--- a/src/spell-realm/spells-hex.h
+++ b/src/spell-realm/spells-hex.h
@@ -20,6 +20,7 @@ private:
     bool check_restart();
     int calc_need_mana();
     void gain_exp_from_hex();
+    bool gain_exp_skilled(const int spell);
 };
 
 bool stop_hex_spell_all(player_type *caster_ptr);