From f2fc18b849c130d12d629efb07a60c16cc1ded24 Mon Sep 17 00:00:00 2001
From: mogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Mon, 6 May 2002 10:19:20 +0000
Subject: [PATCH] =?utf8?q?=E3=80=8C{=E5=91=AA=E3=82=8F=E3=82=8C=E3=81=A6?=
 =?utf8?q?=E3=81=84=E3=82=8B}=E3=80=8D=E3=80=8C{=E7=A9=BA}=E3=80=8D?=
 =?utf8?q?=E3=80=8C{=E6=9C=AA=E9=91=91=E5=AE=9A}=E3=80=8D=E7=AD=89?=
 =?utf8?q?=E3=81=AE=E6=93=AC=E4=BC=BC=E9=8A=98=E3=82=92=E6=9C=AC=E5=BD=93?=
 =?utf8?q?=E3=81=AE=E9=8A=98=E3=81=A7=E4=B8=8A=E6=9B=B8=E3=81=8D=E3=81=97?=
 =?utf8?q?=E3=81=AA=E3=81=84=E3=81=A7=20=E3=80=8C{=E5=91=AA=E3=82=8F?=
 =?utf8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B,=20+=E8=85=95r=E5=86=B7?=
 =?utf8?q?=E4=B9=B1}=E3=80=8D=E7=AD=89=E3=81=AE=E3=82=88=E3=81=86=E3=81=AB?=
 =?utf8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?utf8?q?=E3=81=97=E3=81=9F=E3=80=82=20=E3=81=9F=E3=81=A0=E3=81=97?=
 =?utf8?q?=E3=80=81=E3=80=8C=3F=3F%=E5=BC=95=E3=81=8D=E3=80=8D=E3=81=AE?=
 =?utf8?q?=E8=A1=A8=E7=A4=BA=E3=81=AF=E4=BE=8B=E5=A4=96=E3=81=A8=E3=81=97?=
 =?utf8?q?=E3=81=A6=E4=B8=8A=E6=9B=B8=E3=81=8D=E3=81=99=E3=82=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/flavor.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/flavor.c b/src/flavor.c
index 92823f8c6..badc05861 100644
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -2540,20 +2540,8 @@ t = object_desc_str(t, "(
 	/* No inscription yet */
 	tmp_val2[0] = '\0';
 
-	/* Use the standard inscription if available */
-	if (o_ptr->inscription)
-	{
-		char *u = tmp_val2;
-
-		strcpy(tmp_val2, quark_str(o_ptr->inscription));
-
-		for (; *u && (*u != '#'); u++);
-
-		*u = '\0';
-	}
-
 	/* Use the game-generated "feeling" otherwise, if available */
-	else if (o_ptr->feeling)
+	if (o_ptr->feeling)
 	{
 		strcpy(tmp_val2, game_inscriptions[o_ptr->feeling]);
 	}
@@ -2604,12 +2592,26 @@ strcpy(tmp_val2, "̤Ƚ
 
 	}
 
+	/* Use the standard inscription if available */
+	if (o_ptr->inscription)
+	{
+		char *u = tmp_val2;
+
+		if (tmp_val2[0]) strcat(tmp_val2, ", ");
+
+		strcat(tmp_val2, quark_str(o_ptr->inscription));
+
+		for (; *u && (*u != '#'); u++);
+
+		*u = '\0';
+	}
+
 	/* Note the discount, if any */
-	else if (o_ptr->discount)
+	else if (o_ptr->discount && !(tmp_val2[0]))
 	{
 		(void)object_desc_num(tmp_val2, o_ptr->discount);
 #ifdef JP
-strcat(tmp_val2, "%°ú¤­");
+		strcat(tmp_val2, "%°ú¤­");
 #else
 		strcat(tmp_val2, "% off");
 #endif
-- 
2.11.0