X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=1c94028aa52c9d1872bc7c4abfd32a970cacb730;hb=924ccf7dec90442b9f1dc29743203792b11fdd3d;hp=20f83a5efadf32a5f3e668b210f4f0a59e62200e;hpb=fae855898cbbf9395503bb182104744a25f9479b;p=hengband%2Fhengband.git

diff --git a/src/wizard2.c b/src/wizard2.c
index 20f83a5ef..1c94028aa 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1,20 +1,21 @@
-/* File: wizard2.c */
-
-/*
- * Copyright (c) 1997 Ben Harrison, and others
- *
+/*!
+ * @file wizard2.c
+ * @brief ウィザードモードの処理(特別処理中心) / Wizard commands
+ * @date 2014/09/07
+ * @author
+ * Copyright (c) 1997 Ben Harrison, and others<br>
  * 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.
+ * are included in all such copies.  Other copyrights may also apply.<br>
+ * 2014 Deskull rearranged comment for Doxygen.<br>
  */
 
-/* Purpose: Wizard commands */
-
 #include "angband.h"
 
 
-/*
- * Roll the hitdie -- aux of do_cmd_rerate()
+/*!
+ * @brief プレイヤーのヒットダイスを振り直す / Roll the hitdie -- aux of do_cmd_rerate()
+ * @return なし
  */
 void do_cmd_rerate_aux(void)
 {
@@ -30,7 +31,7 @@ void do_cmd_rerate_aux(void)
 	while (1)
 	{
 		/* Pre-calculate level 1 hitdice */
-		p_ptr->player_hp[0] = p_ptr->hitdie;
+		p_ptr->player_hp[0] = (HIT_POINT)p_ptr->hitdie;
 
 		for (i = 1; i < 4; i++)
 		{
@@ -50,8 +51,10 @@ void do_cmd_rerate_aux(void)
 }
 
 
-/*
- * Hack -- Rerate Hitpoints
+/*!
+ * @brief プレイヤーのヒットダイスを振り直した後明示を行う / Hack -- Rerate Hitpoints
+ * @param display TRUEならば体力ランクを明示する
+ * @return なし
  */
 void do_cmd_rerate(bool display)
 {
@@ -78,20 +81,12 @@ void do_cmd_rerate(bool display)
 	/* Message */
 	if (display)
 	{
-#ifdef JP
-		msg_format("¸½ºß¤ÎÂÎÎÏ¥é¥ó¥¯¤Ï %d/100 ¤Ç¤¹¡£", percent);
-#else
-		msg_format("Your life rate is %d/100 now.", percent);
-#endif
+		msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent);
 		p_ptr->knowledge |= KNOW_HPRATE;
 	}
 	else
 	{
-#ifdef JP
-		msg_print("ÂÎÎÏ¥é¥ó¥¯¤¬ÊѤï¤Ã¤¿¡£");
-#else
-		msg_print("Life rate is changed.");
-#endif
+		msg_print(_("体力ランクが変わった。", "Life rate is changed."));
 		p_ptr->knowledge &= ~(KNOW_HPRATE);
 	}
 }
@@ -99,37 +94,77 @@ void do_cmd_rerate(bool display)
 
 #ifdef ALLOW_WIZARD
 
-/*
- * Dimension Door
+/*!
+ * @brief 必ず成功するウィザードモード用次元の扉処理 / Wizard Dimension Door
+ * @return 実際にテレポートを行ったらTRUEを返す
  */
 static bool wiz_dimension_door(void)
 {
-	int	x = 0, y = 0;
-
+	POSITION x = 0, y = 0;
 	if (!tgt_pt(&x, &y)) return FALSE;
+	teleport_player_to(y, x, TELEPORT_NONMAGICAL);
+	return (TRUE);
+}
+
+
+/*!
+ * @brief プレイ日数を変更する / Set gametime.
+ * @return 実際に変更を行ったらTRUEを返す
+ */
+static bool set_gametime(void)
+{
+	int tmp_int = 0;
+	char ppp[80], tmp_val[40];
 
-	teleport_player_to(y, x, FALSE, FALSE);
+	/* 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);
+
 }
 
 
-/*
- * Create the artifact of the specified number -- DAN
- *
+/*!
+ * @brief 指定されたIDの固定アーティファクトを生成する / Create the artifact of the specified number
+ * @return なし
  */
-static void wiz_create_named_art(int a_idx)
+static void wiz_create_named_art(void)
 {
+	char tmp_val[10] = "";
+	int a_idx;
+
+	/* Query */
+	if (!get_string("Artifact ID:", tmp_val, 3)) return;
+
+	/* Extract */
+	a_idx = atoi(tmp_val);
+	if(a_idx < 0) a_idx = 0;
+	if(a_idx >= max_a_idx) a_idx = 0; 
+
 	/* Create the artifact */
-	create_named_art(a_idx, py, px);
+	(void)create_named_art(a_idx, p_ptr->y, p_ptr->x);
 
 	/* All done */
 	msg_print("Allocated.");
 }
 
 
-/*
- * Hack -- quick debugging hook
+/*!
+ * @brief ウィザードモード用モンスター調査 / Hack -- quick debugging hook
+ * @return なし
  */
 static void do_cmd_wiz_hack_ben(void)
 {
@@ -139,18 +174,20 @@ static void do_cmd_wiz_hack_ben(void)
 }
 
 
-
 #ifdef MONSTER_HORDES
 
-/* Summon a horde of monsters */
+/*!
+ * @brief ウィザードモード用モンスターの群れ生成 / Summon a horde of monsters
+ * @return なし
+ */
 static void do_cmd_summon_horde(void)
 {
-	int wy = py, wx = px;
+	POSITION wy = p_ptr->y, wx = p_ptr->x;
 	int attempts = 1000;
 
 	while (--attempts)
 	{
-		scatter(&wy, &wx, py, px, 3, 0);
+		scatter(&wy, &wx, p_ptr->y, p_ptr->x, 3, 0);
 		if (cave_empty_bold(wy, wx)) break;
 	}
 
@@ -159,9 +196,9 @@ static void do_cmd_summon_horde(void)
 
 #endif /* MONSTER_HORDES */
 
-
-/*
- * Output a long int in binary format.
+/*!
+ * @brief 32ビット変数のビット配列を並べて描画する / Output a long int in binary format.
+ * @return なし
  */
 static void prt_binary(u32b flags, int row, int col)
 {
@@ -186,21 +223,24 @@ static void prt_binary(u32b flags, int row, int col)
 }
 
 
-#define K_MAX_DEPTH 110
+#define K_MAX_DEPTH 110 /*!< アイテムの階層毎生成率を表示する最大階 */
 
-/*
- * Output a rarity graph for a type of object.
+/*!
+ * @brief アイテムの階層毎生成率を表示する / Output a rarity graph for a type of object.
+ * @param tval ベースアイテムの大項目ID
+ * @param sval ベースアイテムの小項目ID
+ * @param row 表示列
+ * @param col 表示行
+ * @return なし
  */
-static void prt_alloc(byte tval, byte sval, int row, int col)
+static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_POSITION row, TERM_POSITION col)
 {
 	int i, j;
 	int home = 0;
-	u32b maxr = 1, maxt = 1, ratio;
 	u32b rarity[K_MAX_DEPTH];
 	u32b total[K_MAX_DEPTH];
-	s32b maxd = 1, display[22];
-	byte c = TERM_WHITE;
-	cptr r = "+--common--+";
+	s32b display[22];
+	cptr r = "+---Rate---+";
 	object_kind *k_ptr;
 
 
@@ -240,68 +280,20 @@ static void prt_alloc(byte tval, byte sval, int row, int col)
 			if ((k_ptr->tval == tval) && (k_ptr->sval == sval))
 			{
 				home = k_ptr->level;
-				rarity[i] += prob;
+				rarity[i] += prob / (GREAT_OBJ * K_MAX_DEPTH);
 			}
 		}
 		total[i] += total_frac / (GREAT_OBJ * K_MAX_DEPTH);
 	}
 
-	/* Find maxima */
-	for (i = 0; i < K_MAX_DEPTH; i++)
-	{
-		if (rarity[i] > maxr) maxr = rarity[i];
-		if (total[i] > maxt) maxt = total[i];
-	}
-
-	if (maxr / (GREAT_OBJ * K_MAX_DEPTH) != 0)
-		ratio = maxt / (maxr / (GREAT_OBJ * K_MAX_DEPTH));
-	else
-		ratio = 99999L;
-
-	/* Simulate a log graph */
-	if (ratio > 1000)
-	{
-		c = TERM_L_WHITE;
-		r = "+-uncommon-+";
-	}
-	if (ratio > 3000)
-	{
-		c = TERM_SLATE;
-		r = "+---rare---+";
-	}
-	if (ratio > 32768L)
-	{
-		c = TERM_L_DARK;
-		r = "+-VeryRare-+";
-	}
-
 	/* Calculate probabilities for each range */
 	for (i = 0; i < 22; i++)
 	{
 		/* Shift the values into view */
-
 		int possibility = 0;
 		for (j = i * K_MAX_DEPTH / 22; j < (i + 1) * K_MAX_DEPTH / 22; j++)
-			possibility += rarity[j] * (100 * maxt / total[j]);
-
-		possibility = possibility / maxr;
-
-		/* display[i] = log_{sqrt(2)}(possibility) */
-		display[i] = 0;
-		while (possibility)
-		{
-			display[i]++;
-			possibility = possibility * 1000 / 1414;
-		}
-
-		/* Track maximum */
-		if (display[i] > maxd) maxd = display[i];
-	}
-
-	/* Normalize */
-	if (maxd > 10) for (i = 0; i < 22; i++)
-	{
-		display[i] = display[i] - maxd + 10;
+			possibility += rarity[j] * 100000 / total[j];
+		display[i] = possibility / 5;
 	}
 
 	/* Graph the rarities */
@@ -309,19 +301,17 @@ static void prt_alloc(byte tval, byte sval, int row, int col)
 	{
 		Term_putch(col, row + i + 1, TERM_WHITE,  '|');
 
-		prt(format("%d", (i * K_MAX_DEPTH / 220) % 10), row + i + 1, col);
+		prt(format("%2dF", (i * 5)), row + i + 1, col);
 
-		if (display[i] <= 0) 
-			continue;
 
 		/* Note the level */
 		if ((i * K_MAX_DEPTH / 22 <= home) && (home < (i + 1) * K_MAX_DEPTH / 22))
 		{
-			c_prt(TERM_RED, format("%.*s", display[i], "**********"), row + i + 1, col + 1);
+			c_prt(TERM_RED, format("%3d.%04d%%", display[i] / 1000, display[i] % 1000), row + i + 1, col + 3);
 		}
 		else
 		{
-			c_prt(c, format("%.*s", display[i], "**********"), row + i + 1, col + 1);
+			c_prt(TERM_WHITE, format("%3d.%04d%%", display[i] / 1000, display[i] % 1000), row + i + 1, col + 3);
 		}
 	}
 
@@ -329,9 +319,48 @@ static void prt_alloc(byte tval, byte sval, int row, int col)
 	prt(r, row, col);
 }
 
