From 2072faf43f95a225073c944f0a18def671128029 Mon Sep 17 00:00:00 2001
From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Mon, 1 Dec 2003 19:56:04 +0000
Subject: [PATCH] =?utf8?q?=E3=82=A2=E3=83=BC=E3=83=81=E3=83=A3=E3=83=BC?=
 =?utf8?q?=E3=81=AE=E5=B2=A9=E7=9F=B3=E3=81=8B=E3=82=89=E3=81=AE=E3=82=B9?=
 =?utf8?q?=E3=83=AA=E3=83=B3=E3=82=B0=E7=94=A8=E3=81=AE=E5=BC=BE=E4=BD=9C?=
 =?utf8?q?=E6=88=90=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E5=A4=89=E6=9B=B4.?=
 =?utf8?q?=20*=20=E5=B2=A9=E7=9F=B3=E3=81=8C=E6=B3=A5=E3=81=AB=E3=81=AA?=
 =?utf8?q?=E3=82=8B=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92?=
 =?utf8?q?=E5=87=BA=E3=81=95=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
 =?utf8?q?=E3=81=97=E3=81=9F.=20*=20=E5=9C=B0=E5=BD=A2=E5=88=A4=E5=AE=9A?=
 =?utf8?q?=E3=82=92CAN=5FDIG=20&&=20HURT=5FROCK=E3=81=AB=E5=A4=89=E6=9B=B4?=
 =?utf8?q?.=20*=20=E6=98=8E=E3=82=89=E3=81=8B=E3=81=AB=E6=9D=90=E6=96=99?=
 =?utf8?q?=E3=81=AB=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=9C=B0=E5=BD=A2?=
 =?utf8?q?=E3=81=8B=E3=82=89=E4=BD=9C=E6=88=90=E8=A9=A6=E3=81=BF=E3=81=9F?=
 =?utf8?q?=E5=A0=B4=E5=90=88=E3=81=AF=E3=82=BF=E3=83=BC=E3=83=B3=E3=82=92?=
 =?utf8?q?=E6=B6=88=E8=B2=BB=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=20=20=20?=
 =?utf8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4.=20=E3=81=9F=E3=81=A0?=
 =?utf8?q?=E3=81=97mimic=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=81=9F?=
 =?utf8?q?=E3=82=81=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=97=E3=81=9F=E5=A0=B4?=
 =?utf8?q?=E5=90=88=E3=81=AF=E3=82=BF=E3=83=BC=E3=83=B3=E6=B6=88=E8=B2=BB.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

なお, 以下の変更を含む.
* 岩喰いの岩石味判定をHAS_ITEMからCAN_DIGに変更.
---
 src/mutation.c |  2 +-
 src/racial.c   | 34 +++++++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/mutation.c b/src/mutation.c
index 5faf057ab..4773cc3bd 100644
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -3506,7 +3506,7 @@ bool mutation_power_aux(u32b power)
 #endif
 					break;
 				}
-				else if (have_flag(f_ptr->flags, FF_DOOR) || have_flag(f_ptr->flags, FF_HAS_ITEM))
+				else if (have_flag(f_ptr->flags, FF_DOOR) || have_flag(f_ptr->flags, FF_CAN_DIG))
 				{
 					(void)set_food(p_ptr->food + 3000);
 				}
diff --git a/src/racial.c b/src/racial.c
index 886285882..fa72314d0 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -114,7 +114,25 @@ static bool do_cmd_archer(void)
 		y = py + ddy[dir];
 		x = px + ddx[dir];
 		c_ptr = &cave[y][x];
-		if (c_ptr->feat == FEAT_RUBBLE)
+
+		if (!have_flag(f_info[get_feat_mimic(c_ptr)].flags, FF_CAN_DIG))
+		{
+#ifdef JP
+			msg_print("¤½¤³¤Ë¤Ï´äÀФ¬¤Ê¤¤¡£");
+#else
+			msg_print("You need pile of rubble.");
+#endif
+			return FALSE;
+		}
+		else if (!have_flag(f_flags_grid(c_ptr), FF_CAN_DIG) || !have_flag(f_flags_grid(c_ptr), FF_HURT_ROCK))
+		{
+#ifdef JP
+			msg_print("¹Å¤¹¤®¤ÆÊø¤»¤Ê¤«¤Ã¤¿¡£");
+#else
+			msg_print("You failed to make ammo.");
+#endif
+		}
+		else
 		{
 			/* Get local object */
 			q_ptr = &forge;
@@ -131,23 +149,17 @@ static bool do_cmd_archer(void)
 
 			object_desc(o_name, q_ptr, 0);
 #ifdef JP
-			msg_format("´äÀФòºï¤Ã¤Æ%s¤òºî¤Ã¤¿¡£",o_name);
+			msg_format("%s¤òºî¤Ã¤¿¡£", o_name);
 #else
 			msg_print("You make some ammo.");
 #endif
 
-			(void)wall_to_mud(dir);
+			/* Destroy the wall */
+			cave_alter_feat(y, x, FF_HURT_ROCK);
+
 			p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
 			p_ptr->window |= (PW_OVERHEAD);
 		}
-		else
-		{
-#ifdef JP
-			msg_print("¤½¤³¤Ë¤Ï´äÀФ¬¤Ê¤¤¡£");
-#else
-			msg_print("You need pile of rubble.");
-#endif
-		}
 	}
 	/**********Create arrows*********/
 	else if (ext == 2)
-- 
2.11.0