*/
#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"
#include "object-enchant/object-ego.h"
#include "object-enchant/special-object-flags.h"
+#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-weapon-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 生成されたベースアイテムに魔法的な強化を与えるメインルーチン
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) {
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;
}
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;
}
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);
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);
}
}