+/*!
+ * @brief プレイヤーの職業を変更する
+ * @return なし
+ * @todo 魔法領域の再選択などがまだ不完全、要実装。
+ */
+static void do_cmd_wiz_reset_class(void)
+{
+	int tmp_int;
+	char tmp_val[160];
+	char ppp[80];
+
+	/* Prompt */
+	sprintf(ppp, "Class (0-%d): ", MAX_CLASS - 1);
 
-/*
- * Hack -- Teleport to the target
+	/* Default */
+	sprintf(tmp_val, "%d", p_ptr->pclass);
+
+	/* Query */
+	if (!get_string(ppp, tmp_val, 2)) return;
+
+	/* Extract */
+	tmp_int = atoi(tmp_val);
+
+	/* Verify */
+	if (tmp_int < 0 || tmp_int >= MAX_CLASS) return;
+
+	/* Save it */
+	p_ptr->pclass = (byte_hack)tmp_int;
+
+	/* Redraw inscription */
+	p_ptr->window |= (PW_PLAYER);
+
+	/* {.} and {$} effect p_ptr->warning and TRC_TELEPORT_SELF */
+	p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
+
+	update_stuff();
+}
+
+
+/*!
+ * @brief ウィザードモード用処理としてターゲット中の相手をテレポートバックする / Hack -- Teleport to the target
+ * @return なし
  */
 static void do_cmd_wiz_bamf(void)
 {
@@ -339,12 +368,14 @@ static void do_cmd_wiz_bamf(void)
 	if (!target_who) return;
 
 	/* Teleport to the target */
-	teleport_player_to(target_row, target_col, FALSE, FALSE);
+	teleport_player_to(target_row, target_col, TELEPORT_NONMAGICAL);
 }
 
 
