[Refactor] #38997 identify_fully() にplayer_type * 引数を追加 / Added player_type * argumen...

[hengband/hengband.git] / src / realm-craft.c

diff --git a/src/realm-craft.c b/src/realm-craft.c
index f5c5257..335c2ec 100644 (file)
--- a/src/realm-craft.c
+++ b/src/realm-craft.c
@@ -1,9 +1,15 @@
 #include "angband.h"
+#include "util.h"
+
 #include "cmd-spell.h"
 #include "selfinfo.h"
-#include "projection.h"
+#include "spells.h"
+#include "spells-object.h"
 #include "spells-summon.h"
+#include "spells-status.h"
 #include "mutation.h"
+#include "player-status.h"
+#include "player-effects.h"
 
 
 
@@ -13,14 +19,14 @@
 * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
 * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。
 */
-concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
+concptr do_craft_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 {
        bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
        bool info = (mode == SPELL_INFO) ? TRUE : FALSE;
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;
 
-       PLAYER_LEVEL plev = p_ptr->lev;
+       PLAYER_LEVEL plev = caster_ptr->lev;
 
        switch (spell)
        {
@@ -35,7 +41,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_tim_infra(base + randint1(base), FALSE);
+                               set_tim_infra(caster_ptr, base + randint1(base), FALSE);
                        }
                }
                break;
@@ -51,7 +57,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_tim_regen(base + randint1(base), FALSE);
+                               set_tim_regen(caster_ptr, base + randint1(base), FALSE);
                        }
                }
                break;
@@ -63,7 +69,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               set_food(PY_FOOD_MAX - 1);
+                               set_food(caster_ptr, PY_FOOD_MAX - 1);
                        }
                }
                break;
@@ -80,7 +86,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_cold(randint1(base) + base, FALSE);
+                               set_oppose_cold(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -97,7 +103,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_fire(randint1(base) + base, FALSE);
+                               set_oppose_fire(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -113,7 +119,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               (void)heroism(base);
+                               (void)heroism(caster_ptr, base);
                        }
                }
                break;
@@ -130,7 +136,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_elec(randint1(base) + base, FALSE);
+                               set_oppose_elec(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -147,7 +153,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_acid(randint1(base) + base, FALSE);
+                               set_oppose_acid(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -163,7 +169,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_tim_invis(randint1(base) + base, FALSE);
+                               set_tim_invis(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -173,7 +179,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (desc) return _("アイテムにかかった弱い呪いを解除する。", "Removes normal curses from equipped items.");
 
                {
-                       if (cast) (void)remove_curse();
+                       if (cast) (void)remove_curse(caster_ptr);
                }
                break;
 
@@ -189,7 +195,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_pois(randint1(base) + base, FALSE);
+                               set_oppose_pois(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -205,7 +211,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               (void)berserk(base + randint1(base));
+                               (void)berserk(caster_ptr, base + randint1(base));
                        }
                }
                break;
@@ -218,7 +224,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               self_knowledge();
+                               self_knowledge(caster_ptr);
                        }
                }
                break;
@@ -235,7 +241,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_protevil(randint1(sides) + base, FALSE);
+                               set_protevil(caster_ptr, randint1(sides) + base, FALSE);
                        }
                }
                break;
@@ -247,7 +253,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               (void)true_healing(0);
+                               (void)true_healing(caster_ptr, 0);
                        }
                }
                break;
@@ -264,7 +270,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!choose_ele_attack()) return NULL;
+                               if (!choose_ele_attack(caster_ptr)) return NULL;
                        }
                }
                break;
@@ -281,7 +287,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_tim_esp(randint1(sides) + base, FALSE);
+                               set_tim_esp(caster_ptr, randint1(sides) + base, FALSE);
                        }
                }
                break;
@@ -298,7 +304,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_shield(randint1(sides) + base, FALSE);
+                               set_shield(caster_ptr, randint1(sides) + base, FALSE);
                        }
                }
                break;
