if (flg & (PROJECT_STOP))
{
if ((n > 0) &&
- ((y == py && x == px) || cave[y][x].m_idx != 0))
+ (player_bold(y, x) || cave[y][x].m_idx != 0))
break;
}
if (flg & (PROJECT_STOP))
{
if ((n > 0) &&
- ((y == py && x == px) || cave[y][x].m_idx != 0))
+ (player_bold(y, x) || cave[y][x].m_idx != 0))
break;
}
if (flg & (PROJECT_STOP))
{
if ((n > 0) &&
- ((y == py && x == px) || cave[y][x].m_idx != 0))
+ (player_bold(y, x) || cave[y][x].m_idx != 0))
break;
}
obvious = TRUE;
}
- /* Place gold */
- place_object(y, x, FALSE, FALSE);
+ /* Place object */
+ place_object(y, x, 0L);
}
}
if (!cave_naked_bold(y, x)) break;
/* Not on the player */
- if ((y == py) && (x == px)) break;
+ if (player_bold(y, x)) break;
/* Create a closed door */
cave_set_feat(y, x, FEAT_DOOR_HEAD + 0x00);
if (!cave_naked_bold(y, x)) break;
/* Not on the player */
- if ((y == py) && (x == px)) break;
+ if (player_bold(y, x)) break;
/* Create a closed door */
cave_set_feat(y, x, FEAT_TREES);
/* Create a glyph */
cave[y][x].info |= CAVE_OBJECT;
- cave[y][x].mimic = FEAT_GLYPH;
+ cave[y][x].mimic = f_info[FEAT_GLYPH].mimic;
/* Notice */
note_spot(y, x);
-
+
/* Redraw */
lite_spot(y, x);
if (!cave_naked_bold(y, x)) break;
/* Not on the player */
- if ((y == py) && (x == px)) break;
+ if (player_bold(y, x)) break;
/* Place a trap */
cave_set_feat(y, x, FEAT_WALL_EXTRA);
bool get_angry = FALSE;
/* Polymorph setting (true or false) */
- int do_poly = 0;
+ bool do_poly = FALSE;
/* Teleport setting (max distance) */
int do_dist = 0;
/* Hold the monster name */
char m_name[80];
+#ifndef JP
char m_poss[10];
+#endif
int photo = 0;
cptr note = NULL;
/* Assume a default death */
-#ifdef JP
-cptr note_dies = "¤Ï»à¤ó¤À¡£";
-#else
- cptr note_dies = " dies.";
-#endif
+ cptr note_dies = extract_note_dies(real_r_ptr(m_ptr));
int ty = m_ptr->fy;
int tx = m_ptr->fx;
+ int caster_lev = (who > 0) ? (r_info[m_list[who].r_idx].level / 2) : p_ptr->lev;
/* Nobody here */
if (!c_ptr->m_idx) return (FALSE);
/* Get the monster name (BEFORE polymorphing) */
monster_desc(m_name, m_ptr, 0);
+#ifndef JP
/* Get the monster possessive ("his"/"her"/"its") */
- monster_desc(m_poss, m_ptr, 0x22);
-
-
- /* Some monsters get "destroyed" */
- if (!monster_living(r_ptr))
- {
- int i;
- bool explode = FALSE;
-
- for (i = 0; i < 4; i++)
- {
- if (r_ptr->blow[i].method == RBM_EXPLODE) explode = TRUE;
- }
-
- /* Special note at death */
- if (explode)
-#ifdef JP
-note_dies = "¤ÏÇúȯ¤·¤ÆÊ´¡¹¤Ë¤Ê¤Ã¤¿¡£";
-#else
- note_dies = " explodes into tiny shreds.";
+ monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
#endif
- else
-#ifdef JP
-note_dies = "¤òÅݤ·¤¿¡£";
-#else
- note_dies = " is destroyed.";
-#endif
- }
+
if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 0);
case GF_MISSILE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
break;
case GF_ACID:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & (RF3_IM_ACID))
+ if (r_ptr->flagsr & RFR_IM_ACID)
{
#ifdef JP
note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ¤¬¤¢¤ë¡ª";
#endif
dam /= 9;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_ACID);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID);
}
break;
}
case GF_ELEC:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & (RF3_IM_ELEC))
+ if (r_ptr->flagsr & RFR_IM_ELEC)
{
#ifdef JP
note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ¤¬¤¢¤ë¡ª";
#endif
dam /= 9;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_ELEC);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC);
}
break;
}
case GF_FIRE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & (RF3_IM_FIRE))
+ if (r_ptr->flagsr & RFR_IM_FIRE)
{
#ifdef JP
note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ¤¬¤¢¤ë¡ª";
#endif
dam /= 9;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_FIRE);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_FIRE);
}
else if (r_ptr->flags3 & (RF3_HURT_FIRE))
{
#endif
dam *= 2;
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_FIRE);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE);
}
break;
}
case GF_COLD:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & (RF3_IM_COLD))
+ if (r_ptr->flagsr & RFR_IM_COLD)
{
#ifdef JP
note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ¤¬¤¢¤ë¡ª";
#endif
dam /= 9;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_COLD);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD);
}
else if (r_ptr->flags3 & (RF3_HURT_COLD))
{
#endif
dam *= 2;
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_COLD);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD);
}
break;
}
case GF_POIS:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & RF3_IM_POIS)
+ if (r_ptr->flagsr & RFR_IM_POIS)
{
#ifdef JP
note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ¤¬¤¢¤ë¡ª";
#endif
dam /= 9;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_POIS);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS);
}
break;
}
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & RF3_IM_POIS)
+ if (r_ptr->flagsr & RFR_IM_POIS)
{
#ifdef JP
note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#endif
dam *= 3; dam /= randint1(6) + 6;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_POIS);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS);
}
else if (one_in_(3)) do_poly = TRUE;
break;
case GF_HELL_FIRE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (r_ptr->flags3 & RF3_GOOD)
note = " is hit hard.";
#endif
- if (seen) r_ptr->r_flags3 |= (RF3_GOOD);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
}
break;
}
case GF_HOLY_FIRE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (r_ptr->flags3 & RF3_GOOD)
note = " is immune.";
#endif
- if (seen) r_ptr->r_flags3 |= RF3_GOOD;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= RF3_GOOD;
}
else if (r_ptr->flags3 & RF3_EVIL)
{
note = " is hit hard.";
#endif
- if (seen) r_ptr->r_flags3 |= RF3_EVIL;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL;
}
else
{
case GF_ARROW:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
break;
case GF_PLASMA:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & RF3_RES_PLAS)
+ if (r_ptr->flagsr & RFR_RES_PLAS)
{
#ifdef JP
note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#endif
dam *= 3; dam /= randint1(6) + 6;
- if (seen)
- r_ptr->r_flags3 |= (RF3_RES_PLAS);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS);
}
break;
}
case GF_NETHER:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & RF3_UNDEAD)
+ if (r_ptr->flagsr & RFR_RES_NETH)
{
+ if (r_ptr->flags3 & RF3_UNDEAD)
+ {
#ifdef JP
-note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡£";
#else
- note = " is immune.";
+ note = " is immune.";
#endif
- dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_UNDEAD);
- }
- else if (r_ptr->flags3 & RF3_RES_NETH)
- {
+ dam = 0;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ }
+ else
+ {
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
- note = " resists.";
+ note = " resists.";
#endif
- dam *= 3; dam /= randint1(6) + 6;
-
- if (seen) r_ptr->r_flags3 |= (RF3_RES_NETH);
+ dam *= 3; dam /= randint1(6) + 6;
+ }
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NETH);
}
else if (r_ptr->flags3 & RF3_EVIL)
{
dam /= 2;
#ifdef JP
-note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ¤ò¼¨¤·¤¿¡£";
+ note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ¤ò¼¨¤·¤¿¡£";
#else
note = " resists somewhat.";
#endif
- if (seen) r_ptr->r_flags3 |= (RF3_EVIL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
}
break;
}
case GF_WATER:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (m_ptr->r_idx == MON_WATER_ELEM || m_ptr->r_idx == MON_UNMAKER)
+ if (r_ptr->flagsr & RFR_RES_WATE)
{
+ if ((m_ptr->r_idx == MON_WATER_ELEM) || (m_ptr->r_idx == MON_UNMAKER))
+ {
#ifdef JP
-note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡£";
#else
- note = " is immune.";
+ note = " is immune.";
#endif
- dam = 0;
- }
- else if (r_ptr->flags3 & RF3_RES_WATE)
- {
+ dam = 0;
+ }
+ else
+ {
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
- note = " resists.";
+ note = " resists.";
#endif
- dam *= 3; dam /= randint1(6) + 6;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_WATE);
+ dam *= 3; dam /= randint1(6) + 6;
+ }
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE);
}
break;
}
case GF_CHAOS:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- do_poly = TRUE;
- do_conf = (5 + randint1(11) + r) / (r + 1);
- if ((r_ptr->flags4 & RF4_BR_CHAO) ||
- (m_ptr->r_idx == MON_STORMBRINGER) ||
- ((r_ptr->flags3 & RF3_DEMON) && one_in_(3)))
+ if (r_ptr->flagsr & RFR_RES_CHAO)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
- do_poly = FALSE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_CHAO);
+ }
+ else if ((r_ptr->flags3 & RF3_DEMON) && one_in_(3))
+ {
+#ifdef JP
+ note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ¤ò¼¨¤·¤¿¡£";
+#else
+ note = " resists somewhat.";
+#endif
+
+ dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON);
+ }
+ else
+ {
+ do_poly = TRUE;
+ do_conf = (5 + randint1(11) + r) / (r + 1);
}
break;
}
case GF_SHARDS:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags4 & RF4_BR_SHAR)
+ if (r_ptr->flagsr & RFR_RES_SHAR)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR);
}
break;
}
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags4 & RF4_BR_SHAR)
+ if (r_ptr->flagsr & RFR_RES_SHAR)
{
#ifdef JP
-note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ¤ò¼¨¤·¤¿¡£";
+ note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ¤ò¼¨¤·¤¿¡£";
#else
note = " resists somewhat.";
#endif
dam /= 2;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR);
}
break;
}
case GF_SOUND:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- do_stun = (10 + randint1(15) + r) / (r + 1);
- if (r_ptr->flags4 & RF4_BR_SOUN)
+ if (r_ptr->flagsr & RFR_RES_SOUN)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 2; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN);
}
+ else do_stun = (10 + randint1(15) + r) / (r + 1);
break;
}
case GF_CONFUSION:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- do_conf = (10 + randint1(15) + r) / (r + 1);
- if (r_ptr->flags4 & RF4_BR_CONF)
+ if (r_ptr->flags3 & RF3_NO_CONF)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
- dam *= 2; dam /= randint1(6) + 6;
- }
- else if (r_ptr->flags3 & RF3_NO_CONF)
- {
-#ifdef JP
-note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ¤ò¼¨¤·¤¿¡£";
-#else
- note = " resists somewhat.";
-#endif
-
- dam /= 2;
+ dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
+ else do_conf = (10 + randint1(15) + r) / (r + 1);
break;
}
case GF_DISENCHANT:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & RF3_RES_DISE)
+ if (r_ptr->flagsr & RFR_RES_DISE)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_DISE);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE);
}
break;
}
case GF_NEXUS:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & RF3_RES_NEXU)
+ if (r_ptr->flagsr & RFR_RES_NEXU)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_NEXU);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU);
}
break;
}
case GF_FORCE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- do_stun = (randint1(15) + r) / (r + 1);
- if (r_ptr->flags4 & RF4_BR_WALL)
+ if (r_ptr->flagsr & RFR_RES_WALL)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL);
}
+ else do_stun = (randint1(15) + r) / (r + 1);
break;
}
case GF_INERTIA:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags4 & (RF4_BR_INER))
+ if (r_ptr->flagsr & RFR_RES_INER)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER);
}
else
{
if (!m_ptr->slow)
{
#ifdef JP
-note = "¤ÎÆ°¤¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£";
+ note = "¤ÎÆ°¤¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£";
#else
note = " starts moving slower.";
#endif
case GF_TIME:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags4 & (RF4_BR_TIME))
+ if (r_ptr->flagsr & RFR_RES_TIME)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME);
}
- else do_time = (dam+1)/2;
+ else do_time = (dam + 1) / 2;
break;
}
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags3 & (RF3_RES_TELE))
+ if (r_ptr->flagsr & RFR_RES_TELE)
{
if (r_ptr->flags1 & (RF1_UNIQUE))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
}
else if (r_ptr->level > randint1(100))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
#else
else do_dist = 0;
if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) do_dist = 0;
- if (r_ptr->flags4 & (RF4_BR_GRAV))
+ if (r_ptr->flagsr & RFR_RES_GRAV)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
dam *= 3; dam /= randint1(6) + 6;
do_dist = 0;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV);
}
else
{
}
/* 2. stun */
- do_stun = damroll((p_ptr->lev / 10) + 3 , (dam)) + 1;
+ do_stun = damroll((caster_lev / 10) + 3 , (dam)) + 1;
/* Attempt a saving throw */
if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
do_stun = 0;
/* No obvious effect */
#ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = " is unaffected!";
#endif
case GF_SUPER_RAY:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
break;
case GF_DISINTEGRATE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (r_ptr->flags3 & RF3_HURT_ROCK)
{
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
#ifdef JP
note = "¤ÎÈéÉ椬¤¿¤À¤ì¤¿¡ª";
note_dies = "¤Ï¾øȯ¤·¤¿¡ª";
/* PSI only works if the monster can see you! -- RG */
if (!(los(m_ptr->fy, m_ptr->fx, py, px)))
{
- dam = 0;
#ifdef JP
-note = "¤Ï¤¢¤Ê¤¿¤¬¸«¤¨¤Ê¤¤¤Î¤Ç±Æ¶Á¤µ¤ì¤Ê¤¤¡ª";
+ if (seen) msg_format("%s¤Ï¤¢¤Ê¤¿¤¬¸«¤¨¤Ê¤¤¤Î¤Ç±Æ¶Á¤µ¤ì¤Ê¤¤¡ª", m_name);
#else
- note = " can't see you, and isn't affected!";
+ if (seen) msg_format("%^s can't see you, and isn't affected!", m_name);
#endif
-
+ skipped = TRUE;
+ break;
}
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (r_ptr->flags2 & RF2_EMPTY_MIND)
{
dam = 0;
#ifdef JP
-note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
+ note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
#else
note = " is immune!";
#endif
- if (seen) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
}
- else if ((r_ptr->flags2 & RF2_STUPID) ||
- (r_ptr->flags2 & RF2_WEIRD_MIND) ||
- (r_ptr->flags3 & RF3_ANIMAL) ||
- (r_ptr->level > randint1(3 * dam)))
+ else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) ||
+ (r_ptr->flags3 & RF3_ANIMAL) ||
+ (r_ptr->level > randint1(3 * dam)))
{
dam /= 3;
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
* Powerful demons & undead can turn a mindcrafter's
* attacks back on them
*/
- if (((r_ptr->flags3 & RF3_UNDEAD) ||
- (r_ptr->flags3 & RF3_DEMON)) &&
- (r_ptr->level > p_ptr->lev / 2) &&
- one_in_(2))
+ if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
+ (r_ptr->level > p_ptr->lev / 2) &&
+ one_in_(2))
{
note = NULL;
#ifdef JP
-msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª",
- m_name);
+ msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª", m_name);
#else
msg_format("%^s%s corrupted mind backlashes your attack!",
m_name, (seen ? "'s" : "s"));
if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav)
{
#ifdef JP
-msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
+ msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
msg_print("You resist the effects!");
#endif
else
{
/* Injure +/- confusion */
- monster_desc(killer, m_ptr, 0x288);
+ monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
take_hit(DAMAGE_ATTACK, dam, killer, -1); /* has already been /3 */
if (one_in_(4))
{
{
if (r_ptr->flags3 & RF3_NO_FEAR)
#ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = " is unaffected.";
#endif
break;
default:
#ifdef JP
-note = "¤Ï̲¤ê¹þ¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
+ note = "¤Ï̲¤ê¹þ¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
#else
note = " falls asleep!";
#endif
}
#ifdef JP
-note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
+ note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
#else
note_dies = " collapses, a mindless husk.";
#endif
case GF_PSI_DRAIN:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (r_ptr->flags2 & RF2_EMPTY_MIND)
{
dam = 0;
#ifdef JP
-note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
+ note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
#else
note = " is immune!";
#endif
}
- else if ((r_ptr->flags2 & RF2_STUPID) ||
- (r_ptr->flags2 & RF2_WEIRD_MIND) ||
- (r_ptr->flags3 & RF3_ANIMAL) ||
- (r_ptr->level > randint1(3 * dam)))
+ else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) ||
+ (r_ptr->flags3 & RF3_ANIMAL) ||
+ (r_ptr->level > randint1(3 * dam)))
{
dam /= 3;
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists.";
#endif
* Powerful demons & undead can turn a mindcrafter's
* attacks back on them
*/
- if (((r_ptr->flags3 & RF3_UNDEAD) ||
- (r_ptr->flags3 & RF3_DEMON)) &&
+ if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
(r_ptr->level > p_ptr->lev / 2) &&
(one_in_(2)))
{
note = NULL;
#ifdef JP
-msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª",
- m_name);
+ msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª", m_name);
#else
msg_format("%^s%s corrupted mind backlashes your attack!",
m_name, (seen ? "'s" : "s"));
if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav)
{
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
+ msg_print("¤¢¤Ê¤¿¤Ï¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
msg_print("You resist the effects!");
#endif
else
{
/* Injure + mana drain */
- monster_desc(killer, m_ptr, 0x288);
+ monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
#ifdef JP
-msg_print("ĶǽÎϥѥ¤òµÛ¤¤¤È¤é¤ì¤¿¡ª");
+ msg_print("ĶǽÎϥѥ¤òµÛ¤¤¤È¤é¤ì¤¿¡ª");
#else
msg_print("Your psychic energy is drained!");
#endif
{
int b = damroll(5, dam) / 4;
#ifdef JP
-msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¶ìÄˤòĶǽÎϥѥ¤ËÊÑ´¹¤·¤¿¡ª",
- m_name);
+ msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¶ìÄˤòĶǽÎϥѥ¤ËÊÑ´¹¤·¤¿¡ª", m_name);
#else
msg_format("You convert %s%s pain into psychic energy!",
m_name, (seen ? "'s" : "s"));
}
#ifdef JP
-note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
+ note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
#else
note_dies = " collapses, a mindless husk.";
#endif
case GF_TELEKINESIS:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (one_in_(4))
}
/* 1. stun */
- do_stun = damroll((p_ptr->lev / 10) + 3 , dam) + 1;
+ do_stun = damroll((caster_lev / 10) + 3 , dam) + 1;
/* Attempt a saving throw */
if ((r_ptr->flags1 & RF1_UNIQUE) ||
case GF_PSY_SPEAR:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
break;
case GF_METEOR:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
break;
case GF_DOMINATION:
{
if (!is_hostile(m_ptr)) break;
+
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
- if ((r_ptr->flags1 & RF1_UNIQUE) ||
- (r_ptr->flags1 & RF1_QUESTOR) ||
+ if ((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) ||
(r_ptr->flags3 & RF3_NO_CONF) ||
(r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* Memorize a flag */
if (r_ptr->flags3 & RF3_NO_CONF)
{
- if (seen) r_ptr->r_flags3 |= (RF3_NO_CONF);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
/* Resist */
* Powerful demons & undead can turn a mindcrafter's
* attacks back on them
*/
- if (((r_ptr->flags3 & RF3_UNDEAD) ||
- (r_ptr->flags3 & RF3_DEMON)) &&
- (r_ptr->level > p_ptr->lev / 2) &&
- (one_in_(2)))
+ if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) &&
+ (r_ptr->level > p_ptr->lev / 2) &&
+ (one_in_(2)))
{
note = NULL;
#ifdef JP
-msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª",
- m_name);
+ msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª", m_name);
#else
msg_format("%^s%s corrupted mind backlashes your attack!",
m_name, (seen ? "'s" : "s"));
if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav)
{
#ifdef JP
-msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
+ msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
msg_print("You resist the effects!");
#endif
{
if (r_ptr->flags3 & RF3_NO_FEAR)
#ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = " is unaffected.";
#endif
case GF_ICE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
do_stun = (randint1(15) + 1) / (r + 1);
- if (r_ptr->flags3 & RF3_IM_COLD)
+ if (r_ptr->flagsr & RFR_IM_COLD)
{
#ifdef JP
-note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ¤¬¤¢¤ë¡£";
+ note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ¤¬¤¢¤ë¡£";
#else
note = " resists a lot.";
#endif
dam /= 9;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_COLD);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD);
}
else if (r_ptr->flags3 & (RF3_HURT_COLD))
{
#ifdef JP
-note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£";
+ note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£";
#else
note = " is hit hard.";
#endif
dam *= 2;
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_COLD);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD);
}
break;
}
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (!monster_living(r_ptr))
{
- if (r_ptr->flags3 & RF3_UNDEAD)
- {
- if (seen) r_ptr->r_flags3 |= (RF3_UNDEAD);
- }
-
- if (r_ptr->flags3 & (RF3_DEMON))
+ if (seen)
{
- if (seen) r_ptr->r_flags3 |= (RF3_DEMON);
+ if (is_original_ap(m_ptr))
+ {
+ if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON);
+ if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING);
+ }
}
#ifdef JP
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if ((r_ptr->flags3 & RF3_UNDEAD) ||
- (r_ptr->flags3 & RF3_NONLIVING))
+ if (!monster_living(r_ptr))
{
- if (r_ptr->flags3 & RF3_UNDEAD)
+ if (seen)
{
- if (seen) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ if (is_original_ap(m_ptr))
+ {
+ if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON);
+ if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING);
+ }
}
#ifdef JP
}
else if (((r_ptr->flags1 & RF1_UNIQUE) &&
(randint1(888) != 666)) ||
- (((r_ptr->level + randint1(20)) > randint1(p_ptr->lev + randint1(10))) &&
+ (((r_ptr->level + randint1(20)) > randint1(caster_lev + randint1(10))) &&
randint1(100) != 66))
{
#ifdef JP
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt to polymorph (see below) */
/* Wake up */
m_ptr->csleep = 0;
+ if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE);
+
if (m_ptr->maxhp < m_ptr->max_maxhp)
{
#ifdef JP
/* Wake up */
m_ptr->csleep = 0;
+ if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE);
+
if (m_ptr->stunned)
{
#ifdef JP
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Powerful monsters can resist */
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
/* Memorize a flag */
if (r_ptr->flags3 & RF3_NO_SLEEP)
{
- if (seen) r_ptr->r_flags3 |= (RF3_NO_SLEEP);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP);
}
/* No obvious effect */
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
if (seen) obvious = TRUE;
- if ((r_ptr->flags3 & (RF3_RES_ALL)) || p_ptr->inside_arena)
+ if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Memorize a flag */
if (r_ptr->flags3 & RF3_NO_CONF)
{
- if (seen) r_ptr->r_flags3 |= (RF3_NO_CONF);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
/* Resist */
dam -= p_ptr->virtues[vir-1]/20;
}
- if ((r_ptr->flags3 & (RF3_RES_ALL)) || p_ptr->inside_arena)
+ if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
dam -= p_ptr->virtues[vir-1]/20;
}
- if ((r_ptr->flags3 & (RF3_RES_ALL)) || p_ptr->inside_arena)
+ if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
dam -= p_ptr->virtues[vir-1]/20;
}
- if ((r_ptr->flags3 & (RF3_RES_ALL)) || p_ptr->inside_arena)
+ if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Memorize a flag */
if (r_ptr->flags3 & (RF3_NO_CONF))
{
- if (seen) r_ptr->r_flags3 |= (RF3_NO_CONF);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
/* Resist */
#else
msg_format("You stare into %s.", m_name);
#endif
- if ((r_ptr->flags3 & (RF3_RES_ALL)) || p_ptr->inside_arena)
+ if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
(m_ptr->mflag2 & MFLAG2_NOPET) ||
- (r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)) ||
+ !monster_living(r_ptr) ||
((r_ptr->level+10) > randint1(dam)))
{
/* Resist */
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Get confused later */
/* Memorize a flag */
if (r_ptr->flags3 & (RF3_NO_CONF))
{
- if (seen) r_ptr->r_flags3 |= (RF3_NO_CONF);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
/* Resist */
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- do_stun = damroll((p_ptr->lev / 10) + 3 , (dam)) + 1;
+ do_stun = damroll((caster_lev / 10) + 3 , (dam)) + 1;
/* Attempt a saving throw */
if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
skipped = TRUE;
break;
}
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
dam = 0;
break;
/* Hurt by light */
if (r_ptr->flags3 & (RF3_HURT_LITE))
{
- /* Obvious effect */
- if (seen) obvious = TRUE;
+ if (seen)
+ {
+ /* Obvious effect */
+ obvious = TRUE;
- /* Memorize the effects */
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_LITE);
+ /* Memorize the effects */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
+ }
/* Special effect */
#ifdef JP
case GF_LITE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- if (r_ptr->flags4 & (RF4_BR_LITE))
+ if (r_ptr->flagsr & RFR_RES_LITE)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
#else
note = " resists.";
#endif
dam *= 2; dam /= (randint1(6)+6);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE);
}
else if (r_ptr->flags3 & (RF3_HURT_LITE))
{
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_LITE);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
#ifdef JP
-note = "¤Ï¸÷¤Ë¿È¤ò¤¹¤¯¤á¤¿¡ª";
-note_dies = "¤Ï¸÷¤ò¼õ¤±¤Æ¤·¤Ü¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
+ note = "¤Ï¸÷¤Ë¿È¤ò¤¹¤¯¤á¤¿¡ª";
+ note_dies = "¤Ï¸÷¤ò¼õ¤±¤Æ¤·¤Ü¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
#else
note = " cringes from the light!";
note_dies = " shrivels away in the light!";
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
- /* Likes darkness... */
- if ((r_ptr->flags4 & (RF4_BR_DARK)) ||
- (r_ptr->flags3 & RF3_ORC) ||
- (r_ptr->flags3 & RF3_HURT_LITE))
+ if (r_ptr->flagsr & RFR_RES_DARK)
{
#ifdef JP
-note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
+ note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
#else
note = " resists.";
#endif
dam *= 2; dam /= (randint1(6)+6);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK);
}
break;
}
/* Stone to Mud */
case GF_KILL_WALL:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
dam = 0;
break;
/* Hurt by rock remover */
if (r_ptr->flags3 & (RF3_HURT_ROCK))
{
- /* Notice effect */
- if (seen) obvious = TRUE;
+ if (seen)
+ {
+ /* Notice effect */
+ obvious = TRUE;
- /* Memorize the effects */
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
+ /* Memorize the effects */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK);
+ }
/* Cute little message */
#ifdef JP
{
bool resists_tele = FALSE;
- if (r_ptr->flags3 & (RF3_RES_TELE))
+ if (r_ptr->flagsr & RFR_RES_TELE)
{
- if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags3 & (RF3_RES_ALL)))
+ if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
#else
}
else if (r_ptr->level > randint1(100))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
#else
if (!resists_tele)
{
- if (seen) obvious = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ if (seen)
+ {
+ obvious = TRUE;
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ }
do_dist = dam;
}
}
{
bool resists_tele = FALSE;
- if (r_ptr->flags3 & (RF3_RES_TELE))
+ if (r_ptr->flagsr & RFR_RES_TELE)
{
- if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags3 & (RF3_RES_ALL)))
+ if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
#else
}
else if (r_ptr->level > randint1(100))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
#else
if (!resists_tele)
{
- if (seen) obvious = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_EVIL);
+ if (seen)
+ {
+ obvious = TRUE;
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
+ }
do_dist = dam;
}
}
case GF_AWAY_ALL:
{
bool resists_tele = FALSE;
- if (r_ptr->flags3 & (RF3_RES_TELE))
+ if (r_ptr->flagsr & RFR_RES_TELE)
{
- if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags3 & (RF3_RES_ALL)))
+ if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
#else
}
else if (r_ptr->level > randint1(100))
{
- if (seen) r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
#else
/* Turn undead (Use "dam" as "power") */
case GF_TURN_UNDEAD:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
break;
/* Only affect undead */
if (r_ptr->flags3 & (RF3_UNDEAD))
{
- /* Learn about type */
- if (seen) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ if (seen)
+ {
+ /* Learn about type */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
- /* Obvious */
- if (seen) obvious = TRUE;
+ /* Obvious */
+ obvious = TRUE;
+ }
/* Apply some fear */
do_fear = damroll(3, (dam / 2)) + 1;
/* Turn evil (Use "dam" as "power") */
case GF_TURN_EVIL:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
break;
/* Only affect evil */
if (r_ptr->flags3 & (RF3_EVIL))
{
- /* Learn about type */
- if (seen) r_ptr->r_flags3 |= (RF3_EVIL);
+ if (seen)
+ {
+ /* Learn about type */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
- /* Obvious */
- if (seen) obvious = TRUE;
+ /* Obvious */
+ obvious = TRUE;
+ }
/* Apply some fear */
do_fear = damroll(3, (dam / 2)) + 1;
/* Turn monster (Use "dam" as "power") */
case GF_TURN_ALL:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
break;
/* Dispel undead */
case GF_DISP_UNDEAD:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
dam = 0;
/* Only affect undead */
if (r_ptr->flags3 & (RF3_UNDEAD))
{
- /* Learn about type */
- if (seen) r_ptr->r_flags3 |= (RF3_UNDEAD);
+ if (seen)
+ {
+ /* Learn about type */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD);
- /* Obvious */
- if (seen) obvious = TRUE;
+ /* Obvious */
+ obvious = TRUE;
+ }
/* Message */
#ifdef JP
/* Dispel evil */
case GF_DISP_EVIL:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
dam = 0;
/* Only affect evil */
if (r_ptr->flags3 & (RF3_EVIL))
{
- /* Learn about type */
- if (seen) r_ptr->r_flags3 |= (RF3_EVIL);
+ if (seen)
+ {
+ /* Learn about type */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL);
- /* Obvious */
- if (seen) obvious = TRUE;
+ /* Obvious */
+ obvious = TRUE;
+ }
/* Message */
#ifdef JP
/* Dispel good */
case GF_DISP_GOOD:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
dam = 0;
/* Only affect good */
if (r_ptr->flags3 & (RF3_GOOD))
{
- /* Learn about type */
- if (seen) r_ptr->r_flags3 |= (RF3_GOOD);
+ if (seen)
+ {
+ /* Learn about type */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
- /* Obvious */
- if (seen) obvious = TRUE;
+ /* Obvious */
+ obvious = TRUE;
+ }
/* Message */
#ifdef JP
/* Dispel living */
case GF_DISP_LIVING:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
dam = 0;
/* Dispel demons */
case GF_DISP_DEMON:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
dam = 0;
/* Only affect demons */
if (r_ptr->flags3 & (RF3_DEMON))
{
- /* Learn about type */
- if (seen) r_ptr->r_flags3 |= (RF3_DEMON);
+ if (seen)
+ {
+ /* Learn about type */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON);
- /* Obvious */
- if (seen) obvious = TRUE;
+ /* Obvious */
+ obvious = TRUE;
+ }
/* Message */
#ifdef JP
/* Dispel monster */
case GF_DISP_ALL:
{
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
skipped = TRUE;
dam = 0;
case GF_DRAIN_MANA:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
msg_format("You gaze intently at %s.", m_name);
#endif
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
if ((r_ptr->flags1 & RF1_UNIQUE) ||
(r_ptr->flags3 & RF3_NO_CONF) ||
- (r_ptr->level > randint1((p_ptr->lev*2 - 10) < 1 ? 1 : (p_ptr->lev*2 - 10)) + 10))
+ (r_ptr->level > randint1((caster_lev*2 - 10) < 1 ? 1 : (caster_lev*2 - 10)) + 10))
{
/* Memorize a flag */
if (r_ptr->flags3 & (RF3_NO_CONF))
{
- r_ptr->r_flags3 |= (RF3_NO_CONF);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
{
#ifdef JP
msg_format("%s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£",m_name);
-note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±¶õ¤È¤Ê¤Ã¤¿¡£";
+note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
#else
msg_format("%^s is blasted by psionic energy.", m_name);
note_dies = " collapses, a mindless husk.";
msg_format("You gaze intently at %s.", m_name);
#endif
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
if ((r_ptr->flags1 & RF1_UNIQUE) ||
(r_ptr->flags3 & RF3_NO_CONF) ||
- (r_ptr->level > randint1((p_ptr->lev*2 - 10) < 1 ? 1 : (p_ptr->lev*2 - 10)) + 10))
+ (r_ptr->level > randint1((caster_lev*2 - 10) < 1 ? 1 : (caster_lev*2 - 10)) + 10))
{
/* Memorize a flag */
if (r_ptr->flags3 & (RF3_NO_CONF))
{
- r_ptr->r_flags3 |= (RF3_NO_CONF);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
{
#ifdef JP
msg_format("%s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£",m_name);
-note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±¶õ¤È¤Ê¤Ã¤¿¡£";
+note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
#else
msg_format("%^s is blasted by psionic energy.", m_name);
note_dies = " collapses, a mindless husk.";
msg_format("You point at %s and curses.", m_name);
#endif
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
- if (randint0(100 + p_ptr->lev) < (r_ptr->level + 35))
+ if (randint0(100 + caster_lev) < (r_ptr->level + 35))
{
#ifdef JP
msg_format("You point at %s and curses horribly.", m_name);
#endif
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
- if (randint0(100 + p_ptr->lev) < (r_ptr->level + 35))
+ if (randint0(100 + caster_lev) < (r_ptr->level + 35))
{
#ifdef JP
msg_format("You point at %s, incanting terribly!", m_name);
#endif
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
- if (randint0(100 + p_ptr->lev) < (r_ptr->level + 35))
+ if (randint0(100 + caster_lev) < (r_ptr->level + 35))
{
#ifdef JP
msg_format("You point at %s, screaming th word, 'DIE!'.", m_name);
#endif
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Attempt a saving throw */
- if (randint0(100 + p_ptr->lev) < (r_ptr->level + 35))
+ if (randint0(100 + caster_lev) < (r_ptr->level + 35))
{
#ifdef JP
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
}
else
{
- if ((p_ptr->lev + randint1(dam)) >
+ if ((caster_lev + randint1(dam)) >
(r_ptr->level + randint1(200)))
{
dam = ((40 + randint1(20)) * m_ptr->hp) / 100;
}
if (is_pet(m_ptr)) nokori_hp = m_ptr->maxhp*4L;
- else if ((p_ptr->pclass == CLASS_BEASTMASTER) && (r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)))
+ else if ((p_ptr->pclass == CLASS_BEASTMASTER) && monster_living(r_ptr))
nokori_hp = m_ptr->maxhp * 3 / 10;
else
nokori_hp = m_ptr->maxhp * 3 / 20;
-
+
if (m_ptr->hp >= nokori_hp)
{
#ifdef JP
break;
}
+ /* Attack (Use "dam" as attack type) */
case GF_ATTACK:
{
- if (seen) obvious = TRUE;
- skipped = TRUE;
- if (dam == HISSATSU_NYUSIN)
- {
- int i;
- int ny = y, nx = x;
- bool success = FALSE;
- for (i = 0; i < 8; i++)
- {
- if (cave_empty_bold(y+ddy[i], x+ddx[i]) || ((y+ddy[i] == py) && (x+ddx[i] == px)))
- {
- success = TRUE;
- if (distance(py, px, ny, nx) > distance(py, px, y+ddy[i], x+ddx[i]))
- {
- ny = y+ddy[i];
- nx = x+ddx[i];
- }
- }
- }
- if (success)
- {
- if ((ny != py) || (nx != px))
- {
- teleport_player_to(ny, nx, FALSE);
-#ifdef JP
- msg_print("ÁÇÁ᤯Áê¼ê¤Î²û¤ËÆþ¤ê¹þ¤ó¤À¡ª");
-#else
- msg_format("You quickly jump in and attack %s!", m_name);
-#endif
- }
- }
- else
- {
-#ifdef JP
- msg_print("¼ºÇÔ¡ª");
-#else
- msg_print("Failed!");
-#endif
- dam = 0;
- break;
- }
- }
- if (c_ptr->m_idx)
- return (py_attack(y, x, dam));
- else
-#ifdef JP
- msg_print("¹¶·â¤Ï¶õ¤òÀڤä¿¡£");
-#else
- msg_print("You attack the empty air.");
-#endif
- dam = 0;
- break;
+ /* Return this monster's death */
+ return py_attack(y, x, dam);
}
/* Sleep (Use "dam" as "power") */
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
if (r_ptr->flags2 & RF2_EMPTY_MIND)
#endif
dam = 0;
skipped = TRUE;
- if (seen) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
break;
}
if (m_ptr->csleep)
/* Memorize a flag */
if (r_ptr->flags3 & RF3_NO_SLEEP)
{
- if (seen) r_ptr->r_flags3 |= (RF3_NO_SLEEP);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP);
}
/* No obvious effect */
bool angry = FALSE;
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
/* Hurt by light */
if (r_ptr->flags3 & (RF3_HURT_LITE))
{
- /* Obvious effect */
- if (seen) obvious = TRUE;
+ if (seen)
+ {
+ /* Obvious effect */
+ obvious = TRUE;
- /* Memorize the effects */
- if (seen) r_ptr->r_flags3 |= (RF3_HURT_LITE);
+ /* Memorize the effects */
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE);
+ }
/* Special effect */
#ifdef JP
case GF_BLOOD_CURSE:
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
dam = 0;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
break;
m_ptr->fast = MIN(200, m_ptr->fast + 100);
/* Learn about type */
- if (seen) r_ptr->r_flags3 |= (RF3_GOOD);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
success = TRUE;
}
}
}
else if (seen)
{
- r_ptr->r_flags3 |= (RF3_NO_FEAR);
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_FEAR);
}
}
{
if (seen) obvious = TRUE;
- if (r_ptr->flags3 & (RF3_RES_ALL))
+ if (r_ptr->flagsr & RFR_RES_ALL)
{
#ifdef JP
note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
note = " is immune.";
#endif
skipped = TRUE;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_ALL);
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
break;
}
tmp = dam;
dam = mon_damage_mod(m_ptr, dam, (bool)(typ == GF_PSY_SPEAR));
#ifdef JP
- if ((tmp > 0) && (dam == 0)) note = "¤Ï¥À¥á¡¼¥¸¤ò¼õ¤±¤Æ¤¤¤Ê¤¤";
+ if ((tmp > 0) && (dam == 0)) note = "¤Ï¥À¥á¡¼¥¸¤ò¼õ¤±¤Æ¤¤¤Ê¤¤¡£";
#else
if ((tmp > 0) && (dam == 0)) note = " is unharmed.";
#endif
/* Monster polymorphs */
#ifdef JP
-note = "¤¬ÊѿȤ·¤¿¡ª";
+ note = "¤¬ÊѿȤ·¤¿¡ª";
#else
note = " changes!";
#endif
/* Message */
#ifdef JP
-note = "¤¬¾Ã¤¨µî¤Ã¤¿¡ª";
+ note = "¤¬¾Ã¤¨µî¤Ã¤¿¡ª";
#else
note = " disappears!";
#endif
c_ptr = &cave[y][x];
}
- /* Sound and Impact breathers never stun */
+ /* Sound and Impact resisters never stun */
else if (do_stun &&
- !(r_ptr->flags4 & (RF4_BR_SOUN)) &&
- !(r_ptr->flags4 & (RF4_BR_WALL)) &&
- !(r_ptr->flags3 & (RF3_NO_STUN)))
+ !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
+ !(r_ptr->flags3 & RF3_NO_STUN))
{
/* Obvious */
if (seen) obvious = TRUE;
- /* Get confused */
+ /* Get stunned */
if (m_ptr->stunned)
{
#ifdef JP
-note = "¤Ï¤Ò¤É¤¯¤â¤¦¤í¤¦¤È¤·¤¿¡£";
+ note = "¤Ï¤Ò¤É¤¯¤â¤¦¤í¤¦¤È¤·¤¿¡£";
#else
note = " is more dazed.";
#endif
else
{
#ifdef JP
-note = "¤Ï¤â¤¦¤í¤¦¤È¤·¤¿¡£";
+ note = "¤Ï¤â¤¦¤í¤¦¤È¤·¤¿¡£";
#else
note = " is dazed.";
#endif
get_angry = TRUE;
}
- /* Confusion and Chaos breathers (and sleepers) never confuse */
+ /* Confusion and Chaos resisters (and sleepers) never confuse */
else if (do_conf &&
- !(r_ptr->flags3 & (RF3_NO_CONF)) &&
- !(r_ptr->flags4 & (RF4_BR_CONF)) &&
- !(r_ptr->flags4 & (RF4_BR_CHAO)))
+ !(r_ptr->flags3 & RF3_NO_CONF) &&
+ !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK))
{
/* Obvious */
if (seen) obvious = TRUE;
if (m_ptr->confused)
{
#ifdef JP
-note = "¤Ï¤µ¤é¤Ëº®Í𤷤¿¤è¤¦¤À¡£";
+ note = "¤Ï¤µ¤é¤Ëº®Í𤷤¿¤è¤¦¤À¡£";
#else
note = " looks more confused.";
#endif
else
{
#ifdef JP
-note = "¤Ïº®Í𤷤¿¤è¤¦¤À¡£";
+ note = "¤Ïº®Í𤷤¿¤è¤¦¤À¡£";
#else
note = " looks confused.";
#endif
/* Get angry */
get_angry = TRUE;
}
+
else if (do_time)
{
/* Obvious */
if (seen) obvious = TRUE;
- if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp-1;
+ if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1;
if (do_time)
{
#ifdef JP
-note = "¤Ï¼å¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£";
+ note = "¤Ï¼å¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£";
#else
note = " seems weakened.";
#endif
m_ptr->maxhp -= do_time;
- if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp-m_ptr->maxhp;
+ if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp;
}
get_angry = TRUE;
}
/* Wake the monster up */
m_ptr->csleep = 0;
+ if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE);
+
/* Hurt the monster */
m_ptr->hp -= dam;
/* Give detailed messages if destroyed */
if (known && note)
{
- monster_desc(m_name, m_ptr, 0x100);
+ monster_desc(m_name, m_ptr, MD_TRUE_NAME);
if (see_s)
{
msg_format("%^s%s", m_name, note);
set_target(m_ptr, monster_target_y, monster_target_x);
}
}
- else if (is_pet(&m_list[who]) && (m_ptr->target_y != py) && (m_ptr->target_x != px))
+ else if (is_pet(&m_list[who]) && !player_bold(m_ptr->target_y, m_ptr->target_x))
{
set_target(m_ptr, m_list[who].fy, m_list[who].fx);
}
/* Player is not here */
- if ((x != px) || (y != py)) return (FALSE);
+ if (!player_bold(y, x)) return (FALSE);
if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && (randint0(55) < (p_ptr->lev*3/5+20)) && who && (who != p_ptr->riding))
{
if (!who) return (FALSE);
if (who == p_ptr->riding) return (FALSE);
- if ((p_ptr->reflect || p_ptr->tim_reflect || ((p_ptr->special_defense & KATA_FUUJIN) && !p_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
+ if ((p_ptr->reflect || ((p_ptr->special_defense & KATA_FUUJIN) && !p_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
{
byte t_y, t_x;
int max_attempts = 10;
#ifdef JP
-if (blind) msg_print("²¿¤«¤¬Ä·¤ÍÊ֤ä¿¡ª");
-else if (p_ptr->special_defense & KATA_FUUJIN) msg_print("É÷¤ÎÇ¡¤¯Éð´ï¤ò¿¶¤ë¤Ã¤ÆÃƤÊÖ¤·¤¿¡ª");
-else msg_print("¹¶·â¤¬Ä·¤ÍÊ֤ä¿¡ª");
+ if (blind) msg_print("²¿¤«¤¬Ä·¤ÍÊ֤ä¿¡ª");
+ else if (p_ptr->special_defense & KATA_FUUJIN) msg_print("É÷¤ÎÇ¡¤¯Éð´ï¤ò¿¶¤ë¤Ã¤ÆÃƤÊÖ¤·¤¿¡ª");
+ else msg_print("¹¶·â¤¬Ä·¤ÍÊ֤ä¿¡ª");
#else
if (blind) msg_print("Something bounces!");
else msg_print("The attack bounces!");
/* Standard damage -- also poisons player */
case GF_POIS:
{
- bool double_resist = (p_ptr->oppose_pois || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU));
+ bool double_resist = IS_OPPOSE_POIS();
#ifdef JP
if (fuzzy) msg_print("ÆǤǹ¶·â¤µ¤ì¤¿¡ª");
#else
/* Standard damage -- also poisons / mutates player */
case GF_NUKE:
{
- bool double_resist = (p_ptr->oppose_pois || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU));
+ bool double_resist = IS_OPPOSE_POIS();
#ifdef JP
if (fuzzy) msg_print("Êü¼Íǽ¤Ç¹¶·â¤µ¤ì¤¿¡ª");
#else
}
if (!(p_ptr->resist_fire ||
- p_ptr->oppose_fire ||
- music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU) ||
+ IS_OPPOSE_FIRE() ||
p_ptr->immune_fire))
{
inven_damage(set_acid_destroy, 3);
(void)set_stun(p_ptr->stun + randint1(15));
}
- if ((!(p_ptr->resist_cold || p_ptr->oppose_cold || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))) || one_in_(12))
+ if ((!(p_ptr->resist_cold || IS_OPPOSE_COLD())) || one_in_(12))
{
if (!p_ptr->immune_cold) inven_damage(set_cold_destroy, 3);
}
msg_format("¹¶·â¤¬%s¼«¿È¤ò½ý¤Ä¤±¤¿¡ª", m_name);
#else
char m_name_self[80];
-
+
/* hisself */
- monster_desc(m_name_self, m_ptr, 0x23);
+ monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
msg_format("The attack of %s has wounded %s!", m_name, m_name_self);
#endif
int y1, x1;
int y2, x2;
+ int by, bx;
int dist_hack = 0;
{
x1 = m_list[who].fx;
y1 = m_list[who].fy;
- monster_desc(who_name, &m_list[who], 0x288);
+ monster_desc(who_name, &m_list[who], MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
}
/* Oops */
Term_xtra(TERM_XTRA_DELAY, msec);
}
}
- if ((typ == GF_ATTACK) && (dam == HISSATSU_NYUSIN) && ((i+1) == path_n))
- {
- if (cave_empty_bold(y, x)) teleport_player_to(ny, nx, FALSE);
- }
-
}
/* Save the "blast epicenter" */
- y2 = y;
- x2 = x;
+ by = y;
+ bx = x;
- if (breath && (y1 == y2) && (x1 == x2))
+ if (breath && (y1 == by) && (x1 == bx))
{
breath = FALSE;
gm_rad = 1;
{
flg &= ~(PROJECT_HIDE);
- breath_shape(path_g, dist, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, y2, x2, (bool)(typ == GF_DISINTEGRATE), TRUE);
+ breath_shape(path_g, dist, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, by, bx, (bool)(typ == GF_DISINTEGRATE), TRUE);
}
else
{
for (dist = 0; dist <= rad; dist++)
{
/* Scan the maximal blast area of radius "dist" */
- for (y = y2 - dist; y <= y2 + dist; y++)
+ for (y = by - dist; y <= by + dist; y++)
{
- for (x = x2 - dist; x <= x2 + dist; x++)
+ for (x = bx - dist; x <= bx + dist; x++)
{
/* Ignore "illegal" locations */
if (!in_bounds2(y, x)) continue;
/* Enforce a "circular" explosion */
- if (distance(y2, x2, y, x) != dist) continue;
+ if (distance(by, bx, y, x) != dist) continue;
if (typ == GF_DISINTEGRATE)
{
/* Disintegration are stopped only by perma-walls */
- if (!do_disintegration(y2, x2, y, x)) continue;
+ if (!do_disintegration(by, bx, y, x)) continue;
}
else
{
/* Ball explosions are stopped by walls */
- if (!los(y2, x2, y, x)) continue;
+ if (!los(by, bx, y, x)) continue;
}
/* Save this grid */
}
/* Hack -- center the cursor */
- move_cursor_relative(y2, x2);
+ move_cursor_relative(by, bx);
/* Flush each "radius" seperately */
/*if (fresh_before)*/ Term_fresh();
}
/* Hack -- center the cursor */
- move_cursor_relative(y2, x2);
+ move_cursor_relative(by, bx);
/* Flush the explosion */
/*if (fresh_before)*/ Term_fresh();
/* Find the closest point in the blast */
if (breath)
{
- int d = dist_to_line(y, x, y1, x1, y2, x2);
+ int d = dist_to_line(y, x, y1, x1, by, bx);
/* Affect the grid */
if (project_f(who, d, y, x, dam, typ)) notice = TRUE;
/* Find the closest point in the blast */
if (breath)
{
- int d = dist_to_line(y, x, y1, x1, y2, x2);
+ int d = dist_to_line(y, x, y1, x1, by, bx);
/* Affect the object in the grid */
if (project_o(who, d, y, x, dam, typ)) notice = TRUE;
/* Scan for monsters */
for (i = 0; i < grids; i++)
{
+ int effective_dist;
+
/* Hack -- Notice new "dist" values */
if (gm[dist + 1] == i) dist++;
y = gy[i];
x = gx[i];
- if (grids > 1)
- {
- /* Find the closest point in the blast */
- if (breath)
- {
- int d = dist_to_line(y, x, y1, x1, y2, x2);
-
- /* Affect the monster in the grid */
- if ((y == y2) && (x == x2) && (y == py) && (x == px) && (flg & PROJECT_PLAYER))
- {
- if (project_m(who, d+1, y, x, dam, typ,flg)) notice = TRUE;
- }
- else if (project_m(who, d, y, x, dam, typ,flg)) notice = TRUE;
- }
- else
- {
- /* Affect the monster in the grid */
- if ((y == y2) && (x == x2) && (y == py) && (x == px) && (flg & PROJECT_PLAYER))
- {
- if (!(flg & PROJECT_BEAM))
- {
- if (project_m(who, dist+1, y, x, dam, typ,flg)) notice = TRUE;
- }
- }
- else if (project_m(who, dist, y, x, dam, typ,flg)) notice = TRUE;
- }
- }
- else
+ /* A single bolt may be reflected */
+ if (grids <= 1)
{
- monster_race *ref_ptr = &r_info[m_list[cave[y][x].m_idx].r_idx];
+ monster_type *m_ptr = &m_list[cave[y][x].m_idx];
+ monster_race *ref_ptr = &r_info[m_ptr->r_idx];
- if ((ref_ptr->flags2 & RF2_REFLECTING) && (!one_in_(10) && (flg & PROJECT_REFLECTABLE) && (!who || dist_hack > 1)))
+ if ((ref_ptr->flags2 & RF2_REFLECTING) && (flg & PROJECT_REFLECTABLE) && (!who || dist_hack > 1) && !one_in_(10))
{
byte t_y, t_x;
int max_attempts = 10;
t_x = x_saver - 1 + randint1(3);
max_attempts--;
}
-
while (max_attempts && in_bounds2u(t_y, t_x) &&
!(los(y, x, t_y, t_x)));
t_x = x_saver;
}
- if (m_list[cave[y][x].m_idx].ml)
+ if (m_ptr->ml)
{
#ifdef JP
-if ((m_list[cave[y][x].m_idx].r_idx == MON_KENSHIROU)
- || (m_list[cave[y][x].m_idx].r_idx == MON_RAOU))
- msg_print("¡ÖËÌÅÍ¿À·ý±üµÁ¡¦Æó»Ø¿¿¶õÇÄ¡ª¡×");
-if (m_list[cave[y][x].m_idx].r_idx == MON_DIO) msg_print("¥Ç¥£¥ª¡¦¥Ö¥é¥ó¥É¡¼¤Ï»Ø°ìËܤǹ¶·â¤òÃƤÊÖ¤·¤¿¡ª");
-else msg_print("¹¶·â¤ÏÄ·¤ÍÊ֤ä¿¡ª");
+ if ((m_ptr->r_idx == MON_KENSHIROU) || (m_ptr->r_idx == MON_RAOU))
+ msg_print("¡ÖËÌÅÍ¿À·ý±üµÁ¡¦Æó»Ø¿¿¶õÇÄ¡ª¡×");
+ else if (m_ptr->r_idx == MON_DIO) msg_print("¥Ç¥£¥ª¡¦¥Ö¥é¥ó¥É¡¼¤Ï»Ø°ìËܤǹ¶·â¤òÃƤÊÖ¤·¤¿¡ª");
+ else msg_print("¹¶·â¤ÏÄ·¤ÍÊ֤ä¿¡ª");
#else
msg_print("The attack bounces!");
#endif
- ref_ptr->r_flags2 |= RF2_REFLECTING;
+ if (is_original_ap(m_ptr)) ref_ptr->r_flags2 |= RF2_REFLECTING;
}
+
+ /* Reflected bolts randomly target either one */
flg &= ~(PROJECT_MONSTER | PROJECT_PLAYER);
if (one_in_(2)) flg |= PROJECT_MONSTER;
else flg |= PROJECT_PLAYER;
- project(cave[y][x].m_idx, 0, t_y, t_x, dam, typ, flg, monspell);
+ /* The bolt is reflected */
+ project(cave[y][x].m_idx, 0, t_y, t_x, dam, typ, flg, monspell);
+
+ /* Don't affect the monster any longer */
+ continue;
}
- else
+ }
+
+
+ /* Find the closest point in the blast */
+ if (breath)
+ {
+ effective_dist = dist_to_line(y, x, y1, x1, by, bx);
+ }
+ else
+ {
+ effective_dist = dist;
+ }
+
+
+ /* There is the riding player on this monster */
+ if (p_ptr->riding && player_bold(y, x))
+ {
+ /* Aimed on the player */
+ if (flg & PROJECT_PLAYER)
{
- if ((y == y2) && (x == x2) && (y == py) && (x == px) && (flg & PROJECT_PLAYER))
+ if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE))
{
+ /*
+ * A beam or bolt is well aimed
+ * at the PLAYER!
+ * So don't affects the mount.
+ */
+ continue;
+ }
+ else
+ {
+ /*
+ * The spell is not well aimed,
+ * So partly affect the mount too.
+ */
+ effective_dist++;
}
- else if (project_m(who, dist, y, x, dam, typ,flg)) notice = TRUE;
+ }
+
+ /*
+ * This grid is the original target.
+ */
+ else if ((y == y2) || (x == x2))
+ {
+ /* Hit the mount with full damage */
+ }
+
+ /*
+ * Otherwise this grid is not the
+ * original target, it means that line
+ * of fire is obstructed by this
+ * monster.
+ */
+ /*
+ * A beam or bolt will hit either
+ * player or mount. Choose randomly.
+ */
+ else if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE))
+ {
+ if (one_in_(2))
+ {
+ /* Hit the mount with full damage */
+ }
+ else
+ {
+ /* Hit the player later */
+ flg &= ~(PROJECT_MONSTER);
+ flg |= PROJECT_PLAYER;
+
+ /* Don't affect the mount */
+ continue;
+ }
+ }
+
+ /*
+ * The spell is not well aimed, so
+ * partly affect both player and
+ * mount.
+ */
+ else
+ {
+ effective_dist++;
}
}
+
+ /* Affect the monster in the grid */
+ if (project_m(who, effective_dist, y, x, dam, typ,flg)) notice = TRUE;
}
+
/* Player affected one monster (without "jumping") */
if (!who && (project_m_n == 1) && !jump)
{
/* Scan for player */
for (i = 0; i < grids; i++)
{
+ int effective_dist;
+
/* Hack -- Notice new "dist" values */
if (gm[dist+1] == i) dist++;
y = gy[i];
x = gx[i];
+ /* Affect the player? */
+ if (!player_bold(y, x)) continue;
+
/* Find the closest point in the blast */
if (breath)
{
- int d = dist_to_line(y, x, y1, x1, y2, x2);
-
- /* Affect the player */
- if ((y == y2) && (x == x2) && (y == py) && (x == px) && (flg & PROJECT_MONSTER))
- {
- if (project_p(who, who_name, d+1, y, x, dam, typ, flg, monspell)) notice = TRUE;
- }
- else if (project_p(who, who_name, d, y, x, dam, typ, flg, monspell)) notice = TRUE;
+ effective_dist = dist_to_line(y, x, y1, x1, by, bx);
}
else
{
- /* Affect the player */
- if ((y == y2) && (x == x2) && (y == py) && (x == px) && (flg & PROJECT_MONSTER))
+ effective_dist = dist;
+ }
+
+ /* Target may be your horse */
+ if (p_ptr->riding)
+ {
+ /* Aimed on the player */
+ if (flg & PROJECT_PLAYER)
{
- if (!((flg & PROJECT_BEAM) || (flg & PROJECT_STOP)))
- {
- if (project_p(who, who_name, dist+1, y, x, dam, typ, flg, monspell)) notice = TRUE;
- }
+ /* Hit the player with full damage */
+ }
+
+ /*
+ * Hack -- When this grid was not the
+ * original target, a beam or bolt
+ * would hit either player or mount,
+ * and should be choosen randomly.
+ *
+ * But already choosen to hit the
+ * mount at this point.
+ */
+ else if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE))
+ {
+ /*
+ * A beam or bolt is well aimed
+ * at the mount!
+ * So don't affects the player.
+ */
+ continue;
+ }
+ else
+ {
+ /*
+ * The spell is not well aimed,
+ * So partly affect the player too.
+ */
+ effective_dist++;
}
- else if (project_p(who, who_name, dist, y, x, dam, typ, flg, monspell)) notice = TRUE;
}
+
+ /* Affect the player */
+ if (project_p(who, who_name, effective_dist, y, x, dam, typ, flg, monspell)) notice = TRUE;
}
}
OSDN Git Service
