OSDN Git Service

branch-hexの変更をコミット。
[hengband/hengband.git] / src / wizard2.c
index aa94cfa..0a01936 100644 (file)
@@ -1,53 +1,64 @@
 /* File: wizard2.c */
 
-/* Purpose: Wizard commands */
-
 /*
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
+ * Copyright (c) 1997 Ben Harrison, and others
  *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies.  Other copyrights may also apply.
  */
 
+/* Purpose: Wizard commands */
+
 #include "angband.h"
 
 
 /*
- * Hack -- Rerate Hitpoints
+ * Roll the hitdie -- aux of do_cmd_rerate()
  */
-void do_cmd_rerate(bool display)
+void do_cmd_rerate_aux(void)
 {
-       int min_value, max_value, i, percent, j;
+       /* Minimum hitpoints at highest level */
+       int min_value = p_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (p_ptr->hitdie + 1)) * 3 / 8;
 
-       min_value = ((PY_MAX_LEVEL+2) * (p_ptr->hitdie + 1)) * 3 / 8;
-       min_value += p_ptr->hitdie;
+       /* Maximum hitpoints at highest level */
+       int max_value = p_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (p_ptr->hitdie + 1)) * 5 / 8;
 
-       max_value = ((PY_MAX_LEVEL+2) * (p_ptr->hitdie + 1)) * 5 / 8;
-       max_value += p_ptr->hitdie;
+       int i;
 
        /* Rerate */
        while (1)
        {
+               /* Pre-calculate level 1 hitdice */
                p_ptr->player_hp[0] = p_ptr->hitdie;
 
                for (i = 1; i < 4; i++)
                {
-                       j = randint1(p_ptr->hitdie);
-                       p_ptr->player_hp[0] += j;
+                       p_ptr->player_hp[0] += randint1(p_ptr->hitdie);
                }
 
-               /* Collect values */
+               /* Roll the hitpoint values */
                for (i = 1; i < PY_MAX_LEVEL; i++)
                {
-                       p_ptr->player_hp[i] = randint1(p_ptr->hitdie);
-                       p_ptr->player_hp[i] += p_ptr->player_hp[i - 1];
+                       p_ptr->player_hp[i] = p_ptr->player_hp[i - 1] + randint1(p_ptr->hitdie);
                }
 
-               /* Legal values */
+               /* 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;
        }
+}
+
+
+/*
+ * Hack -- Rerate Hitpoints
+ */
+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 +
@@ -97,17 +108,7 @@ static bool wiz_dimension_door(void)
 
        if (!tgt_pt(&x, &y)) return FALSE;
 
-       if (!cave_empty_bold(y, x))
-       {
-#ifdef JP
-msg_print("ÀºÎ¤«¤éʪ¼Á³¦¤ËÌá¤ë»þ¤¦¤Þ¤¯¤¤¤«¤Ê¤«¤Ã¤¿¡ª");
-#else
-               msg_print("You fail to exit the astral plane correctly!");
-#endif
-
-               teleport_player(10);
-       }
-       else teleport_player_to(y, x, FALSE);
+       teleport_player_to(y, x, TELEPORT_NONMAGICAL);
 
        return (TRUE);
 }