-/*
+/*!
+ * @brief プレイヤーの現能力値を調整する
  * Aux function for "do_cmd_wiz_change()".	-RAK-
+ * @return なし
  */
 static void do_cmd_wiz_change_aux(void)
 {
@@ -376,7 +407,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] = tmp_int;
+		p_ptr->stat_cur[i] = p_ptr->stat_max[i] = (s16b)tmp_int;
 	}
 
 
@@ -384,14 +415,10 @@ static void do_cmd_wiz_change_aux(void)
 	sprintf(tmp_val, "%d", WEAPON_EXP_MASTER);
 
 	/* Query */
-#ifdef JP
-	if (!get_string("½ÏÎýÅÙ: ", tmp_val, 9)) return;
-#else
-	if (!get_string("Proficiency: ", tmp_val, 9)) return;
-#endif
+	if (!get_string(_("熟練度: ", "Proficiency: "), tmp_val, 9)) return;
 
 	/* Extract */
-	tmp_s16b = atoi(tmp_val);
+	tmp_s16b = (s16b)atoi(tmp_val);
 
 	/* Verify */
 	if (tmp_s16b < WEAPON_EXP_UNSKILLED) tmp_s16b = WEAPON_EXP_UNSKILLED;
@@ -457,8 +484,10 @@ static void do_cmd_wiz_change_aux(void)
 }
 
 
