OSDN Git Service

[Refactor] #37353 CAVE_* をgrid.hへ移動。
[hengband/hengband.git] / src / wizard2.c
index a2afe69..10b33b5 100644 (file)
  */
 
 #include "angband.h"
-
-
-/*!
- * @brief プレイヤーのヒットダイスを振り直す / Roll the hitdie -- aux of do_cmd_rerate()
- * @return なし
- */
-void do_cmd_rerate_aux(void)
-{
-       /* Minimum hitpoints at highest level */
-       int min_value = p_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (p_ptr->hitdie + 1)) * 3 / 8;
-
-       /* Maximum hitpoints at highest level */
-       int max_value = p_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (p_ptr->hitdie + 1)) * 5 / 8;
-
-       int i;
-
-       /* Rerate */
-       while (1)
-       {
-               /* Pre-calculate level 1 hitdice */
-               p_ptr->player_hp[0] = (HIT_POINT)p_ptr->hitdie;
-
-               for (i = 1; i < 4; i++)
-               {
-                       p_ptr->player_hp[0] += randint1(p_ptr->hitdie);
-               }
-
-               /* Roll the hitpoint values */
-               for (i = 1; i < PY_MAX_LEVEL; i++)
-               {
-                       p_ptr->player_hp[i] = p_ptr->player_hp[i - 1] + randint1(p_ptr->hitdie);
-               }
-
-               /* Require "valid" hitpoints at highest level */
-               if ((p_ptr->player_hp[PY_MAX_LEVEL - 1] >= min_value) &&
-                   (p_ptr->player_hp[PY_MAX_LEVEL - 1] <= max_value)) break;
-       }
-}
-
-
-/*!
- * @brief プレイヤーのヒットダイスを振り直した後明示を行う / Hack -- Rerate Hitpoints
- * @param display TRUEならば体力ランクを明示する
- * @return なし
- */
-void do_cmd_rerate(bool display)
-{
-       int percent;
-
-       /* Rerate */
-       do_cmd_rerate_aux();
-
-       percent = (int)(((long)p_ptr->player_hp[PY_MAX_LEVEL - 1] * 200L) /
-               (2 * p_ptr->hitdie +
-               ((PY_MAX_LEVEL - 1+3) * (p_ptr->hitdie + 1))));
-
-
-       /* Update and redraw hitpoints */
-       p_ptr->update |= (PU_HP);
-       p_ptr->redraw |= (PR_HP);
-
-       /* Window stuff */
-       p_ptr->window |= (PW_PLAYER);
-
-       /* Handle stuff */
-       handle_stuff();
-
-       /* Message */
-       if (display)
-       {
-               msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent);
-               p_ptr->knowledge |= KNOW_HPRATE;
-       }
-       else
-       {
-               msg_print(_("体力ランクが変わった。", "Life rate is changed."));
-               p_ptr->knowledge &= ~(KNOW_HPRATE);
-       }
-}
-
+#include "selfinfo.h"
+#include "patron.h"
+#include "mutation.h"
+#include "quest.h"
+#include "artifact.h"
+#include "player-status.h"
+
+#include "spells.h"
+#include "spells-object.h"
+#include "spells-summon.h"
+#include "spells-status.h"
+#include "spells-world.h"
+#include "spells-floor.h"
+
+#include "object-hook.h"
+#include "monster-status.h"
+
+#include "floor.h"
+#include "floor-save.h"
+#include "grid.h"
 
 #ifdef ALLOW_WIZARD
 
@@ -106,37 +46,6 @@ static bool wiz_dimension_door(void)
        return (TRUE);
 }
 
-
-/*!
- * @brief プレイ日数を変更する / Set gametime.
- * @return 実際に変更を行ったらTRUEを返す
- */
-static bool set_gametime(void)
-{
-       int tmp_int = 0;
-       char ppp[80], tmp_val[40];
-
-       /* Prompt */
-       sprintf(ppp, "Dungeon Turn (0-%ld): ", dungeon_turn_limit);
-
-       /* Default */
-       sprintf(tmp_val, "%ld", dungeon_turn);
-
-       /* Query */
-       if (!get_string(ppp, tmp_val, 10)) return (FALSE);
-
-       /* Extract */
-       tmp_int = atoi(tmp_val);
-
-       /* Verify */
-       if (tmp_int >= dungeon_turn_limit) tmp_int = dungeon_turn_limit - 1;
-       else if (tmp_int < 0) tmp_int = 0;
-       dungeon_turn = turn = tmp_int;
-       return (TRUE);
-
-}
-
-
 /*!
  * @brief 指定されたIDの固定アーティファクトを生成する / Create the artifact of the specified number
  * @return なし
@@ -144,13 +53,13 @@ static bool set_gametime(void)
 static void wiz_create_named_art(void)
 {
        char tmp_val[10] = "";
-       int a_idx;
+       ARTIFACT_IDX a_idx;
 
        /* Query */
        if (!get_string("Artifact ID:", tmp_val, 3)) return;
 
        /* Extract */
