From 811c0206520c3fb1cadf3fc0aaefec49a053aff8 Mon Sep 17 00:00:00 2001
From: mogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Fri, 17 May 2002 15:33:59 +0000
Subject: [PATCH] =?utf8?q?look=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?=
 =?utf8?q?=E3=81=A7=E5=90=8D=E5=89=8D=E3=81=AE=E6=AC=A1=E3=81=AB(=E3=83=AC?=
 =?utf8?q?=E3=83=99=E3=83=AB=3F=3F=3F,=20=E7=84=A1=E5=82=B7)=E7=AD=89?=
 =?utf8?q?=E3=81=A8=E8=A1=A8=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/xtra2.c | 54 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/xtra2.c b/src/xtra2.c
index bc6e548ce..6e36a2342 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2429,64 +2429,82 @@ cptr look_mon_desc(int m_idx)
 	monster_race *r_ptr = &r_info[m_ptr->r_idx];
 	bool         living;
 	int          perc;
-
+	cptr desc = NULL;
 
 	/* Determine if the monster is "living" */
 	living = monster_living(r_ptr);
 
+	/* Calculate a health "percentage" */
+	perc = 100L * m_ptr->hp / m_ptr->maxhp;
 
 	/* Healthy monsters */
 	if (m_ptr->hp >= m_ptr->maxhp)
 	{
 		/* No damage */
 #ifdef JP
-return (living ? "̵½ý" : "̵¥À¥á¡¼¥¸");
+		desc = living ? "̵½ý" : "̵¥À¥á¡¼¥¸";
 #else
-		return (living ? "unhurt" : "undamaged");
+		desc = living ? "unhurt" : "undamaged";
 #endif
 
 	}
 
-
-	/* Calculate a health "percentage" */
-	perc = 100L * m_ptr->hp / m_ptr->maxhp;
-
-	if (perc >= 60)
+	else if (perc >= 60)
 	{
 #ifdef JP
-return (living ? "·Ú½ý" : "¾®¥À¥á¡¼¥¸");
+		desc = living ? "·Ú½ý" : "¾®¥À¥á¡¼¥¸";
 #else
-		return (living ? "somewhat wounded" : "somewhat damaged");
+		desc = living ? "somewhat wounded" : "somewhat damaged";
 #endif
 
 	}
 
-	if (perc >= 25)
+	else if (perc >= 25)
 	{
 #ifdef JP
-return (living ? "Éé½ý" : "Ãæ¥À¥á¡¼¥¸");
+		desc = living ? "Éé½ý" : "Ãæ¥À¥á¡¼¥¸";
 #else
-		return (living ? "wounded" : "damaged");
+		desc = living ? "wounded" : "damaged";
 #endif
 
 	}
 
-	if (perc >= 10)
+	else if (perc >= 10)
 	{
 #ifdef JP
-return (living ? "½Å½ý" : "Âç¥À¥á¡¼¥¸");
+		desc = living ? "½Å½ý" : "Âç¥À¥á¡¼¥¸";
 #else
-		return (living ? "badly wounded" : "badly damaged");
+		desc = living ? "badly wounded" : "badly damaged";
 #endif
 
 	}
 
+	else 
+	{
 #ifdef JP
-return (living ? "Ⱦ»àȾÀ¸" : "Åݤ줫¤±");
+		desc = living ? "Ⱦ»àȾÀ¸" : "Åݤ줫¤±";
 #else
-	return (living ? "almost dead" : "almost destroyed");
+		desc = living ? "almost dead" : "almost destroyed";
 #endif
+	}
 
+	/* Display monster's level --- idea bolowed from ToME */
+	if (r_ptr->r_tkills)
+	{
+#ifdef JP
+		return format("¥ì¥Ù¥ë%d, %s", r_ptr->level, desc);
+#else
+		return format("Level %d, %s", r_ptr->level, desc);
+#endif
+	}
+	else 
+	{
+#ifdef JP
+		return format("¥ì¥Ù¥ë???, %s", desc);
+#else
+		return format("Level ???, %s", desc);
+#endif
+	}
 }
 
 
-- 
2.11.0