-/*
+/*!
+ * @brief プレイヤーの現能力値を調整する(メインルーチン)
  * Change various "permanent" player variables.
+ * @return なし
  */
 static void do_cmd_wiz_change(void)
 {
@@ -470,7 +499,12 @@ static void do_cmd_wiz_change(void)
 }
 
 
-/*
+/*!
+ * @brief アイテムの詳細ステータスを表示する / 
+ * Change various "permanent" player variables.
+ * @param o_ptr 詳細を表示するアイテム情報の参照ポインタ
+ * @return なし
+ * @details
  * Wizard routines for creating objects		-RAK-
  * And for manipulating them!                   -Bernd-
  *
@@ -524,9 +558,6 @@ static void do_cmd_wiz_change(void)
  *
  * Hack -- this function will allow you to create multiple artifacts.
  * This "feature" may induce crashes or other nasty effects.
- */
-
-/*
  * Just display an item's properties (debug-info)
  * Originally by David Reeve Sward <sward+@CMU.EDU>
  * Verbose item flags by -Bernd-
@@ -604,17 +635,17 @@ static void wiz_display_item(object_type *o_ptr)
 }
 
 
-/*
- * A structure to hold a tval and its description
+/*!
+ * ベースアイテムの大項目IDの種別名をまとめる構造体 / A structure to hold a tval and its description
  */
 typedef struct tval_desc
 {
-	int        tval;
-	cptr       desc;
+	int        tval; /*!< 大項目のID */
+	cptr       desc; /*!< 大項目名 */
 } tval_desc;
 
-/*
- * A list of tvals and their textual names
+/*!
+ * ベースアイテムの大項目IDの種別名定義 / A list of tvals and their textual names
  */
 static tval_desc tvals[] =
 {
@@ -649,11 +680,12 @@ 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_MUSIC_BOOK,        "Music Spellbook"      },
 	{ TV_HISSATSU_BOOK,     "Book of Kendo" },
+	{ TV_HEX_BOOK,          "Hex Spellbook"        },
 	{ TV_PARCHMENT,         "Parchment" },
 	{ TV_WHISTLE,           "Whistle"	},
 	{ TV_SPIKE,             "Spikes"               },
@@ -672,8 +704,11 @@ static tval_desc tvals[] =
 };
 
 
-/*
- * Strip an "object name" into a buffer
+/*!
+ * @brief nameバッファ内からベースアイテム名を返す / Strip an "object name" into a buffer
+ * @param buf ベースアイテム格納先の参照ポインタ
+ * @param k_idx ベースアイテムID
+ * @return なし
  */
 void strip_name(char *buf, int k_idx)
 {
@@ -701,19 +736,20 @@ void strip_name(char *buf, int k_idx)
 }
 
 
-/*
+/*!
+ * @brief ベースアイテムのウィザード生成のために大項目IDと小項目IDを取得する /
  * Specify tval and sval (type and subtype of object) originally
+ * @return ベースアイテムID
+ * @details
  * by RAK, heavily modified by -Bernd-
- *
  * This function returns the k_idx of an object type, or zero if failed
- *
  * List up to 50 choices in three columns
  */
-static int wiz_create_itemtype(void)
+static IDX wiz_create_itemtype(void)
 {
 	int i, num, max_num;
 	int col, row;
-	int tval;
+	OBJECT_TYPE_VALUE tval;
 
 	cptr tval_desc;
 	char ch;
@@ -805,46 +841,50 @@ static int wiz_create_itemtype(void)
 }
 
 