@@ -120,7 +121,7 @@ msg_print("
 static void wiz_create_named_art(int a_idx)
 {
        /* Create the artifact */
-       create_named_art(a_idx, py, px);
+       (void)create_named_art(a_idx, py, px);
 
        /* All done */
        msg_print("Allocated.");
@@ -150,7 +151,7 @@ static void do_cmd_summon_horde(void)
        while (--attempts)
        {
                scatter(&wy, &wx, py, px, 3, 0);
-               if (cave_naked_bold(wy, wx)) break;
+               if (cave_empty_bold(wy, wx)) break;
        }
 
        (void)alloc_horde(wy, wx);
@@ -338,7 +339,7 @@ static void do_cmd_wiz_bamf(void)
        if (!target_who) return;
 
        /* Teleport to the target */
-       teleport_player_to(target_row, target_col, FALSE);
+       teleport_player_to(target_row, target_col, TELEPORT_NONMAGICAL);
 }
 
 
@@ -380,7 +381,7 @@ static void do_cmd_wiz_change_aux(void)
 
 
        /* Default */
-       sprintf(tmp_val, "8000");
+       sprintf(tmp_val, "%d", WEAPON_EXP_MASTER);
 
        /* Query */
 #ifdef JP
@@ -393,10 +394,10 @@ static void do_cmd_wiz_change_aux(void)
        tmp_s16b = atoi(tmp_val);
 
        /* Verify */
-       if (tmp_s16b < 0) tmp_s16b = 0L;
-       if (tmp_s16b > 8000) tmp_s16b = 8000L;
+       if (tmp_s16b < WEAPON_EXP_UNSKILLED) tmp_s16b = WEAPON_EXP_UNSKILLED;
+       if (tmp_s16b > WEAPON_EXP_MASTER) tmp_s16b = WEAPON_EXP_MASTER;
 
-       for (j = 0; j <= TV_SWORD - TV_BOW;j++)
+       for (j = 0; j <= TV_WEAPON_END - TV_WEAPON_BEGIN; j++)
        {
                for (i = 0;i < 64;i++)
                {
@@ -412,9 +413,9 @@ static void do_cmd_wiz_change_aux(void)
        }
 
        for (j = 0; j < 32; j++)
-               p_ptr->spell_exp[j] = (tmp_s16b > 1600 ? 1600 : tmp_s16b);
+               p_ptr->spell_exp[j] = (tmp_s16b > SPELL_EXP_MASTER ? SPELL_EXP_MASTER : tmp_s16b);
        for (; j < 64; j++)
-               p_ptr->spell_exp[j] = (tmp_s16b > 1400 ? 1400 : tmp_s16b);
+               p_ptr->spell_exp[j] = (tmp_s16b > SPELL_EXP_EXPERT ? SPELL_EXP_EXPERT : tmp_s16b);
 
        /* Default */
        sprintf(tmp_val, "%ld", (long)(p_ptr->au));
@@ -545,12 +546,12 @@ static void wiz_display_item(object_type *o_ptr)
        prt_alloc(o_ptr->tval, o_ptr->sval, 1, 0);
 
        /* Describe fully */
-       object_desc_store(buf, o_ptr, TRUE, 3);
+       object_desc(buf, o_ptr, OD_STORE);
 
        prt(buf, 2, j);
 
        prt(format("kind = %-5d  level = %-4d  tval = %-5d  sval = %-5d",
-                  o_ptr->k_idx, get_object_level(o_ptr),
+                  o_ptr->k_idx, k_info[o_ptr->k_idx].level,
                   o_ptr->tval, o_ptr->sval), 4, j);
 
        prt(format("number = %-3d  wgt = %-6d  ac = %-5d    damage = %dd%d",
@@ -561,7 +562,7 @@ static void wiz_display_item(object_type *o_ptr)
                   o_ptr->pval, o_ptr->to_a, o_ptr->to_h, o_ptr->to_d), 6, j);
 
        prt(format("name1 = %-4d  name2 = %-4d  cost = %ld",
-                  o_ptr->name1, o_ptr->name2, (long)object_value(o_ptr)), 7, j);
+                  o_ptr->name1, o_ptr->name2, (long)object_value_real(o_ptr)), 7, j);
 
        prt(format("ident = %04x  xtra1 = %-4d  xtra2 = %-4d  timeout = %-d",
                   o_ptr->ident, o_ptr->xtra1, o_ptr->xtra2, o_ptr->timeout), 8, j);
@@ -648,12 +649,13 @@ static tval_desc tvals[] =
        { TV_DEATH_BOOK,        "Death Spellbook"      },
        { TV_TRUMP_BOOK,        "Trump Spellbook"      },
        { TV_ARCANE_BOOK,       "Arcane Spellbook"     },
-       { TV_ENCHANT_BOOK,      "Craft Spellbook"},
+       { TV_CRAFT_BOOK,      "Craft Spellbook"},
        { TV_DAEMON_BOOK,       "Daemon Spellbook"},
-       { TV_CRUSADE_BOOK,         "Crusade Spellbook"},
+       { TV_CRUSADE_BOOK,      "Crusade Spellbook"},
        { TV_MUSIC_BOOK,        "Music Spellbook"      },
        { TV_HISSATSU_BOOK,     "Book of Kendo" },
-       { TV_PARCHEMENT,        "Parchement" },
+       { TV_HEX_BOOK,          "Hex Spellbook"        },
+       { TV_PARCHMENT,         "Parchment" },
        { TV_WHISTLE,           "Whistle"       },
        { TV_SPIKE,             "Spikes"               },
        { TV_DIGGING,           "Digger"               },
@@ -814,7 +816,7 @@ static void wiz_tweak_item(object_type *o_ptr)
 
 
        /* Hack -- leave artifacts alone */