-       a_idx = atoi(tmp_val);
+       a_idx = (ARTIFACT_IDX)atoi(tmp_val);
        if(a_idx < 0) a_idx = 0;
        if(a_idx >= max_a_idx) a_idx = 0; 
 
@@ -161,21 +70,6 @@ static void wiz_create_named_art(void)
        msg_print("Allocated.");
 }
 
-
-/*!
- * @brief ウィザードモード用モンスター調査 / Hack -- quick debugging hook
- * @return なし
- */
-static void do_cmd_wiz_hack_ben(void)
-{
-       /* Oops */
-       msg_print("Oops.");
-       (void)probing();
-}
-
-
-#ifdef MONSTER_HORDES
-
 /*!
  * @brief ウィザードモード用モンスターの群れ生成 / Summon a horde of monsters
  * @return なし
@@ -194,16 +88,14 @@ static void do_cmd_summon_horde(void)
        (void)alloc_horde(wy, wx);
 }
 
-#endif /* MONSTER_HORDES */
-
 /*!
  * @brief 32ビット変数のビット配列を並べて描画する / Output a long int in binary format.
  * @return なし
  */
-static void prt_binary(u32b flags, int row, int col)
+static void prt_binary(BIT_FLAGS flags, int row, int col)
 {
-       int             i;
-       u32b        bitmask;
+       int i;
+       u32b bitmask;
 
        /* Scan the flags */
        for (i = bitmask = 1; i <= 32; i++, bitmask *= 2)
@@ -233,14 +125,14 @@ static void prt_binary(u32b flags, int row, int col)
  * @param col 表示行
  * @return なし
  */
-static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_POSITION row, TERM_POSITION col)
+static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_LEN row, TERM_LEN col)
 {
        int i, j;
        int home = 0;
        u32b rarity[K_MAX_DEPTH];
        u32b total[K_MAX_DEPTH];
        s32b display[22];
-       cptr r = "+---Rate---+";
+       concptr r = "+---Rate---+";
        object_kind *k_ptr;
 
 
@@ -258,7 +150,7 @@ static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_PO
                int total_frac = 0;
                for (j = 0; j < alloc_kind_size; j++)
                {
-                       int prob = 0;
+                       PERCENTAGE prob = 0;
 
                        if (table[j].level <= i)
                        {
@@ -354,7 +246,7 @@ static void do_cmd_wiz_reset_class(void)
        /* {.} and {$} effect p_ptr->warning and TRC_TELEPORT_SELF */
        p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
 
-       update_stuff();
+       handle_stuff();
 }
 
 
@@ -388,7 +280,7 @@ static void do_cmd_wiz_change_aux(void)
 
 
        /* Query the stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                /* Prompt */
                sprintf(ppp, "%s (3-%d): ", stat_names[i], p_ptr->stat_max_max[i]);
@@ -407,7 +299,7 @@ static void do_cmd_wiz_change_aux(void)
                else if (tmp_int < 3) tmp_int = 3;
 
                /* Save it */
-               p_ptr->stat_cur[i] = p_ptr->stat_max[i] = (s16b)tmp_int;
+               p_ptr->stat_cur[i] = p_ptr->stat_max[i] = (BASE_STATUS)tmp_int;
        }
 
 
@@ -459,7 +351,6 @@ static void do_cmd_wiz_change_aux(void)
        /* Save */
        p_ptr->au = tmp_long;
 
-
        /* Default */
        sprintf(tmp_val, "%ld", (long)(p_ptr->max_exp));
 
@@ -493,8 +384,6 @@ static void do_cmd_wiz_change(void)
 {
        /* Interact */
        do_cmd_wiz_change_aux();
-
-       /* Redraw everything */
        do_cmd_redraw();
 }
 
@@ -529,7 +418,7 @@ static void do_cmd_wiz_change(void)
  *     thus accepting the default-values for the remaining values.
  *     pval comes first now, since it is most important.
  * - wiz_reroll_item()
- *     apply some magic to the item or turn it into an artifact.
+ *     apply some magic to the item or current_world_ptr->game_turn it into an artifact.
  * - wiz_roll_item()
  *     Get some statistics about the rarity of an item:
  *     We create a lot of fake items and see if they are of the
@@ -565,10 +454,8 @@ static void do_cmd_wiz_change(void)
 static void wiz_display_item(object_type *o_ptr)
 {
        int i, j = 13;
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
        char buf[256];
-
-       /* Extract the flags */
        object_flags(o_ptr, flgs);
 
        /* Clear the screen */
@@ -641,7 +528,7 @@ static void wiz_display_item(object_type *o_ptr)
 typedef struct tval_desc
 {
        int        tval; /*!< 大項目のID */
-       cptr       desc; /*!< 大項目名 */
+       concptr       desc; /*!< 大項目名 */
 } tval_desc;
 
 /*!
@@ -716,7 +603,7 @@ void strip_name(char *buf, KIND_OBJECT_IDX k_idx)
 
        object_kind *k_ptr = &k_info[k_idx];
 
-       cptr str = (k_name + k_ptr->name);
+       concptr str = (k_name + k_ptr->name);
 
 
        /* Skip past leading characters */
@@ -749,18 +636,16 @@ static KIND_OBJECT_IDX wiz_create_itemtype(void)
 {
        KIND_OBJECT_IDX i;
        int num, max_num;
-       TERM_POSITION col, row;
+       TERM_LEN col, row;
        OBJECT_TYPE_VALUE tval;
 
-       cptr tval_desc;
+       concptr tval_desc;
        char ch;
 
        KIND_OBJECT_IDX choice[80];
 
        char buf[160];
 
-
-       /* Clear screen */
        Term_clear();
 
        /* Print all tval's and their descriptions */
@@ -793,8 +678,6 @@ static KIND_OBJECT_IDX wiz_create_itemtype(void)
 
 
        /*** And now we go for k_idx ***/
-
-       /* Clear screen */
        Term_clear();
 
        /* We have to search the whole itemlist. */
@@ -849,7 +732,7 @@ static KIND_OBJECT_IDX wiz_create_itemtype(void)
  */
 static void wiz_tweak_item(object_type *o_ptr)
 {
-       cptr p;
+       concptr p;
        char tmp_val[80];
 
        /* Hack -- leave artifacts alone */
@@ -883,7 +766,7 @@ static void wiz_tweak_item(object_type *o_ptr)
 
 /*!
  * @brief アイテムの質を選択して再生成する /
- * Apply magic to an item or turn it into an artifact. -Bernd-
+ * Apply magic to an item or current_world_ptr->game_turn it into an artifact. -Bernd-
  * @param o_ptr 再生成の対象となるアイテム情報の参照ポインタ
  * @return なし
  */
@@ -900,8 +783,6 @@ static void wiz_reroll_item(object_type *o_ptr)
        /* Hack -- leave artifacts alone */
        if (object_is_artifact(o_ptr)) return;
 
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Copy the object */
@@ -948,42 +829,42 @@ static void wiz_reroll_item(object_type *o_ptr)
                        case 'w': case 'W':
                        {
                                object_prep(q_ptr, o_ptr->k_idx);
-                               apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT | AM_CURSED);
+                               apply_magic(q_ptr, current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT | AM_CURSED);
                                break;
                        }
                        /* Apply bad magic, but first clear object */
                        case 'c': case 'C':
                        {
                                object_prep(q_ptr, o_ptr->k_idx);
-                               apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_CURSED);
+                               apply_magic(q_ptr, current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_CURSED);
                                break;
                        }
                        /* Apply normal magic, but first clear object */
                        case 'n': case 'N':
                        {
                                object_prep(q_ptr, o_ptr->k_idx);
-                               apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART);
+                               apply_magic(q_ptr, current_floor_ptr->dun_level, AM_NO_FIXED_ART);
                                break;
                        }
                        /* Apply good magic, but first clear object */
                        case 'g': case 'G':
                        {
                                object_prep(q_ptr, o_ptr->k_idx);
-                               apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART | AM_GOOD);
+                               apply_magic(q_ptr, current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD);
                                break;
                        }
                        /* Apply great magic, but first clear object */
                        case 'e': case 'E':
                        {
                                object_prep(q_ptr, o_ptr->k_idx);
-                               apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT);
+                               apply_magic(q_ptr, current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT);
                                break;
                        }
                        /* Apply special magic, but first clear object */
                        case 's': case 'S':
                        {
                                object_prep(q_ptr, o_ptr->k_idx);
-                               apply_magic(q_ptr, dun_level, AM_GOOD | AM_GREAT | AM_SPECIAL);
+                               apply_magic(q_ptr, current_floor_ptr->dun_level, AM_GOOD | AM_GREAT | AM_SPECIAL);
 
                                /* Failed to create artifact; make a random one */
                                if (!object_is_artifact(q_ptr)) create_artifact(q_ptr, FALSE);
@@ -1002,14 +883,9 @@ static void wiz_reroll_item(object_type *o_ptr)
        {
                /* Apply changes */
                object_copy(o_ptr, q_ptr);
-
-               /* Recalculate bonuses */
                p_ptr->update |= (PU_BONUS);
+               p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
-               /* Combine / Reorder the pack (later) */
-               p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
        }
 }