-/*
- * Tweak an item
+/*!
+ * @briefアイテムの基礎能力値を調整する / Tweak an item
+ * @param o_ptr 調整するアイテムの参照ポインタ
+ * @return なし
  */
 static void wiz_tweak_item(object_type *o_ptr)
 {
 	cptr p;
 	char tmp_val[80];
 
-
 	/* Hack -- leave artifacts alone */
 	if (object_is_artifact(o_ptr)) return;
 
 	p = "Enter new 'pval' setting: ";
 	sprintf(tmp_val, "%d", o_ptr->pval);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->pval = atoi(tmp_val);
+	o_ptr->pval = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 
 	p = "Enter new 'to_a' setting: ";
 	sprintf(tmp_val, "%d", o_ptr->to_a);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->to_a = atoi(tmp_val);
+	o_ptr->to_a = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 
 	p = "Enter new 'to_h' setting: ";
 	sprintf(tmp_val, "%d", o_ptr->to_h);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->to_h = atoi(tmp_val);
+	o_ptr->to_h = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 
 	p = "Enter new 'to_d' setting: ";
-	sprintf(tmp_val, "%d", o_ptr->to_d);
+	sprintf(tmp_val, "%d", (int)o_ptr->to_d);
 	if (!get_string(p, tmp_val, 5)) return;
-	o_ptr->to_d = atoi(tmp_val);
+	o_ptr->to_d = (s16b)atoi(tmp_val);
 	wiz_display_item(o_ptr);
 }
 
 
-/*
+/*!
+ * @brief アイテムの質を選択して再生成する /
  * Apply magic to an item or turn it into an artifact. -Bernd-
+ * @param o_ptr 再生成の対象となるアイテム情報の参照ポインタ
+ * @return なし
  */
 static void wiz_reroll_item(object_type *o_ptr)
 {
@@ -975,9 +1015,11 @@ static void wiz_reroll_item(object_type *o_ptr)
 
 
 
-/*
+/*!
+ * @brief 検査対象のアイテムを基準とした生成テストを行う /
  * Try to create an item again. Output some statistics.    -Bernd-
- *
+ * @param o_ptr 生成テストの基準となるアイテム情報の参照ポインタ
+ * @return なし
  * The statistics are correct now.  We acquire a clean grid, and then
  * repeatedly place an object in this grid, copying it into an item
  * holder, and then deleting the object.  We fiddle with the artifact
@@ -1039,7 +1081,7 @@ static void wiz_statistics(object_type *o_ptr)
 			break;
 		}
 
-		sprintf(tmp_val, "%ld", test_roll);
+		sprintf(tmp_val, "%ld", (long int)test_roll);
 		if (get_string(p, tmp_val, 10)) test_roll = atol(tmp_val);
 		test_roll = MAX(1, test_roll);
 
@@ -1143,8 +1185,11 @@ static void wiz_statistics(object_type *o_ptr)
 }
 
 
-/*
+/*!
+ * @brief 検査対象のアイテムの数を変更する /
  * Change the quantity of a the item
+ * @param o_ptr 変更するアイテム情報構造体の参照ポインタ
+ * @return なし
  */
 static void wiz_quantity_item(object_type *o_ptr)
 {
@@ -1160,7 +1205,7 @@ static void wiz_quantity_item(object_type *o_ptr)
 	tmp_qnt = o_ptr->number;
 
 	/* Default */
-	sprintf(tmp_val, "%d", o_ptr->number);
+	sprintf(tmp_val, "%d", (int)o_ptr->number);
 
 	/* Query */
 	if (get_string("Quantity: ", tmp_val, 2))
@@ -1173,7 +1218,7 @@ static void wiz_quantity_item(object_type *o_ptr)
 		if (tmp_int > 99) tmp_int = 99;
 
 		/* Accept modifications */
-		o_ptr->number = tmp_int;
+		o_ptr->number = (byte_hack)tmp_int;
 	}
 
 	if (o_ptr->tval == TV_ROD)
@@ -1182,7 +1227,11 @@ static void wiz_quantity_item(object_type *o_ptr)
 	}
 }
 
-/* debug command for blue mage */
+/*!
+ * @brief 青魔導師の魔法を全て習得済みにする /
+ * debug command for blue mage
+ * @return なし
+ */
 static void do_cmd_wiz_blue_mage(void)
 {
 
@@ -1211,16 +1260,19 @@ static void do_cmd_wiz_blue_mage(void)
 }
 
 
