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;
}
}
}
+ /* Remove "unsafe" flag if player is not blind */
+ if (!p_ptr->blind && player_has_los_bold(y, x))
+ {
+ c_ptr->info &= ~(CAVE_UNSAFE);
+
+ /* Redraw */
+ lite_spot(y, x);
+
+ obvious = TRUE;
+ }
+
break;
}
#endif
obvious = TRUE;
+ }
- /* Visibility change */
- if ((c_ptr->feat >= FEAT_DOOR_HEAD) &&
- (c_ptr->feat <= FEAT_DOOR_TAIL))
- {
- /* Update some things */
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
- }
+ /* Visibility change */
+ if ((c_ptr->feat >= FEAT_DOOR_HEAD) &&
+ (c_ptr->feat <= FEAT_DOOR_TAIL))
+ {
+ /* Update some things */
+ p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
}
/* Forget the door */
/* Notice */
note_spot(y, x);
+ /* Remove "unsafe" flag if player is not blind */
+ if (!p_ptr->blind && player_has_los_bold(y, x))
+ {
+ c_ptr->info &= ~(CAVE_UNSAFE);
+
+ /* Redraw */
+ lite_spot(y, x);
+
+ obvious = TRUE;
+ }
+
break;
}
{
/* Message */
#ifdef JP
-msg_print("²¿¤«¤¬¤Ä¤Ã¤«¤¨¤Æ¥É¥¢¤¬³«¤«¤Ê¤¤¡£");
+ msg_print("¥É¥¢¤Ë²¿¤«¤¬¤Ä¤Ã¤«¤¨¤Æ³«¤«¤Ê¤¯¤Ê¤Ã¤¿¡£");
#else
msg_print("The door seems stuck.");
#endif
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);
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);
case GF_LITE:
{
/* Turn on the light */
- if (!(d_info[dungeon_type].flags1 & DF1_DARKNESS)) c_ptr->info |= (CAVE_GLOW);
+ if (!(d_info[dungeon_type].flags1 & DF1_DARKNESS))
+ {
+ c_ptr->info |= (CAVE_GLOW);
- /* Notice */
- note_spot(y, x);
+ /* Notice */
+ note_spot(y, x);
- /* Redraw */
- lite_spot(y, x);
+ /* Redraw */
+ lite_spot(y, x);
- /* Observe */
- if (player_can_see_bold(y, x)) obvious = TRUE;
+ /* Observe */
+ if (player_can_see_bold(y, x)) obvious = TRUE;
- /* Mega-Hack -- Update the monster in the affected grid */
- /* This allows "spear of light" (etc) to work "correctly" */
- if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+ /* Mega-Hack -- Update the monster in the affected grid */
+ /* This allows "spear of light" (etc) to work "correctly" */
+ if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+
+ if (p_ptr->special_defense & NINJA_S_STEALTH)
+ {
+ if (player_bold(y, x)) set_superstealth(FALSE);
+ }
+ }
break;
}
#ifdef JP
msg_print("¶À¤¬³ä¤ì¤¿¡ª");
#else
- msg_print("The mirror was chashed!");
+ msg_print("The mirror was crashed!");
#endif
remove_mirror(y,x);
project(0,2,y,x, p_ptr->lev /2 +5 ,GF_SHARDS,(PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP|PROJECT_NO_HANGEKI),-1);
#ifdef JP
msg_print("¶À¤¬³ä¤ì¤¿¡ª");
#else
- msg_print("The mirror was chashed!");
+ msg_print("The mirror was crashed!");
#endif
- cave_set_feat(y,x, FEAT_FLOOR);
+ remove_mirror(y, x);
}
break;
}
#ifdef JP
note_kill = "À¸¤Ê֤ä¿¡£";
#else
- note_kill = "rivived.";
+ note_kill = " revived.";
#endif
}
else if (!note_kill)
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 = "¤Ï¾øȯ¤·¤¿¡ª";
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) */
{
if (seen) obvious = TRUE;
- if (is_pet(m_ptr) || (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_UNIQUE_7 | RF7_UNIQUE2)))
+ if (is_pet(m_ptr) || (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_NAZGUL | RF7_UNIQUE2)))
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
/* 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
/* No overflow */
if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
- chg_virtue(V_VITALITY, 1);
-
- if (r_ptr->flags1 & RF1_UNIQUE)
- chg_virtue(V_INDIVIDUALISM, 1);
-
- if (is_friendly(m_ptr))
- chg_virtue(V_HONOUR, 1);
- else if (!(r_ptr->flags3 & RF3_EVIL))
+ if (!who)
{
- if (r_ptr->flags3 & RF3_GOOD)
- chg_virtue(V_COMPASSION, 2);
- else
- chg_virtue(V_COMPASSION, 1);
+ chg_virtue(V_VITALITY, 1);
+
+ if (r_ptr->flags1 & RF1_UNIQUE)
+ chg_virtue(V_INDIVIDUALISM, 1);
+
+ if (is_friendly(m_ptr))
+ chg_virtue(V_HONOUR, 1);
+ else if (!(r_ptr->flags3 & RF3_EVIL))
+ {
+ if (r_ptr->flags3 & RF3_GOOD)
+ chg_virtue(V_COMPASSION, 2);
+ else
+ chg_virtue(V_COMPASSION, 1);
+ }
+
+ if (r_ptr->flags3 & RF3_ANIMAL)
+ chg_virtue(V_NATURE, 1);
}
if (m_ptr->r_idx == MON_LEPER)
{
heal_leper = TRUE;
- chg_virtue(V_COMPASSION, 5);
+ if (!who) chg_virtue(V_COMPASSION, 5);
}
-
- if (r_ptr->flags3 & RF3_ANIMAL)
- chg_virtue(V_NATURE, 1);
/* Redraw (later) if needed */
if (p_ptr->health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH);
{
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;
}
- if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_UNIQUE_7))
+ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
dam = dam * 2 / 3;
/* Attempt a saving throw */
/* 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;
}
- if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_UNIQUE_7))
+ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
dam = dam * 2 / 3;
/* Attempt a saving throw */
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;
}
- if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_UNIQUE_7))
+ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
dam = dam * 2 / 3;
/* Attempt a saving throw */
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;
}
- if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_UNIQUE_7))
+ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
dam = dam * 2 / 3;
/* Attempt a saving throw */
/* 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;
}
- if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_UNIQUE_7))
+ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))
dam = dam * 2 / 3;
/* 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;
}
if ((r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (r_ptr->flags5 & ~(RF5_NOMAGIC_MASK)) || (r_ptr->flags6 & ~(RF6_NOMAGIC_MASK)))
{
- /* Message */
+ if (!who)
+ {
+ /* Message */
#ifdef JP
-msg_format("%s¤«¤éÀº¿À¥¨¥Í¥ë¥®¡¼¤òµÛ¤¤¤È¤Ã¤¿¡£",m_name);
+ msg_format("%s¤«¤éÀº¿À¥¨¥Í¥ë¥®¡¼¤òµÛ¤¤¤È¤Ã¤¿¡£", m_name);
#else
- msg_format("You draw psychic energy from %s.", m_name);
+ msg_format("You draw psychic energy from %s.", m_name);
#endif
- (void)hp_player(dam);
+ (void)hp_player(dam);
+ }
}
else
{
#ifdef JP
-msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£",m_name);
+ msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name);
#else
msg_format("%s is unaffected.", m_name);
#endif
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£",m_name);
+ if (!who) msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", m_name);
#else
- msg_format("You gaze intently at %s.", m_name);
+ if (!who) 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 = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = "is unaffected!";
#endif
else
{
#ifdef JP
-msg_format("%s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£",m_name);
-note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
+ msg_format("%s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£", m_name);
+ note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
#else
msg_format("%^s is blasted by psionic energy.", m_name);
note_dies = " collapses, a mindless husk.";
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£",m_name);
+ if (!who) msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", m_name);
#else
- msg_format("You gaze intently at %s.", m_name);
+ if (!who) 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 = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = "is unaffected!";
#endif
else
{
#ifdef JP
-msg_format("%s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£",m_name);
-note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
+ msg_format("%s¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£", m_name);
+ note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£";
#else
msg_format("%^s is blasted by psionic energy.", m_name);
note_dies = " collapses, a mindless husk.";
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ò»Øº¹¤·¤Æ¼ö¤¤¤ò¤«¤±¤¿¡£",m_name);
+ if (!who) msg_format("%s¤ò»Øº¹¤·¤Æ¼ö¤¤¤ò¤«¤±¤¿¡£", m_name);
#else
- msg_format("You point at %s and curses.", m_name);
+ if (!who) msg_format("You point at %s and curse.", 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
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = "is unaffected!";
#endif
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ò»Øº¹¤·¤Æ¶²¤í¤·¤²¤Ë¼ö¤¤¤ò¤«¤±¤¿¡£",m_name);
+ if (!who) msg_format("%s¤ò»Øº¹¤·¤Æ¶²¤í¤·¤²¤Ë¼ö¤¤¤ò¤«¤±¤¿¡£", m_name);
#else
- msg_format("You point at %s and curses horribly.", m_name);
+ if (!who) msg_format("You point at %s and curse 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
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = "is unaffected!";
#endif
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ò»Øº¹¤·¡¢¶²¤·¤²¤Ë¼öʸ¤ò¾§¤¨¤¿¡ª",m_name);
+ if (!who) msg_format("%s¤ò»Øº¹¤·¡¢¶²¤í¤·¤²¤Ë¼öʸ¤ò¾§¤¨¤¿¡ª", m_name);
#else
- msg_format("You point at %s, incanting terribly!", m_name);
+ if (!who) 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
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = "is unaffected!";
#endif
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ÎÈ빦¤òÆͤ¤¤Æ¡¢¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£",m_name);
+ if (!who) msg_format("%s¤ÎÈ빦¤òÆͤ¤¤Æ¡¢¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", m_name);
#else
- msg_format("You point at %s, screaming th word, 'DIE!'.", m_name);
+ if (!who) msg_format("You point at %s, screaming the 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)) && ((who <= 0) || (m_list[who].r_idx != MON_KENSHIROU)))
{
-
#ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = "is unaffected!";
#endif
{
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;
{
int nokori_hp;
if ((p_ptr->inside_quest && (quest[p_ptr->inside_quest].type == QUEST_TYPE_KILL_ALL) && !is_pet(m_ptr)) ||
- (r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_UNIQUE_7)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (r_ptr->flags1 & RF1_QUESTOR))
+ (r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_NAZGUL)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (r_ptr->flags1 & RF1_QUESTOR))
{
#ifdef JP
msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£",m_name);
}
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;
}
case GF_PHOTO:
{
#ifdef JP
- msg_format("%s¤ò¼Ì¿¿¤Ë»£¤Ã¤¿¡£",m_name);
+ if (!who) msg_format("%s¤ò¼Ì¿¿¤Ë»£¤Ã¤¿¡£", m_name);
#else
- msg_format("You take a photograph of %s.",m_name);
+ if (!who) msg_format("You take a photograph of %s.", m_name);
#endif
/* 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
-note = "¤Ï¸÷¤Ë¿È¤ò¤¹¤¯¤á¤¿¡ª";
-note_dies = "¤Ï¸÷¤ò¼õ¤±¤Æ¤·¤Ü¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
+ note = "¤Ï¸÷¤Ë¿È¤ò¤¹¤¯¤á¤¿¡ª";
+ note_dies = "¤Ï¸÷¤ò¼õ¤±¤Æ¤·¤Ü¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
#else
note = " cringes from the light!";
note_dies = " shrivels away in the light!";
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;
}
if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) do_poly = FALSE;
/* "Unique" and "quest" monsters can only be "killed" by the player. */
- if (((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_UNIQUE_7) || (r_ptr->flags1 & RF1_QUESTOR)) && !p_ptr->inside_battle)
+ if (((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & RF7_NAZGUL)) && !p_ptr->inside_battle)
{
if (who && (dam > m_ptr->hp)) dam = m_ptr->hp;
}
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
/* Extract method of death */
note = note_dies;
}
-
- /* Mega-Hack -- Handle "polymorph" -- monsters get a saving throw */
- else if (do_poly && (randint1(90) > r_ptr->level))
+ else
{
- if (polymorph_monster(y, x))
+ /* Sound and Impact breathers never stun */
+ if (do_stun &&
+ !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
+ !(r_ptr->flags3 & RF3_NO_STUN))
{
/* Obvious */
if (seen) obvious = TRUE;
- /* Monster polymorphs */
+ /* Get confused */
+ if (m_ptr->stunned)
+ {
#ifdef JP
-note = "¤¬ÊѿȤ·¤¿¡ª";
+ note = "¤Ï¤Ò¤É¤¯¤â¤¦¤í¤¦¤È¤·¤¿¡£";
#else
- note = " changes!";
+ note = " is more dazed.";
#endif
+ tmp = m_ptr->stunned + (do_stun / 2);
+ }
+ else
+ {
+#ifdef JP
+ note = "¤Ï¤â¤¦¤í¤¦¤È¤·¤¿¡£";
+#else
+ note = " is dazed.";
+#endif
- /* Turn off the damage */
- dam = 0;
+ tmp = do_stun;
+ }
- /* Hack -- Get new monster */
- m_ptr = &m_list[c_ptr->m_idx];
+ /* Apply stun */
+ m_ptr->stunned = (tmp < 200) ? tmp : 200;
- /* Hack -- Get new race */
- r_ptr = &r_info[m_ptr->r_idx];
+ /* Get angry */
+ get_angry = TRUE;
}
- else
+
+ /* Confusion and Chaos breathers (and sleepers) never confuse */
+ if (do_conf &&
+ !(r_ptr->flags3 & RF3_NO_CONF) &&
+ !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK))
{
- /* No polymorph */
+ /* Obvious */
+ if (seen) obvious = TRUE;
+
+ /* Already partially confused */
+ if (m_ptr->confused)
+ {
#ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
+ note = "¤Ï¤µ¤é¤Ëº®Í𤷤¿¤è¤¦¤À¡£";
#else
- note = " is unaffected!";
+ note = " looks more confused.";
#endif
- }
- }
-
- /* Handle "teleport" */
- else if (do_dist)
- {
- /* Obvious */
- if (seen) obvious = TRUE;
+ tmp = m_ptr->confused + (do_conf / 2);
+ }
- /* Message */
+ /* Was not confused */
+ else
+ {
#ifdef JP
-note = "¤¬¾Ã¤¨µî¤Ã¤¿¡ª";
+ note = "¤Ïº®Í𤷤¿¤è¤¦¤À¡£";
#else
- note = " disappears!";
+ note = " looks confused.";
#endif
- chg_virtue(V_VALOUR, -1);
+ tmp = do_conf;
+ }
- /* Teleport */
- teleport_away(c_ptr->m_idx, do_dist, (bool)(!who));
+ /* Apply confusion */
+ m_ptr->confused = (tmp < 200) ? tmp : 200;
- /* Hack -- get new location */
- y = m_ptr->fy;
- x = m_ptr->fx;
+ /* Get angry */
+ get_angry = TRUE;
+ }
- /* Hack -- get new grid */
- c_ptr = &cave[y][x];
- }
+ if (do_time)
+ {
+ /* Obvious */
+ if (seen) obvious = TRUE;
- /* Sound and Impact breathers never stun */
- else if (do_stun &&
- !(r_ptr->flags4 & (RF4_BR_SOUN)) &&
- !(r_ptr->flags4 & (RF4_BR_WALL)) &&
- !(r_ptr->flags3 & (RF3_NO_STUN)))
- {
- /* Obvious */
- if (seen) obvious = TRUE;
+ if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1;
- /* Get confused */
- if (m_ptr->stunned)
- {
+ if (do_time)
+ {
#ifdef JP
-note = "¤Ï¤Ò¤É¤¯¤â¤¦¤í¤¦¤È¤·¤¿¡£";
+ note = "¤Ï¼å¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£";
#else
- note = " is more dazed.";
+ note = " seems weakened.";
#endif
-
- tmp = m_ptr->stunned + (do_stun / 2);
+ m_ptr->maxhp -= do_time;
+ if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp;
+ }
+ get_angry = TRUE;
}
- else
+
+ /* Mega-Hack -- Handle "polymorph" -- monsters get a saving throw */
+ if (do_poly && (randint1(90) > r_ptr->level))
{
+ if (polymorph_monster(y, x))
+ {
+ /* Obvious */
+ if (seen) obvious = TRUE;
+
+ /* Monster polymorphs */
#ifdef JP
-note = "¤Ï¤â¤¦¤í¤¦¤È¤·¤¿¡£";
+ note = "¤¬ÊѿȤ·¤¿¡ª";
#else
- note = " is dazed.";
+ note = " changes!";
#endif
- tmp = do_stun;
- }
-
- /* Apply stun */
- m_ptr->stunned = (tmp < 200) ? tmp : 200;
-
- /* Get angry */
- get_angry = TRUE;
- }
-
- /* Confusion and Chaos breathers (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)))
- {
- /* Obvious */
- if (seen) obvious = TRUE;
-
- /* Already partially confused */
- if (m_ptr->confused)
- {
+ /* Turn off the damage */
+ dam = 0;
+ }
+ else
+ {
+ /* No polymorph */
#ifdef JP
-note = "¤Ï¤µ¤é¤Ëº®Í𤷤¿¤è¤¦¤À¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
#else
- note = " looks more confused.";
+ note = " is unaffected!";
#endif
+ }
+
+ /* Hack -- Get new monster */
+ m_ptr = &m_list[c_ptr->m_idx];
- tmp = m_ptr->confused + (do_conf / 2);
+ /* Hack -- Get new race */
+ r_ptr = &r_info[m_ptr->r_idx];
}
- /* Was not confused */
- else
+ /* Handle "teleport" */
+ if (do_dist)
{
+ /* Obvious */
+ if (seen) obvious = TRUE;
+
+ /* Message */
#ifdef JP
-note = "¤Ïº®Í𤷤¿¤è¤¦¤À¡£";
+ note = "¤¬¾Ã¤¨µî¤Ã¤¿¡ª";
#else
- note = " looks confused.";
+ note = " disappears!";
#endif
- tmp = do_conf;
- }
-
- /* Apply confusion */
- m_ptr->confused = (tmp < 200) ? tmp : 200;
+ if (!who) chg_virtue(V_VALOUR, -1);
- /* Get angry */
- get_angry = TRUE;
- }
- else if (do_time)
- {
- /* Obvious */
- if (seen) obvious = TRUE;
+ /* Teleport */
+ teleport_away(c_ptr->m_idx, do_dist, (bool)(!who));
- if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp-1;
+ /* Hack -- get new location */
+ y = m_ptr->fy;
+ x = m_ptr->fx;
- if (do_time)
- {
-#ifdef JP
-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;
+ /* Hack -- get new grid */
+ c_ptr = &cave[y][x];
}
- get_angry = TRUE;
- }
+ /* Fear */
+ if (do_fear)
+ {
+ /* Increase fear */
+ tmp = m_ptr->monfear + do_fear;
- /* Fear */
- if (do_fear)
- {
- /* Increase fear */
- tmp = m_ptr->monfear + do_fear;
-
- /* Set fear */
- m_ptr->monfear = (tmp < 200) ? tmp : 200;
+ /* Set fear */
+ m_ptr->monfear = (tmp < 200) ? tmp : 200;
- /* Get angry */
- get_angry = TRUE;
+ /* Get angry */
+ get_angry = TRUE;
+ }
}
-
/* If another monster did the damage, hurt the monster by hand */
if (who)
{
/* 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))
{
/* Choose 'new' target */
- do
+ if (who > 0)
{
- t_y = m_list[who].fy - 1 + randint1(3);
- t_x = m_list[who].fx - 1 + randint1(3);
- max_attempts--;
- }
- while (max_attempts && in_bounds2u(t_y, t_x) &&
- !(player_has_los_bold(t_y, t_x)));
+ do
+ {
+ t_y = m_list[who].fy - 1 + randint1(3);
+ t_x = m_list[who].fx - 1 + randint1(3);
+ max_attempts--;
+ }
+ while (max_attempts && in_bounds2u(t_y, t_x) &&
+ !(player_has_los_bold(t_y, t_x)));
- if (max_attempts < 1)
+ if (max_attempts < 1)
+ {
+ t_y = m_list[who].fy;
+ t_x = m_list[who].fx;
+ }
+ }
+ else
{
- t_y = m_list[who].fy;
- t_x = m_list[who].fx;
+ t_y = py - 1 + randint1(3);
+ t_x = px - 1 + randint1(3);
}
project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
/* Get the monster's real name (gotten before polymorph!) */
strcpy(killer, who_name);
}
- else if (who < 0)
+ else
{
+ switch (who)
+ {
+ case PROJECT_WHO_UNCTRL_POWER:
+#ifdef JP
+ strcpy(killer, "À©¸æ¤Ç¤¤Ê¤¤ÎϤÎÈÅή");
+#else
+ strcpy(killer, "uncontrollable power storm");
+#endif
+ break;
+
+ default:
#ifdef JP
- strcpy(killer, "æ«");
+ strcpy(killer, "æ«");
#else
- strcpy(killer, "a trap");
+ strcpy(killer, "a trap");
#endif
+ break;
+ }
+
+ /* Paranoia */
+ strcpy(m_name, killer);
}
/* Analyze the damage */
case GF_PLASMA:
{
#ifdef JP
-if (fuzzy) msg_print("²¿¤«¤È¤Æ¤âÇ®¤¤¤â¤Î¤Ç¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+ if (fuzzy) msg_print("²¿¤«¤È¤Æ¤âÇ®¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª");
#else
if (fuzzy) msg_print("You are hit by something *HOT*!");
#endif
case GF_DISENCHANT:
{
#ifdef JP
-if (fuzzy) msg_print("²¿¤«¤µ¤¨¤Ê¤¤¤â¤Î¤Ç¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+ if (fuzzy) msg_print("²¿¤«¤µ¤¨¤Ê¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª");
#else
if (fuzzy) msg_print("You are hit by something static!");
#endif
case GF_GRAVITY:
{
#ifdef JP
-if (fuzzy) msg_print("²¿¤«½Å¤¤¤â¤Î¤Ç¤Ç¹¶·â¤µ¤ì¤¿¡ª");
-msg_print("¼þÊդνÅÎϤ¬¤æ¤¬¤ó¤À¡£");
+ if (fuzzy) msg_print("²¿¤«½Å¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+ msg_print("¼þÊդνÅÎϤ¬¤æ¤¬¤ó¤À¡£");
#else
if (fuzzy) msg_print("You are hit by something heavy!");
msg_print("Gravity warps around you.");
#ifdef JP
msg_print("¤¢¤Ê¤¿¤ÏÌ¿¤¬Çö¤Þ¤Ã¤Æ¤¤¤¯¤è¤¦¤Ë´¶¤¸¤¿¡ª");
#else
- msg_print("Your feel your life fade away!");
+ msg_print("You feel your life fade away!");
#endif
get_damage = take_hit(DAMAGE_ATTACK, dam, m_name, MS_HAND_DOOM);
}
}
- if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead)
+ if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead && (who > 0))
{
#ifdef JP
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
/* Disintegration balls explosions are stopped by perma-walls */
if (!in_disintegration_range(by, bx, y, x)) return FALSE;
-
- /* Permanent walls and artifacts don't get effect */
- /* But not protect monsters and other objects */
- if (!cave_valid_bold(y, x)) return TRUE;
/* Destroy mirror/glyph */
- remove_mirror(y,x);
+ remove_mirror(y, x);
+
+ /* Permanent walls and artifacts don't get effect */
+ /* But not protect monsters and other objects */
+ if (cave_perma_bold(y, x)) return TRUE;
feat = cave[y][x].feat;
int bdis = 0;
int cdis;
int path_n = 0;
- int tdis = distance(y1, x1, y2, x2);
- int mdis = tdis + rad;
+ int mdis = distance(y1, x1, y2, x2) + rad;
while (bdis <= mdis)
{
{
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 */
}
/* Only do visuals if requested */
- if (!blind && !(flg & (PROJECT_HIDE)) && !(flg & PROJECT_FAST))
+ if (!blind && !(flg & (PROJECT_HIDE | PROJECT_FAST)))
{
/* Only do visuals if the player can "see" the bolt */
if (panel_contains(y, x) && player_has_los_bold(y, x))
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);
- }
-
}
+ path_n = i;
+
/* Save the "blast epicenter" */
by = y;
bx = x;
- if (breath && (y1 == by) && (x1 == bx))
+ if (breath && !path_n)
{
breath = FALSE;
- gm_rad = 1;
+ gm_rad = rad;
if (!old_hide)
{
flg &= ~(PROJECT_HIDE);
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;
+ if (one_in_(2)) flg |= PROJECT_PLAYER;
+ else flg &= ~(PROJECT_PLAYER);
/* The bolt is reflected */
project(cave[y][x].m_idx, 0, t_y, t_x, dam, typ, flg, monspell);
{
effective_dist = dist;
}
-
-
+
+
/* There is the riding player on this monster */
- if (p_ptr->riding && (y == py) && (x == px))
+ if (p_ptr->riding && player_bold(y, x))
{
/* Aimed on the player */
if (flg & PROJECT_PLAYER)
{
- if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE))
+ if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE | PROJECT_AIMED))
{
/*
* A beam or bolt is well aimed
/*
* This grid is the original target.
+ * Or aimed on your horse.
*/
- else if ((y == y2) || (x == x2))
+ else if (((y == y2) && (x == x2)) || (flg & PROJECT_AIMED))
{
/* Hit the mount with full damage */
}
else
{
/* Hit the player later */
- flg &= ~(PROJECT_MONSTER);
flg |= PROJECT_PLAYER;
-
+
/* Don't affect the mount */
continue;
}
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)
{
x = gx[i];
/* Affect the player? */
- if (y != py || x != px) continue;
+ if (!player_bold(y, x)) continue;
/* Find the closest point in the blast */
if (breath)
*
* But already choosen to hit the
* mount at this point.
+ *
+ * Or aimed on your horse.
*/
- else if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE))
+ else if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE | PROJECT_AIMED))
{
/*
* A beam or bolt is well aimed
OSDN Git Service