@@ -1034,27 +910,27 @@ static void wiz_statistics(object_type *o_ptr)
        u32b test_roll = 1000000;
 
        char ch;
-       cptr quality;
+       concptr quality;
 
-       u32b mode;
+       BIT_FLAGS mode;
 
        object_type forge;
        object_type     *q_ptr;
 
-       cptr q = "Rolls: %ld  Correct: %ld  Matches: %ld  Better: %ld  Worse: %ld  Other: %ld";
+       concptr q = "Rolls: %ld  Correct: %ld  Matches: %ld  Better: %ld  Worse: %ld  Other: %ld";
 
-       cptr p = "Enter number of items to roll: ";
+       concptr p = "Enter number of items to roll: ";
        char tmp_val[80];
 
 
-       /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+       /* Mega-Hack -- allow multiple artifacts */
        if (object_is_fixed_artifact(o_ptr)) a_info[o_ptr->name1].cur_num = 0;
 
 
        /* Interact */
        while (TRUE)
        {
-               cptr pmt = "Roll for [n]ormal, [g]ood, or [e]xcellent treasure? ";
+               concptr pmt = "Roll for [n]ormal, [g]ood, or [e]xcellent treasure? ";
 
                /* Display item */
                wiz_display_item(o_ptr);
@@ -1088,7 +964,7 @@ static void wiz_statistics(object_type *o_ptr)
 
                /* Let us know what we are doing */
                msg_format("Creating a lot of %s items. Base level = %d.",
-                                         quality, dun_level);
+                                         quality, current_floor_ptr->dun_level);
                msg_print(NULL);
 
                /* Set counters to zero */