-       if (artifact_p(o_ptr) || o_ptr->art_name) return;
+       if (object_is_artifact(o_ptr)) return;
 
        p = "Enter new 'pval' setting: ";
        sprintf(tmp_val, "%d", o_ptr->pval);
@@ -856,7 +858,7 @@ static void wiz_reroll_item(object_type *o_ptr)
 
 
        /* Hack -- leave artifacts alone */
-       if (artifact_p(o_ptr) || o_ptr->art_name) return;
+       if (object_is_artifact(o_ptr)) return;
 
 
        /* Get local object */
@@ -876,7 +878,7 @@ static void wiz_reroll_item(object_type *o_ptr)
                if (!get_com("[a]ccept, [w]orthless, [c]ursed, [n]ormal, [g]ood, [e]xcellent, [s]pecial? ", &ch, FALSE))
                {
                        /* Preserve wizard-generated artifacts */
-                       if (artifact_p(q_ptr))
+                       if (object_is_fixed_artifact(q_ptr))
                        {
                                a_info[q_ptr->name1].cur_num = 0;
                                q_ptr->name1 = 0;
@@ -894,7 +896,7 @@ static void wiz_reroll_item(object_type *o_ptr)
                }
 
                /* Preserve wizard-generated artifacts */
-               if (artifact_p(q_ptr))
+               if (object_is_fixed_artifact(q_ptr))
                {
                        a_info[q_ptr->name1].cur_num = 0;
                        q_ptr->name1 = 0;
@@ -906,44 +908,45 @@ 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, FALSE, TRUE, TRUE, TRUE);
+                               apply_magic(q_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, FALSE, TRUE, FALSE, TRUE);
+                               apply_magic(q_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, FALSE, FALSE, FALSE, FALSE);
+                               apply_magic(q_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, FALSE, TRUE, FALSE, FALSE);
+                               apply_magic(q_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, FALSE, TRUE, TRUE, FALSE);
+                               apply_magic(q_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, TRUE, TRUE, TRUE, FALSE);
+                               apply_magic(q_ptr, dun_level, AM_GOOD | AM_GREAT | AM_SPECIAL);
 
-                               /* Failed to create normal artifact; make a random one */
-                               if (!artifact_p(q_ptr)) create_artifact(q_ptr, FALSE);
+                               /* Failed to create artifact; make a random one */
+                               if (!object_is_artifact(q_ptr)) create_artifact(q_ptr, FALSE);
                                break;
                        }
                }
@@ -991,7 +994,7 @@ static void wiz_statistics(object_type *o_ptr)
        char ch;
        cptr quality;
 
-       bool good, great;
+       u32b mode;
 
        object_type forge;
        object_type     *q_ptr;
@@ -1003,7 +1006,7 @@ static void wiz_statistics(object_type *o_ptr)
 
 
        /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
-       if (artifact_p(o_ptr)) a_info[o_ptr->name1].cur_num = 0;
+       if (object_is_fixed_artifact(o_ptr)) a_info[o_ptr->name1].cur_num = 0;
 
 
        /* Interact */
@@ -1019,26 +1022,21 @@ static void wiz_statistics(object_type *o_ptr)
 
                if (ch == 'n' || ch == 'N')
                {
-                       good = FALSE;
-                       great = FALSE;
+                       mode = 0L;
                        quality = "normal";
                }
                else if (ch == 'g' || ch == 'G')
                {
-                       good = TRUE;
-                       great = FALSE;
+                       mode = AM_GOOD;
                        quality = "good";
                }
                else if (ch == 'e' || ch == 'E')
                {
-                       good = TRUE;
-                       great = TRUE;
+                       mode = AM_GOOD | AM_GREAT;
                        quality = "excellent";
                }
                else
                {
-                       good = FALSE;
-                       great = FALSE;
                        break;
                }
 
@@ -1086,11 +1084,11 @@ static void wiz_statistics(object_type *o_ptr)
                        object_wipe(q_ptr);
 
                        /* Create an object */
-                       make_object(q_ptr, good, great);
+                       make_object(q_ptr, mode);
 
 
                        /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
-                       if (artifact_p(q_ptr)) a_info[q_ptr->name1].cur_num = 0;
+                       if (object_is_fixed_artifact(q_ptr)) a_info[q_ptr->name1].cur_num = 0;
 
 
                        /* Test for the same tval and sval. */
@@ -1142,7 +1140,7 @@ static void wiz_statistics(object_type *o_ptr)
 
 
        /* Hack -- Normally only make a single artifact */
