X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=594e6c9682f86bda253d7f007455200bb0d177b8;hb=97ab6e743be47c3c082d699ddf862a792fe08e9b;hp=87486c991a3852742fbf349d50007977a45f514b;hpb=db793d10013628c33da8057ae6551b9ef4cd6c53;p=hengband%2Fhengband.git
diff --git a/src/wizard2.c b/src/wizard2.c
index 87486c991..594e6c968 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1,20 +1,22 @@
-/* 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
* 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.
+ * 2014 Deskull rearranged comment for Doxygen.
*/
-/* Purpose: Wizard commands */
-
#include "angband.h"
+#include "selfinfo.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 +32,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,12 +52,14 @@ void do_cmd_rerate_aux(void)
}
-/*
- * Hack -- Rerate Hitpoints
+/*!
+ * @brief ãã¬ã¤ã¤ã¼ã®ããããã¤ã¹ãæ¯ãç´ããå¾æ示ãè¡ã / Hack -- Rerate Hitpoints
+ * @param display TRUEãªãã°ä½åã©ã³ã¯ãæ示ãã
+ * @return ãªã
*/
void do_cmd_rerate(bool display)
{
- int percent;
+ PERCENTAGE percent;
/* Rerate */
do_cmd_rerate_aux();
@@ -69,29 +73,19 @@ void do_cmd_rerate(bool display)
p_ptr->update |= (PU_HP);
p_ptr->redraw |= (PR_HP);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
/* Handle stuff */
handle_stuff();
- /* 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,74 +93,110 @@ 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];
+
+ /* Prompt */
+ sprintf(ppp, "Dungeon Turn (0-%ld): ", (long)dungeon_turn_limit);
+
+ /* Default */
+ sprintf(tmp_val, "%ld", (long)dungeon_turn);
- teleport_player_to(y, x, FALSE, FALSE);
+ /* 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] = "";
+ ARTIFACT_IDX a_idx;
+
+ /* Query */
+ if (!get_string("Artifact ID:", tmp_val, 3)) return;
+
+ /* Extract */
+ a_idx = (ARTIFACT_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)
{
- /* Oops */
msg_print("Oops.");
(void)probing();
}
-
-
-#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;
}
(void)alloc_horde(wy, wx);
}
-#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)
+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)
@@ -186,21 +216,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_LEN row, TERM_LEN 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;
@@ -218,7 +251,7 @@ static void prt_alloc(byte tval, byte sval, int row, int col)
int total_frac = 0;
for (j = 0; j < alloc_kind_size; j++)
{
- int prob = 0;
+ PERCENTAGE prob = 0;
if (table[j].level <= i)
{
@@ -240,68 +273,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 +294,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 +312,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];
-/*
- * Hack -- Teleport to the target
+ /* Prompt */
+ sprintf(ppp, "Class (0-%d): ", MAX_CLASS - 1);
+
+ /* 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 +361,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 +400,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 +408,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 +477,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 +492,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 +551,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
* Verbose item flags by -Bernd-
@@ -534,7 +558,7 @@ 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 */
@@ -604,17 +628,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 +673,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,10 +697,13 @@ 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)
+void strip_name(char *buf, KIND_OBJECT_IDX k_idx)
{
char *t;
@@ -701,24 +729,26 @@ 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 KIND_OBJECT_IDX wiz_create_itemtype(void)
{
- int i, num, max_num;
- int col, row;
- int tval;
+ KIND_OBJECT_IDX i;
+ int num, max_num;
+ TERM_LEN col, row;
+ OBJECT_TYPE_VALUE tval;
cptr tval_desc;
char ch;
- int choice[80];
+ KIND_OBJECT_IDX choice[80];
char buf[160];
@@ -805,46 +835,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)
{
@@ -968,16 +1002,17 @@ static void wiz_reroll_item(object_type *o_ptr)
/* 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);
}
}
-/*
+/*!
+ * @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
@@ -993,7 +1028,7 @@ static void wiz_statistics(object_type *o_ptr)
char ch;
cptr quality;
- u32b mode;
+ BIT_FLAGS mode;
object_type forge;
object_type *q_ptr;
@@ -1004,7 +1039,7 @@ static void wiz_statistics(object_type *o_ptr)
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;
@@ -1039,7 +1074,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);
@@ -1063,11 +1098,8 @@ static void wiz_statistics(object_type *o_ptr)
/* Allow interupt */
if (inkey())
{
- /* Flush */
flush();
-
- /* Stop rolling */
- break;
+ break; // stop rolling
}
/* Dump the stats */
@@ -1086,7 +1118,7 @@ static void wiz_statistics(object_type *o_ptr)
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;
@@ -1143,8 +1175,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 +1195,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 +1208,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 +1217,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 +1250,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)
+ * - Reroll item (via wiz_reroll_item)
+ * - Change properties (via wiz_tweak_item)
+ * - Change the number of items (via wiz_quantity_item)
*/
static void do_cmd_wiz_play(void)
{
- int item;
+ OBJECT_IDX item;
object_type forge;
object_type *q_ptr;
@@ -1234,7 +1276,6 @@ static void do_cmd_wiz_play(void)
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;
@@ -1314,7 +1355,6 @@ static void do_cmd_wiz_play(void)
/* Accept change */
if (changed)
{
- /* Message */
msg_print("Changes accepted.");
/* Recalcurate object's weight */
@@ -1334,7 +1374,6 @@ static void do_cmd_wiz_play(void)
/* 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);
}
@@ -1346,8 +1385,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 +1402,7 @@ static void wiz_create_item(void)
object_type forge;
object_type *q_ptr;
- int k_idx;
-
+ OBJECT_IDX k_idx;
/* Save the screen */
screen_save();
@@ -1372,13 +1413,12 @@ static void wiz_create_item(void)
/* Restore the screen */
screen_load();
-
/* Return if failed */
if (!k_idx) return;
if (k_info[k_idx].gen_flags & TRG_INSTA_ART)
{
- int i;
+ ARTIFACT_IDX i;
/* Artifactify */
for (i = 1; i < max_a_idx; i++)
@@ -1390,7 +1430,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,71 +1449,30 @@ 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)
{
- /* 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);
}
-/*
+/*!
+ * @brief ä»»æã®ãã³ã¸ã§ã³åã³é層ã«é£ã¶ /
* Go to any level
+ * @return ãªã
*/
static void do_cmd_wiz_jump(void)
{
@@ -1481,9 +1480,8 @@ 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 : ");
@@ -1494,20 +1492,21 @@ static void do_cmd_wiz_jump(void)
/* 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 */
- 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 = (COMMAND_ARG)atoi(tmp_val);
dungeon_type = tmp_dungeon_type;
}
@@ -1516,7 +1515,7 @@ static void do_cmd_wiz_jump(void)
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[dungeon_type].maxdepth) command_arg = (COMMAND_ARG)d_info[dungeon_type].maxdepth;
/* Accept request */
msg_format("You jump to dungeon level %d.", command_arg);
@@ -1537,7 +1536,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 +1552,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,49 +1585,60 @@ static void do_cmd_wiz_learn(void)
}
-/*
+/*!
+ * @brief ç¾å¨ã®ããã¢ã«åã£ãã¢ã³ã¹ã¿ã¼ãã©ã³ãã ã«å¬åãã /
* Summon some creatures
+ * @param num çæå¦çåæ°
+ * @return ãªã
*/
static void do_cmd_wiz_summon(int num)
{
int i;
-
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
- *
- * XXX XXX XXX This function is rather dangerous
+ * @param r_idx ã¢ã³ã¹ã¿ã¼ç¨®æID
+ * @return ãªã
+ * @details
+ * 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
- *
- * XXX XXX XXX This function is rather dangerous
+ * @param r_idx ã¢ã³ã¹ã¿ã¼ç¨®æID
+ * @return ãªã
+ * @details
+ * 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 +1655,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,23 +1689,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;
- cave_type *c_ptr;
- char tmp_val[160];
- int tmp_feat, tmp_mimic;
- int y, x;
+ static int prev_feat = 0;
+ static int prev_mimic = 0;
+ cave_type *c_ptr;
+ feature_type *f_ptr;
+ char tmp_val[160];
+ IDX tmp_feat, tmp_mimic;
+ POSITION y, x;
if (!tgt_pt(&x, &y)) return;
@@ -1693,14 +1726,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;
@@ -1708,28 +1737,31 @@ 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;
- if (tmp_mimic)
- {
- feature_type *f_ptr = &f_info[tmp_mimic];
+ c_ptr->mimic = (s16b)tmp_mimic;
- if (have_flag(f_ptr->flags, FF_GLYPH) ||
- have_flag(f_ptr->flags, FF_MINOR_GLYPH) ||
- have_flag(f_ptr->flags, FF_MIRROR))
- c_ptr->info |= (CAVE_OBJECT);
- }
+ 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);
+
+ 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;
@@ -1739,8 +1771,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)
{
@@ -1758,14 +1792,9 @@ static void do_cmd_dump_options(void)
/* 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_format(_("ãã¡ã¤ã« %s ãéãã¾ããã§ããã", "Failed to open file %s."), buf);
msg_print(NULL);
return;
}
@@ -1778,7 +1807,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;
}
@@ -1794,7 +1823,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);
}
@@ -1813,11 +1842,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);
}
@@ -1839,16 +1864,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);
@@ -1902,7 +1928,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 */
@@ -1941,7 +1967,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 */
@@ -1949,11 +1975,9 @@ void do_cmd_debug(void)
do_cmd_rerate(TRUE);
break;
-#ifdef MONSTER_HORDES
case 'H':
do_cmd_summon_horde();
break;
-#endif /* MONSTER_HORDES */
/* Identify */
case 'i':
@@ -1985,6 +2009,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);
@@ -2012,29 +2041,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':
@@ -2054,15 +2079,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 */