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
+ }
}