From 3b9f698fb49dbc3f0669009910945b787a8a0072 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Sat, 8 Sep 2018 00:00:08 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=E3=80=80=E3=83=97=E3=83=AC?=
 =?utf8?q?=E3=82=A4=E3=83=A4=E3=83=BC=E3=81=AE=E6=9D=96=E4=BD=BF=E7=94=A8?=
 =?utf8?q?=E5=87=A6=E7=90=86=E3=82=92=20cmd-usestaff.c/h=20=E3=81=AB?=
 =?utf8?q?=E5=88=86=E9=9B=A2=E3=80=82=20/=20Separate=20player's=20use=20st?=
 =?utf8?q?aff=20command=20to=20cmd-usestaff.c/h.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Hengband_vcs2015/Hengband/Hengband.vcxproj         |   2 +
 Hengband_vcs2015/Hengband/Hengband.vcxproj.filters |   6 +
 src/cmd-usestaff.c                                 | 532 +++++++++++++++++++++
 src/cmd-usestaff.h                                 |   3 +
 src/cmd6.c                                         | 530 +-------------------
 src/dungeon.c                                      |   1 +
 src/externs.h                                      |   1 -
 7 files changed, 545 insertions(+), 530 deletions(-)
 create mode 100644 src/cmd-usestaff.c
 create mode 100644 src/cmd-usestaff.h

diff --git a/Hengband_vcs2015/Hengband/Hengband.vcxproj b/Hengband_vcs2015/Hengband/Hengband.vcxproj
index c29ef1429..d120a56da 100644
--- a/Hengband_vcs2015/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2015/Hengband/Hengband.vcxproj
@@ -142,6 +142,7 @@
     <ClCompile Include="..\..\src\cmd-eat.c" />
     <ClCompile Include="..\..\src\cmd-quaff.c" />
     <ClCompile Include="..\..\src\cmd-read.c" />
+    <ClCompile Include="..\..\src\cmd-usestaff.c" />
     <ClCompile Include="..\..\src\cmd1.c" />
     <ClCompile Include="..\..\src\cmd2.c" />
     <ClCompile Include="..\..\src\cmd3.c" />
@@ -212,6 +213,7 @@
     <ClInclude Include="..\..\src\cmd-eat.h" />
     <ClInclude Include="..\..\src\cmd-quaff.h" />
     <ClInclude Include="..\..\src\cmd-read.h" />
+    <ClInclude Include="..\..\src\cmd-usestaff.h" />
     <ClInclude Include="..\..\src\defines.h" />
     <ClInclude Include="..\..\src\externs.h" />
     <ClInclude Include="..\..\src\generate.h" />
diff --git a/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
index 514330044..6e402a0d9 100644
--- a/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
@@ -223,6 +223,9 @@
     <ClCompile Include="..\..\src\cmd-read.c">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd-usestaff.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\angband.h">
@@ -309,6 +312,9 @@
     <ClInclude Include="..\..\src\cmd-read.h">
       <Filter>Header</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd-usestaff.h">