-       if (artifact_p(o_ptr)) a_info[o_ptr->name1].cur_num = 1;
+       if (object_is_fixed_artifact(o_ptr)) a_info[o_ptr->name1].cur_num = 1;
 }
 
 
@@ -1157,7 +1155,7 @@ static void wiz_quantity_item(object_type *o_ptr)
 
 
        /* Never duplicate artifacts */
-       if (artifact_p(o_ptr) || o_ptr->art_name) return;
+       if (object_is_artifact(o_ptr)) return;
 
        /* Store old quantity. -LM- */
        tmp_qnt = o_ptr->number;
@@ -1178,8 +1176,40 @@ static void wiz_quantity_item(object_type *o_ptr)
                /* Accept modifications */
                o_ptr->number = tmp_int;
        }
+
+       if (o_ptr->tval == TV_ROD)
+       {
+               o_ptr->pval = o_ptr->pval * o_ptr->number / tmp_qnt;
+       }
 }
 
+/* debug command for blue mage */
+static void do_cmd_wiz_blue_mage(void)
+{
+
+       int                             i = 0;
+       int                             j = 0;
+       s32b            f4 = 0, f5 = 0, f6 = 0; 
+
+       for (j=1; j<6; j++)
+       {
+
+               set_rf_masks(&f4, &f5, &f6, j);
+
+               for (i = 0; i < 32; i++)
+               {
+                       if ((0x00000001 << i) & f4) p_ptr->magic_num2[i] = 1;
+               }
+               for (; i < 64; i++)
+               {
+                       if ((0x00000001 << (i - 32)) & f5) p_ptr->magic_num2[i] = 1;
+               }
+               for (; i < 96; i++)
+               {
+                       if ((0x00000001 << (i - 64)) & f6) p_ptr->magic_num2[i] = 1;
+               }
+       }
+}
 
 
 /*
@@ -1361,7 +1391,7 @@ static void wiz_create_item(void)
                        if (a_info[i].sval != k_info[k_idx].sval) continue;
 
                        /* Create this artifact */
-                       create_named_art(i, py, px);
+                       (void)create_named_art(i, py, px);
 
                        /* All done */
                        msg_print("Allocated(INSTA_ART).");
@@ -1377,7 +1407,7 @@ static void wiz_create_item(void)
        object_prep(q_ptr, k_idx);
 
        /* Apply magic */
-       apply_magic(q_ptr, dun_level, FALSE, FALSE, FALSE, FALSE);
+       apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART);
 
        /* Drop the object from heaven */
        (void)drop_near(q_ptr, -1, py, px);
@@ -1404,14 +1434,27 @@ static void do_cmd_wiz_cure_all(void)
        (void)restore_level();
 
        /* Heal the player */
-       p_ptr->chp = p_ptr->mhp;
-       p_ptr->chp_frac = 0;
+       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 */
@@ -1427,9 +1470,6 @@ static void do_cmd_wiz_cure_all(void)
 
        /* No longer hungry */
        (void)set_food(PY_FOOD_MAX - 1);
-
-       /* Redraw everything */
-       do_cmd_redraw();
 }
 
 
@@ -1444,6 +1484,7 @@ static void do_cmd_wiz_jump(void)
                char    ppp[80];
 
                char    tmp_val[160];
+               int             tmp_dungeon_type;
 
                /* Prompt */
                sprintf(ppp, "Jump which dungeon : ");
@@ -1454,11 +1495,11 @@ static void do_cmd_wiz_jump(void)
                /* Ask for a level */
                if (!get_string(ppp, tmp_val, 2)) return;
 
-               dungeon_type = atoi(tmp_val);
-               if (!d_info[dungeon_type].maxdepth || (dungeon_type > max_d_idx)) dungeon_type = DUNGEON_ANGBAND;
+               tmp_dungeon_type = atoi(tmp_val);
+               if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND;
 
                /* Prompt */
-               sprintf(ppp, "Jump to level (0, %d-%d): ", d_info[dungeon_type].mindepth, d_info[dungeon_type].maxdepth);
+               sprintf(ppp, "Jump to level (0, %d-%d): ", d_info[tmp_dungeon_type].mindepth, d_info[tmp_dungeon_type].maxdepth);
 
                /* Default */
                sprintf(tmp_val, "%d", dun_level);
@@ -1468,6 +1509,8 @@ static void do_cmd_wiz_jump(void)
 
                /* Extract request */
                command_arg = atoi(tmp_val);
+
+               dungeon_type = tmp_dungeon_type;
        }
 
        /* Paranoia */