@@ -1106,30 +982,22 @@ static void wiz_statistics(object_type *o_ptr)
                                /* Allow interupt */
                                if (inkey())
                                {
-                                       /* Flush */
                                        flush();
-
-                                       /* Stop rolling */
-                                       break;
+                                       break; // stop rolling
                                }
 
                                /* Dump the stats */
                                prt(format(q, i, correct, matches, better, worse, other), 0, 0);
                                Term_fresh();
                        }
-
-
-                       /* Get local object */
                        q_ptr = &forge;
-
-                       /* Wipe the object */
                        object_wipe(q_ptr);
 
                        /* Create an object */
                        make_object(q_ptr, mode);
 
 
-                       /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+                       /* Mega-Hack -- allow multiple artifacts */
                        if (object_is_fixed_artifact(q_ptr)) a_info[q_ptr->name1].cur_num = 0;
 
 
@@ -1213,8 +1081,6 @@ static void wiz_quantity_item(object_type *o_ptr)
        {
                /* Extract */
                tmp_int = atoi(tmp_val);
-
-               /* Paranoia */
                if (tmp_int < 1) tmp_int = 1;
                if (tmp_int > 99) tmp_int = 99;
 
@@ -1235,14 +1101,12 @@ static void wiz_quantity_item(object_type *o_ptr)
  */
 static void do_cmd_wiz_blue_mage(void)
 {
+       int i = 0;
+       int j = 0;
+       BIT_FLAGS f4 = 0L, f5 = 0L, f6 = 0L;
 
-       int                             i = 0;
-       int                             j = 0;
-       s32b            f4 = 0, f5 = 0, f6 = 0; 
-
-       for (j=1; j<6; j++)
+       for (j = 1; j < A_MAX; j++)
        {
-
                set_rf_masks(&f4, &f5, &f6, j);
 
                for (i = 0; i < 32; i++)
@@ -1274,48 +1138,26 @@ static void do_cmd_wiz_blue_mage(void)
 static void do_cmd_wiz_play(void)
 {
        OBJECT_IDX item;
-
        object_type     forge;
        object_type *q_ptr;
-
        object_type *o_ptr;
-
        char ch;
-
        bool changed;
+       concptr q, s;
 
-       cptr q, s;
-
-       item_tester_no_ryoute = TRUE;
-       /* Get an item */
        q = "Play with which object? ";
        s = "You have nothing to play with.";
-       if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return;
 
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
+       o_ptr = choose_object(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT));
 
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
+       if (!o_ptr) return;
        
        /* The item was not changed */
        changed = FALSE;
 
-
-       /* Save the screen */
        screen_save();
 
-
-       /* Get local object */
        q_ptr = &forge;
-
-       /* Copy object */
        object_copy(q_ptr, o_ptr);
 
 
@@ -1359,15 +1201,12 @@ static void do_cmd_wiz_play(void)
                }
        }
 
-
-       /* Restore the screen */
        screen_load();
 
 
        /* Accept change */
        if (changed)
        {
-               /* Message */
                msg_print("Changes accepted.");
 
                /* Recalcurate object's weight */
@@ -1380,14 +1219,9 @@ static void do_cmd_wiz_play(void)
                /* Change */
                object_copy(o_ptr, q_ptr);
 
-
-               /* Recalculate bonuses */
                p_ptr->update |= (PU_BONUS);
+               p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
-               /* Combine / Reorder the pack (later) */
-               p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
        }
 
@@ -1416,15 +1250,12 @@ static void wiz_create_item(void)
        object_type     forge;
        object_type *q_ptr;
 
-       IDX k_idx;
-
-       /* Save the screen */
+       OBJECT_IDX k_idx;
        screen_save();
 
        /* Get object base type */
        k_idx = wiz_create_itemtype();
 
-       /* Restore the screen */
        screen_load();
 
        /* Return if failed */
@@ -1432,7 +1263,7 @@ static void wiz_create_item(void)
 
        if (k_info[k_idx].gen_flags & TRG_INSTA_ART)
        {
-               int i;
+               ARTIFACT_IDX i;
 
                /* Artifactify */
                for (i = 1; i < max_a_idx; i++)
@@ -1452,15 +1283,10 @@ static void wiz_create_item(void)
                        return;
                }
        }