@@ -315,11 +321,11 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_acid(randint1(base) + base, FALSE);
-                               set_oppose_elec(randint1(base) + base, FALSE);
-                               set_oppose_fire(randint1(base) + base, FALSE);
-                               set_oppose_cold(randint1(base) + base, FALSE);
-                               set_oppose_pois(randint1(base) + base, FALSE);
+                               set_oppose_acid(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_elec(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_fire(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_cold(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_pois(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -336,7 +342,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_fast(randint1(sides) + base, FALSE);
+                               set_fast(caster_ptr, randint1(sides) + base, FALSE);
                        }
                }
                break;
@@ -352,7 +358,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_kabenuke(randint1(base) + base, FALSE);
+                               set_kabenuke(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -364,7 +370,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               pulish_shield();
+                               pulish_shield(caster_ptr);
                        }
                }
                break;
@@ -376,7 +382,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (summon_specific(-1, p_ptr->y, p_ptr->x, plev, SUMMON_GOLEM, PM_FORCE_PET, '\0'))
+                               if (summon_specific(-1, caster_ptr->y, caster_ptr->x, plev, SUMMON_GOLEM, PM_FORCE_PET))
                                {
                                        msg_print(_("ゴーレムを作った。", "You make a golem."));
                                }
@@ -400,7 +406,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_magicdef(randint1(base) + base, FALSE);
+                               set_magicdef(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -412,7 +418,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!mundane_spell(TRUE)) return NULL;
+                               if (!mundane_spell(caster_ptr, TRUE)) return NULL;
                        }
                }
                break;
@@ -422,7 +428,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (desc) return _("アイテムにかかった強力な呪いを解除する。", "Removes normal and heavy curse from equipped items.");
 
                {
-                       if (cast) (void)remove_all_curse();
+                       if (cast) (void)remove_all_curse(caster_ptr);
                }
                break;
 
@@ -433,7 +439,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!identify_fully(FALSE)) return NULL;
+                               if (!identify_fully(caster_ptr, FALSE)) return NULL;
                        }
                }
                break;
@@ -445,7 +451,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!enchant_spell(randint0(4) + 1, randint0(4) + 1, 0)) return NULL;
+                               if (!enchant_spell(caster_ptr, randint0(4) + 1, randint0(4) + 1, 0)) return NULL;
                        }
                }
                break;
@@ -457,7 +463,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!enchant_spell(0, 0, randint0(3) + 2)) return NULL;
+                               if (!enchant_spell(caster_ptr, 0, 0, randint0(3) + 2)) return NULL;
                        }
                }
                break;
@@ -469,7 +475,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               brand_weapon(randint0(18));
+                               brand_weapon(caster_ptr, randint0(18));
                        }
                }
                break;
@@ -478,26 +484,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (name) return _("人間トランプ", "Living Trump");
                if (desc) return _("ランダムにテレポートする突然変異か、自分の意思でテレポートする突然変異が身につく。",
                        "Gives mutation which makes you teleport randomly or makes you able to teleport at will.");
-
-               {
-                       if (cast)
-                       {
-                               int mutation;
-
-                               if (one_in_(7))
-                                       /* Teleport control */
-                                       mutation = 12;
-                               else
-                                       /* Random teleportation (uncontrolled) */
-                                       mutation = 77;
-
-                               /* Gain the mutation */
-                               if (gain_random_mutation(mutation))
-                               {
-                                       msg_print(_("あなたは生きているカードに変わった。", "You have turned into a Living Trump."));
-                               }
-                       }
-               }
+               if (cast) become_living_trump(caster_ptr);
                break;
 
        case 31:
@@ -512,7 +499,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!choose_ele_immune(base + randint1(base))) return NULL;
+                               if (!choose_ele_immune(caster_ptr, base + randint1(base))) return NULL;
                        }
                }
                break;