@@ -1484,7 +1527,7 @@ static void do_cmd_wiz_jump(void)
        /* Change level */
        dun_level = command_arg;
 
-       prepare_change_floor_mode(CFM_RAND_PLACE | CFM_CLEAR_ALL);
+       prepare_change_floor_mode(CFM_RAND_PLACE);
 
        if (!dun_level) dungeon_type = 0;
        p_ptr->inside_arena = FALSE;
@@ -1495,12 +1538,17 @@ 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->leftbldg = FALSE;
        energy_use = 0;
 
        /* Prevent energy_need from being too lower than 0 */
        p_ptr->energy_need = 0;
 
+       /*
+        * Clear all saved floors
+        * and create a first saved floor
+        */
+       prepare_change_floor_mode(CFM_FIRST_FLOOR);
+
        /* Leaving */
        p_ptr->leaving = TRUE;
 }
@@ -1558,28 +1606,7 @@ static void do_cmd_wiz_summon(int num)
  */
 static void do_cmd_wiz_named(int r_idx)
 {
-       int i, x, y;
-
-       /* Paranoia */
-       /* if (!r_idx) return; */
-
-       /* Prevent illegal monsters */
-       if (r_idx >= max_r_idx) return;
-
-       /* Try 10 times */
-       for (i = 0; i < 10; i++)
-       {
-               int d = 1;
-
-               /* Pick a location */
-               scatter(&y, &x, py, px, d, 0);
-
-               /* Require empty grids */
-               if (!cave_empty_bold(y, x)) continue;
-
-               /* Place it (allow groups) */
-               if (place_monster_aux(0, y, x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP))) break;
-       }
+       (void)summon_named_creature(0, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
 }
 
 
@@ -1590,7 +1617,7 @@ static void do_cmd_wiz_named(int r_idx)
  */
 static void do_cmd_wiz_named_friendly(int r_idx)
 {
-       (void) summon_named_creature(0, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
+       (void)summon_named_creature(0, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
 }
 
 
@@ -1611,14 +1638,20 @@ static void do_cmd_wiz_zap(void)
                /* Paranoia -- Skip dead monsters */
                if (!m_ptr->r_idx) continue;
 
+               /* Skip the mount */
+               if (i == p_ptr->riding) continue;
+
                /* Delete nearby monsters */
                if (m_ptr->cdis <= MAX_SIGHT)
                {
-                       if (i == p_ptr->riding)
+                       if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                        {
-                               rakuba(-1, FALSE);
-                               p_ptr->redraw |= (PR_EXTRA);
+                               char m_name[80];
+
+                               monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
+                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
                        }
+
                        delete_monster_idx(i);
                }
        }
@@ -1640,10 +1673,15 @@ static void do_cmd_wiz_zap_all(void)
                /* Paranoia -- Skip dead monsters */
                if (!m_ptr->r_idx) continue;
 
-               if (i == p_ptr->riding)
+               /* Skip the mount */
+               if (i == p_ptr->riding) continue;
+
+               if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       rakuba(-1, FALSE);
-                       p_ptr->redraw |= (PR_EXTRA);
+                       char m_name[80];
+
+                       monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
+                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
                }
 
                /* Delete this monster */
@@ -1652,6 +1690,163 @@ static void do_cmd_wiz_zap_all(void)
 }
 
 