-
-       /* Get local object */
        q_ptr = &forge;
-
-       /* Create the item */
        object_prep(q_ptr, k_idx);
 
-       /* Apply magic */
-       apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART);
+       apply_magic(q_ptr, current_floor_ptr->dun_level, AM_NO_FIXED_ART);
 
        /* Drop the object from heaven */
        (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
@@ -1477,53 +1303,8 @@ static void wiz_create_item(void)
  */
 static void do_cmd_wiz_cure_all(void)
 {
-       /* Restore stats */
-       (void)res_stat(A_STR);
-       (void)res_stat(A_INT);
-       (void)res_stat(A_WIS);
-       (void)res_stat(A_CON);
-       (void)res_stat(A_DEX);
-       (void)res_stat(A_CHR);
-
-       /* Restore the level */
-       (void)restore_level();
-
-       /* Heal the player */
-       if (p_ptr->chp < p_ptr->mhp)
-       {
-               p_ptr->chp = p_ptr->mhp;
-               p_ptr->chp_frac = 0;
-
-               /* Redraw */
-               p_ptr->redraw |= (PR_HP);
-
-               /* Window stuff */
-               p_ptr->window |= (PW_PLAYER);
-       }
-
-       /* Restore mana */
-       if (p_ptr->csp < p_ptr->msp)
-       {
-               p_ptr->csp = p_ptr->msp;
-               p_ptr->csp_frac = 0;
-
-               p_ptr->redraw |= (PR_MANA);
-               p_ptr->window |= (PW_PLAYER);
-               p_ptr->window |= (PW_SPELL);
-       }
-
-       /* Cure stuff */
-       (void)set_blind(0);
-       (void)set_confused(0);
-       (void)set_poisoned(0);
-       (void)set_afraid(0);
-       (void)set_paralyzed(0);
-       (void)set_image(0);
-       (void)set_stun(0);
-       (void)set_cut(0);
-       (void)set_slow(0, TRUE);
-
-       /* No longer hungry */
+       (void)life_stream(FALSE, FALSE);
+       (void)restore_mana(TRUE);
        (void)set_food(PY_FOOD_MAX - 1);
 }
 
@@ -1539,20 +1320,19 @@ static void do_cmd_wiz_jump(void)
        if (command_arg <= 0)
        {
                char    ppp[80];
-
                char    tmp_val[160];
-               int             tmp_dungeon_type;
+               DUNGEON_IDX tmp_dungeon_type;
 
                /* Prompt */
                sprintf(ppp, "Jump which dungeon : ");
 
                /* Default */
-               sprintf(tmp_val, "%d", dungeon_type);
+               sprintf(tmp_val, "%d", p_ptr->dungeon_idx);
 
                /* Ask for a level */
                if (!get_string(ppp, tmp_val, 2)) return;
 
-               tmp_dungeon_type = atoi(tmp_val);
+               tmp_dungeon_type = (DUNGEON_IDX)atoi(tmp_val);
                if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND;
 
                /* Prompt */
@@ -1560,22 +1340,18 @@ static void do_cmd_wiz_jump(void)
                        (int)d_info[tmp_dungeon_type].mindepth, (int)d_info[tmp_dungeon_type].maxdepth);
 
                /* Default */
-               sprintf(tmp_val, "%d", (int)dun_level);
+               sprintf(tmp_val, "%d", (int)current_floor_ptr->dun_level);
 
                /* Ask for a level */
                if (!get_string(ppp, tmp_val, 10)) return;
 
                /* Extract request */
-               command_arg = (s16b)atoi(tmp_val);
+               command_arg = (COMMAND_ARG)atoi(tmp_val);
 
-               dungeon_type = (byte_hack)tmp_dungeon_type;
+               p_ptr->dungeon_idx = tmp_dungeon_type;
        }