-/*
+/*!
+ * @brief アイテム検査のメインルーチン /
  * Play with an item. Options include:
- *   - Output statistics (via wiz_roll_item)
- *   - Reroll item (via wiz_reroll_item)
- *   - Change properties (via wiz_tweak_item)
- *   - Change the number of items (via wiz_quantity_item)
+ * @return なし
+ * @details 
+ *   - Output statistics (via wiz_roll_item)<br>
+ *   - Reroll item (via wiz_reroll_item)<br>
+ *   - Change properties (via wiz_tweak_item)<br>
+ *   - Change the number of items (via wiz_quantity_item)<br>
  */
 static void do_cmd_wiz_play(void)
 {
-	int item;
+	OBJECT_IDX item;
 
 	object_type	forge;
 	object_type *q_ptr;
@@ -1346,8 +1398,11 @@ static void do_cmd_wiz_play(void)
 }
 
 
-/*
+/*!
+ * @brief 任意のベースアイテム生成のメインルーチン /
  * Wizard routine for creating objects		-RAK-
+ * @return なし
+ * @details
  * Heavily modified to allow magification and artifactification  -Bernd-
  *
  * Note that wizards cannot create objects on top of other objects.
@@ -1360,8 +1415,7 @@ static void wiz_create_item(void)
 	object_type	forge;
 	object_type *q_ptr;
 
-	int k_idx;
-
+	IDX k_idx;
 
 	/* Save the screen */
 	screen_save();
@@ -1372,7 +1426,6 @@ static void wiz_create_item(void)
 	/* Restore the screen */
 	screen_load();
 
-
 	/* Return if failed */
 	if (!k_idx) return;
 
@@ -1390,7 +1443,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, p_ptr->y, p_ptr->x);
 
 			/* All done */
 			msg_print("Allocated(INSTA_ART).");
@@ -1409,15 +1462,17 @@ static void wiz_create_item(void)
 	apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART);
 
 	/* Drop the object from heaven */
-	(void)drop_near(q_ptr, -1, py, px);
+	(void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
 
 	/* All done */
 	msg_print("Allocated.");
 }
 
 
-/*
+/*!
+ * @brief プレイヤーを完全回復する /
  * Cure everything instantly
+ * @return なし
  */
 static void do_cmd_wiz_cure_all(void)
 {
@@ -1472,8 +1527,10 @@ static void do_cmd_wiz_cure_all(void)
 }
 
 
-/*
+/*!
+ * @brief 任意のダンジョン及び階層に飛ぶ /
  * Go to any level
+ * @return なし
  */
 static void do_cmd_wiz_jump(void)
 {
@@ -1498,18 +1555,19 @@ static void do_cmd_wiz_jump(void)
 		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[tmp_dungeon_type].mindepth, d_info[tmp_dungeon_type].maxdepth);
+		sprintf(ppp, "Jump to level (0, %d-%d): ",
+			(int)d_info[tmp_dungeon_type].mindepth, (int)d_info[tmp_dungeon_type].maxdepth);
 
 		/* Default */
-		sprintf(tmp_val, "%d", dun_level);
+		sprintf(tmp_val, "%d", (int)dun_level);
 
 		/* Ask for a level */
 		if (!get_string(ppp, tmp_val, 10)) return;
 
 		/* Extract request */
-		command_arg = atoi(tmp_val);
+		command_arg = (s16b)atoi(tmp_val);
 
-		dungeon_type = tmp_dungeon_type;
+		dungeon_type = (byte_hack)tmp_dungeon_type;
 	}
 
 	/* Paranoia */
@@ -1537,7 +1595,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;
-	energy_use = 0;
+	p_ptr->energy_use = 0;
 
 	/* Prevent energy_need from being too lower than 0 */
 	p_ptr->energy_need = 0;
@@ -1553,12 +1611,14 @@ static void do_cmd_wiz_jump(void)
 }
 
 
-/*
+/*!
+ * @brief 全ベースアイテムを鑑定済みにする /
  * Become aware of a lot of objects
+ * @return なし
  */
 static void do_cmd_wiz_learn(void)
 {
-	int i;
+	IDX i;
 
 	object_type forge;
 	object_type *q_ptr;
@@ -1584,8 +1644,11 @@ static void do_cmd_wiz_learn(void)
 }
 
 