+/*
+ * Create desired feature
+ */
+static void do_cmd_wiz_create_feature(void)
+{
+       static int   prev_feat = 0;
+       static int   prev_mimic = 0;
+       cave_type    *c_ptr;
+       feature_type *f_ptr;
+       char         tmp_val[160];
+       int          tmp_feat, tmp_mimic;
+       int          y, x;
+
+       if (!tgt_pt(&x, &y)) return;
+
+       c_ptr = &cave[y][x];
+
+       /* Default */
+       sprintf(tmp_val, "%d", prev_feat);
+
+       /* Query */
+#ifdef JP
+       if (!get_string("ÃÏ·Á: ", tmp_val, 3)) return;
+#else
+       if (!get_string("Feature: ", tmp_val, 3)) return;
+#endif
+
+       /* Extract */
+       tmp_feat = atoi(tmp_val);
+       if (tmp_feat < 0) tmp_feat = 0;
+       else if (tmp_feat >= max_f_idx) tmp_feat = max_f_idx - 1;
+
+       /* Default */
+       sprintf(tmp_val, "%d", prev_mimic);
+
+       /* Query */
+#ifdef JP
+       if (!get_string("ÃÏ·Á (mimic): ", tmp_val, 3)) return;
+#else
+       if (!get_string("Feature (mimic): ", tmp_val, 3)) return;
+#endif
+
+       /* Extract */
+       tmp_mimic = atoi(tmp_val);
+       if (tmp_mimic < 0) tmp_mimic = 0;
+       else if (tmp_mimic >= max_f_idx) tmp_mimic = max_f_idx - 1;
+
+       cave_set_feat(y, x, tmp_feat);
+       c_ptr->mimic = tmp_mimic;
+
+       f_ptr = &f_info[get_feat_mimic(c_ptr)];
+
+       if (have_flag(f_ptr->flags, FF_GLYPH) ||
+           have_flag(f_ptr->flags, FF_MINOR_GLYPH))
+               c_ptr->info |= (CAVE_OBJECT);
+       else if (have_flag(f_ptr->flags, FF_MIRROR))
+               c_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;
+       prev_mimic = tmp_mimic;
+}
+
+
+#define NUM_O_SET 8
+#define NUM_O_BIT 32
+
+/*
+ * Hack -- Dump option bits usage
+ */
+static void do_cmd_dump_options(void)
+{
+       int  i, j;
+       FILE *fff;
+       char buf[1024];
+       int  **exist;
+
+       /* Build the filename */
+       path_build(buf, sizeof buf, ANGBAND_DIR_USER, "opt_info.txt");
+
+       /* File type is "TEXT" */
+       FILE_TYPE(FILE_TYPE_TEXT);
+
+       /* Open the file */
+       fff = my_fopen(buf, "a");
+
+       /* Oops */
+       if (!fff)
+       {
+#ifdef JP
+               msg_format("¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£", buf);
+#else
+               msg_format("Failed to open file %s.", buf);
+#endif
+               msg_print(NULL);
+               return;
+       }
+
+       /* Allocate the "exist" array (2-dimension) */
+       C_MAKE(exist, NUM_O_SET, int *);
+       C_MAKE(*exist, NUM_O_BIT * NUM_O_SET, int);
+       for (i = 1; i < NUM_O_SET; i++) exist[i] = *exist + i * NUM_O_BIT;
+
+       /* Check for exist option bits */
+       for (i = 0; option_info[i].o_desc; i++)
+       {
+               option_type *ot_ptr = &option_info[i];
+               if (ot_ptr->o_var) exist[ot_ptr->o_set][ot_ptr->o_bit] = i + 1;
+       }
+
+       fprintf(fff, "[Option bits usage on Hengband %d.%d.%d]\n\n",
+               FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+
+       fputs("Set - Bit (Page) Option Name\n", fff);
+       fputs("------------------------------------------------\n", fff);
+       /* Dump option bits usage */
+       for (i = 0; i < NUM_O_SET; i++)
+       {
+               for (j = 0; j < NUM_O_BIT; j++)
+               {
+                       if (exist[i][j])
+                       {
+                               option_type *ot_ptr = &option_info[exist[i][j] - 1];
+                               fprintf(fff, "  %d -  %02d (%4d) %s\n",
+                                       i, j, ot_ptr->o_page, ot_ptr->o_text);
+                       }
+                       else
+                       {
+                               fprintf(fff, "  %d -  %02d\n", i, j);
+                       }
+               }
+               fputc('\n', fff);
+       }
+
+       /* 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);
+
+#ifdef JP
+       msg_format("¥ª¥×¥·¥ç¥óbit»ÈÍѾõ¶·¤ò¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤­½Ð¤·¤Þ¤·¤¿¡£", buf);
+#else
+       msg_format("Option bits usage dump saved to file %s.", buf);
+#endif
+}
+
+
 #ifdef ALLOW_SPOILERS
 
 /*
@@ -1686,236 +1881,243 @@ void do_cmd_debug(void)
        /* Analyze the command */
        switch (cmd)
        {
-               /* Nothing */
-               case ESCAPE:
-               case ' ':
-               case '\n':
-               case '\r':
+       /* Nothing */
+       case ESCAPE:
+       case ' ':
+       case '\n':
+       case '\r':
                break;
 
-
 #ifdef ALLOW_SPOILERS
 
-               /* Hack -- Generate Spoilers */
-               case '"':
+       /* Hack -- Generate Spoilers */
+       case '"':
                do_cmd_spoilers();
                break;
 
 #endif /* ALLOW_SPOILERS */
 
-
-               /* Hack -- Help */
-               case '?':
+       /* Hack -- Help */
+       case '?':
                do_cmd_help();
                break;
 
-
-               /* Cure all maladies */
-               case 'a':
+       /* Cure all maladies */
+       case 'a':
                do_cmd_wiz_cure_all();
                break;
 
-               /* Know alignment */
-               case 'A':
+       /* Know alignment */
+       case 'A':
                msg_format("Your alignment is %d.", p_ptr->align);
                break;
 
-               /* Teleport to target */
-               case 'b':
+       /* Teleport to target */
+       case 'b':
                do_cmd_wiz_bamf();
                break;
 
-               case 'B':
+       case 'B':
                battle_monsters();
                break;
 
-               /* Create any object */
-               case 'c':
+       /* Create any object */
+       case 'c':
                wiz_create_item();
                break;
 
-               /* Create a named artifact */
-               case 'C':
+       /* Create a named artifact */
+       case 'C':
                wiz_create_named_art(command_arg);
                break;
 
-               /* Detect everything */
-               case 'd':
-               detect_all(DETECT_RAD_ALL*3);
+       /* Detect everything */
+       case 'd':
+               detect_all(DETECT_RAD_ALL * 3);
                break;
 
-               /* Dimension_door */
-               case 'D':
+       /* Dimension_door */
+       case 'D':
                wiz_dimension_door();
                break;
 
-               /* Edit character */
-               case 'e':
+       /* Edit character */
+       case 'e':
                do_cmd_wiz_change();
                break;
 
-               /* View item info */
-               case 'f':
+       /* Blue Mage Only */
+       case 'E':
+               if (p_ptr->pclass == CLASS_BLUE_MAGE)
+               {
+                       do_cmd_wiz_blue_mage();
+               }
+               break;
+
+       /* View item info */
+       case 'f':
                identify_fully(FALSE);
                break;
 
-               /* Good Objects */
-               case 'g':
+       /* Create desired feature */
+       case 'F':
+               do_cmd_wiz_create_feature();
+               break;
+
+       /* Good Objects */
+       case 'g':
                if (command_arg <= 0) command_arg = 1;
                acquirement(py, px, command_arg, FALSE, TRUE);
                break;
 
-               /* Hitpoint rerating */
-               case 'h':
-               do_cmd_rerate(TRUE); break;
+       /* Hitpoint rerating */
+       case 'h':
+               do_cmd_rerate(TRUE);
+               break;
 
 #ifdef MONSTER_HORDES
-               case 'H':
-               do_cmd_summon_horde(); break;
+       case 'H':
+               do_cmd_summon_horde();
+               break;
 #endif /* MONSTER_HORDES */
 
-               /* Identify */
-               case 'i':
+       /* Identify */
+       case 'i':
                (void)ident_spell(FALSE);
                break;
 
-               /* Go up or down in the dungeon */
-               case 'j':
+       /* Go up or down in the dungeon */
+       case 'j':
                do_cmd_wiz_jump();
                break;
 
-               /* Self-Knowledge */
-               case 'k':
-                       self_knowledge();
-                       break;
+       /* Self-Knowledge */
+       case 'k':
+               self_knowledge();
+               break;
 
-               /* Learn about objects */
-               case 'l':
-                       do_cmd_wiz_learn();
-                       break;
+       /* Learn about objects */
+       case 'l':
+               do_cmd_wiz_learn();
+               break;
 
-               /* Magic Mapping */
-               case 'm':
-                       map_area(DETECT_RAD_ALL);
-                       break;
+       /* Magic Mapping */
+       case 'm':
+               map_area(DETECT_RAD_ALL * 3);
+               break;
 
-               /* Mutation */
-               case 'M':
-                       (void)gain_random_mutation(command_arg);
-                       break;
+       /* Mutation */
+       case 'M':
+               (void)gain_random_mutation(command_arg);
+               break;
 
-               /* Specific reward */
-               case 'r':
-                       (void)gain_level_reward(command_arg);
-                       break;
+       /* Specific reward */
+       case 'r':
+               (void)gain_level_reward(command_arg);
+               break;
 
-               /* Summon _friendly_ named monster */
-               case 'N':
-                       do_cmd_wiz_named_friendly(command_arg);
-                       break;
+       /* Summon _friendly_ named monster */
+       case 'N':
+               do_cmd_wiz_named_friendly(command_arg);
+               break;
 
-               /* Summon Named Monster */
-               case 'n':
-                       do_cmd_wiz_named(command_arg);
-                       break;
+       /* Summon Named Monster */
+       case 'n':
+               do_cmd_wiz_named(command_arg);
+               break;
 
-               /* Object playing routines */
-               case 'o':
-                       do_cmd_wiz_play();
-                       break;
+       /* Dump option bits usage */
+       case 'O':
+               do_cmd_dump_options();
+               break;
 
-               /* Phase Door */
-               case 'p':
-                       teleport_player(10);
-                       break;
+       /* Object playing routines */
+       case 'o':
+               do_cmd_wiz_play();
+               break;
+
+       /* Phase Door */
+       case 'p':
+               teleport_player(10, 0L);
+               break;
 
 #if 0
-               /* Complete a Quest -KMW- */
-               case 'q':
+       /* Complete a Quest -KMW- */
+       case 'q':
+               for (i = 0; i < max_quests; i++)
                {
-                       for (i = 0; i < max_quests; i++)
-                       {
-                               if (p_ptr->quest[i].status == QUEST_STATUS_TAKEN)
-                               {
-                                       p_ptr->quest[i].status++;
-                                       msg_print("Completed Quest");
-                                       msg_print(NULL);
-                                       break;
-                               }
-                       }
-                       if (i == max_quests)
+                       if (p_ptr->quest[i].status == QUEST_STATUS_TAKEN)
                        {
-                               msg_print("No current quest");
+                               p_ptr->quest[i].status++;
+                               msg_print("Completed Quest");
                                msg_print(NULL);
+                               break;
                        }
-                       break;
                }
+               if (i == max_quests)
+               {
+                       msg_print("No current quest");
+                       msg_print(NULL);
+               }
+               break;
 #endif
 
-               /* Make every dungeon square "known" to test streamers -KMW- */
-               case 'u':
+       /* Make every dungeon square "known" to test streamers -KMW- */
+       case 'u':
+               for (y = 0; y < cur_hgt; y++)
                {
-                       for(y = 0; y < cur_hgt; y++)
+                       for (x = 0; x < cur_wid; x++)
                        {
-                               for(x = 0; x < cur_wid; x++)
-                               {
-                                       cave[y][x].info |= (CAVE_GLOW | CAVE_MARK);
-                               }
+                               cave[y][x].info |= (CAVE_GLOW | CAVE_MARK);
                        }
-                       wiz_lite(FALSE);
-                       break;
                }
+               wiz_lite(FALSE);
+               break;
 
-               /* Summon Random Monster(s) */
-               case 's':
-                       if (command_arg <= 0) command_arg = 1;
-                       do_cmd_wiz_summon(command_arg);
-                       break;
+       /* Summon Random Monster(s) */
+       case 's':
+               if (command_arg <= 0) command_arg = 1;
+               do_cmd_wiz_summon(command_arg);
+               break;
 
-               /* Teleport */
-               case 't':
-                       teleport_player(100);
-                       break;
+       /* Teleport */
+       case 't':
+               teleport_player(100, 0L);
+               break;
 
-               /* Very Good Objects */
-               case 'v':
-                       if (command_arg <= 0) command_arg = 1;
-                       acquirement(py, px, command_arg, TRUE, TRUE);
-                       break;
+       /* Very Good Objects */
+       case 'v':
+               if (command_arg <= 0) command_arg = 1;
+               acquirement(py, px, command_arg, TRUE, TRUE);
+               break;
 
-               /* Wizard Light the Level */
-               case 'w':
+       /* Wizard Light the Level */
+       case 'w':
                wiz_lite((bool)(p_ptr->pclass == CLASS_NINJA));
                break;
 
-               /* Increase Experience */
-               case 'x':
-               if (command_arg)
-               {
-                       gain_exp(command_arg);
-               }
-               else
-               {
-                       gain_exp(p_ptr->exp + 1);
-               }
+       /* Increase Experience */
+       case 'x':
+               gain_exp(command_arg ? command_arg : (p_ptr->exp + 1));
                break;
 
-               /* Zap Monsters (Genocide) */
-               case 'z':
+       /* Zap Monsters (Genocide) */
+       case 'z':
                do_cmd_wiz_zap();
                break;
 
-               case 'Z':
+       /* Zap Monsters (Omnicide) */
+       case 'Z':
                do_cmd_wiz_zap_all();
                break;
 
-               /* Hack -- whatever I desire */
-               case '_':
+       /* Hack -- whatever I desire */
+       case '_':
                do_cmd_wiz_hack_ben();
                break;
 
-               /* Not a Wizard Command */
-               default:
+       /* Not a Wizard Command */
+       default:
                msg_print("That is not a valid debug command.");
                break;
        }