-
-       /* Paranoia */
-       if (command_arg < d_info[dungeon_type].mindepth) command_arg = 0;
-
-       /* Paranoia */
-       if (command_arg > d_info[dungeon_type].maxdepth) command_arg = d_info[dungeon_type].maxdepth;
+       if (command_arg < d_info[p_ptr->dungeon_idx].mindepth) command_arg = 0;
+       if (command_arg > d_info[p_ptr->dungeon_idx].maxdepth) command_arg = (COMMAND_ARG)d_info[p_ptr->dungeon_idx].maxdepth;
 
        /* Accept request */
        msg_format("You jump to dungeon level %d.", command_arg);
@@ -1583,11 +1359,11 @@ static void do_cmd_wiz_jump(void)
        if (autosave_l) do_cmd_save_game(TRUE);
 
        /* Change level */
-       dun_level = command_arg;
+       current_floor_ptr->dun_level = command_arg;
 
        prepare_change_floor_mode(CFM_RAND_PLACE);
 
-       if (!dun_level) dungeon_type = 0;
+       if (!current_floor_ptr->dun_level) p_ptr->dungeon_idx = 0;
        p_ptr->inside_arena = FALSE;
        p_ptr->wild_mode = FALSE;
 
@@ -1596,7 +1372,7 @@ static void do_cmd_wiz_jump(void)
        if (record_stair) do_cmd_write_nikki(NIKKI_WIZ_TELE,0,NULL);
 
        p_ptr->inside_quest = 0;
-       p_ptr->energy_use = 0;
+       free_turn(p_ptr);
 
        /* Prevent energy_need from being too lower than 0 */
        p_ptr->energy_need = 0;
@@ -1606,8 +1382,6 @@ static void do_cmd_wiz_jump(void)
         * and create a first saved floor
         */
        prepare_change_floor_mode(CFM_FIRST_FLOOR);
-
-       /* Leaving */
        p_ptr->leaving = TRUE;
 }
 
@@ -1619,7 +1393,7 @@ static void do_cmd_wiz_jump(void)
  */
 static void do_cmd_wiz_learn(void)
 {
-       IDX i;
+       KIND_OBJECT_IDX i;
 
        object_type forge;
        object_type *q_ptr;
@@ -1632,13 +1406,8 @@ static void do_cmd_wiz_learn(void)
                /* Induce awareness */
                if (k_ptr->level <= command_arg)
                {
-                       /* Get local object */
                        q_ptr = &forge;
-
-                       /* Prepare object */
                        object_prep(q_ptr, i);
-
-                       /* Awareness */
                        object_aware(q_ptr);
                }
        }
@@ -1654,10 +1423,9 @@ static void do_cmd_wiz_learn(void)
 static void do_cmd_wiz_summon(int num)
 {
        int i;
-
        for (i = 0; i < num; i++)
        {
-               (void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+               (void)summon_specific(0, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE), '\0');
        }
 }
 
