/* File: monster1.c */
-/* Purpose: describe monsters (using monster memory) */
-
/*
- * Copyright (c) 1989 James E. Wilson, Christopher J. Stuart
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
*
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies. Other copyrights may also apply.
*/
+/* Purpose: describe monsters (using monster memory) */
+
#include "angband.h"
/*
* Hack -- display monster information using "hooked_roff()"
*
- * Note that there is now a compiler option to only read the monster
- * descriptions from the raw file when they are actually needed, which
- * saves about 60K of memory at the cost of disk access during monster
- * recall, which is optional to the user.
- *
* This function should only be called with the cursor placed at the
* left edge of the screen, on a cleared line, in which the recall is
* to take place. One extra blank line is left after the recall.
monster_race *r_ptr = &r_info[r_idx];
bool old = FALSE;
- bool sin = FALSE;
int m, n, r;
cptr p, q;
#ifdef JP
- char jverb_buf[64];
+ char jverb_buf[64];
+#else
+ bool sin = FALSE;
#endif
int msex = 0;
- int speed = (ironman_nightmare) ? r_ptr->speed + 5 : r_ptr->speed;
+ bool nightmare = ironman_nightmare && !(mode & 0x02);
+ int speed = nightmare ? r_ptr->speed + 5 : r_ptr->speed;
bool breath = FALSE;
bool magic = FALSE;
+ bool reinforce = FALSE;
u32b flags1;
u32b flags2;
u32b flags5;
u32b flags6;
u32b flags7;
+ u32b flagsr;
byte drop_gold, drop_item;
int vn = 0;
- byte color[64];
- cptr vp[64];
+ byte color[96];
+ cptr vp[96];
bool know_everything = FALSE;
flags5 = (r_ptr->flags5 & r_ptr->r_flags5);
flags6 = (r_ptr->flags6 & r_ptr->r_flags6);
flags7 = (r_ptr->flags7 & r_ptr->flags7);
+ flagsr = (r_ptr->flagsr & r_ptr->r_flagsr);
+
+ for(n = 0; n < 6; n++)
+ {
+ if(r_ptr->reinforce_id[n] > 0) reinforce = TRUE;
+ }
- /* cheat_know or reserch_mon() */
+ /* cheat_know or research_mon() */
if (cheat_know || (mode & 0x01))
know_everything = TRUE;
flags4 = r_ptr->flags4;
flags5 = r_ptr->flags5;
flags6 = r_ptr->flags6;
+ flagsr = r_ptr->flagsr;
}
/* Killed ancestors */
#ifdef JP
hooked_roff(format("%^s¤Ï¤¢¤Ê¤¿¤ÎÀèÁĤò %d ¿ÍÁò¤Ã¤Æ¤¤¤ë",
- wd_he[msex], r_ptr->r_deaths));
+ wd_he[msex], r_ptr->r_deaths));
#else
hooked_roff(format("%^s has slain %d of your ancestors",
- wd_he[msex], r_ptr->r_deaths));
+ wd_he[msex], r_ptr->r_deaths));
#endif
hooked_roff(format("¤¬¡¢¤¹¤Ç¤ËµØƤ¤Á¤Ï²Ì¤¿¤·¤Æ¤¤¤ë¡ª"));
#else
hooked_roff(format(", but you have avenged %s! ",
- plural(r_ptr->r_deaths, "him", "them")));
+ plural(r_ptr->r_deaths, "him", "them")));
#endif
}
hooked_roff(format("¤Î¤Ë¡¢¤Þ¤ÀµØƤ¤Á¤ò²Ì¤¿¤·¤Æ¤¤¤Ê¤¤¡£"));
#else
hooked_roff(format(", who %s unavenged. ",
- plural(r_ptr->r_deaths, "remains", "remain")));
+ plural(r_ptr->r_deaths, "remains", "remain")));
#endif
}
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
/* Dead unique who never hurt us */
hooked_roff("You have slain this foe. ");
#endif
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
}
/* Dead ancestors */
#ifdef JP
hooked_roff(format("¤³¤Î¥â¥ó¥¹¥¿¡¼¤Ï¤¢¤Ê¤¿¤ÎÀèÁĤò %d ¿ÍÁò¤Ã¤Æ¤¤¤ë",
- r_ptr->r_deaths ));
+ r_ptr->r_deaths ));
#else
hooked_roff(format("%d of your ancestors %s been killed by this creature, ",
- r_ptr->r_deaths, plural(r_ptr->r_deaths, "has", "have")));
+ r_ptr->r_deaths, plural(r_ptr->r_deaths, "has", "have")));
#endif
{
#ifdef JP
hooked_roff(format("¤¬¡¢%s¤Ï¤³¤Î¥â¥ó¥¹¥¿¡¼¤ò¾¯¤Ê¤¯¤È¤â %d ÂΤÏÅݤ·¤Æ¤¤¤ë¡£",
- "¤¢¤Ê¤¿¤ÎÀèÁÄ", r_ptr->r_tkills));
+ "¤¢¤Ê¤¿¤ÎÀèÁÄ", r_ptr->r_tkills));
#else
hooked_roff(format("and %s have exterminated at least %d of the creatures. ",
- "your ancestors", r_ptr->r_tkills));
+ "your ancestors", r_ptr->r_tkills));
#endif
}
}
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
/* Normal monsters */
#endif
}
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
/* Descriptions */
- if (1)
{
- char buf[2048];
-
-#ifdef DELAY_LOAD_R_TEXT
+ cptr tmp = r_text + r_ptr->text;
- int fd;
-
- /* Build the filename */
-#ifdef JP
-path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, "r_info_j.raw");
-#else
- path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, "r_info.raw");
-#endif
-
-
- /* Open the "raw" file */
- fd = fd_open(buf, O_RDONLY);
-
- /* Use file */
- if (fd >= 0)
+ if (tmp[0])
{
- huge pos;
-
- /* Starting position */
- pos = r_ptr->text;
+ /* Dump it */
+ hooked_roff(tmp);
- /* Additional offsets */
- pos += r_head->head_size;
- pos += r_head->info_size;
- pos += r_head->name_size;
-
- /* Seek */
- (void)fd_seek(fd, pos);
-
- /* Read a chunk of data */
- (void)fd_read(fd, buf, 2048);
-
- /* Close it */
- (void)fd_close(fd);
+ /* Start a new line */
+ hooked_roff("\n");
}
-
-#else
-
- /* Simple method */
- strcpy(buf, r_text + r_ptr->text);
-
-#endif
-
- if (buf[0])
- {
- /* Dump it */
- hooked_roff(buf);
-
- /* Start a new line */
- hooked_roff("\n");
- }
}
if (r_idx == MON_KAGE)
hooked_roff(format("%^s is normally found at depths of %d feet",
#endif
- wd_he[msex], r_ptr->level * 50));
+ wd_he[msex], r_ptr->level * 50));
}
else
{
hooked_roff(format("%^s is normally found on dungeon level %d",
#endif
- wd_he[msex], r_ptr->level));
+ wd_he[msex], r_ptr->level));
}
old = TRUE;
}
#ifdef JP
if (flags2 & RF2_ELDRITCH_HORROR) hook_c_roff(TERM_VIOLET, "¶¸µ¤¤òͶ¤¦");/*nuke me*/
#else
- if (flags2 & RF2_ELDRITCH_HORROR) hooked_roff(" sanity-blasting");
+ if (flags2 & RF2_ELDRITCH_HORROR) hook_c_roff(TERM_VIOLET, " sanity-blasting");
#endif
#ifdef JP
if (flags3 & RF3_ANIMAL) hook_c_roff(TERM_L_GREEN, "¼«Á³³¦¤Î");
#else
- if (flags3 & RF3_ANIMAL) hooked_roff(" natural");
+ if (flags3 & RF3_ANIMAL) hook_c_roff(TERM_L_GREEN, " natural");
#endif
#ifdef JP
if (flags3 & RF3_EVIL) hook_c_roff(TERM_L_DARK, "¼Ù°¤Ê¤ë");
#else
- if (flags3 & RF3_EVIL) hooked_roff(" evil");
+ if (flags3 & RF3_EVIL) hook_c_roff(TERM_L_DARK, " evil");
#endif
#ifdef JP
if (flags3 & RF3_GOOD) hook_c_roff(TERM_YELLOW, "Á±ÎɤÊ");
#else
- if (flags3 & RF3_GOOD) hooked_roff(" good");
+ if (flags3 & RF3_GOOD) hook_c_roff(TERM_YELLOW, " good");
#endif
#ifdef JP
if (flags3 & RF3_UNDEAD) hook_c_roff(TERM_VIOLET, "¥¢¥ó¥Ç¥Ã¥É¤Î");
#else
- if (flags3 & RF3_UNDEAD) hooked_roff(" undead");
+ if (flags3 & RF3_UNDEAD) hook_c_roff(TERM_VIOLET, " undead");
#endif
#ifdef JP
if (flags3 & RF3_AMBERITE) hook_c_roff(TERM_VIOLET, "¥¢¥ó¥Ð¡¼¤Î²¦Â²¤Î");
#else
- if (flags3 & RF3_AMBERITE) hooked_roff(" Amberite");
+ if (flags3 & RF3_AMBERITE) hook_c_roff(TERM_VIOLET, " Amberite");
#endif
#ifdef JP
if (flags3 & RF3_DRAGON) hook_c_roff(TERM_ORANGE, "¥É¥é¥´¥ó");
#else
- if (flags3 & RF3_DRAGON) hooked_roff(" dragon");
+ if (flags3 & RF3_DRAGON) hook_c_roff(TERM_ORANGE, " dragon");
#endif
#ifdef JP
if (flags3 & RF3_DEMON) hook_c_roff(TERM_VIOLET, "¥Ç¡¼¥â¥ó");
#else
- if (flags3 & RF3_DEMON) hooked_roff(" demon");
+ if (flags3 & RF3_DEMON) hook_c_roff(TERM_VIOLET, " demon");
#endif
#ifdef JP
if (flags3 & RF3_GIANT) hook_c_roff(TERM_L_UMBER, "¥¸¥ã¥¤¥¢¥ó¥È");
#else
- if (flags3 & RF3_GIANT) hooked_roff(" giant");
+ if (flags3 & RF3_GIANT) hook_c_roff(TERM_L_UMBER, " giant");
#endif
#ifdef JP
if (flags3 & RF3_TROLL) hook_c_roff(TERM_BLUE, "¥È¥í¥ë");
#else
- if (flags3 & RF3_TROLL) hooked_roff(" troll");
+ if (flags3 & RF3_TROLL) hook_c_roff(TERM_BLUE, " troll");
#endif
#ifdef JP
if (flags3 & RF3_ORC) hook_c_roff(TERM_UMBER, "¥ª¡¼¥¯");
#else
- if (flags3 & RF3_ORC) hooked_roff(" orc");
+ if (flags3 & RF3_ORC) hook_c_roff(TERM_UMBER, " orc");
#endif
#ifdef JP
if (flags2 & RF2_HUMAN) hook_c_roff(TERM_L_WHITE, "¿Í´Ö");
#else
- if (flags2 & RF2_HUMAN) hooked_roff(" Human");
+ if (flags2 & RF2_HUMAN) hook_c_roff(TERM_L_WHITE, " human");
#endif
#ifdef JP
if (flags2 & RF2_QUANTUM) hook_c_roff(TERM_VIOLET, "ÎÌ»ÒÀ¸Êª");
#else
- if (flags2 & RF2_QUANTUM) hooked_roff(" quantum creature");
+ if (flags2 & RF2_QUANTUM) hook_c_roff(TERM_VIOLET, " quantum creature");
#endif
}
hooked_roff("¤òÅݤ¹¤³¤È¤Ï");
#endif
/* Group some variables */
- if (TRUE)
{
long i, j;
(long)1000 / (p_ptr->max_plv+2) + 5) / 10);
hooked_roff(format(" Ìó%ld.%02ld ¥Ý¥¤¥ó¥È¤Î·Ð¸³¤È¤Ê¤ë¡£",
- (long)i, (long)j ));
+ (long)i, (long)j ));
#else
/* calculate the integer exp part */
i = (long)r_ptr->mexp * r_ptr->level / (p_ptr->max_plv+2);
/* Mention the experience */
hooked_roff(format(" is worth about %ld.%02ld point%s",
- (long)i, (long)j,
- (((i == 1) && (j == 0)) ? "" : "s")));
+ (long)i, (long)j,
+ (((i == 1) && (j == 0)) ? "" : "s")));
/* Take account of annoying English */
p = "th";
/* Mention the dependance on the player's level */
hooked_roff(format(" for a%s %lu%s level character. ",
- q, (long)i, p));
+ q, (long)i, p));
#endif
}
if ((flags2 & RF2_AURA_FIRE) && (flags2 & RF2_AURA_ELEC) && (flags3 & RF3_AURA_COLD))
{
#ifdef JP
-hook_c_roff(TERM_VIOLET, format("%^s¤Ï±ê¤Èɹ¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
+ hook_c_roff(TERM_VIOLET, format("%^s¤Ï±ê¤Èɹ¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
#else
- hooked_roff(format("%^s is surrounded by flames and electricity. ", wd_he[msex]));
+ hook_c_roff(TERM_VIOLET, format("%^s is surrounded by flames, ice and electricity. ", wd_he[msex]));
#endif
-
}
else if ((flags2 & RF2_AURA_FIRE) && (flags2 & RF2_AURA_ELEC))
{
#ifdef JP
-hook_c_roff(TERM_L_RED, format("%^s¤Ï±ê¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
+ hook_c_roff(TERM_L_RED, format("%^s¤Ï±ê¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
#else
- hooked_roff(format("%^s is surrounded by flames and electricity. ", wd_he[msex]));
+ hook_c_roff(TERM_L_RED, format("%^s is surrounded by flames and electricity. ", wd_he[msex]));
#endif
-
}
else if ((flags2 & RF2_AURA_FIRE) && (flags3 & RF3_AURA_COLD))
{
#ifdef JP
-hook_c_roff(TERM_BLUE, format("%^s¤Ï±ê¤Èɹ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
+ hook_c_roff(TERM_BLUE, format("%^s¤Ï±ê¤Èɹ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
#else
- hooked_roff(format("%^s is surrounded by flames and electricity. ", wd_he[msex]));
+ hook_c_roff(TERM_BLUE, format("%^s is surrounded by flames and ice. ", wd_he[msex]));
#endif
-
}
else if ((flags3 & RF3_AURA_COLD) && (flags2 & RF2_AURA_ELEC))
{
#ifdef JP
-hook_c_roff(TERM_L_GREEN, format("%^s¤Ïɹ¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
+ hook_c_roff(TERM_L_GREEN, format("%^s¤Ïɹ¤È¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
#else
- hooked_roff(format("%^s is surrounded by ice and electricity. ", wd_he[msex]));
+ hook_c_roff(TERM_L_GREEN, format("%^s is surrounded by ice and electricity. ", wd_he[msex]));
#endif
-
}
else if (flags2 & RF2_AURA_FIRE)
{
#ifdef JP
-hook_c_roff(TERM_RED, format("%^s¤Ï±ê¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
+ hook_c_roff(TERM_RED, format("%^s¤Ï±ê¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
#else
- hooked_roff(format("%^s is surrounded by flames. ", wd_he[msex]));
+ hook_c_roff(TERM_RED, format("%^s is surrounded by flames. ", wd_he[msex]));
#endif
-
}
else if (flags3 & RF3_AURA_COLD)
{
#ifdef JP
-hook_c_roff(TERM_BLUE, format("%^s¤Ïɹ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
+ hook_c_roff(TERM_BLUE, format("%^s¤Ïɹ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
#else
- hooked_roff(format("%^s is surrounded by ice. ", wd_he[msex]));
+ hook_c_roff(TERM_BLUE, format("%^s is surrounded by ice. ", wd_he[msex]));
#endif
-
}
else if (flags2 & RF2_AURA_ELEC)
{
#ifdef JP
-hook_c_roff(TERM_L_BLUE, format("%^s¤Ï¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
+ hook_c_roff(TERM_L_BLUE, format("%^s¤Ï¥¹¥Ñ¡¼¥¯¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex]));
#else
- hooked_roff(format("%^s is surrounded by electricity. ", wd_he[msex]));
+ hook_c_roff(TERM_L_BLUE, format("%^s is surrounded by electricity. ", wd_he[msex]));
#endif
-
}
if (flags2 & RF2_REFLECTING)
{
#ifdef JP
-hooked_roff(format("%^s¤ÏÌð¤Î¼öʸ¤òÄ·¤ÍÊÖ¤¹¡£", wd_he[msex]));
+ hooked_roff(format("%^s¤ÏÌð¤Î¼öʸ¤òÄ·¤ÍÊÖ¤¹¡£", wd_he[msex]));
#else
hooked_roff(format("%^s reflects bolt spells. ", wd_he[msex]));
#endif
}
/* Describe escorts */
- if ((flags1 & RF1_ESCORT) || (flags1 & RF1_ESCORTS))
+ if ((flags1 & RF1_ESCORT) || (flags1 & RF1_ESCORTS) || reinforce)
{
#ifdef JP
hooked_roff(format("%^s¤ÏÄ̾ï¸î±Ò¤òȼ¤Ã¤Æ¸½¤ì¤ë¡£",
#else
hooked_roff(format("%^s usually appears with escorts. ",
#endif
+ wd_he[msex]));
- wd_he[msex]));
+ if(reinforce)
+ {
+#ifdef JP
+ hooked_roff("¸î±Ò¤Î¹½À®¤Ï");
+ if((flags1 & RF1_ESCORT) || (flags1 & RF1_ESCORTS))
+ {
+ hooked_roff("¾¯¤Ê¤¯¤È¤â");
+ }
+#else
+ hooked_roff("These escorts");
+ if((flags1 & RF1_ESCORT) || (flags1 & RF1_ESCORTS))
+ {
+ hooked_roff(" at the least");
+ }
+ hooked_roff(" contain ");
+#endif
+ for(n = 0; n < 6; n++)
+ {
+#ifdef JP
+ if(r_ptr->reinforce_id[n] && r_ptr->reinforce_dd[n] && r_ptr->reinforce_ds[n])
+ {
+ monster_race *rf_ptr = &r_info[r_ptr->reinforce_id[n]];
+ if(rf_ptr->flags1 & RF1_UNIQUE)
+ {
+ hooked_roff(format("¡¢%s", r_name + rf_ptr->name));
+ }
+ else
+ {
+ hooked_roff(format("¡¢ %dd%d ÂΤÎ%s", r_ptr->reinforce_dd[n], r_ptr->reinforce_ds[n],
+ r_name + rf_ptr->name));
+ }
+ }
+#else
+ if(r_ptr->reinforce_id[n] && r_ptr->reinforce_dd[n] && r_ptr->reinforce_ds[n])
+ {
+ monster_race *rf_ptr = &r_info[r_ptr->reinforce_id[n]];
+ if(rf_ptr->flags1 & RF1_UNIQUE)
+ {
+ hooked_roff(format(", %s", r_name + rf_ptr->name));
+ }
+ else
+ {
+ bool plural = (r_ptr->reinforce_dd[n] * r_ptr->reinforce_ds[n] > 1);
+ char name[80];
+ strcpy(name, r_name + rf_ptr->name);
+ if(plural) plural_aux(name);
+ hooked_roff(format(",%dd%d %s", r_ptr->reinforce_dd[n], r_ptr->reinforce_ds[n], name));
+ }
+ }
+#endif
+ }
+#ifdef JP
+ hooked_roff("¤ÇÀ®¤êΩ¤Ã¤Æ¤¤¤ë¡£");
+#else
+ hooked_roff(".");
+#endif
+ }
}
/* Describe friends */
hooked_roff(format("%^s usually appears in groups. ",
#endif
- wd_he[msex]));
+ wd_he[msex]));
}
for (n = 0; n < vn; n++)
{
#ifdef JP
- if(n!=vn-1){
- jverb(vp[n],jverb_buf,JVERB_OR);
- hook_c_roff(color[n], jverb_buf);
- hook_c_roff(color[n], "¤ê¡¢");
+ if (n != vn - 1)
+ {
+ jverb(vp[n], jverb_buf, JVERB_OR);
+ hook_c_roff(color[n], jverb_buf);
+ hook_c_roff(color[n], "¤ê");
+ hooked_roff("¡¢");
}
- else hook_c_roff(color[n], vp[n]);
+ else hook_c_roff(color[n], vp[n]);
#else
/* Intro */
if (n == 0) hooked_roff(" may ");
- else if (n < vn-1) hooked_roff(", ");
+ else if (n < vn - 1) hooked_roff(", ");
else hooked_roff(" or ");
/* Dump */
- hooked_roff(vp[n]);
+ hook_c_roff(color[n], vp[n]);
#endif
}
#endif
#ifdef JP
- if (flags6 & (RF6_INVULNER)) {vp[vn] = "̵Ũ²½";color[vn++] = TERM_WHITE;}
+ if (flags6 & (RF6_INVULNER)) {vp[vn] = "̵Ũ²½";color[vn++] = TERM_WHITE;}
#else
if (flags6 & (RF6_INVULNER)) {vp[vn] = "make invulnerable";color[vn++] = TERM_WHITE;}
#endif
if (flags6 & (RF6_TELE_LEVEL)) {vp[vn] = "teleport level";color[vn++] = TERM_ORANGE;}
#endif
+ if (flags6 & (RF6_DARKNESS))
+ {
+ if ((p_ptr->pclass != CLASS_NINJA) || (r_ptr->flags3 & (RF3_UNDEAD | RF3_HURT_LITE)) || (r_ptr->flags7 & RF7_DARK_MASK))
+ {
+#ifdef JP
+ vp[vn] = "°Å°Ç"; color[vn++] = TERM_L_DARK;
+#else
+ vp[vn] = "create darkness"; color[vn++] = TERM_L_DARK;
+#endif
+ }
+ else
+ {
#ifdef JP
-if (flags6 & (RF6_DARKNESS)) {if ((p_ptr->pclass != CLASS_NINJA) || (flags3 & (RF3_UNDEAD | RF3_HURT_LITE))) {vp[vn] = "°Å°Ç";color[vn++] = TERM_L_DARK;} else { vp[vn] = "Á®¸÷";color[vn++] = TERM_YELLOW;}}
+ vp[vn] = "Á®¸÷"; color[vn++] = TERM_YELLOW;
#else
-if (flags6 & (RF6_DARKNESS)) {vp[vn] = ((p_ptr->pclass != CLASS_NINJA) || (flags3 & (RF3_UNDEAD | RF3_HURT_LITE))) ? "create darkness" : "create light";color[vn++] = TERM_L_DARK;}
+ vp[vn] = "create light"; color[vn++] = TERM_YELLOW;
#endif
+ }
+ }
#ifdef JP
if (flags6 & (RF6_TRAPS)) {vp[vn] = "¥È¥é¥Ã¥×";color[vn++] = TERM_BLUE;}
hooked_roff(" magical, casting spells");
/* Adverb */
- if (flags2 & RF2_SMART) hooked_roff(" intelligently");
+ if (flags2 & RF2_SMART) hook_c_roff(TERM_YELLOW, " intelligently");
#endif
hook_c_roff(color[n], vp[n]);
}
#ifdef JP
- hooked_roff("¤Î¼öʸ¤ò¾§¤¨¤ë¤³¤È¤¬¤¢¤ë");
+ hooked_roff("¤Î¼öʸ¤ò¾§¤¨¤ë¤³¤È¤¬¤¢¤ë");
#endif
}
if (breath || magic)
{
/* Total casting */
- m = r_ptr->r_cast_inate + r_ptr->r_cast_spell;
+ m = r_ptr->r_cast_spell;
/* Average frequency */
- n = (r_ptr->freq_inate + r_ptr->freq_spell) / 2;
+ n = r_ptr->freq_spell;
/* Describe the spell frequency */
if (m > 100 || know_everything)
hooked_roff(format("%^s has an armor rating of %d",
#endif
- wd_he[msex], r_ptr->ac));
+ wd_he[msex], r_ptr->ac));
/* Maximized hitpoints */
- if (flags1 & RF1_FORCE_MAXHP)
+ if ((flags1 & RF1_FORCE_MAXHP) || (r_ptr->hside == 1))
{
+ u32b hp = r_ptr->hdice * (nightmare ? 2 : 1) * r_ptr->hside;
#ifdef JP
hooked_roff(format(" %d ¤ÎÂÎÎϤ¬¤¢¤ë¡£",
#else
hooked_roff(format(" and a life rating of %d. ",
#endif
-
- r_ptr->hdice * r_ptr->hside));
+ (s16b)MIN(30000, hp)));
}
/* Variable hitpoints */
#else
hooked_roff(format(" and a life rating of %dd%d. ",
#endif
-
- r_ptr->hdice, r_ptr->hside));
+ r_ptr->hdice * (nightmare ? 2 : 1), r_ptr->hside));
}
}
/* Collect special abilities. */
vn = 0;
-#ifdef JP
-if (flags7 & (RF7_HAS_LITE_1 | RF7_HAS_LITE_2)) vp[vn++] = "¥À¥ó¥¸¥ç¥ó¤ò¾È¤é¤¹";
-#else
- if (flags7 & (RF7_HAS_LITE_1 | RF7_HAS_LITE_2)) vp[vn++] = "illuminate the dungeon";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_OPEN_DOOR) vp[vn++] = "¥É¥¢¤ò³«¤±¤ë";
-#else
- if (flags2 & RF2_OPEN_DOOR) vp[vn++] = "open doors";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_BASH_DOOR) vp[vn++] = "¥É¥¢¤òÂǤÁÇˤë";
-#else
- if (flags2 & RF2_BASH_DOOR) vp[vn++] = "bash down doors";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_PASS_WALL) vp[vn++] = "Êɤò¤¹¤êÈ´¤±¤ë";
-#else
- if (flags2 & RF2_PASS_WALL) vp[vn++] = "pass through walls";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_KILL_WALL) vp[vn++] = "Êɤò·¡¤ê¿Ê¤à";
-#else
- if (flags2 & RF2_KILL_WALL) vp[vn++] = "bore through walls";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_MOVE_BODY) vp[vn++] = "¼å¤¤¥â¥ó¥¹¥¿¡¼¤ò²¡¤·¤Î¤±¤ë";
-#else
- if (flags2 & RF2_MOVE_BODY) vp[vn++] = "push past weaker monsters";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_KILL_BODY) vp[vn++] = "¼å¤¤¥â¥ó¥¹¥¿¡¼¤òÅݤ¹";
-#else
- if (flags2 & RF2_KILL_BODY) vp[vn++] = "destroy weaker monsters";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_TAKE_ITEM) vp[vn++] = "¥¢¥¤¥Æ¥à¤ò½¦¤¦";
-#else
- if (flags2 & RF2_TAKE_ITEM) vp[vn++] = "pick up objects";
-#endif
-
-#ifdef JP
-if (flags2 & RF2_KILL_ITEM) vp[vn++] = "¥¢¥¤¥Æ¥à¤ò²õ¤¹";
-#else
- if (flags2 & RF2_KILL_ITEM) vp[vn++] = "destroy objects";
-#endif
+ if (flags7 & (RF7_HAS_LITE_1 | RF7_HAS_LITE_2)) { vp[vn] = _("¥À¥ó¥¸¥ç¥ó¤ò¾È¤é¤¹", "illuminate the dungeon"); color[vn++] = TERM_WHITE; }
+ if (flags7 & (RF7_HAS_DARK_1 | RF7_HAS_DARK_2)) { vp[vn] = _("¥À¥ó¥¸¥ç¥ó¤ò°Å¤¯¤¹¤ë", "darken the dungeon"); color[vn++] = TERM_L_DARK; }
+ if (flags2 & RF2_OPEN_DOOR) { vp[vn] = _("¥É¥¢¤ò³«¤±¤ë", "open doors"); color[vn++] = TERM_WHITE; }
+ if (flags2 & RF2_BASH_DOOR) { vp[vn] = _("¥É¥¢¤òÂǤÁÇˤë", "bash down doors"); color[vn++] = TERM_WHITE; }
+ if (flags7 & RF7_CAN_FLY) { vp[vn] = _("¶õ¤òÈô¤Ö", "fly"); color[vn++] = TERM_WHITE; }
+ if (flags7 & RF7_CAN_SWIM) { vp[vn] = _("¿å¤òÅϤë", "swim"); color[vn++] = TERM_WHITE; }
+ if (flags2 & RF2_PASS_WALL) { vp[vn] = _("Êɤò¤¹¤êÈ´¤±¤ë", "pass through walls"); color[vn++] = TERM_WHITE; }
+ if (flags2 & RF2_KILL_WALL) { vp[vn] = _("Êɤò·¡¤ê¿Ê¤à", "bore through walls"); color[vn++] = TERM_WHITE; }
+ if (flags2 & RF2_MOVE_BODY) { vp[vn] = _("¼å¤¤¥â¥ó¥¹¥¿¡¼¤ò²¡¤·¤Î¤±¤ë", "push past weaker monsters"); color[vn++] = TERM_WHITE; }
+ if (flags2 & RF2_KILL_BODY) { vp[vn] = _("¼å¤¤¥â¥ó¥¹¥¿¡¼¤òÅݤ¹", "destroy weaker monsters"); color[vn++] = TERM_WHITE; }
+ if (flags2 & RF2_TAKE_ITEM) { vp[vn] = _("¥¢¥¤¥Æ¥à¤ò½¦¤¦", "pick up objects"); color[vn++] = TERM_WHITE; }
+ if (flags2 & RF2_KILL_ITEM) { vp[vn] = _("¥¢¥¤¥Æ¥à¤ò²õ¤¹", "destroy objects"); color[vn++] = TERM_WHITE; }
/* Describe special abilities. */
if (vn)
{
/* Intro */
-#ifdef JP
- hooked_roff(format("%^s¤Ï", wd_he[msex]));
-#else
- hooked_roff(format("%^s", wd_he[msex]));
-#endif
-
+ hooked_roff(format(_("%^s¤Ï", "%^s"), wd_he[msex]));
/* Scan */
for (n = 0; n < vn; n++)
{
/* Intro */
#ifdef JP
- if(n!=vn-1){
- jverb(vp[n],jverb_buf,JVERB_AND);
- hooked_roff(jverb_buf);
- hooked_roff("¡¢");
+ if (n != vn - 1)
+ {
+ jverb(vp[n], jverb_buf, JVERB_AND);
+ hook_c_roff(color[n], jverb_buf);
+ hooked_roff("¡¢");
}
- else hooked_roff(vp[n]);
+ else hook_c_roff(color[n], vp[n]);
#else
if (n == 0) hooked_roff(" can ");
- else if (n < vn-1) hooked_roff(", ");
+ else if (n < vn - 1) hooked_roff(", ");
else hooked_roff(" and ");
/* Dump */
- hooked_roff(vp[n]);
+ hook_c_roff(color[n], vp[n]);
#endif
}
/* End */
-#ifdef JP
- hooked_roff("¤³¤È¤¬¤Ç¤¤ë¡£");
-#else
- hooked_roff(". ");
-#endif
+ hooked_roff(_("¤³¤È¤¬¤Ç¤¤ë¡£", ". "));
}
-
+
+ /* Aquatic */
+ if (flags7 & RF7_AQUATIC)
+ {
+ hooked_roff(format(_("%^s¤Ï¿åÃæ¤ËÀ³¤ó¤Ç¤¤¤ë¡£", "%^s lives in water. "), wd_he[msex]));
+ }
/* Describe special abilities. */
if (flags7 & (RF7_SELF_LITE_1 | RF7_SELF_LITE_2))
{
-#ifdef JP
- hooked_roff(format("%^s¤Ï¸÷¤Ã¤Æ¤¤¤ë¡£", wd_he[msex]));
-#else
- hooked_roff(format("%^s illuminate the dungeon. ", wd_he[msex]));
-#endif
-
+ hooked_roff(format(_("%^s¤Ï¸÷¤Ã¤Æ¤¤¤ë¡£", "%^s is shining. "), wd_he[msex]));
+ }
+ if (flags7 & (RF7_SELF_DARK_1 | RF7_SELF_DARK_2))
+ {
+ hook_c_roff(TERM_L_DARK, format(_("%^s¤Ï°Å¹õ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", "%^s is surrounded by darkness. "), wd_he[msex]));
}
if (flags2 & RF2_INVISIBLE)
{
-#ifdef JP
- hooked_roff(format("%^s¤ÏÆ©ÌÀ¤ÇÌܤ˸«¤¨¤Ê¤¤¡£", wd_he[msex]));
-#else
- hooked_roff(format("%^s is invisible. ", wd_he[msex]));
-#endif
-
+ hooked_roff(format(_("%^s¤ÏÆ©ÌÀ¤ÇÌܤ˸«¤¨¤Ê¤¤¡£", "%^s is invisible. "), wd_he[msex]));
}
if (flags2 & RF2_COLD_BLOOD)
{
-#ifdef JP
- hooked_roff(format("%^s¤ÏÎä·ìưʪ¤Ç¤¢¤ë¡£", wd_he[msex]));
-#else
- hooked_roff(format("%^s is cold blooded. ", wd_he[msex]));
-#endif
-
+ hooked_roff(format(_("%^s¤ÏÎä·ìưʪ¤Ç¤¢¤ë¡£", "%^s is cold blooded. "), wd_he[msex]));
}
if (flags2 & RF2_EMPTY_MIND)
{
-#ifdef JP
- hooked_roff(format("%^s¤Ï¥Æ¥ì¥Ñ¥·¡¼¤Ç¤Ï´¶ÃΤǤ¤Ê¤¤¡£", wd_he[msex]));
-#else
- hooked_roff(format("%^s is not detected by telepathy. ", wd_he[msex]));
-#endif
-
+ hooked_roff(format(_("%^s¤Ï¥Æ¥ì¥Ñ¥·¡¼¤Ç¤Ï´¶ÃΤǤ¤Ê¤¤¡£", "%^s is not detected by telepathy. "), wd_he[msex]));
}
else if (flags2 & RF2_WEIRD_MIND)
{
-#ifdef JP
- hooked_roff(format("%^s¤Ï¤Þ¤ì¤Ë¥Æ¥ì¥Ñ¥·¡¼¤Ç´¶ÃΤǤ¤ë¡£", wd_he[msex]));
-#else
- hooked_roff(format("%^s is rarely detected by telepathy. ", wd_he[msex]));
-#endif
-
+ hooked_roff(format(_("%^s¤Ï¤Þ¤ì¤Ë¥Æ¥ì¥Ñ¥·¡¼¤Ç´¶ÃΤǤ¤ë¡£", "%^s is rarely detected by telepathy. "), wd_he[msex]));
}
if (flags2 & RF2_MULTIPLY)
{
-#ifdef JP
- hook_c_roff(TERM_L_UMBER, format("%^s¤ÏÇúȯŪ¤ËÁý¿£¤¹¤ë¡£", wd_he[msex]));
-#else
- hook_c_roff(TERM_L_UMBER, format("%^s breeds explosively. ", wd_he[msex]));
-#endif
-
+ hook_c_roff(TERM_L_UMBER, format(_("%^s¤ÏÇúȯŪ¤ËÁý¿£¤¹¤ë¡£", "%^s breeds explosively. "), wd_he[msex]));
}
if (flags2 & RF2_REGENERATE)
{
-#ifdef JP
- hook_c_roff(TERM_L_WHITE, format("%^s¤ÏÁÇÁ᤯ÂÎÎϤò²óÉü¤¹¤ë¡£", wd_he[msex]));
-#else
- hook_c_roff(TERM_L_WHITE, format("%^s regenerates quickly. ", wd_he[msex]));
-#endif
-
+ hook_c_roff(TERM_L_WHITE, format(_("%^s¤ÏÁÇÁ᤯ÂÎÎϤò²óÉü¤¹¤ë¡£", "%^s regenerates quickly. "), wd_he[msex]));
}
if (flags7 & RF7_RIDING)
{
-#ifdef JP
- hook_c_roff(TERM_SLATE, format("%^s¤Ë¾è¤ë¤³¤È¤¬¤Ç¤¤ë¡£", wd_he[msex]));
-#else
- hook_c_roff(TERM_SLATE, format("%^s is suitable for riding. ", wd_he[msex]));
-#endif
-
+ hook_c_roff(TERM_SLATE, format(_("%^s¤Ë¾è¤ë¤³¤È¤¬¤Ç¤¤ë¡£", "%^s is suitable for riding. "), wd_he[msex]));
}
/* Collect immunities */
vn = 0;
#ifdef JP
- if (flags3 & RF3_IM_ACID) {vp[vn] = "»À";color[vn++] = TERM_GREEN;}
+ if (flagsr & RFR_IM_ACID) {vp[vn] = "»À";color[vn++] = TERM_GREEN;}
#else
- if (flags3 & RF3_IM_ACID) {vp[vn] = "acid";color[vn++] = TERM_GREEN;}
+ if (flagsr & RFR_IM_ACID) {vp[vn] = "acid";color[vn++] = TERM_GREEN;}
#endif
#ifdef JP
- if (flags3 & RF3_IM_ELEC) {vp[vn] = "°ðºÊ";color[vn++] = TERM_BLUE;}
+ if (flagsr & RFR_IM_ELEC) {vp[vn] = "°ðºÊ";color[vn++] = TERM_BLUE;}
#else
- if (flags3 & RF3_IM_ELEC) {vp[vn] = "lightning";color[vn++] = TERM_BLUE;}
+ if (flagsr & RFR_IM_ELEC) {vp[vn] = "lightning";color[vn++] = TERM_BLUE;}
#endif
#ifdef JP
- if (flags3 & RF3_IM_FIRE) {vp[vn] = "±ê";color[vn++] = TERM_RED;}
+ if (flagsr & RFR_IM_FIRE) {vp[vn] = "±ê";color[vn++] = TERM_RED;}
#else
- if (flags3 & RF3_IM_FIRE) {vp[vn] = "fire";color[vn++] = TERM_RED;}
+ if (flagsr & RFR_IM_FIRE) {vp[vn] = "fire";color[vn++] = TERM_RED;}
#endif
#ifdef JP
- if (flags3 & RF3_IM_COLD) {vp[vn] = "Î䵤";color[vn++] = TERM_L_WHITE;}
+ if (flagsr & RFR_IM_COLD) {vp[vn] = "Î䵤";color[vn++] = TERM_L_WHITE;}
#else
- if (flags3 & RF3_IM_COLD) {vp[vn] = "cold";color[vn++] = TERM_L_WHITE;}
+ if (flagsr & RFR_IM_COLD) {vp[vn] = "cold";color[vn++] = TERM_L_WHITE;}
#endif
#ifdef JP
- if (flags3 & RF3_IM_POIS) {vp[vn] = "ÆÇ";color[vn++] = TERM_L_GREEN;}
+ if (flagsr & RFR_IM_POIS) {vp[vn] = "ÆÇ";color[vn++] = TERM_L_GREEN;}
#else
- if (flags3 & RF3_IM_POIS) {vp[vn] = "poison";color[vn++] = TERM_L_GREEN;}
+ if (flagsr & RFR_IM_POIS) {vp[vn] = "poison";color[vn++] = TERM_L_GREEN;}
#endif
- /* Describe immunities */
- if (vn)
- {
- /* Intro */
-#ifdef JP
- hooked_roff(format("%^s¤Ï", wd_he[msex]));
-#else
- hooked_roff(format("%^s", wd_he[msex]));
-#endif
-
-
- /* Scan */
- for (n = 0; n < vn; n++)
- {
- /* Intro */
-#ifdef JP
- if ( n != 0 ) hooked_roff("¤È");
-#else
- if (n == 0) hooked_roff(" resists ");
- else if (n < vn-1) hooked_roff(", ");
- else hooked_roff(" and ");
-#endif
-
-
- /* Dump */
- hook_c_roff(color[n], vp[n]);
- }
-
- /* End */
-#ifdef JP
- hooked_roff("¤ÎÂÑÀ¤ò»ý¤Ã¤Æ¤¤¤ë¡£");
-#else
- hooked_roff(". ");
-#endif
-
- }
-
-
/* Collect resistances */
- vn = 0;
-#ifdef JP
-if (flags4 & RF4_BR_LITE) {vp[vn] = "Á®¸÷";color[vn++] = TERM_YELLOW;}
-#else
- if (flags4 & RF4_BR_LITE) {vp[vn] = "light";color[vn++] = TERM_YELLOW;}
-#endif
-
#ifdef JP
-if ((flags4 & RF4_BR_DARK) || (flags3 & RF3_ORC)) {vp[vn] = "°Å¹õ";color[vn++] = TERM_L_DARK;}
+ if (flagsr & RFR_RES_LITE) {vp[vn] = "Á®¸÷";color[vn++] = TERM_YELLOW;}
#else
- if (flags4 & RF4_BR_DARK || (flags3 & RF3_ORC)) {vp[vn] = "dark";color[vn++] = TERM_L_DARK;}
+ if (flagsr & RFR_RES_LITE) {vp[vn] = "light";color[vn++] = TERM_YELLOW;}
#endif
#ifdef JP
-if (flags3 & RF3_RES_NETH) {vp[vn] = "ÃϹö";color[vn++] = TERM_L_DARK;}
+ if (flagsr & RFR_RES_DARK) {vp[vn] = "°Å¹õ";color[vn++] = TERM_L_DARK;}
#else
- if (flags3 & RF3_RES_NETH) {vp[vn] = "nether";color[vn++] = TERM_L_DARK;}
+ if (flagsr & RFR_RES_DARK) {vp[vn] = "dark";color[vn++] = TERM_L_DARK;}
#endif
#ifdef JP
-if (flags3 & RF3_RES_WATE) {vp[vn] = "¿å";color[vn++] = TERM_BLUE;}
+ if (flagsr & RFR_RES_NETH) {vp[vn] = "ÃϹö";color[vn++] = TERM_L_DARK;}
#else
-if (flags3 & RF3_RES_WATE) {vp[vn] = "water";color[vn++] = TERM_BLUE;}
+ if (flagsr & RFR_RES_NETH) {vp[vn] = "nether";color[vn++] = TERM_L_DARK;}
#endif
#ifdef JP
-if (flags3 & RF3_RES_PLAS) {vp[vn] = "¥×¥é¥º¥Þ";color[vn++] = TERM_L_RED;}
+ if (flagsr & RFR_RES_WATE) {vp[vn] = "¿å";color[vn++] = TERM_BLUE;}
#else
- if (flags3 & RF3_RES_PLAS) {vp[vn] = "plasma";color[vn++] = TERM_L_RED;}
+ if (flagsr & RFR_RES_WATE) {vp[vn] = "water";color[vn++] = TERM_BLUE;}
#endif
#ifdef JP
-if (flags4 & RF4_BR_SHAR) {vp[vn] = "ÇËÊÒ";color[vn++] = TERM_L_UMBER;}
+ if (flagsr & RFR_RES_PLAS) {vp[vn] = "¥×¥é¥º¥Þ";color[vn++] = TERM_L_RED;}
#else
- if (flags4 & RF4_BR_SHAR) {vp[vn] = "shards";color[vn++] = TERM_L_UMBER;}
+ if (flagsr & RFR_RES_PLAS) {vp[vn] = "plasma";color[vn++] = TERM_L_RED;}
#endif
#ifdef JP
-if (flags4 & RF4_BR_SOUN) {vp[vn] = "¹ì²»";color[vn++] = TERM_ORANGE;}
+ if (flagsr & RFR_RES_SHAR) {vp[vn] = "ÇËÊÒ";color[vn++] = TERM_L_UMBER;}
#else
- if (flags4 & RF4_BR_SOUN) {vp[vn] = "sound";color[vn++] = TERM_ORANGE;}
+ if (flagsr & RFR_RES_SHAR) {vp[vn] = "shards";color[vn++] = TERM_L_UMBER;}
#endif
#ifdef JP
-if (flags4 & RF4_BR_CONF) {vp[vn] = "º®Íð";color[vn++] = TERM_L_UMBER;}
+ if (flagsr & RFR_RES_SOUN) {vp[vn] = "¹ì²»";color[vn++] = TERM_ORANGE;}
#else
- if (flags4 & RF4_BR_CONF) {vp[vn] = "conf";color[vn++] = TERM_L_UMBER;}
+ if (flagsr & RFR_RES_SOUN) {vp[vn] = "sound";color[vn++] = TERM_ORANGE;}
#endif
#ifdef JP
-if ((flags4 & RF4_BR_CHAO) || (r_idx == MON_STORMBRINGER)) {vp[vn] = "¥«¥ª¥¹";color[vn++] = TERM_VIOLET;}
+ if (flagsr & RFR_RES_CHAO) {vp[vn] = "¥«¥ª¥¹";color[vn++] = TERM_VIOLET;}
#else
-if ((flags4 & RF4_BR_CHAO) || (r_idx == MON_STORMBRINGER)) {vp[vn] = "chaos";color[vn++] = TERM_VIOLET;}
+ if (flagsr & RFR_RES_CHAO) {vp[vn] = "chaos";color[vn++] = TERM_VIOLET;}
#endif
#ifdef JP
-if (flags3 & RF3_RES_NEXU) {vp[vn] = "°ø²Ìº®Íð";color[vn++] = TERM_VIOLET;}
+ if (flagsr & RFR_RES_NEXU) {vp[vn] = "°ø²Ìº®Íð";color[vn++] = TERM_VIOLET;}
#else
- if (flags3 & RF3_RES_NEXU) {vp[vn] = "nexus";color[vn++] = TERM_VIOLET;}
+ if (flagsr & RFR_RES_NEXU) {vp[vn] = "nexus";color[vn++] = TERM_VIOLET;}
#endif
#ifdef JP
-if (flags3 & RF3_RES_DISE) {vp[vn] = "Îô²½";color[vn++] = TERM_VIOLET;}
+ if (flagsr & RFR_RES_DISE) {vp[vn] = "Îô²½";color[vn++] = TERM_VIOLET;}
#else
- if (flags3 & RF3_RES_DISE) {vp[vn] = "disenchantment";color[vn++] = TERM_VIOLET;}
+ if (flagsr & RFR_RES_DISE) {vp[vn] = "disenchantment";color[vn++] = TERM_VIOLET;}
#endif
#ifdef JP
-if (flags4 & RF4_BR_WALL) {vp[vn] = "¥Õ¥©¡¼¥¹";color[vn++] = TERM_UMBER;}
+ if (flagsr & RFR_RES_WALL) {vp[vn] = "¥Õ¥©¡¼¥¹";color[vn++] = TERM_UMBER;}
#else
- if (flags4 & RF4_BR_WALL) {vp[vn] = "sound";color[vn++] = TERM_UMBER;}
+ if (flagsr & RFR_RES_WALL) {vp[vn] = "force";color[vn++] = TERM_UMBER;}
#endif
#ifdef JP
-if (flags4 & RF4_BR_INER) {vp[vn] = "ÃÙÆß";color[vn++] = TERM_SLATE;}
+ if (flagsr & RFR_RES_INER) {vp[vn] = "ÃÙÆß";color[vn++] = TERM_SLATE;}
#else
- if (flags4 & RF4_BR_INER) {vp[vn] = "inertia";color[vn++] = TERM_SLATE;}
+ if (flagsr & RFR_RES_INER) {vp[vn] = "inertia";color[vn++] = TERM_SLATE;}
#endif
#ifdef JP
-if (flags4 & RF4_BR_TIME) {vp[vn] = "»þ´ÖµÕž";color[vn++] = TERM_L_BLUE;}
+ if (flagsr & RFR_RES_TIME) {vp[vn] = "»þ´ÖµÕž";color[vn++] = TERM_L_BLUE;}
#else
- if (flags4 & RF4_BR_TIME) {vp[vn] = "time";color[vn++] = TERM_L_BLUE;}
+ if (flagsr & RFR_RES_TIME) {vp[vn] = "time";color[vn++] = TERM_L_BLUE;}
#endif
#ifdef JP
-if (flags4 & RF4_BR_GRAV) {vp[vn] = "½ÅÎÏ";color[vn++] = TERM_SLATE;}
+ if (flagsr & RFR_RES_GRAV) {vp[vn] = "½ÅÎÏ";color[vn++] = TERM_SLATE;}
#else
- if (flags4 & RF4_BR_GRAV) {vp[vn] = "gravity";color[vn++] = TERM_SLATE;}
+ if (flagsr & RFR_RES_GRAV) {vp[vn] = "gravity";color[vn++] = TERM_SLATE;}
#endif
#ifdef JP
-if (flags3 & RF3_RES_ALL) {vp[vn] = "¤¢¤é¤æ¤ë¹¶·â";color[vn++] = TERM_YELLOW;}
+ if (flagsr & RFR_RES_ALL) {vp[vn] = "¤¢¤é¤æ¤ë¹¶·â";color[vn++] = TERM_YELLOW;}
#else
- if (flags3 & RF3_RES_ALL) {vp[vn] = "all";color[vn++] = TERM_YELLOW;}
+ if (flagsr & RFR_RES_ALL) {vp[vn] = "all";color[vn++] = TERM_YELLOW;}
#endif
#ifdef JP
-if ((flags3 & RF3_RES_TELE) && !(r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "¥Æ¥ì¥Ý¡¼¥È";color[vn++] = TERM_ORANGE;}
+ if ((flagsr & RFR_RES_TELE) && !(r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "¥Æ¥ì¥Ý¡¼¥È";color[vn++] = TERM_ORANGE;}
#else
- if ((flags3 & RF3_RES_TELE) && !(r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "teleportation";color[vn++] = TERM_ORANGE;}
+ if ((flagsr & RFR_RES_TELE) && !(r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "teleportation";color[vn++] = TERM_ORANGE;}
#endif
- /* Describe resistances */
+ /* Describe immunities and resistances */
if (vn)
{
/* Intro */
/* Collect non-effects */
vn = 0;
#ifdef JP
-if (flags3 & RF3_NO_STUN) {vp[vn] = "Û¯Û°¤È¤·¤Ê¤¤";color[vn++] = TERM_ORANGE;}
+ if (flags3 & RF3_NO_STUN) {vp[vn] = "Û¯Û°¤È¤·¤Ê¤¤";color[vn++] = TERM_ORANGE;}
#else
- if (flags3 & RF3_NO_STUN) {vp[vn] = "stunned";color[vn++] = TERM_ORANGE;}
+ if (flags3 & RF3_NO_STUN) {vp[vn] = "stunned";color[vn++] = TERM_ORANGE;}
#endif
#ifdef JP
-if (flags3 & RF3_NO_FEAR) {vp[vn] = "¶²Éݤò´¶¤¸¤Ê¤¤";color[vn++] = TERM_SLATE;}
+ if (flags3 & RF3_NO_FEAR) {vp[vn] = "¶²Éݤò´¶¤¸¤Ê¤¤";color[vn++] = TERM_SLATE;}
#else
- if (flags3 & RF3_NO_FEAR) {vp[vn] = "frightened";color[vn++] = TERM_SLATE;}
+ if (flags3 & RF3_NO_FEAR) {vp[vn] = "frightened";color[vn++] = TERM_SLATE;}
#endif
#ifdef JP
-if (flags3 & RF3_NO_CONF) {vp[vn] = "º®Í𤷤ʤ¤";color[vn++] = TERM_L_UMBER;}
+ if (flags3 & RF3_NO_CONF) {vp[vn] = "º®Í𤷤ʤ¤";color[vn++] = TERM_L_UMBER;}
#else
- if (flags3 & RF3_NO_CONF) {vp[vn] = "confused";color[vn++] = TERM_L_UMBER;}
+ if (flags3 & RF3_NO_CONF) {vp[vn] = "confused";color[vn++] = TERM_L_UMBER;}
#endif
#ifdef JP
-if (flags3 & RF3_NO_SLEEP) {vp[vn] = "̲¤é¤µ¤ì¤Ê¤¤";color[vn++] = TERM_BLUE;}
+ if (flags3 & RF3_NO_SLEEP) {vp[vn] = "̲¤é¤µ¤ì¤Ê¤¤";color[vn++] = TERM_BLUE;}
#else
- if (flags3 & RF3_NO_SLEEP) {vp[vn] = "slept";color[vn++] = TERM_BLUE;}
+ if (flags3 & RF3_NO_SLEEP) {vp[vn] = "slept";color[vn++] = TERM_BLUE;}
#endif
#ifdef JP
-if ((flags3 & RF3_RES_TELE) && (r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "¥Æ¥ì¥Ý¡¼¥È¤µ¤ì¤Ê¤¤";color[vn++] = TERM_ORANGE;}
+ if ((flagsr & RFR_RES_TELE) && (r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "¥Æ¥ì¥Ý¡¼¥È¤µ¤ì¤Ê¤¤";color[vn++] = TERM_ORANGE;}
#else
- if ((flags3 & RF3_RES_TELE) && (r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "teleported";color[vn++] = TERM_ORANGE;}
+ if ((flagsr & RFR_RES_TELE) && (r_ptr->flags1 & RF1_UNIQUE)) {vp[vn] = "teleported";color[vn++] = TERM_ORANGE;}
#endif
/* Describe non-effects */
/* Do we know how aware it is? */
if ((((int)r_ptr->r_wake * (int)r_ptr->r_wake) > r_ptr->sleep) ||
- (r_ptr->r_ignore == MAX_UCHAR) ||
+ (r_ptr->r_ignore == MAX_UCHAR) ||
(r_ptr->sleep == 0 && r_ptr->r_tkills >= 10) || know_everything)
{
cptr act;
wd_he[msex], act, 10 * r_ptr->aaf));
#else
hooked_roff(format("%^s %s intruders, which %s may notice from %d feet. ",
- wd_he[msex], act, wd_he[msex], 10 * r_ptr->aaf));
+ wd_he[msex], act, wd_he[msex], 10 * r_ptr->aaf));
#endif
}
/* Drops gold and/or items */
if (drop_gold || drop_item)
{
- /* No "n" needed */
- sin = FALSE;
-
/* Intro */
#ifdef JP
hooked_roff(format("%^s¤Ï", wd_he[msex]));
#else
hooked_roff(format("%^s may carry", wd_he[msex]));
+
+ /* No "n" needed */
+ sin = FALSE;
#endif
hooked_roff("°ì¤Ä¤Î");
#else
hooked_roff(" a");
-#endif
-
sin = TRUE;
+#endif
}
/* Two drops */
p = "¾å¼Á¤Ê";
#else
p = " good";
-#endif
-
sin = FALSE;
+#endif
}
/* Okay */
/* Handle singular "an" */
#ifndef JP
if (sin) hooked_roff("n");
-#endif
sin = FALSE;
+#endif
/* Dump "object(s)" */
if (p) hooked_roff(p);
/* Treasures */
if (drop_gold)
{
+#ifndef JP
/* Cancel prefix */
if (!p) sin = FALSE;
/* Handle singular "an" */
-#ifndef JP
if (sin) hooked_roff("n");
-#endif
sin = FALSE;
+#endif
/* Dump "treasure(s)" */
if (p) hooked_roff(p);
case RBE_DR_MANA: q = "drain mana force"; break;
#endif
+#ifdef JP
+ case RBE_INERTIA: q = "¸ºÂ®¤µ¤»¤ë"; break;
+ case RBE_STUN: q = "Û¯Û°¤È¤µ¤»¤ë"; break;
+#else
+ case RBE_INERTIA: q = "slow"; break;
+ case RBE_STUN: q = "stun"; break;
+#endif
}
#ifdef JP
- if ( r == 0 ) hooked_roff( format("%^s¤Ï", wd_he[msex]) );
+ if ( r == 0 ) hooked_roff( format("%^s¤Ï", wd_he[msex]) );
/***¼ã´³É½¸½¤òÊѹ¹ ita ***/
- /* Describe damage (if known) */
+ /* Describe damage (if known) */
if (d1 && d2 && (know_everything || know_damage(r_idx, m)))
{
/* Reset the cursor */
Term_gotoxy(0, 0);
+#ifndef JP
/* A title (use "The" for non-uniques) */
-#ifdef JP
- if (0)
-#else
if (!(r_ptr->flags1 & RF1_UNIQUE))
-#endif
-
{
Term_addstr(-1, TERM_WHITE, "The ");
}
+#endif
/* Dump the name */
Term_addstr(-1, TERM_WHITE, (r_name + r_ptr->name));
/* Append the "standard" attr/char info */
Term_addstr(-1, TERM_WHITE, " ('");
- Term_addch(a1, c1);
- if (use_bigtile && (a1 & 0x80)) Term_addch(255, -1);
+ Term_add_bigch(a1, c1);
Term_addstr(-1, TERM_WHITE, "')");
/* Append the "optional" attr/char info */
Term_addstr(-1, TERM_WHITE, "/('");
- Term_addch(a2, c2);
- if (use_bigtile && (a2 & 0x80)) Term_addch(255, -1);
+ Term_add_bigch(a2, c2);
Term_addstr(-1, TERM_WHITE, "'):");
/* Wizards get extra info */
}
-bool monster_quest(int r_idx)
-{
- monster_race *r_ptr = &r_info[r_idx];
-
- /* Random quests are in the dungeon */
- if (r_ptr->flags8 & RF8_WILD_ONLY) return FALSE;
-
- /* No random quests for aquatic monsters */
- if (r_ptr->flags7 & RF7_AQUATIC) return FALSE;
-
- /* No random quests for multiplying monsters */
- if (r_ptr->flags2 & RF2_MULTIPLY) return FALSE;
-
- /* No quests to kill friendly monsters */
- if (r_ptr->flags7 & RF7_FRIENDLY) return FALSE;
-
- return TRUE;
-}
-
-
-bool monster_dungeon(int r_idx)
+bool mon_hook_dungeon(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
if (!(r_ptr->flags8 & RF8_WILD_ONLY))
return TRUE;
else
- {
- dungeon_info_type *d_ptr = &d_info[dungeon_type];
- if ((d_ptr->mflags8 & RF8_WILD_MOUNTAIN) &&
- (r_ptr->flags8 & RF8_WILD_MOUNTAIN)) return TRUE;
+ {
+ dungeon_info_type *d_ptr = &d_info[dungeon_type];
+ if ((d_ptr->mflags8 & RF8_WILD_MOUNTAIN) &&
+ (r_ptr->flags8 & RF8_WILD_MOUNTAIN)) return TRUE;
return FALSE;
- }
+ }
}
-bool monster_ocean(int r_idx)
+static bool mon_hook_ocean(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-bool monster_shore(int r_idx)
+static bool mon_hook_shore(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-static bool monster_waste(int r_idx)
+static bool mon_hook_waste(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-bool monster_town(int r_idx)
+static bool mon_hook_town(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-bool monster_wood(int r_idx)
+static bool mon_hook_wood(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-bool monster_volcano(int r_idx)
+static bool mon_hook_volcano(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-bool monster_mountain(int r_idx)
+static bool mon_hook_mountain(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-bool monster_grass(int r_idx)
+static bool mon_hook_grass(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
}
-bool monster_deep_water(int r_idx)
+static bool mon_hook_deep_water(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
- if (!monster_dungeon(r_idx)) return FALSE;
+ if (!mon_hook_dungeon(r_idx)) return FALSE;
if (r_ptr->flags7 & RF7_AQUATIC)
return TRUE;
}
-bool monster_shallow_water(int r_idx)
+static bool mon_hook_shallow_water(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
- if (!monster_dungeon(r_idx)) return FALSE;
+ if (!mon_hook_dungeon(r_idx)) return FALSE;
if (r_ptr->flags2 & RF2_AURA_FIRE)
return FALSE;
}
-bool monster_lava(int r_idx)
+static bool mon_hook_lava(int r_idx)
{
monster_race *r_ptr = &r_info[r_idx];
- if (!monster_dungeon(r_idx)) return FALSE;
+ if (!mon_hook_dungeon(r_idx)) return FALSE;
- if (((r_ptr->flags3 & RF3_IM_FIRE) ||
+ if (((r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK) ||
(r_ptr->flags7 & RF7_CAN_FLY)) &&
!(r_ptr->flags3 & RF3_AURA_COLD))
return TRUE;
}
+static bool mon_hook_floor(int r_idx)
+{
+ monster_race *r_ptr = &r_info[r_idx];
+
+ if (!(r_ptr->flags7 & RF7_AQUATIC) ||
+ (r_ptr->flags7 & RF7_CAN_FLY))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+
monster_hook_type get_monster_hook(void)
{
if (!dun_level && !p_ptr->inside_quest)
switch (wilderness[p_ptr->wilderness_y][p_ptr->wilderness_x].terrain)
{
case TERRAIN_TOWN:
- return (monster_hook_type)monster_town;
+ return (monster_hook_type)mon_hook_town;
case TERRAIN_DEEP_WATER:
- return (monster_hook_type)monster_ocean;
+ return (monster_hook_type)mon_hook_ocean;
case TERRAIN_SHALLOW_WATER:
case TERRAIN_SWAMP:
- return (monster_hook_type)monster_shore;
+ return (monster_hook_type)mon_hook_shore;
case TERRAIN_DIRT:
case TERRAIN_DESERT:
- return (monster_hook_type)monster_waste;
+ return (monster_hook_type)mon_hook_waste;
case TERRAIN_GRASS:
- return (monster_hook_type)monster_grass;
+ return (monster_hook_type)mon_hook_grass;
case TERRAIN_TREES:
- return (monster_hook_type)monster_wood;
+ return (monster_hook_type)mon_hook_wood;
case TERRAIN_SHALLOW_LAVA:
case TERRAIN_DEEP_LAVA:
- return (monster_hook_type)monster_volcano;
+ return (monster_hook_type)mon_hook_volcano;
case TERRAIN_MOUNTAIN:
- return (monster_hook_type)monster_mountain;
+ return (monster_hook_type)mon_hook_mountain;
default:
- return (monster_hook_type)monster_dungeon;
+ return (monster_hook_type)mon_hook_dungeon;
}
}
else
{
- return (monster_hook_type)monster_dungeon;
+ return (monster_hook_type)mon_hook_dungeon;
}
}
monster_hook_type get_monster_hook2(int y, int x)
{
+ feature_type *f_ptr = &f_info[cave[y][x].feat];
+
/* Set the monster list */
- switch (cave[y][x].feat)
- {
- case FEAT_SHAL_WATER:
- return (monster_hook_type)monster_shallow_water;
- case FEAT_DEEP_WATER:
- return (monster_hook_type)monster_deep_water;
- case FEAT_DEEP_LAVA:
- case FEAT_SHAL_LAVA:
- return (monster_hook_type)monster_lava;
- default:
- return NULL;
+
+ /* Water */
+ if (have_flag(f_ptr->flags, FF_WATER))
+ {
+ /* Deep water */
+ if (have_flag(f_ptr->flags, FF_DEEP))
+ {
+ return (monster_hook_type)mon_hook_deep_water;
+ }
+
+ /* Shallow water */
+ else
+ {
+ return (monster_hook_type)mon_hook_shallow_water;
+ }
}
+
+ /* Lava */
+ else if (have_flag(f_ptr->flags, FF_LAVA))
+ {
+ return (monster_hook_type)mon_hook_lava;
+ }
+
+ else return (monster_hook_type)mon_hook_floor;
}
void set_pet(monster_type *m_ptr)
{
+ if (!is_pet(m_ptr)) check_pets_num_and_align(m_ptr, TRUE);
+
/* Check for quest completion */
check_quest_completion(m_ptr);
void set_hostile(monster_type *m_ptr)
{
if (p_ptr->inside_battle) return;
+
+ if (is_pet(m_ptr)) check_pets_num_and_align(m_ptr, FALSE);
+
m_ptr->smart &= ~SM_PET;
m_ptr->smart &= ~SM_FRIENDLY;
}
/*
* Check if monster can cross terrain
*/
-bool monster_can_cross_terrain(byte feat, monster_race *r_ptr)
+bool monster_can_cross_terrain(s16b feat, monster_race *r_ptr, u16b mode)
{
- /* Pit */
- if (feat == FEAT_DARK_PIT)
- {
- if (r_ptr->flags7 & RF7_CAN_FLY)
- return TRUE;
- else
- return FALSE;
- }
- /* Deep water */
- if (feat == FEAT_DEEP_WATER)
+ feature_type *f_ptr = &f_info[feat];
+
+ /* Pattern */
+ if (have_flag(f_ptr->flags, FF_PATTERN))
{
- if ((r_ptr->flags7 & RF7_AQUATIC) ||
- (r_ptr->flags7 & RF7_CAN_FLY) ||
- (r_ptr->flags7 & RF7_CAN_SWIM))
- return TRUE;
+ if (!(mode & CEM_RIDING))
+ {
+ if (!(r_ptr->flags7 & RF7_CAN_FLY)) return FALSE;
+ }
else
- return FALSE;
+ {
+ if (!(mode & CEM_P_CAN_ENTER_PATTERN)) return FALSE;
+ }
}
- /* Shallow water */
- else if (feat == FEAT_SHAL_WATER)
+
+ /* "CAN" flags */
+ if (have_flag(f_ptr->flags, FF_CAN_FLY) && (r_ptr->flags7 & RF7_CAN_FLY)) return TRUE;
+ if (have_flag(f_ptr->flags, FF_CAN_SWIM) && (r_ptr->flags7 & RF7_CAN_SWIM)) return TRUE;
+ if (have_flag(f_ptr->flags, FF_CAN_PASS))
{
- if (!(r_ptr->flags2 & RF2_AURA_FIRE) ||
- (r_ptr->flags7 & RF7_AQUATIC) ||
- (r_ptr->flags7 & RF7_CAN_FLY) ||
- (r_ptr->flags7 & RF7_CAN_SWIM))
- return TRUE;
- else
- return FALSE;
+ if ((r_ptr->flags2 & RF2_PASS_WALL) && (!(mode & CEM_RIDING) || p_ptr->pass_wall)) return TRUE;
}
- /* Aquatic monster */
- else if ((r_ptr->flags7 & RF7_AQUATIC) &&
- !(r_ptr->flags7 & RF7_CAN_FLY))
+
+ if (!have_flag(f_ptr->flags, FF_MOVE)) return FALSE;
+
+ /* Some monsters can walk on mountains */
+ if (have_flag(f_ptr->flags, FF_MOUNTAIN) && (r_ptr->flags8 & RF8_WILD_MOUNTAIN)) return TRUE;
+
+ /* Water */
+ if (have_flag(f_ptr->flags, FF_WATER))
{
- return FALSE;
+ if (!(r_ptr->flags7 & RF7_AQUATIC))
+ {
+ /* Deep water */
+ if (have_flag(f_ptr->flags, FF_DEEP)) return FALSE;
+
+ /* Shallow water */
+ else if (r_ptr->flags2 & RF2_AURA_FIRE) return FALSE;
+ }
}
+
+ /* Aquatic monster into non-water? */
+ else if (r_ptr->flags7 & RF7_AQUATIC) return FALSE;
+
/* Lava */
- else if ((feat == FEAT_SHAL_LAVA) ||
- (feat == FEAT_DEEP_LAVA))
+ if (have_flag(f_ptr->flags, FF_LAVA))
{
- if ((r_ptr->flags3 & RF3_IM_FIRE) ||
- (r_ptr->flags7 & RF7_CAN_FLY))
- return TRUE;
- else
- return FALSE;
+ if (!(r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)) return FALSE;
}
return TRUE;
/*
* Strictly check if monster can enter the grid
*/
-bool monster_can_enter(int y, int x, monster_race *r_ptr)
+bool monster_can_enter(int y, int x, monster_race *r_ptr, u16b mode)
{
- cave_type *c_ptr = &cave[y][x];
- byte feat = c_ptr->feat;
-
- /* Player or other monster */
- if ((y == py) && (x == px)) return FALSE;
- if (c_ptr->m_idx) return FALSE;
-
- /* Permanent wall */
- if ((c_ptr->feat >= FEAT_PERM_EXTRA) &&
- (c_ptr->feat <= FEAT_PERM_SOLID))
- return FALSE;
-
- /* Can fly over the Pattern */
- if ((c_ptr->feat >= FEAT_PATTERN_START) &&
- (c_ptr->feat <= FEAT_PATTERN_XTRA2))
- {
- if (!(r_ptr->flags7 & RF7_CAN_FLY))
- return FALSE;
- else
- return TRUE;
- }
-
- /* Can fly over mountain on the surface */
- if (feat == FEAT_MOUNTAIN)
- {
- if (!dun_level &&
- ((r_ptr->flags7 & RF7_CAN_FLY) ||
- (r_ptr->flags8 & RF8_WILD_MOUNTAIN)))
- return TRUE;
- else
- return FALSE;
- }
-
- /* Cannot enter wall without pass wall ability */
- if (!cave_floor_grid(c_ptr) && !(r_ptr->flags2 & RF2_PASS_WALL))
- return FALSE;
-
- /* Pit */
- if (feat == FEAT_DARK_PIT)
- {
- if (r_ptr->flags7 & RF7_CAN_FLY)
- return TRUE;
- else
- return FALSE;
- }
- /* Deep water */
- if (feat == FEAT_DEEP_WATER)
- {
- if ((r_ptr->flags7 & RF7_AQUATIC) ||
- (r_ptr->flags7 & RF7_CAN_FLY) ||
- (r_ptr->flags7 & RF7_CAN_SWIM))
- return TRUE;
- else
- return FALSE;
- }
- /* Shallow water */
- else if (feat == FEAT_SHAL_WATER)
- {
- if (!(r_ptr->flags2 & RF2_AURA_FIRE) ||
- (r_ptr->flags7 & RF7_AQUATIC) ||
- (r_ptr->flags7 & RF7_CAN_FLY) ||
- (r_ptr->flags7 & RF7_CAN_SWIM))
- return TRUE;
- else
- return FALSE;
- }
- /* Aquatic monster */
- else if ((r_ptr->flags7 & RF7_AQUATIC) &&
- !(r_ptr->flags7 & RF7_CAN_FLY))
- {
- return FALSE;
- }
- /* Lava */
- else if ((feat == FEAT_SHAL_LAVA) ||
- (feat == FEAT_DEEP_LAVA))
+ cave_type *c_ptr = &cave[y][x];
+
+ /* Player or other monster */
+ if (player_bold(y, x)) return FALSE;
+ if (c_ptr->m_idx) return FALSE;
+
+ return monster_can_cross_terrain(c_ptr->feat, r_ptr, mode);
+}
+
+
+/*
+ * Check if this monster has "hostile" alignment (aux)
+ */
+static bool check_hostile_align(byte sub_align1, byte sub_align2)
+{
+ if (sub_align1 != sub_align2)
{
- if ((r_ptr->flags3 & RF3_IM_FIRE) ||
- (r_ptr->flags7 & RF7_CAN_FLY))
+ if (((sub_align1 & SUB_ALIGN_EVIL) && (sub_align2 & SUB_ALIGN_GOOD)) ||
+ ((sub_align1 & SUB_ALIGN_GOOD) && (sub_align2 & SUB_ALIGN_EVIL)))
return TRUE;
- else
- return FALSE;
}
- return TRUE;
+ /* Non-hostile alignment */
+ return FALSE;
}
-
/*
* Check if two monsters are enemies
*/
}
/* Friendly vs. opposite aligned normal or pet */
- if (m_ptr->sub_align != n_ptr->sub_align)
+ if (check_hostile_align(m_ptr->sub_align, n_ptr->sub_align))
{
- if (((m_ptr->sub_align & SUB_ALIGN_EVIL) &&
- (n_ptr->sub_align & SUB_ALIGN_GOOD)) ||
- ((m_ptr->sub_align & SUB_ALIGN_GOOD) &&
- (n_ptr->sub_align & SUB_ALIGN_EVIL)))
- {
- if (!(m_ptr->mflag2 & MFLAG_CHAMELEON) || !(n_ptr->mflag2 & MFLAG_CHAMELEON)) return TRUE;
- }
+ if (!(m_ptr->mflag2 & MFLAG2_CHAMELEON) || !(n_ptr->mflag2 & MFLAG2_CHAMELEON)) return TRUE;
}
/* Hostile vs. non-hostile */
/*
+ * Check if this monster race has "hostile" alignment
+ * If user is player, m_ptr == NULL.
+ */
+bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr)
+{
+ byte sub_align1 = SUB_ALIGN_NEUTRAL;
+ byte sub_align2 = SUB_ALIGN_NEUTRAL;
+
+ if (m_ptr) /* For a monster */
+ {
+ sub_align1 = m_ptr->sub_align;
+ }
+ else /* For player */
+ {
+ if (p_ptr->align >= pa_good) sub_align1 |= SUB_ALIGN_GOOD;
+ if (p_ptr->align <= pa_evil) sub_align1 |= SUB_ALIGN_EVIL;
+ }
+
+ /* Racial alignment flags */
+ if (r_ptr->flags3 & RF3_EVIL) sub_align2 |= SUB_ALIGN_EVIL;
+ if (r_ptr->flags3 & RF3_GOOD) sub_align2 |= SUB_ALIGN_GOOD;
+
+ if (check_hostile_align(sub_align1, sub_align2)) return TRUE;
+
+ /* Non-hostile alignment */
+ return FALSE;
+}
+
+
+/*
* Is the monster "alive"?
*
* Used to determine the message to print for a killed monster.
else
return TRUE;
}
+
+
+/*
+ * Is this monster declined to be questor or bounty?
+ */
+bool no_questor_or_bounty_uniques(int r_idx)
+{
+ switch (r_idx)
+ {
+ /*
+ * Decline them to be questor or bounty because they use
+ * special motion "split and combine"
+ */
+ case MON_BANORLUPART:
+ case MON_BANOR:
+ case MON_LUPART:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
OSDN Git Service