-/*
+/*!
+ * @brief 現在のフロアに合ったモンスターをランダムに召喚する /
  * Summon some creatures
+ * @param num 生成処理回数
+ * @return なし
  */
 static void do_cmd_wiz_summon(int num)
 {
@@ -1593,40 +1656,49 @@ static void do_cmd_wiz_summon(int num)
 
 	for (i = 0; i < num; i++)
 	{
-		(void)summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+		(void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
 	}
 }
 
 
-/*
+
+/*!
+ * @brief モンスターを種族IDを指定して敵対的に召喚する /
  * Summon a creature of the specified type
- *
+ * @param r_idx モンスター種族ID
+ * @return なし
+ * @details
  * XXX XXX XXX This function is rather dangerous
  */
-static void do_cmd_wiz_named(int r_idx)
+static void do_cmd_wiz_named(MONRACE_IDX r_idx)
 {
-	(void)summon_named_creature(0, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
+	(void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
 }
 
 
-/*
+/*!
+ * @brief モンスターを種族IDを指定してペット召喚する /
  * Summon a creature of the specified type
- *
+ * @param r_idx モンスター種族ID
+ * @return なし
+ * @details
  * XXX XXX XXX This function is rather dangerous
  */
-static void do_cmd_wiz_named_friendly(int r_idx)
+static void do_cmd_wiz_named_friendly(MONRACE_IDX 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, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
 }
 
 
 
-/*
+/*!
+ * @brief プレイヤー近辺の全モンスターを消去する /
  * Hack -- Delete all nearby monsters
+ * @return なし
  */
 static void do_cmd_wiz_zap(void)
 {
-	int i;
+	MONSTER_IDX i;
 
 
 	/* Genocide everyone nearby */
@@ -1643,18 +1715,28 @@ static void do_cmd_wiz_zap(void)
 		/* Delete nearby monsters */
 		if (m_ptr->cdis <= MAX_SIGHT)
 		{
+			if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
+			{
+				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);
 		}
 	}
 }
 
 
-/*
+/*!
+ * @brief フロアに存在する全モンスターを消去する /
  * Hack -- Delete all monsters
+ * @return なし
  */
 static void do_cmd_wiz_zap_all(void)
 {
-	int i;
+	MONSTER_IDX i;
 
 	/* Genocide everyone */
 	for (i = 1; i < m_max; i++)
@@ -1667,24 +1749,34 @@ static void do_cmd_wiz_zap_all(void)
 		/* Skip the mount */
 		if (i == p_ptr->riding) continue;
 
+		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
+		{
+			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 */
 		delete_monster_idx(i);
 	}
 }
 
 
-/*
+/*!
+ * @brief 指定された地点の地形IDを変更する /
  * Create desired feature
+ * @return なし
  */
 static void do_cmd_wiz_create_feature(void)
 {
-	static int   prev_feat = FEAT_NONE;
-	static int   prev_mimic = FEAT_NONE;
+	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;
+	IDX          tmp_feat, tmp_mimic;
+	POSITION y, x;
 
 	if (!tgt_pt(&x, &y)) return;
 
@@ -1694,14 +1786,10 @@ static void do_cmd_wiz_create_feature(void)
 	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
+	if (!get_string(_("地形: ", "Feature: "), tmp_val, 3)) return;
 
 	/* Extract */
-	tmp_feat = atoi(tmp_val);
+	tmp_feat = (IDX)atoi(tmp_val);
 	if (tmp_feat < 0) tmp_feat = 0;
 	else if (tmp_feat >= max_f_idx) tmp_feat = max_f_idx - 1;
 
@@ -1709,19 +1797,15 @@ static void do_cmd_wiz_create_feature(void)
 	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
+	if (!get_string(_("地形 (mimic): ", "Feature (mimic): "), tmp_val, 3)) return;
 
 	/* Extract */
-	tmp_mimic = atoi(tmp_val);
+	tmp_mimic = (IDX)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;
+	c_ptr->mimic = (s16b)tmp_mimic;
 
 	f_ptr = &f_info[get_feat_mimic(c_ptr)];
 
@@ -1738,7 +1822,7 @@ static void do_cmd_wiz_create_feature(void)
 	lite_spot(y, x);
 
 	/* Update some things */
-	p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
+	p_ptr->update |= (PU_FLOW);
 
 	prev_feat = tmp_feat;
 	prev_mimic = tmp_mimic;
@@ -1748,8 +1832,10 @@ static void do_cmd_wiz_create_feature(void)
 #define NUM_O_SET 8
 #define NUM_O_BIT 32
 
-/*
+/*!
+ * @brief 現在のオプション設定をダンプ出力する /
  * Hack -- Dump option bits usage
+ * @return なし
  */
 static void do_cmd_dump_options(void)
 {
@@ -1770,11 +1856,7 @@ static void do_cmd_dump_options(void)
 	/* Oops */
 	if (!fff)
 	{
-#ifdef JP
-		msg_format("¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£", buf);
-#else
-		msg_format("Failed to open file %s.", buf);
-#endif
+		msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
 		msg_print(NULL);
 		return;
 	}
@@ -1787,7 +1869,7 @@ static void do_cmd_dump_options(void)
 	/* Check for exist option bits */
 	for (i = 0; option_info[i].o_desc; i++)
 	{
-		option_type *ot_ptr = &option_info[i];
+		const option_type *ot_ptr = &option_info[i];
 		if (ot_ptr->o_var) exist[ot_ptr->o_set][ot_ptr->o_bit] = i + 1;
 	}
 
@@ -1803,7 +1885,7 @@ static void do_cmd_dump_options(void)
 		{
 			if (exist[i][j])
 			{
-				option_type *ot_ptr = &option_info[exist[i][j] - 1];
+				const 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);
 			}
@@ -1822,11 +1904,7 @@ static void do_cmd_dump_options(void)
 	/* 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
+	msg_format(_("オプションbit使用状況をファイル %s に書き出しました。", "Option bits usage dump saved to file %s."), buf);
 }
 
 
@@ -1848,16 +1926,17 @@ extern void do_cmd_debug(void);
 
 
 
-/*
+/*!
+ * @brief デバッグコマンドを選択する処理のメインルーチン /
  * Ask for and parse a "debug command"
  * The "command_arg" may have been set.
+ * @return なし
  */
 void do_cmd_debug(void)
 {
 	int     x, y;
 	char    cmd;
 
-
 	/* Get a "debug command" */
 	get_com("Debug Command: ", &cmd, FALSE);
 
@@ -1911,7 +1990,7 @@ void do_cmd_debug(void)
 
 	/* Create a named artifact */
 	case 'C':
-		wiz_create_named_art(command_arg);
+		wiz_create_named_art();
 		break;
 
 	/* Detect everything */
@@ -1950,7 +2029,7 @@ void do_cmd_debug(void)
 	/* Good Objects */
 	case 'g':
 		if (command_arg <= 0) command_arg = 1;
-		acquirement(py, px, command_arg, FALSE, TRUE);
+		acquirement(p_ptr->y, p_ptr->x, command_arg, FALSE, FALSE, TRUE);
 		break;
 
 	/* Hitpoint rerating */
@@ -1994,6 +2073,11 @@ void do_cmd_debug(void)
 		(void)gain_random_mutation(command_arg);
 		break;
 
+	/* Reset Class */
+	case 'R':
+		(void)do_cmd_wiz_reset_class();
+		break;
+
 	/* Specific reward */
 	case 'r':
 		(void)gain_level_reward(command_arg);
@@ -2021,29 +2105,25 @@ void do_cmd_debug(void)
 
 	/* Phase Door */
 	case 'p':
-		teleport_player(10, FALSE);
+		teleport_player(10, 0L);
 		break;
 
-#if 0
 	/* Complete a Quest -KMW- */
 	case 'q':
-		for (i = 0; i < max_quests; i++)
+		if(p_ptr->inside_quest)
 		{
-			if (p_ptr->quest[i].status == QUEST_STATUS_TAKEN)
+			if (quest[p_ptr->inside_quest].status == QUEST_STATUS_TAKEN)
 			{
-				p_ptr->quest[i].status++;
-				msg_print("Completed Quest");
-				msg_print(NULL);
+				complete_quest(p_ptr->inside_quest);
 				break;
 			}
 		}
-		if (i == max_quests)
+		else
 		{
 			msg_print("No current quest");
 			msg_print(NULL);
 		}
 		break;
-#endif
 
 	/* Make every dungeon square "known" to test streamers -KMW- */
 	case 'u':
@@ -2063,15 +2143,27 @@ void do_cmd_debug(void)
 		do_cmd_wiz_summon(command_arg);
 		break;
 
+	/* Special(Random Artifact) Objects */
+	case 'S':
+		if (command_arg <= 0) command_arg = 1;
+		acquirement(p_ptr->y, p_ptr->x, command_arg, TRUE, TRUE, TRUE);
+		break;
+
 	/* Teleport */
 	case 't':
-		teleport_player(100, FALSE);
+		teleport_player(100, 0L);
 		break;
 
+	/* Game Time Setting */
+	case 'T':
+		set_gametime();
+		break;
+
+
 	/* Very Good Objects */
 	case 'v':
 		if (command_arg <= 0) command_arg = 1;
-		acquirement(py, px, command_arg, TRUE, TRUE);
+		acquirement(p_ptr->y, p_ptr->x, command_arg, TRUE, FALSE, TRUE);
 		break;
 
 	/* Wizard Light the Level */