@@ -1669,7 +1437,7 @@ static void do_cmd_wiz_summon(int num)
  * @param r_idx モンスター種族ID
  * @return なし
  * @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
  */
 static void do_cmd_wiz_named(MONRACE_IDX r_idx)
 {
@@ -1683,7 +1451,7 @@ static void do_cmd_wiz_named(MONRACE_IDX r_idx)
  * @param r_idx モンスター種族ID
  * @return なし
  * @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
  */
 static void do_cmd_wiz_named_friendly(MONRACE_IDX r_idx)
 {
@@ -1701,14 +1469,11 @@ static void do_cmd_wiz_zap(void)
 {
        MONSTER_IDX i;
 
-
        /* Genocide everyone nearby */
        for (i = 1; i < m_max; i++)
        {
-               monster_type *m_ptr = &m_list[i];
-
-               /* Paranoia -- Skip dead monsters */
-               if (!m_ptr->r_idx) continue;
+               monster_type *m_ptr = &current_floor_ptr->m_list[i];
+               if (!monster_is_valid(m_ptr)) continue;
 
                /* Skip the mount */
                if (i == p_ptr->riding) continue;
@@ -1718,7 +1483,7 @@ static void do_cmd_wiz_zap(void)
                {
                        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[MAX_NLEN];
 
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
@@ -1742,17 +1507,15 @@ static void do_cmd_wiz_zap_all(void)
        /* Genocide everyone */
        for (i = 1; i < m_max; i++)
        {
-               monster_type *m_ptr = &m_list[i];
-
-               /* Paranoia -- Skip dead monsters */
-               if (!m_ptr->r_idx) continue;
+               monster_type *m_ptr = &current_floor_ptr->m_list[i];
+               if (!monster_is_valid(m_ptr)) continue;
 
                /* Skip the mount */
                if (i == p_ptr->riding) continue;
 
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[MAX_NLEN];
 
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
@@ -1773,7 +1536,7 @@ static void do_cmd_wiz_create_feature(void)
 {
        static int   prev_feat = 0;
        static int   prev_mimic = 0;
-       cave_type    *c_ptr;
+       grid_type    *g_ptr;
        feature_type *f_ptr;
        char         tmp_val[160];
        IDX          tmp_feat, tmp_mimic;
@@ -1781,7 +1544,7 @@ static void do_cmd_wiz_create_feature(void)
 
        if (!tgt_pt(&x, &y)) return;
 
-       c_ptr = &cave[y][x];
+       g_ptr = &current_floor_ptr->grid_array[y][x];
 
        /* Default */
        sprintf(tmp_val, "%d", prev_feat);
@@ -1806,23 +1569,18 @@ static void do_cmd_wiz_create_feature(void)
        else if (tmp_mimic >= max_f_idx) tmp_mimic = max_f_idx - 1;
 
        cave_set_feat(y, x, tmp_feat);
-       c_ptr->mimic = (s16b)tmp_mimic;
+       g_ptr->mimic = (s16b)tmp_mimic;
 
-       f_ptr = &f_info[get_feat_mimic(c_ptr)];
+       f_ptr = &f_info[get_feat_mimic(g_ptr)];
 
        if (have_flag(f_ptr->flags, FF_GLYPH) ||
            have_flag(f_ptr->flags, FF_MINOR_GLYPH))
-               c_ptr->info |= (CAVE_OBJECT);
+               g_ptr->info |= (CAVE_OBJECT);
        else if (have_flag(f_ptr->flags, FF_MIRROR))
-               c_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
+               g_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
 
-       /* Notice */
        note_spot(y, x);
-
-       /* Redraw */
        lite_spot(y, x);
-
-       /* Update some things */
        p_ptr->update |= (PU_FLOW);
 
        prev_feat = tmp_feat;
@@ -1854,7 +1612,6 @@ static void do_cmd_dump_options(void)
        /* Open the file */
        fff = my_fopen(buf, "a");
 
-       /* Oops */
        if (!fff)
        {
                msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
@@ -1901,8 +1658,6 @@ static void do_cmd_dump_options(void)
        /* Free the "exist" array (2-dimension) */
        C_KILL(*exist, NUM_O_BIT * NUM_O_SET, int);
        C_KILL(exist, NUM_O_SET, int *);
-
-       /* Close it */
        my_fclose(fff);
 
        msg_format(_("オプションbit使用状況をファイル %s に書き出しました。", "Option bits usage dump saved to file %s."), buf);
@@ -2035,14 +1790,12 @@ void do_cmd_debug(void)
 
        /* Hitpoint rerating */
        case 'h':
-               do_cmd_rerate(TRUE);
+               roll_hitdice(p_ptr, SPOP_DISPLAY_MES | SPOP_DEBUG);
                break;
 
-#ifdef MONSTER_HORDES
        case 'H':
                do_cmd_summon_horde();
                break;
-#endif /* MONSTER_HORDES */
 
        /* Identify */
        case 'i':
@@ -2071,7 +1824,7 @@ void do_cmd_debug(void)
 
        /* Mutation */
        case 'M':
-               (void)gain_random_mutation(command_arg);
+               (void)gain_mutation(p_ptr, command_arg);
                break;
 
        /* Reset Class */
@@ -2109,6 +1862,28 @@ void do_cmd_debug(void)
                teleport_player(10, 0L);
                break;
 
+       /* Take a Quests */
+       case 'Q':
+               {
+                       char ppp[30];
+                       char tmp_val[5];
+                       int tmp_int;
+                       sprintf(ppp, "QuestID (0-%d):", max_q_idx - 1);
+                       sprintf(tmp_val, "%d", 0);
+
+                       if (!get_string(ppp, tmp_val, 3)) return;
+                       tmp_int = atoi(tmp_val);
+
+                       if(tmp_int < 0) break;
+                       if(tmp_int >= max_q_idx) break;
+
+                       p_ptr->inside_quest = (QUEST_IDX)tmp_int;
+                       process_dungeon_file("q_info.txt", 0, 0, 0, 0);
+                       quest[tmp_int].status = QUEST_STATUS_TAKEN;
+                       p_ptr->inside_quest = 0;
+               }
+               break;
+
        /* Complete a Quest -KMW- */
        case 'q':
                if(p_ptr->inside_quest)
@@ -2128,11 +1903,11 @@ void do_cmd_debug(void)
 
        /* Make every dungeon square "known" to test streamers -KMW- */
        case 'u':
-               for (y = 0; y < cur_hgt; y++)
+               for (y = 0; y < current_floor_ptr->height; y++)
                {
-                       for (x = 0; x < cur_wid; x++)
+                       for (x = 0; x < current_floor_ptr->width; x++)
                        {
-                               cave[y][x].info |= (CAVE_GLOW | CAVE_MARK);
+                               current_floor_ptr->grid_array[y][x].info |= (CAVE_GLOW | CAVE_MARK);
                        }
                }
                wiz_lite(FALSE);
@@ -2189,7 +1964,23 @@ void do_cmd_debug(void)
 
        /* Hack -- whatever I desire */
        case '_':
-               do_cmd_wiz_hack_ben();
+               probing();
+               break;
+
+       /* For temporary test. */
+       case 'X':
+       {
+               INVENTORY_IDX i;
+               for(i = INVEN_TOTAL - 1; i >= 0; i--)
+               {
+                       if(inventory[i].k_idx) inven_drop(i, 999);
+               }
+               player_outfit();
+               break;
+       }
+
+       case 'V':
+               do_cmd_wiz_reset_class();
                break;
 
        /* Not a Wizard Command */
@@ -2199,6 +1990,109 @@ void do_cmd_debug(void)
        }
 }
 
+void cheat_death(player_type *creature_ptr)
+{
+       /* Mark social class, reset age, if needed */
+       if (creature_ptr->sc) creature_ptr->sc = creature_ptr->age = 0;
+
+       /* Increase age */
+       creature_ptr->age++;
+
+       /* Mark savefile */
+       creature_ptr->noscore |= 0x0001;
+
+       msg_print(_("ウィザードモードに念を送り、死を欺いた。", "You invoke wizard mode and cheat death."));
+       msg_print(NULL);
+
+       (void)life_stream(FALSE, FALSE);
+
+       if (creature_ptr->pclass == CLASS_MAGIC_EATER)
+       {
+               int magic_idx;
+               for (magic_idx = 0; magic_idx < EATER_EXT * 2; magic_idx++)
+               {
+                       creature_ptr->magic_num1[magic_idx] = creature_ptr->magic_num2[magic_idx] * EATER_CHARGE;
+               }
+               for (; magic_idx < EATER_EXT * 3; magic_idx++)
+               {
+                       creature_ptr->magic_num1[magic_idx] = 0;
+               }
+       }
+
+       /* Restore spell points */
+       creature_ptr->csp = creature_ptr->msp;
+       creature_ptr->csp_frac = 0;
+
+       /* Hack -- cancel recall */
+       if (creature_ptr->word_recall)
+       {
+               msg_print(_("張りつめた大気が流れ去った...", "A tension leaves the air around you..."));
+               msg_print(NULL);
+
+               /* Hack -- Prevent recall */
+               creature_ptr->word_recall = 0;
+               creature_ptr->redraw |= (PR_STATUS);
+       }
+
+       /* Hack -- cancel alter */
+       if (creature_ptr->alter_reality)
+       {
+               /* Hack -- Prevent alter */
+               creature_ptr->alter_reality = 0;
+               creature_ptr->redraw |= (PR_STATUS);
+       }
+
+       /* Note cause of death */
+       (void)strcpy(creature_ptr->died_from, _("死の欺き", "Cheating death"));
+
+       /* Do not die */
+       creature_ptr->is_dead = FALSE;
+
+       /* Hack -- Prevent starvation */
+       (void)set_food(PY_FOOD_MAX - 1);
+
+       current_floor_ptr->dun_level = 0;
+       creature_ptr->inside_arena = FALSE;
+       creature_ptr->inside_battle = FALSE;
+       leaving_quest = 0;
+       creature_ptr->inside_quest = 0;
+       if (p_ptr->dungeon_idx) creature_ptr->recall_dungeon = p_ptr->dungeon_idx;
+       p_ptr->dungeon_idx = 0;
+       if (lite_town || vanilla_town)
+       {
+               creature_ptr->wilderness_y = 1;
+               creature_ptr->wilderness_x = 1;
+               if (vanilla_town)
+               {
+                       creature_ptr->oldpy = 10;
+                       creature_ptr->oldpx = 34;
+               }
+               else
+               {
+                       creature_ptr->oldpy = 33;
+                       creature_ptr->oldpx = 131;
+               }
+       }
+       else
+       {
+               creature_ptr->wilderness_y = 48;
+               creature_ptr->wilderness_x = 5;
+               creature_ptr->oldpy = 33;
+               creature_ptr->oldpx = 131;
+       }
+       creature_ptr->wild_mode = FALSE;
+       creature_ptr->leaving = TRUE;
+
+       do_cmd_write_nikki(NIKKI_BUNSHOU, 1,
+               _("                            しかし、生き返った。",
+                       "                            but revived."));
+
+       /* Prepare next floor */
+       leave_floor();
+       wipe_m_list();
+
+}
+
 
 #else