Merge remote-tracking branch 'remotes/hengband-osx/For2.2.2-Refactoring-am-distcheck4...

[hengband/hengband.git] / src / object-enchant / apply-magic.c

diff --git a/src/object-enchant/apply-magic.c b/src/object-enchant/apply-magic.c
index 06c3ee6..71b1c78 100644 (file)
--- a/src/object-enchant/apply-magic.c
+++ b/src/object-enchant/apply-magic.c
@@ -6,14 +6,15 @@
  */
 
 #include "object-enchant/apply-magic.h"
+#include "artifact/fixed-art-generator.h"
 #include "art-definition/art-armor-types.h"
 #include "dungeon/dungeon.h"
-#include "floor/floor.h"
+#include "mutation/mutation-flag-types.h"
 #include "object-enchant/apply-magic-accessory.h"
 #include "object-enchant/apply-magic-armor.h"
 #include "object-enchant/apply-magic-others.h"
 #include "object-enchant/apply-magic-weapon.h"
-#include "object-enchant/artifact.h"
+#include "system/artifact-type-definition.h"
 #include "object-enchant/item-apply-magic.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-curse.h"
@@ -22,13 +23,17 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object-enchant/trg-types.h"
-#include "object/object-hook.h"
+#include "object-hook/hook-checker.h"
+#include "object-hook/hook-enchant.h"
 #include "object/object-kind.h"
 #include "sv-definition/sv-armor-types.h"
 #include "sv-definition/sv-protector-types.h"
 #include "sv-definition/sv-weapon-types.h"
+#include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "world/world.h"
+#include "player/player-status-flags.h"
+
 
 /*!
  * @brief 生成されたベースアイテムに魔法的な強化を与えるメインルーチン
@@ -56,7 +61,7 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
     if ((owner_ptr->pseikaku != PERSONALITY_MUNCHKIN) && (f2 > d_info[owner_ptr->dungeon_idx].obj_great))
         f2 = d_info[owner_ptr->dungeon_idx].obj_great;
 
-    if (owner_ptr->muta3 & MUT3_GOOD_LUCK) {
+    if (have_good_luck(owner_ptr)) {
         f1 += 5;
         f2 += 2;
     } else if (owner_ptr->muta3 & MUT3_BAD_LUCK) {
@@ -97,7 +102,7 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
     for (int i = 0; i < rolls; i++) {
         if (make_artifact(owner_ptr, o_ptr))
             break;
-        if ((owner_ptr->muta3 & MUT3_GOOD_LUCK) && one_in_(77)) {
+        if (have_good_luck(owner_ptr) && one_in_(77)) {
             if (make_artifact(owner_ptr, o_ptr))
                 break;
         }
@@ -134,11 +139,11 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
         if (a_ptr->gen_flags & TRG_PERMA_CURSE)
             o_ptr->curse_flags |= (TRC_PERMA_CURSE);
         if (a_ptr->gen_flags & (TRG_RANDOM_CURSE0))
-            o_ptr->curse_flags |= get_curse(0, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 0, o_ptr);
         if (a_ptr->gen_flags & (TRG_RANDOM_CURSE1))
-            o_ptr->curse_flags |= get_curse(1, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 1, o_ptr);
         if (a_ptr->gen_flags & (TRG_RANDOM_CURSE2))
-            o_ptr->curse_flags |= get_curse(2, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 2, o_ptr);
 
         return;
     }
@@ -218,11 +223,11 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
         if (e_ptr->gen_flags & TRG_PERMA_CURSE)
             o_ptr->curse_flags |= (TRC_PERMA_CURSE);
         if (e_ptr->gen_flags & (TRG_RANDOM_CURSE0))
-            o_ptr->curse_flags |= get_curse(0, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 0, o_ptr);
         if (e_ptr->gen_flags & (TRG_RANDOM_CURSE1))
-            o_ptr->curse_flags |= get_curse(1, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 1, o_ptr);
         if (e_ptr->gen_flags & (TRG_RANDOM_CURSE2))
-            o_ptr->curse_flags |= get_curse(2, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 2, o_ptr);
 
         if (e_ptr->gen_flags & (TRG_ONE_SUSTAIN))
             one_sustain(o_ptr);
@@ -352,10 +357,10 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
         if (k_ptr->gen_flags & (TRG_PERMA_CURSE))
             o_ptr->curse_flags |= TRC_PERMA_CURSE;
         if (k_ptr->gen_flags & (TRG_RANDOM_CURSE0))
-            o_ptr->curse_flags |= get_curse(0, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 0, o_ptr);
         if (k_ptr->gen_flags & (TRG_RANDOM_CURSE1))
-            o_ptr->curse_flags |= get_curse(1, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 1, o_ptr);
         if (k_ptr->gen_flags & (TRG_RANDOM_CURSE2))
-            o_ptr->curse_flags |= get_curse(2, o_ptr);
+            o_ptr->curse_flags |= get_curse(owner_ptr, 2, o_ptr);
     }
 }