[Refactor] #37353 VARTUE_LARGE, VARTUE_SMALL を avatar.h へ移動．

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

diff --git a/src/realm-trump.c b/src/realm-trump.c
index b993e99..48b86b5 100644 (file)
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -1,5 +1,14 @@
 #include "angband.h"
+#include "util.h"
+
 #include "cmd-spell.h"
+#include "mutation.h"
+#include "spells.h"
+#include "spells-summon.h"
+#include "spells-status.h"
+#include "player-effects.h"
+#include "player-class.h"
+#include "targeting.h"
 
 
 /*!
@@ -61,7 +70,7 @@ concptr do_trump_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (desc) return _("カードの占いをする。", "Causes random effects.");
 
                {
-                       if (info) return s_random;
+                       if (info) return KWD_RANDOM;
 
                        if (cast)
                        {
@@ -441,26 +450,7 @@ concptr do_trump_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(p_ptr);
                break;
 
        case 23: