From 5ccef7303dd5a11c20cb6a939fbf650afd4bbeae Mon Sep 17 00:00:00 2001
From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Tue, 24 Jun 2003 07:01:21 +0000
Subject: [PATCH] =?utf8?q?=E9=8D=9B=E5=86=B6=E5=B8=AB=E3=81=AEpval?=
 =?utf8?q?=E8=83=BD=E5=8A=9B=E3=81=AE=E3=82=A8=E3=83=83=E3=82=BB=E3=83=B3?=
 =?utf8?q?=E3=82=B9=E3=81=AE=E4=BB=98=E5=8A=A0=E3=81=AF=E8=B2=A0=E3=81=AEp?=
 =?utf8?q?val=E3=81=AE=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=81=AB?=
 =?utf8?q?=E3=81=AF=E4=BD=BF=E3=81=88=E3=81=AA=E3=81=84=E3=82=88=20?=
 =?utf8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/object2.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/object2.c b/src/object2.c
index 6f3342547..09b74b038 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -7990,7 +7990,16 @@ static void add_essence(int mode)
 		}
 		if (is_pval_flag(es_ptr->add))
 		{
-			if (es_ptr->add == TR_BLOWS)
+			if (o_ptr->pval < 0)
+			{
+#ifdef JP
+				msg_print("¤³¤Î¥¢¥¤¥Æ¥à¤ÎǽÎϽ¤Àµ¤ò¶¯²½¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡£");
+#else
+				msg_print("You cannot increase magic number of this item.");
+#endif
+				return;
+			}
+			else if (es_ptr->add == TR_BLOWS)
 			{
 				if (o_ptr->pval > 1)
 				{
@@ -8001,8 +8010,6 @@ static void add_essence(int mode)
 #endif
 				}
 
-				/* Hack -- Negative pval takes more essence */
-				use_essence *= 1 - ((o_ptr->pval >= 0) ? 0 : o_ptr->pval);
 				o_ptr->pval = 1;
 #ifdef JP
 				msg_format("¥¨¥Ã¥»¥ó¥¹¤ò%d¸Ä»ÈÍѤ·¤Þ¤¹¡£", use_essence);
@@ -8026,7 +8033,6 @@ static void add_essence(int mode)
 				int pval;
 				int limit = MIN(5, p_ptr->magic_num1[es_ptr->essence]/es_ptr->value);
 
-				if (o_ptr->pval < 0) limit -= o_ptr->pval;
 #ifdef JP
 				sprintf(tmp, "¤¤¤¯¤ÄÉղä·¤Þ¤¹¤«¡© (1-%d): ", limit);
 #else
@@ -8074,16 +8080,16 @@ static void add_essence(int mode)
 			else if (val < 1) val = 1;
 			use_essence *= val;
 #ifdef JP
-			msg_format("¥¨¥Ã¥»¥ó¥¹¤ò%d¸Ä»ÈÍѤ·¤Þ¤¹¡£",use_essence);
+			msg_format("¥¨¥Ã¥»¥ó¥¹¤ò%d¸Ä»ÈÍѤ·¤Þ¤¹¡£", use_essence);
 #else
-			msg_format("It will take %d essences.",use_essence);
+			msg_format("It will take %d essences.", use_essence);
 #endif
 			if (p_ptr->magic_num1[es_ptr->essence] < use_essence)
 			{
 #ifdef JP
 				msg_print("¥¨¥Ã¥»¥ó¥¹¤¬Â­¤ê¤Ê¤¤¡£");
 #else
-				msg_print("You don't have enough essences");
+				msg_print("You don't have enough essences.");
 #endif
 				return;
 			}
@@ -8185,7 +8191,7 @@ static void add_essence(int mode)
 #ifdef JP
 			msg_print("¥¨¥Ã¥»¥ó¥¹¤¬Â­¤ê¤Ê¤¤¡£");
 #else
-			msg_print("You don't have enough essences");
+			msg_print("You don't have enough essences.");
 #endif
 			return;
 		}
-- 
2.11.0