+      <Filter>Header</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />
diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
new file mode 100644
index 000000000..738066ffb
--- /dev/null
+++ b/src/cmd-usestaff.c
@@ -0,0 +1,532 @@
+#include "angband.h"
+
+
+
+/*!
+* @brief 杖の効果を発動する
+* @param sval オブジェクトのsval
+* @param use_charge 使用回数を消費したかどうかを返す参照ポインタ
+* @param powerful 強力発動上の処理ならばTRUE
+* @param magic 魔道具術上の処理ならばTRUE
+* @param known 判明済ならばTRUE
+* @return 発動により効果内容が確定したならばTRUEを返す
+*/
+int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known)
+{
+	int k;
+	int ident = FALSE;
+	int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
+	int detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT;
+
+	/* Analyze the staff */
+	switch (sval)
+	{
+	case SV_STAFF_DARKNESS:
+	{
+		if (!(p_ptr->resist_blind) && !(p_ptr->resist_dark))
+		{
+			if (set_blind(p_ptr->blind + 3 + randint1(5))) ident = TRUE;
+		}
+		if (unlite_area(10, (powerful ? 6 : 3))) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_SLOWNESS:
+	{
+		if (set_slow(p_ptr->slow + randint1(30) + 15, FALSE)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_HASTE_MONSTERS:
+	{
+		if (speed_monsters()) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_SUMMONING:
+	{
+		const int times = randint1(powerful ? 8 : 4);
+		for (k = 0; k < times; k++)
+		{
+			if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+			{
+				ident = TRUE;
+			}
+		}
+		break;
+	}
+
+	case SV_STAFF_TELEPORTATION:
+	{
+		teleport_player((powerful ? 150 : 100), 0L);
+		ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_IDENTIFY:
+	{
+		if (powerful) {
+			if (!identify_fully(FALSE)) *use_charge = FALSE;
+		}
+		else {
+			if (!ident_spell(FALSE)) *use_charge = FALSE;
+		}
+		ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_REMOVE_CURSE:
+	{
+		bool result = powerful ? remove_all_curse() : remove_curse();
+		if (result)
+		{
+			if (magic)
+			{
+				msg_print(_("誰かに見守られているような気がする。", "You feel as if someone is watching over you."));
+			}
+			else if (!p_ptr->blind)
+			{
+				msg_print(_("杖は一瞬ブルーに輝いた...", "The staff glows blue for a moment..."));
+
+			}
+			ident = TRUE;
+		}
+		break;
+	}
+
+	case SV_STAFF_STARLITE:
+	{
+		HIT_POINT num = damroll(5, 3);
+		POSITION y = 0, x = 0;
+		int attempts;
+
+		if (!p_ptr->blind && !magic)
+		{
+			msg_print(_("杖の先が明るく輝いた...", "The end of the staff glows brightly..."));
+		}
+		for (k = 0; k < num; k++)
+		{
+			attempts = 1000;
+
+			while (attempts--)
+			{
+				scatter(&y, &x, p_ptr->y, p_ptr->x, 4, 0);
+
+				if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue;
+
+				if (!player_bold(y, x)) break;
+			}
+
+			project(0, 0, y, x, damroll(6 + lev / 8, 10), GF_LITE_WEAK,
+				(PROJECT_BEAM | PROJECT_THRU | PROJECT_GRID | PROJECT_KILL), -1);
+		}
+		ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_LITE:
+	{
+		if (lite_area(damroll(2, 8), (powerful ? 4 : 2))) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_MAPPING:
+	{
+		map_area(powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP);
+		ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_DETECT_GOLD:
+	{
+		if (detect_treasure(detect_rad)) ident = TRUE;
+		if (detect_objects_gold(detect_rad)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_DETECT_ITEM:
+	{
+		if (detect_objects_normal(detect_rad)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_DETECT_TRAP:
+	{
+		if (detect_traps(detect_rad, known)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_DETECT_DOOR:
+	{
+		if (detect_doors(detect_rad)) ident = TRUE;
+		if (detect_stairs(detect_rad)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_DETECT_INVIS:
+	{
+		if (detect_monsters_invis(detect_rad)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_DETECT_EVIL:
+	{
+		if (detect_monsters_evil(detect_rad)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_CURE_LIGHT:
+	{
+		if (hp_player(damroll((powerful ? 4 : 2), 8))) ident = TRUE;
+		if (powerful) {
+			if (set_blind(0)) ident = TRUE;
+			if (set_poisoned(0)) ident = TRUE;
+			if (set_cut(p_ptr->cut - 10)) ident = TRUE;
+		}
+		if (set_shero(0, TRUE)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_CURING:
+	{
+		if (set_blind(0)) ident = TRUE;
+		if (set_poisoned(0)) ident = TRUE;
+		if (set_confused(0)) ident = TRUE;
+		if (set_stun(0)) ident = TRUE;
+		if (set_cut(0)) ident = TRUE;
+		if (set_image(0)) ident = TRUE;
+		if (set_shero(0, TRUE)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_HEALING:
+	{
+		if (hp_player(powerful ? 500 : 300)) ident = TRUE;
+		if (set_stun(0)) ident = TRUE;
+		if (set_cut(0)) ident = TRUE;
+		if (set_shero(0, TRUE)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_THE_MAGI:
+	{
+		if (do_res_stat(A_INT)) ident = TRUE;
+		if (p_ptr->csp < p_ptr->msp)
+		{
+			p_ptr->csp = p_ptr->msp;
+			p_ptr->csp_frac = 0;
+			ident = TRUE;
+			msg_print(_("頭がハッキリとした。", "You feel your head clear."));
+
+			p_ptr->redraw |= (PR_MANA);
+			p_ptr->window |= (PW_PLAYER);
+			p_ptr->window |= (PW_SPELL);
+		}
+		if (set_shero(0, TRUE)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_SLEEP_MONSTERS:
+	{
+		if (sleep_monsters(lev)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_SLOW_MONSTERS:
+	{
+		if (slow_monsters(lev)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_SPEED:
+	{
+		if (set_fast(randint1(30) + (powerful ? 30 : 15), FALSE)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_PROBING:
+	{
+		probing();
+		ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_DISPEL_EVIL:
+	{
+		if (dispel_evil(powerful ? 120 : 80)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_POWER:
+	{
+		if (dispel_monsters(powerful ? 225 : 150)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_HOLINESS:
+	{
+		if (dispel_evil(powerful ? 225 : 150)) ident = TRUE;
+		k = 3 * lev;
+		if (set_protevil((magic ? 0 : p_ptr->protevil) + randint1(25) + k, FALSE)) ident = TRUE;
+		if (set_poisoned(0)) ident = TRUE;
+		if (set_afraid(0)) ident = TRUE;
+		if (hp_player(50)) ident = TRUE;
+		if (set_stun(0)) ident = TRUE;
+		if (set_cut(0)) ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_GENOCIDE:
+	{
+		(void)symbol_genocide((magic ? lev + 50 : 200), TRUE);
+		ident = TRUE;
+		break;
+	}
+
+	case SV_STAFF_EARTHQUAKES:
+	{
+		if (earthquake(p_ptr->y, p_ptr->x, (powerful ? 15 : 10)))
+			ident = TRUE;
+		else
+			msg_print(_("ダンジョンが揺れた。", "The dungeon trembles."));
+
+		break;
+	}
+
+	case SV_STAFF_DESTRUCTION:
+	{
+		if (destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE))
+			ident = TRUE;
+
+		break;
+	}
+
+	case SV_STAFF_ANIMATE_DEAD:
+	{
+		if (animate_dead(0, p_ptr->y, p_ptr->x))
+			ident = TRUE;
+
+		break;
+	}
+
+	case SV_STAFF_MSTORM:
+	{
+		msg_print(_("強力な魔力が敵を引き裂いた！", "Mighty magics rend your enemies!"));
+		project(0, (powerful ? 7 : 5), p_ptr->y, p_ptr->x,
+			(randint1(200) + (powerful ? 500 : 300)) * 2, GF_MANA, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID, -1);
+		if ((p_ptr->pclass != CLASS_MAGE) && (p_ptr->pclass != CLASS_HIGH_MAGE) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_MAGIC_EATER) && (p_ptr->pclass != CLASS_BLUE_MAGE))
+		{
+			(void)take_hit(DAMAGE_NOESCAPE, 50, _("コントロールし難い強力な魔力の解放", "unleashing magics too mighty to control"), -1);
+		}
+		ident = TRUE;
+
+		break;
+	}
+
+	case SV_STAFF_NOTHING:
+	{
+		msg_print(_("何も起らなかった。", "Nothing happen."));
+		if (prace_is_(RACE_SKELETON) || prace_is_(RACE_GOLEM) ||
+			prace_is_(RACE_ZOMBIE) || prace_is_(RACE_SPECTRE))
+			msg_print(_("もったいない事をしたような気がする。食べ物は大切にしなくては。", "What a waste.  It's your food!"));
+		break;
+	}
+	}
+	return ident;
+}
+
+/*!
+ * @brief 杖を使うコマンドのサブルーチン /
+ * Use a staff.			-RAK-
+ * @param item 使うオブジェクトの所持品ID
+ * @return なし
+ * @details
+ * One charge of one staff disappears.
+ * Hack -- staffs of identify can be "cancelled".
+ */
+void do_cmd_use_staff_aux(int item)
+{
+	int         ident, chance, lev;
+	object_type *o_ptr;
+
+
+	/* Hack -- let staffs of identify get aborted */
+	bool use_charge = TRUE;
+
+
+	/* Get the item (in the pack) */
+	if (item >= 0)
+	{
+		o_ptr = &inventory[item];
+	}
+
+	/* Get the item (on the floor) */
+	else
+	{
+		o_ptr = &o_list[0 - item];
+	}
+
+
+	/* Mega-Hack -- refuse to use a pile from the ground */
+	if ((item < 0) && (o_ptr->number > 1))
+	{
+		msg_print(_("まずは杖を拾わなければ。", "You must first pick up the staffs."));
+		return;
+	}
+
+
+	/* Take a turn */
+	p_ptr->energy_use = 100;
+
+	/* Extract the item level */
+	lev = k_info[o_ptr->k_idx].level;
+	if (lev > 50) lev = 50 + (lev - 50) / 2;
+
+	/* Base chance of success */
+	chance = p_ptr->skill_dev;
+
+	/* Confusion hurts skill */
+	if (p_ptr->confused) chance = chance / 2;
+
+	/* Hight level objects are harder */
+	chance = chance - lev;
+
+	/* Give everyone a (slight) chance */
+	if ((chance < USE_DEVICE) && one_in_(USE_DEVICE - chance + 1))
+	{
+		chance = USE_DEVICE;
+	}
+
+	if (world_player)
+	{
+		if (flush_failure) flush();
+		msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this staff is freezing too."));
+		sound(SOUND_FAIL);
+		return;
+	}
+
+	/* Roll for usage */
+	if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER))
+	{
+		if (flush_failure) flush();
+		msg_print(_("杖をうまく使えなかった。", "You failed to use the staff properly."));
+		sound(SOUND_FAIL);
+		return;
+	}
+
+	/* Notice empty staffs */
+	if (o_ptr->pval <= 0)
+	{
+		if (flush_failure) flush();
+		msg_print(_("この杖にはもう魔力が残っていない。", "The staff has no charges left."));
+		o_ptr->ident |= (IDENT_EMPTY);
+
+		/* Combine / Reorder the pack (later) */
+		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+		p_ptr->window |= (PW_INVEN);
+
+		return;
+	}
+
+
+	/* Sound */
+	sound(SOUND_ZAP);
+
+	ident = staff_effect(o_ptr->sval, &use_charge, FALSE, FALSE, object_is_aware(o_ptr));
+
+	if (!(object_is_aware(o_ptr)))
+	{
+		chg_virtue(V_PATIENCE, -1);
+		chg_virtue(V_CHANCE, 1);
+		chg_virtue(V_KNOWLEDGE, -1);
+	}
+
+	/* Combine / Reorder the pack (later) */
+	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+
+	/* Tried the item */
+	object_tried(o_ptr);
+
+	/* An identification was made */
+	if (ident && !object_is_aware(o_ptr))
+	{
+		object_aware(o_ptr);
+		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
+	}
+
+	/* Window stuff */
+	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
+
+
+	/* Hack -- some uses are "free" */
+	if (!use_charge) return;
+
+
+	/* Use a single charge */
+	o_ptr->pval--;
+
+	/* XXX Hack -- unstack if necessary */
+	if ((item >= 0) && (o_ptr->number > 1))
+	{
+		object_type forge;
+		object_type *q_ptr;
+
+		/* Get local object */
+		q_ptr = &forge;
+
+		/* Obtain a local object */
+		object_copy(q_ptr, o_ptr);
+
+		/* Modify quantity */
+		q_ptr->number = 1;
+
+		/* Restore the charges */
+		o_ptr->pval++;
+
+		/* Unstack the used item */
+		o_ptr->number--;
+		p_ptr->total_weight -= q_ptr->weight;
+		item = inven_carry(q_ptr);
+
+		/* Message */
+		msg_print(_("杖をまとめなおした。", "You unstack your staff."));
+	}
+
+	/* Describe charges in the pack */
+	if (item >= 0)
+	{
+		inven_item_charges(item);
+	}
+
+	/* Describe charges on the floor */
+	else
+	{
+		floor_item_charges(0 - item);
+	}
+}
+
+/*!
+* @brief 杖を使うコマンドのメインルーチン /
+* @return なし
+*/
+void do_cmd_use_staff(void)
+{
+	OBJECT_IDX item;
+	cptr q, s;
+
+	if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
+	{
+		set_action(ACTION_NONE);
+	}
+
+	/* Restrict choices to wands */
+	item_tester_tval = TV_STAFF;
+
+	/* Get an item */
+	q = _("どの杖を使いますか? ", "Use which staff? ");
+	s = _("使える杖がない。", "You have no staff to use.");
+
+	if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+
+	do_cmd_use_staff_aux(item);
+}
diff --git a/src/cmd-usestaff.h b/src/cmd-usestaff.h
new file mode 100644
index 000000000..85caf78e1
--- /dev/null
+++ b/src/cmd-usestaff.h
@@ -0,0 +1,3 @@
+extern int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known);
+extern void do_cmd_use_staff_aux(int item);
+extern void do_cmd_use_staff(void);
diff --git a/src/cmd6.c b/src/cmd6.c
index e0ec0fe09..1c066bc3f 100644
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -58,538 +58,10 @@
 #include "cmd-eat.h"
 #include "cmd-quaff.h"
 #include "cmd-read.h"
+#include "cmd-usestaff.h"
 
 
 
-
-/*!
- * @brief 杖の効果を発動する
- * @param sval オブジェクトのsval
- * @param use_charge 使用回数を消費したかどうかを返す参照ポインタ
- * @param powerful 強力発動上の処理ならばTRUE
- * @param magic 魔道具術上の処理ならばTRUE
- * @param known 判明済ならばTRUE
- * @return 発動により効果内容が確定したならばTRUEを返す
- */
-static int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known)
-{
-	int k;
-	int ident = FALSE;
-	int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
-	int detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT;
-
-	/* Analyze the staff */
-	switch (sval)
-	{
-		case SV_STAFF_DARKNESS:
-		{
-			if (!(p_ptr->resist_blind) && !(p_ptr->resist_dark))
-			{
-				if (set_blind(p_ptr->blind + 3 + randint1(5))) ident = TRUE;
-			}
-			if (unlite_area(10, (powerful ? 6 : 3))) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_SLOWNESS:
-		{
-			if (set_slow(p_ptr->slow + randint1(30) + 15, FALSE)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_HASTE_MONSTERS:
-		{
-			if (speed_monsters()) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_SUMMONING:
-		{
-			const int times = randint1(powerful ? 8 : 4);
-			for (k = 0; k < times; k++)
-			{
-				if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
-				{
-					ident = TRUE;
-				}
-			}
-			break;
-		}
-
-		case SV_STAFF_TELEPORTATION:
-		{
-			teleport_player((powerful ? 150 : 100), 0L);
-			ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_IDENTIFY:
-		{
-			if (powerful) {
-				if (!identify_fully(FALSE)) *use_charge = FALSE;
-			} else {
-				if (!ident_spell(FALSE)) *use_charge = FALSE;
-			}
-			ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_REMOVE_CURSE:
-		{
-			bool result = powerful ? remove_all_curse() : remove_curse();
-			if (result)
-			{
-				if (magic)
-				{
-					msg_print(_("誰かに見守られているような気がする。", "You feel as if someone is watching over you."));
-				}
-				else if (!p_ptr->blind)
-				{
-					msg_print(_("杖は一瞬ブルーに輝いた...", "The staff glows blue for a moment..."));
-
-				}
-				ident = TRUE;
-			}
-			break;
-		}
-
-		case SV_STAFF_STARLITE:
-		{
-			HIT_POINT num = damroll(5, 3);
-			POSITION y = 0, x = 0;
-			int attempts;
-
-			if (!p_ptr->blind && !magic)
-			{
-				msg_print(_("杖の先が明るく輝いた...", "The end of the staff glows brightly..."));
-			}
-			for (k = 0; k < num; k++)
-			{
-				attempts = 1000;
-
-				while (attempts--)
-				{
-					scatter(&y, &x, p_ptr->y, p_ptr->x, 4, 0);
-
-					if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue;
-
-					if (!player_bold(y, x)) break;
-				}
-
-				project(0, 0, y, x, damroll(6 + lev / 8, 10), GF_LITE_WEAK,
-						  (PROJECT_BEAM | PROJECT_THRU | PROJECT_GRID | PROJECT_KILL), -1);
-			}
-			ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_LITE:
-		{
-			if (lite_area(damroll(2, 8), (powerful ? 4 : 2))) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_MAPPING:
-		{
-			map_area(powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP);
-			ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_DETECT_GOLD:
-		{
-			if (detect_treasure(detect_rad)) ident = TRUE;
-			if (detect_objects_gold(detect_rad)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_DETECT_ITEM:
-		{
-			if (detect_objects_normal(detect_rad)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_DETECT_TRAP:
-		{
-			if (detect_traps(detect_rad, known)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_DETECT_DOOR:
-		{
-			if (detect_doors(detect_rad)) ident = TRUE;
-			if (detect_stairs(detect_rad)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_DETECT_INVIS:
-		{
-			if (detect_monsters_invis(detect_rad)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_DETECT_EVIL:
-		{
-			if (detect_monsters_evil(detect_rad)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_CURE_LIGHT:
-		{
-			if (hp_player(damroll((powerful ? 4 : 2), 8))) ident = TRUE;
-			if (powerful) {
-				if (set_blind(0)) ident = TRUE;
-				if (set_poisoned(0)) ident = TRUE;
-				if (set_cut(p_ptr->cut - 10)) ident = TRUE;
-			}
-			if (set_shero(0,TRUE)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_CURING:
-		{
-			if (set_blind(0)) ident = TRUE;
-			if (set_poisoned(0)) ident = TRUE;
-			if (set_confused(0)) ident = TRUE;
-			if (set_stun(0)) ident = TRUE;
-			if (set_cut(0)) ident = TRUE;
-			if (set_image(0)) ident = TRUE;
-			if (set_shero(0,TRUE)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_HEALING:
-		{
-			if (hp_player(powerful ? 500 : 300)) ident = TRUE;
-			if (set_stun(0)) ident = TRUE;
-			if (set_cut(0)) ident = TRUE;
-			if (set_shero(0,TRUE)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_THE_MAGI:
-		{
-			if (do_res_stat(A_INT)) ident = TRUE;
-			if (p_ptr->csp < p_ptr->msp)
-			{
-				p_ptr->csp = p_ptr->msp;
-				p_ptr->csp_frac = 0;
-				ident = TRUE;
-				msg_print(_("頭がハッキリとした。", "You feel your head clear."));
-
-				p_ptr->redraw |= (PR_MANA);
-				p_ptr->window |= (PW_PLAYER);
-				p_ptr->window |= (PW_SPELL);
-			}
-			if (set_shero(0,TRUE)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_SLEEP_MONSTERS:
-		{
-			if (sleep_monsters(lev)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_SLOW_MONSTERS:
-		{
-			if (slow_monsters(lev)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_SPEED:
-		{
-			if (set_fast(randint1(30) + (powerful ? 30 : 15), FALSE)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_PROBING:
-		{
-			probing();
-			ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_DISPEL_EVIL:
-		{
-			if (dispel_evil(powerful ? 120 : 80)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_POWER:
-		{
-			if (dispel_monsters(powerful ? 225 : 150)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_HOLINESS:
-		{
-			if (dispel_evil(powerful ? 225 : 150)) ident = TRUE;
-			k = 3 * lev;
-			if (set_protevil((magic ? 0 : p_ptr->protevil) + randint1(25) + k, FALSE)) ident = TRUE;
-			if (set_poisoned(0)) ident = TRUE;
-			if (set_afraid(0)) ident = TRUE;
-			if (hp_player(50)) ident = TRUE;
-			if (set_stun(0)) ident = TRUE;
-			if (set_cut(0)) ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_GENOCIDE:
-		{
-			(void)symbol_genocide((magic ? lev + 50 : 200), TRUE);
-			ident = TRUE;
-			break;
-		}
-
-		case SV_STAFF_EARTHQUAKES:
-		{
-			if (earthquake(p_ptr->y, p_ptr->x, (powerful ? 15 : 10)))
-				ident = TRUE;
-			else
-				msg_print(_("ダンジョンが揺れた。", "The dungeon trembles."));
-
-			break;
-		}
-
-		case SV_STAFF_DESTRUCTION:
-		{
-			if (destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE))
-				ident = TRUE;
-
-			break;
-		}
-
-		case SV_STAFF_ANIMATE_DEAD:
-		{
-			if (animate_dead(0, p_ptr->y, p_ptr->x))
-				ident = TRUE;
-
-			break;
-		}
-
-		case SV_STAFF_MSTORM:
-		{
-			msg_print(_("強力な魔力が敵を引き裂いた！", "Mighty magics rend your enemies!"));
-			project(0, (powerful ? 7 : 5), p_ptr->y, p_ptr->x,
-				(randint1(200) + (powerful ? 500 : 300)) * 2, GF_MANA, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID, -1);
-			if ((p_ptr->pclass != CLASS_MAGE) && (p_ptr->pclass != CLASS_HIGH_MAGE) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_MAGIC_EATER) && (p_ptr->pclass != CLASS_BLUE_MAGE))
-			{
-				(void)take_hit(DAMAGE_NOESCAPE, 50, _("コントロールし難い強力な魔力の解放", "unleashing magics too mighty to control"), -1);
-			}
-			ident = TRUE;
-
-			break;
-		}
-
-		case SV_STAFF_NOTHING:
-		{
-			msg_print(_("何も起らなかった。", "Nothing happen."));
-			if (prace_is_(RACE_SKELETON) || prace_is_(RACE_GOLEM) ||
-				prace_is_(RACE_ZOMBIE) || prace_is_(RACE_SPECTRE))
-				msg_print(_("もったいない事をしたような気がする。食べ物は大切にしなくては。", "What a waste.  It's your food!"));
-			break;
-		}
-	}
-	return ident;
-}
-
-/*!
- * @brief 杖を使うコマンドのサブルーチン / 
- * Use a staff.			-RAK-
- * @param item 使うオブジェクトの所持品ID
- * @return なし
- * @details
- * One charge of one staff disappears.
- * Hack -- staffs of identify can be "cancelled".
- */
-static void do_cmd_use_staff_aux(int item)
-{
-	int         ident, chance, lev;
-	object_type *o_ptr;
-
-
-	/* Hack -- let staffs of identify get aborted */
-	bool use_charge = TRUE;
-
-
-	/* Get the item (in the pack) */
-	if (item >= 0)
-	{
-		o_ptr = &inventory[item];
-	}
-
-	/* Get the item (on the floor) */
-	else
-	{
-		o_ptr = &o_list[0 - item];
-	}
-
-
-	/* Mega-Hack -- refuse to use a pile from the ground */
-	if ((item < 0) && (o_ptr->number > 1))
-	{
-		msg_print(_("まずは杖を拾わなければ。", "You must first pick up the staffs."));
-		return;
-	}
-
-
-	/* Take a turn */
-	p_ptr->energy_use = 100;
-
-	/* Extract the item level */
-	lev = k_info[o_ptr->k_idx].level;
-	if (lev > 50) lev = 50 + (lev - 50)/2;
-
-	/* Base chance of success */
-	chance = p_ptr->skill_dev;
-
-	/* Confusion hurts skill */
-	if (p_ptr->confused) chance = chance / 2;
-
-	/* Hight level objects are harder */
-	chance = chance - lev;
-
-	/* Give everyone a (slight) chance */
-	if ((chance < USE_DEVICE) && one_in_(USE_DEVICE - chance + 1))
-	{
-		chance = USE_DEVICE;
-	}
-
-	if (world_player)
-	{
-		if (flush_failure) flush();
-		msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this staff is freezing too."));
-		sound(SOUND_FAIL);
-		return;
-	}
-
-	/* Roll for usage */
-	if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER))
-	{
-		if (flush_failure) flush();
-		msg_print(_("杖をうまく使えなかった。", "You failed to use the staff properly."));
-		sound(SOUND_FAIL);
-		return;
-	}
-
-	/* Notice empty staffs */
-	if (o_ptr->pval <= 0)
-	{
-		if (flush_failure) flush();
-		msg_print(_("この杖にはもう魔力が残っていない。", "The staff has no charges left."));
-		o_ptr->ident |= (IDENT_EMPTY);
-
-		/* Combine / Reorder the pack (later) */
-		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-		p_ptr->window |= (PW_INVEN);
-
-		return;
-	}
-
-
-	/* Sound */
-	sound(SOUND_ZAP);
-
-	ident = staff_effect(o_ptr->sval, &use_charge, FALSE, FALSE, object_is_aware(o_ptr));
-
-	if (!(object_is_aware(o_ptr)))
-	{
-		chg_virtue(V_PATIENCE, -1);
-		chg_virtue(V_CHANCE, 1);
-		chg_virtue(V_KNOWLEDGE, -1);
-	}
-
-	/* Combine / Reorder the pack (later) */
-	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-	/* Tried the item */
-	object_tried(o_ptr);
-
-	/* An identification was made */
-	if (ident && !object_is_aware(o_ptr))
-	{
-		object_aware(o_ptr);
-		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-	}
-
-	/* Window stuff */
-	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-
-	/* Hack -- some uses are "free" */
-	if (!use_charge) return;
-
-
-	/* Use a single charge */
-	o_ptr->pval--;
-
-	/* XXX Hack -- unstack if necessary */
-	if ((item >= 0) && (o_ptr->number > 1))
-	{
-		object_type forge;
-		object_type *q_ptr;
-
-		/* Get local object */
-		q_ptr = &forge;
-
-		/* Obtain a local object */
-		object_copy(q_ptr, o_ptr);
-
-		/* Modify quantity */
-		q_ptr->number = 1;
-
-		/* Restore the charges */
-		o_ptr->pval++;
-
-		/* Unstack the used item */
-		o_ptr->number--;
-		p_ptr->total_weight -= q_ptr->weight;
-		item = inven_carry(q_ptr);
-
-		/* Message */
-		msg_print(_("杖をまとめなおした。", "You unstack your staff."));
-	}
-
-	/* Describe charges in the pack */
-	if (item >= 0)
-	{
-		inven_item_charges(item);
-	}
-
-	/* Describe charges on the floor */
-	else
-	{
-		floor_item_charges(0 - item);
-	}
-}
-
-/*!
- * @brief 杖を使うコマンドのメインルーチン /
- * @return なし
- */
-void do_cmd_use_staff(void)
-{
-	OBJECT_IDX item;
-	cptr q, s;
-
-	if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-	{
-		set_action(ACTION_NONE);
-	}
-
-	/* Restrict choices to wands */
-	item_tester_tval = TV_STAFF;
-
-	/* Get an item */
-	q = _("どの杖を使いますか? ", "Use which staff? ");
-	s = _("使える杖がない。", "You have no staff to use.");
-
-	if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-	do_cmd_use_staff_aux(item);
-}
-
 /*!
  * @brief 魔法棒の効果を発動する
  * @param sval オブジェクトのsval
diff --git a/src/dungeon.c b/src/dungeon.c
index 97977f80e..d6abf2092 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -15,6 +15,7 @@
 #include "cmd-eat.h"
 #include "cmd-quaff.h"
 #include "cmd-read.h"
+#include "cmd-usestaff.h"
 
 #define TY_CURSE_CHANCE 200 /*!<太古の怨念の1ターン毎の発動確率(1/n)*/
 #define CHAINSWORD_NOISE 100 /*!<チェンソーの1ターン毎の発動確率(1/n)*/
diff --git a/src/externs.h b/src/externs.h
index 3b896520d..ed218fa21 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -805,7 +805,6 @@ extern void do_cmd_pet(void);
 
 /* cmd6.c */
 extern void do_cmd_aim_wand(void);
-extern void do_cmd_use_staff(void);
 extern void do_cmd_zap_rod(void);
 extern void do_cmd_rerate_aux(void);
 extern void do_cmd_rerate(bool display);
-- 
2.11.0