/* File: spells1.c */
-/* Purpose: Spell projection */
-
/*
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
*
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies. Other copyrights may also apply.
*/
+/* Purpose: Spell projection */
+
#include "angband.h"
/* ToDo: Make this global */
/*
* Get another mirror. for SEEKER
*/
-static void next_mirror( int* next_y , int* next_x )
+static void next_mirror( int* next_y , int* next_x , int cury, int curx)
{
int mirror_x[10],mirror_y[10]; /* ¶À¤Ï¤â¤Ã¤È¾¯¤Ê¤¤ */
int mirror_num=0; /* ¶À¤Î¿ô */
{
for( y=0 ; y < cur_hgt ; y++ )
{
- if( cave[y][x].feat == FEAT_MIRROR ){
+ if( is_mirror_grid(&cave[y][x])){
mirror_y[mirror_num]=y;
mirror_x[mirror_num]=x;
mirror_num++;
}
if( mirror_num )
{
- num=rand_int(mirror_num);
+ num=randint0(mirror_num);
*next_y=mirror_y[num];
*next_x=mirror_x[num];
return;
}
- *next_y=rand_int(cur_hgt);
- *next_x=rand_int(cur_wid);
+ *next_y=cury+randint0(5)-2;
+ *next_x=curx+randint0(5)-2;
return;
}
*/
static byte mh_attr(int max)
{
- switch (randint(max))
+ switch (randint1(max))
{
case 1: return (TERM_RED);
case 2: return (TERM_GREEN);
if (!s) return (TERM_WHITE);
/* Pick a random color */
- c = s[rand_int(strlen(s))];
+ c = s[randint0(strlen(s))];
/* Lookup this color */
a = strchr(color_char, c) - color_char;
/* Sometimes stop at non-initial monsters/players */
if (flg & (PROJECT_STOP))
{
- if ((n > 0) && (cave[y][x].m_idx != 0)) break;
+ if ((n > 0) &&
+ (player_bold(y, x) || cave[y][x].m_idx != 0))
+ break;
}
if (!in_bounds(y, x)) break;
/* Sometimes stop at non-initial monsters/players */
if (flg & (PROJECT_STOP))
{
- if ((n > 0) && (cave[y][x].m_idx != 0)) break;
+ if ((n > 0) &&
+ (player_bold(y, x) || cave[y][x].m_idx != 0))
+ break;
}
if (!in_bounds(y, x)) break;
/* Sometimes stop at non-initial monsters/players */
if (flg & (PROJECT_STOP))
{
- if ((n > 0) && (cave[y][x].m_idx != 0)) break;
+ if ((n > 0) &&
+ (player_bold(y, x) || cave[y][x].m_idx != 0))
+ break;
}
if (!in_bounds(y, x)) break;
dam = (dam + r) / (r + 1);
+ if (c_ptr->feat == FEAT_TREES)
+ {
+ cptr message;
+ switch (typ)
+ {
+ case GF_POIS:
+ case GF_NUKE:
+ case GF_DEATH_RAY:
+#ifdef JP
+ message = "¸Ï¤ì¤¿";break;
+#else
+ message = "was blasted.";break;
+#endif
+ case GF_TIME:
+#ifdef JP
+ message = "½Ì¤ó¤À";break;
+#else
+ message = "shrank.";break;
+#endif
+ case GF_ACID:
+#ifdef JP
+ message = "ÍϤ±¤¿";break;
+#else
+ message = "melted.";break;
+#endif
+ case GF_COLD:
+ case GF_ICE:
+#ifdef JP
+ message = "Åà¤ê¡¢ºÕ¤±»¶¤Ã¤¿";break;
+#else
+ message = "was frozen and smashed.";break;
+#endif
+ case GF_FIRE:
+ case GF_ELEC:
+ case GF_PLASMA:
+#ifdef JP
+ message = "dz¤¨¤¿";break;
+#else
+ message = "burns up!";break;
+#endif
+ case GF_METEOR:
+ case GF_CHAOS:
+ case GF_MANA:
+ case GF_SEEKER:
+ case GF_SUPER_RAY:
+ case GF_SHARDS:
+ case GF_ROCKET:
+ case GF_SOUND:
+ case GF_DISENCHANT:
+ case GF_FORCE:
+ case GF_GRAVITY:
+#ifdef JP
+ message = "Ê´ºÕ¤µ¤ì¤¿";break;
+#else
+ message = "was crushed.";break;
+#endif
+ default:
+ message = NULL;break;
+ }
+ if (message)
+ {
+#ifdef JP
+ msg_format("ÌÚ¤Ï%s¡£", message);
+#else
+ msg_format("A tree %s", message);
+#endif
+ cave_set_feat(y, x, (one_in_(3) ? FEAT_DEEP_GRASS : FEAT_GRASS));
+
+ /* Observe */
+ if (c_ptr->info & (CAVE_MARK)) obvious = TRUE;
+
+ /* Update some things */
+ p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
+ }
+ }
+
/* Analyze the type */
switch (typ)
{
case GF_BRAIN_SMASH:
case GF_DRAIN_MANA:
case GF_PSY_SPEAR:
- case GF_ELEC:
- case GF_COLD:
- case GF_ICE:
case GF_FORCE:
case GF_HOLY_FIRE:
case GF_HELL_FIRE:
case GF_DOMINATION:
case GF_IDENTIFY:
case GF_ATTACK:
- {
- break;
- }
-
case GF_ACID:
+ case GF_ELEC:
+ case GF_COLD:
+ case GF_ICE:
case GF_FIRE:
case GF_PLASMA:
case GF_METEOR:
case GF_SEEKER:
case GF_SUPER_RAY:
{
- cptr message;
- if (c_ptr->feat == FEAT_TREES)
- {
- switch (typ)
- {
- case GF_ACID:
-#ifdef JP
- message = "ÍϤ±¤¿";break;
-#else
- message = "melted.";break;
-#endif
- case GF_FIRE:
- case GF_PLASMA:
-#ifdef JP
- message = "dz¤¨¤¿";break;
-#else
- message = "burns up!";break;
-#endif
- case GF_METEOR:
- case GF_CHAOS:
- case GF_MANA:
- case GF_SEEKER:
- case GF_SUPER_RAY:
-#ifdef JP
- message = "Ê´ºÕ¤µ¤ì¤¿";break;
-#else
- message = "was crushed.";break;
-#endif
- default:
-#ifdef JP
- message = "dz¤¨¤¿";break;
-#else
- message = "burns up!";break;
-#endif
- }
-#ifdef JP
- msg_format("ÌÚ¤Ï%s¡£", message);
-#else
- msg_format("A tree %s", message);
-#endif
- c_ptr->feat = (one_in_(3) ? FEAT_DEEP_GRASS : FEAT_GRASS);
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
-
- /* Observe */
- if (c_ptr->info & (CAVE_MARK)) obvious = TRUE;
-
- /* Update some things */
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
- }
break;
}
case GF_KILL_TRAP:
{
/* Reveal secret doors */
- if (c_ptr->feat == FEAT_SECRET)
+ if (is_hidden_door(c_ptr))
{
/* Pick a door */
- place_closed_door(y, x);
+ disclose_grid(y, x);
/* Check line of sight */
if (known)
}
/* Destroy traps */
- if ((c_ptr->info & CAVE_TRAP) || is_trap(c_ptr->feat))
+ if (is_trap(c_ptr->feat))
{
/* Check line of sight */
if (known)
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the trap */
- if (c_ptr->info & CAVE_TRAP) c_ptr->info &= ~(CAVE_TRAP);
- else
- {
- c_ptr->feat = floor_type[rand_int(100)];
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
- }
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* Locked doors are unlocked */
}
}
- /* 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;
}
{
/* Destroy all doors and traps */
if ((c_ptr->feat == FEAT_OPEN) ||
- (c_ptr->feat == FEAT_BROKEN) ||
- (c_ptr->info & CAVE_TRAP) ||
- (is_trap(c_ptr->feat)) ||
- ((c_ptr->feat >= FEAT_DOOR_HEAD) &&
- (c_ptr->feat <= FEAT_DOOR_TAIL)))
+ (c_ptr->feat == FEAT_BROKEN) ||
+ is_trap(c_ptr->feat) ||
+ ((c_ptr->feat >= FEAT_DOOR_HEAD) &&
+ (c_ptr->feat <= FEAT_DOOR_TAIL)))
{
/* Check line of sight */
if (known)
#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 */
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the feature */
- if (c_ptr->info & CAVE_TRAP) c_ptr->info &= ~(CAVE_TRAP);
- else
- {
- c_ptr->feat = floor_type[rand_int(100)];
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
- }
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* 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
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the wall */
- c_ptr->feat = floor_type[rand_int(100)];
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* Quartz / Magma with treasure */
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the wall */
- c_ptr->feat = floor_type[rand_int(100)];
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
+ cave_set_feat(y, x, floor_type[randint0(100)]);
/* Place some gold */
place_gold(y, x);
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the wall */
- c_ptr->feat = floor_type[rand_int(100)];
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* Rubble */
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the rubble */
- c_ptr->feat = floor_type[rand_int(100)];
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
+ cave_set_feat(y, x, floor_type[randint0(100)]);
/* Hack -- place an object */
- if (rand_int(100) < 10)
+ if (randint0(100) < 10)
{
/* Found something */
if (player_can_see_bold(y, x))
obvious = TRUE;
}
- /* Place gold */
- place_object(y, x, FALSE, FALSE);
+ /* Place object */
+ place_object(y, x, 0L);
}
}
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the feature */
- c_ptr->feat = floor_type[rand_int(100)];
- c_ptr->info &= ~(CAVE_MASK);
- c_ptr->info |= CAVE_FLOOR;
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* Notice */
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);
case GF_MAKE_TRAP:
{
/* Require a "naked" floor grid */
- if ((cave[y][x].feat != FEAT_FLOOR) &&
- (cave[y][x].feat != FEAT_GRASS) &&
- (cave[y][x].feat != FEAT_DIRT) &&
- (cave[y][x].o_idx == 0) &&
- (cave[y][x].m_idx == 0))
+ if (((cave[y][x].feat != FEAT_FLOOR) &&
+ (cave[y][x].feat != FEAT_GRASS) &&
+ (cave[y][x].feat != FEAT_DIRT) &&
+ (cave[y][x].o_idx == 0) &&
+ (cave[y][x].m_idx == 0))
+ || is_mirror_grid(&cave[y][x]) )
break;
-
/* Place a trap */
place_trap(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;
/* Create a closed door */
cave_set_feat(y, x, FEAT_TREES);
/* Require a "naked" floor grid */
if (!cave_naked_bold(y, x)) break;
- cave_set_feat(y, x, FEAT_GLYPH);
+ /* Create a glyph */
+ cave[y][x].info |= CAVE_OBJECT;
+ cave[y][x].mimic = FEAT_GLYPH;
+
+ /* Notice */
+ note_spot(y, x);
+
+ /* Redraw */
+ lite_spot(y, x);
break;
}
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_LAVA_FLOW:
+ case GF_LAVA_FLOW:
{
- /* Shallow Lava */
- if(dam == 1)
- {
- /* Require a "naked" floor grid */
- if (!cave_naked_bold(y, x)) break;
+ /* Shallow Lava */
+ if(dam == 1)
+ {
+ /* Require a "naked" floor grid */
+ if (!cave_naked_bold(y, x)) break;
- /* Place a shallow lava */
- cave_set_feat(y, x, FEAT_SHAL_LAVA);
- }
- /* Deep Lava */
- else
- {
- /* Require a "naked" floor grid */
- if (cave_perma_bold(y, x) || !dam) break;
+ /* Place a shallow lava */
+ cave_set_feat(y, x, FEAT_SHAL_LAVA);
+ }
+ /* Deep Lava */
+ else
+ {
+ /* Require a "naked" floor grid */
+ if (cave_perma_bold(y, x) || !dam) break;
- /* Place a deep lava */
- cave_set_feat(y, x, FEAT_DEEP_LAVA);
+ /* Place a deep lava */
+ cave_set_feat(y, x, FEAT_DEEP_LAVA);
- /* Dam is used as a counter for the number of grid to convert */
- dam--;
- }
+ /* Dam is used as a counter for the number of grid to convert */
+ dam--;
+ }
break;
}
- case GF_WATER_FLOW:
+ case GF_WATER_FLOW:
{
- /* Shallow Water */
- if(dam == 1)
- {
- /* Require a "naked" floor grid */
- if (!cave_naked_bold(y, x)) break;
+ /* Shallow Water */
+ if(dam == 1)
+ {
+ /* Require a "naked" floor grid */
+ if (!cave_naked_bold(y, x)) break;
- /* Place a shallow lava */
- cave_set_feat(y, x, FEAT_SHAL_WATER);
- }
- /* Deep Water */
- else
- {
- /* Require a "naked" floor grid */
- if (cave_perma_bold(y, x) || !dam) break;
+ /* Place a shallow lava */
+ cave_set_feat(y, x, FEAT_SHAL_WATER);
+ }
+ /* Deep Water */
+ else
+ {
+ /* Require a "naked" floor grid */
+ if (cave_perma_bold(y, x) || !dam) break;
- /* Place a deep lava */
- cave_set_feat(y, x, FEAT_DEEP_WATER);
+ /* Place a deep lava */
+ cave_set_feat(y, x, FEAT_DEEP_WATER);
- /* Dam is used as a counter for the number of grid to convert */
- dam--;
- }
+ /* Dam is used as a counter for the number of grid to convert */
+ dam--;
+ }
break;
}
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;
}
if (player_can_see_bold(y, x)) obvious = TRUE;
/* Turn off the light. */
- c_ptr->info &= ~(CAVE_GLOW);
+ if (!is_mirror_grid(c_ptr)) c_ptr->info &= ~(CAVE_GLOW);
/* Hack -- Forget "boring" grids */
if ((c_ptr->feat <= FEAT_INVIS) || (c_ptr->feat == FEAT_DIRT) || (c_ptr->feat == FEAT_GRASS))
case GF_SHARDS:
case GF_ROCKET:
{
- if( cave[y][x].feat == FEAT_MIRROR )
+ if (is_mirror_grid(&cave[y][x]))
{
#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);
- project(0,2,y,x, p_ptr->lev /2 +5 ,GF_SHARDS,(PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP|PROJECT_NO_REF|PROJECT_NO_HANGEKI),-1);
+ 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);
}
break;
}
case GF_SOUND:
{
- if( cave[y][x].feat == FEAT_MIRROR && p_ptr->lev < 40 )
+ if (is_mirror_grid(&cave[y][x]) && p_ptr->lev < 40 )
{
#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;
}
bool obvious = FALSE;
bool known = player_has_los_bold(y, x);
- u32b f1, f2, f3;
+ u32b flgs[TR_FLAG_SIZE];
char o_name[MAX_NLEN];
/* Scan all objects in the grid */
for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
- object_type *o_ptr;
+ /* Acquire object */
+ object_type *o_ptr = &o_list[this_o_idx];
bool is_art = FALSE;
bool ignore = FALSE;
- bool plural = FALSE;
bool do_kill = FALSE;
cptr note_kill = NULL;
- /* Acquire object */
- o_ptr = &o_list[this_o_idx];
+#ifndef JP
+ /* Get the "plural"-ness */
+ bool plural = (o_ptr->number > 1);
+#endif
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
/* Extract the flags */
- object_flags(o_ptr, &f1, &f2, &f3);
-
- /* Get the "plural"-ness */
- if (o_ptr->number > 1) plural = TRUE;
+ object_flags(o_ptr, flgs);
/* Check for artifact */
if ((artifact_p(o_ptr) || o_ptr->art_name)) is_art = TRUE;
note_kill = (plural ? " melt!" : " melts!");
#endif
- if (f3 & (TR3_IGNORE_ACID)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_ACID)) ignore = TRUE;
}
break;
}
note_kill = (plural ? " are destroyed!" : " is destroyed!");
#endif
- if (f3 & (TR3_IGNORE_ELEC)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE;
}
break;
}
note_kill = (plural ? " burn up!" : " burns up!");
#endif
- if (f3 & (TR3_IGNORE_FIRE)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
}
break;
}
#endif
do_kill = TRUE;
- if (f3 & (TR3_IGNORE_COLD)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE;
}
break;
}
note_kill = (plural ? " burn up!" : " burns up!");
#endif
- if (f3 & (TR3_IGNORE_FIRE)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
}
if (hates_elec(o_ptr))
{
note_kill = (plural ? " are destroyed!" : " is destroyed!");
#endif
- if (f3 & (TR3_IGNORE_ELEC)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE;
}
break;
}
note_kill = (plural ? " burn up!" : " burns up!");
#endif
- if (f3 & (TR3_IGNORE_FIRE)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE;
}
if (hates_cold(o_ptr))
{
note_kill = (plural ? " shatter!" : " shatters!");
#endif
- if (f3 & (TR3_IGNORE_COLD)) ignore = TRUE;
+ if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE;
}
break;
}
note_kill = (plural ? " are destroyed!" : " is destroyed!");
#endif
- if (f2 & (TR2_RES_CHAOS)) ignore = TRUE;
+ if (have_flag(flgs, TR_RES_CHAOS)) ignore = TRUE;
else if ((o_ptr->tval == TV_SCROLL) && (o_ptr->sval == SV_SCROLL_CHAOS)) ignore = TRUE;
break;
}
break;
}
- case GF_IDENTIFY:
- {
+ case GF_IDENTIFY:
+ {
identify_item(o_ptr);
break;
- }
+ }
/* Unlock chests */
case GF_KILL_TRAP:
if (o_ptr->tval == TV_CORPSE)
{
int i;
- bool friendly = (!who || is_friendly(&m_list[who]));
- bool pet = (!who || is_pet(&m_list[who]));
+ u32b mode = 0L;
+
+ if (!who || is_pet(&m_list[who]))
+ mode |= PM_FORCE_PET;
+
for (i = 0; i < o_ptr->number ; i++)
{
- if (((o_ptr->sval == SV_CORPSE) && (randint(100) > 80)) ||
- ((o_ptr->sval == SV_SKELETON) && (randint(100) > 60)))
+ if (((o_ptr->sval == SV_CORPSE) && (randint1(100) > 80)) ||
+ ((o_ptr->sval == SV_SKELETON) && (randint1(100) > 60)))
{
if (!note_kill)
{
}
continue;
}
- else if (summon_named_creature(y, x, o_ptr->pval, FALSE, FALSE, friendly, pet))
+ else if (summon_named_creature(who, y, x, o_ptr->pval, mode))
{
#ifdef JP
note_kill = "À¸¤Ê֤ä¿¡£";
#else
- note_kill = "rivived.";
+ note_kill = " revived.";
#endif
}
else if (!note_kill)
* and hurts evil less. If can breath nether, then it resists it as well.
*
* Damage reductions use the following formulas:
- * Note that "dam = dam * 6 / (randint(6) + 6);"
+ * Note that "dam = dam * 6 / (randint1(6) + 6);"
* gives avg damage of .655, ranging from .858 to .500
- * Note that "dam = dam * 5 / (randint(6) + 6);"
+ * Note that "dam = dam * 5 / (randint1(6) + 6);"
* gives avg damage of .544, ranging from .714 to .417
- * Note that "dam = dam * 4 / (randint(6) + 6);"
+ * Note that "dam = dam * 4 / (randint1(6) + 6);"
* gives avg damage of .444, ranging from .556 to .333
- * Note that "dam = dam * 3 / (randint(6) + 6);"
+ * Note that "dam = dam * 3 / (randint1(6) + 6);"
* gives avg damage of .327, ranging from .427 to .250
- * Note that "dam = dam * 2 / (randint(6) + 6);"
+ * Note that "dam = dam * 2 / (randint1(6) + 6);"
* gives something simple.
*
* In this function, "result" messages are postponed until the end, where
/* Can the player know about this effect? */
bool known = ((m_ptr->cdis <= MAX_SIGHT) || p_ptr->inside_battle);
- /* Can the player see the source of this effect? */
- bool see_s = ((who <= 0) || m_list[who].ml);
+ /* Can the player see the source of this effect? */
+ bool see_s = ((who <= 0) || m_list[who].ml);
/* Were the effects "irrelevant"? */
bool skipped = FALSE;
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.";
-#endif
- else
-#ifdef JP
-note_dies = "¤òÅݤ·¤¿¡£";
-#else
- note_dies = " is destroyed.";
+ monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
#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);
}
- if (r_ptr->flags3 & (RF3_HURT_FIRE))
+ else if (r_ptr->flags3 & (RF3_HURT_FIRE))
{
#ifdef JP
note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£";
#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);
}
- if (r_ptr->flags3 & (RF3_HURT_COLD))
+ else if (r_ptr->flags3 & (RF3_HURT_COLD))
{
#ifdef JP
note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£";
#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 = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
note = " resists.";
#endif
- dam *= 3; dam /= randint(6) + 6;
- if (seen) r_ptr->r_flags3 |= (RF3_IM_POIS);
+ dam *= 3; dam /= randint1(6) + 6;
+ 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
{
note = " resists.";
#endif
- dam *= 3; dam /= randint(6) + 6;
+ dam *= 3; dam /= randint1(6) + 6;
}
break;
}
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 = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£";
note = " resists.";
#endif
- dam *= 3; dam /= randint(6) + 6;
- if (seen)
- r_ptr->r_flags3 |= (RF3_RES_PLAS);
+ dam *= 3; dam /= randint1(6) + 6;
+ 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 /= randint(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 /= randint(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 + randint(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 /= randint(6) + 6;
- do_poly = FALSE;
+ dam *= 3; dam /= randint1(6) + 6;
+ 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 /= randint(6) + 6;
+ 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 + randint(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 /= randint(6) + 6;
+ 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 + randint(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 /= randint(6) + 6;
+ dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF);
}
- else if (r_ptr->flags3 & RF3_NO_CONF)
- {
-#ifdef JP
-note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ¤ò¼¨¤·¤¿¡£";
-#else
- note = " resists somewhat.";
-#endif
-
- dam /= 2;
- }
- break;
- }
+ else do_conf = (10 + randint1(15) + r) / (r + 1);
+ break;
+ }
/* Disenchantment -- Breathers and Disenchanters resist */
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 /= randint(6) + 6;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_DISE);
+ dam *= 3; dam /= randint1(6) + 6;
+ 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 /= randint(6) + 6;
- if (seen) r_ptr->r_flags3 |= (RF3_RES_NEXU);
+ dam *= 3; dam /= randint1(6) + 6;
+ 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 = (randint(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 /= randint(6) + 6;
+ 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 /= randint(6) + 6;
+ dam *= 3; dam /= randint1(6) + 6;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER);
}
else
{
/* Powerful monsters can resist */
if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
obvious = FALSE;
}
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 /= randint(6) + 6;
+ 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
resist_tele = TRUE;
}
- else if (r_ptr->level > randint(100))
+ 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 /= randint(6) + 6;
+ dam *= 3; dam /= randint1(6) + 6;
do_dist = 0;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV);
}
else
{
/* 1. slowness */
/* Powerful monsters can resist */
if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
obvious = FALSE;
}
}
/* 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)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* Resist */
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 > randint(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"));
#endif
/* Saving throw */
- if (rand_int(100 + r_ptr->level/2) < p_ptr->skill_sav)
+ 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, 0x88);
+ 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))
{
- switch (randint(4))
+ switch (randint1(4))
{
case 1:
- set_confused(p_ptr->confused + 3 + randint(dam));
+ set_confused(p_ptr->confused + 3 + randint1(dam));
break;
case 2:
- set_stun(p_ptr->stun + randint(dam));
+ set_stun(p_ptr->stun + randint1(dam));
break;
case 3:
{
if (r_ptr->flags3 & RF3_NO_FEAR)
#ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = " is unaffected.";
#endif
else
- set_afraid(p_ptr->afraid + 3 + randint(dam));
+ set_afraid(p_ptr->afraid + 3 + randint1(dam));
break;
}
default:
if (!p_ptr->free_act)
- (void)set_paralyzed(p_ptr->paralyzed + randint(dam));
+ (void)set_paralyzed(p_ptr->paralyzed + randint1(dam));
break;
}
}
if ((dam > 0) && one_in_(4))
{
- switch (randint(4))
+ switch (randint1(4))
{
case 1:
- do_conf = 3 + randint(dam);
+ do_conf = 3 + randint1(dam);
break;
case 2:
- do_stun = 3 + randint(dam);
+ do_stun = 3 + randint1(dam);
break;
case 3:
- do_fear = 3 + randint(dam);
+ do_fear = 3 + randint1(dam);
break;
default:
#ifdef JP
-note = "¤Ï̲¤ê¹þ¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
+ note = "¤Ï̲¤ê¹þ¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª";
#else
note = " falls asleep!";
#endif
- do_sleep = 3 + randint(dam);
+ do_sleep = 3 + randint1(dam);
break;
}
}
#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) ||
+ else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) ||
(r_ptr->flags3 & RF3_ANIMAL) ||
- (r_ptr->level > randint(3 * dam)))
+ (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"));
#endif
/* Saving throw */
- if (rand_int(100 + r_ptr->level/2) < p_ptr->skill_sav)
+ 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, 0x88);
+ 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
- p_ptr->csp = MAX(0, p_ptr->csp - damroll(5, dam) / 2);
+ p_ptr->csp -= damroll(5, dam) / 2;
+ if (p_ptr->csp < 0) p_ptr->csp = 0;
p_ptr->redraw |= PR_MANA;
p_ptr->window |= (PW_SPELL);
take_hit(DAMAGE_ATTACK, dam, killer, -1); /* has already been /3 */
{
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) ||
- (r_ptr->level > 5 + randint(dam)))
+ (r_ptr->level > 5 + randint1(dam)))
{
/* Resist */
do_stun = 0;
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 > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (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"));
#endif
/* Saving throw */
- if (rand_int(100 + r_ptr->level/2) < p_ptr->skill_sav)
+ 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
{
/* Confuse, stun, terrify */
- switch (randint(4))
+ switch (randint1(4))
{
case 1:
set_stun(p_ptr->stun + dam / 2);
{
if (r_ptr->flags3 & RF3_NO_FEAR)
#ifdef JP
-note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
#else
note = " is unaffected.";
#endif
}
else
{
- if ((dam > 29) && (randint(100) < dam))
+ if ((dam > 29) && (randint1(100) < dam))
{
#ifdef JP
note = "¤¬¤¢¤Ê¤¿¤ËÎì°¤·¤¿¡£";
}
else
{
- switch (randint(4))
+ switch (randint1(4))
{
case 1:
do_stun = dam / 2;
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 = (randint(15) + 1) / (r + 1);
- if (r_ptr->flags3 & RF3_IM_COLD)
+ do_stun = (randint1(15) + 1) / (r + 1);
+ 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 = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£";
+#else
+ note = " is hit hard.";
+#endif
+
+ dam *= 2;
+ 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
dam = 0;
}
else if (((r_ptr->flags1 & RF1_UNIQUE) &&
- (randint(888) != 666)) ||
- (((r_ptr->level + randint(20)) > randint(p_ptr->lev + randint(10))) &&
- randint(100) != 66))
+ (randint1(888) != 666)) ||
+ (((r_ptr->level + randint1(20)) > randint1(caster_lev + randint1(10))) &&
+ randint1(100) != 66))
{
#ifdef JP
note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª";
{
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) */
/* Powerful monsters can resist */
if ((r_ptr->flags1 & RF1_UNIQUE) ||
(r_ptr->flags1 & RF1_QUESTOR) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
/* Clone monsters (Ignore "dam") */
case GF_OLD_CLONE:
{
- bool friendly = FALSE;
- bool pet = FALSE;
-
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 = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
m_ptr->hp = m_ptr->maxhp;
/* Attempt to clone. */
- if (multiply_monster(c_ptr->m_idx, TRUE, friendly, pet))
+ if (multiply_monster(c_ptr->m_idx, TRUE, 0L))
{
#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 ((r_ptr->flags1 & RF1_UNIQUE) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
{
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->flags3 & RF3_NO_SLEEP) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* 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 */
/* Sleep (Use "dam" as "power") */
+ case GF_STASIS_EVIL:
+ {
+ if (seen) obvious = TRUE;
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
+ {
+#ifdef JP
+ note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
+#else
+ note = " is immune.";
+#endif
+ dam = 0;
+ 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_EVIL) ||
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ {
+#ifdef JP
+note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
+#else
+ note = " is unaffected!";
+#endif
+
+ obvious = FALSE;
+ }
+ else
+ {
+ /* Go to sleep (much) later */
+#ifdef JP
+note = "¤ÏÆ°¤±¤Ê¤¯¤Ê¤Ã¤¿¡ª";
+#else
+ note = " is suspended!";
+#endif
+
+ do_sleep = 500;
+ }
+
+ /* No "real" damage */
+ dam = 0;
+ break;
+ }
+
+ /* Sleep (Use "dam" as "power") */
case GF_STASIS:
{
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->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
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 */
if ((r_ptr->flags1 & RF1_QUESTOR) ||
(r_ptr->flags3 & RF3_NO_CONF) ||
- (m_ptr->mflag2 & MFLAG_NOPET) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 5))
+ (m_ptr->mflag2 & MFLAG2_NOPET) ||
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 5))
{
/* 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 */
obvious = FALSE;
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
- else if (p_ptr->aggravate)
+ else if (p_ptr->cursed & TRC_AGGRAVATE)
{
#ifdef JP
note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª";
note = " hates you too much!";
#endif
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
else
{
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 */
if ((r_ptr->flags1 & RF1_QUESTOR) ||
(!(r_ptr->flags3 & RF3_UNDEAD)) ||
- (m_ptr->mflag2 & MFLAG_NOPET) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (m_ptr->mflag2 & MFLAG2_NOPET) ||
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* No obvious effect */
#ifdef JP
#endif
obvious = FALSE;
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
- else if (p_ptr->aggravate)
+ else if (p_ptr->cursed & TRC_AGGRAVATE)
{
#ifdef JP
note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª";
note = " hates you too much!";
#endif
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
else
{
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 */
if ((r_ptr->flags1 & RF1_QUESTOR) ||
(!(r_ptr->flags3 & RF3_DEMON)) ||
- (m_ptr->mflag2 & MFLAG_NOPET) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (m_ptr->mflag2 & MFLAG2_NOPET) ||
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* No obvious effect */
#ifdef JP
#endif
obvious = FALSE;
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
- else if (p_ptr->aggravate)
+ else if (p_ptr->cursed & TRC_AGGRAVATE)
{
#ifdef JP
note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª";
note = " hates you too much!";
#endif
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
else
{
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 */
if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
(!(r_ptr->flags3 & (RF3_ANIMAL))) ||
- (m_ptr->mflag2 & MFLAG_NOPET) ||
+ (m_ptr->mflag2 & MFLAG2_NOPET) ||
(r_ptr->flags3 & (RF3_NO_CONF)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (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 */
#endif
obvious = FALSE;
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
- else if (p_ptr->aggravate)
+ else if (p_ptr->cursed & TRC_AGGRAVATE)
{
#ifdef JP
note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª";
note = " hates you too much!";
#endif
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
else
{
#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 & MFLAG_NOPET) ||
- (r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)) ||
- ((r_ptr->level+10) > randint(dam)))
+ (m_ptr->mflag2 & MFLAG2_NOPET) ||
+ !monster_living(r_ptr) ||
+ ((r_ptr->level+10) > randint1(dam)))
{
/* Resist */
/* No obvious effect */
#endif
obvious = FALSE;
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
- else if (p_ptr->aggravate)
+ else if (p_ptr->cursed & TRC_AGGRAVATE)
{
#ifdef JP
note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª";
note = " hates you too much!";
#endif
- if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
}
else
{
{
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 */
/* Attempt a saving throw */
if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
(r_ptr->flags3 & (RF3_NO_CONF)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (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 */
{
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)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* Resist */
do_stun = 0;
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 /= (randint(6)+6);
+ 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 /= (randint(6)+6);
+ 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
resists_tele = TRUE;
}
- else if (r_ptr->level > randint(100))
+ 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
resists_tele = TRUE;
}
- else if (r_ptr->level > randint(100))
+ 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
resists_tele = TRUE;
}
- else if (r_ptr->level > randint(100))
+ 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;
/* Attempt a saving throw */
- if (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
+ if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
{
/* No obvious effect */
#ifdef JP
/* 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;
/* Attempt a saving throw */
- if (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
+ if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
{
/* No obvious effect */
#ifdef JP
/* 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;
/* Attempt a saving throw */
if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
(r_ptr->flags3 & (RF3_NO_FEAR)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* No obvious effect */
#ifdef JP
/* 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 draws 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 gazes 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 > randint((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.";
#endif
- do_conf = rand_int(8) + 8;
+ do_conf = randint0(8) + 8;
}
break;
}
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£",m_name);
+ if (!who) msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", m_name);
#else
- msg_format("You gazes 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 > randint((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.";
#endif
- do_conf = rand_int(8) + 8;
- do_stun = rand_int(8) + 8;
+ do_conf = randint0(8) + 8;
+ do_stun = randint0(8) + 8;
m_ptr->slow = MIN(200, m_ptr->slow + 10);
if (c_ptr->m_idx == p_ptr->riding)
p_ptr->update |= (PU_BONUS);
if (seen) obvious = TRUE;
/* Message */
#ifdef JP
-msg_format("%s¤ò»Øº¹¤·¤Æ¼ö¤¤¤ò¤«¤±¤¿¡£",m_name);
+ if (!who) msg_format("%s¤ò»Øº¹¤·¤Æ¼ö¤¤¤ò¤«¤±¤¿¡£", m_name);
#else
- msg_format("You points 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 (rand_int(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 points 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 (rand_int(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 points 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 (rand_int(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 points 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 (rand_int(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 + randint(dam)) >
- (r_ptr->level + randint(200)))
+ if ((caster_lev + randint1(dam)) >
+ (r_ptr->level + randint1(200)))
{
- dam = ((40 + randint(20)) * m_ptr->hp) / 100;
+ dam = ((40 + randint1(20)) * m_ptr->hp) / 100;
if (m_ptr->hp < dam) dam = m_ptr->hp - 1;
}
{
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
#endif
skipped = TRUE;
}
- else if (m_ptr->hp < rand_int(nokori_hp))
+ else if (m_ptr->hp < randint0(nokori_hp))
{
- if (m_ptr->mflag2 & MFLAG_CHAMELEON) choose_new_monster(c_ptr->m_idx, FALSE, MON_CHAMELEON);
+ if (m_ptr->mflag2 & MFLAG2_CHAMELEON) choose_new_monster(c_ptr->m_idx, FALSE, MON_CHAMELEON);
#ifdef JP
msg_format("%s¤òÊᤨ¤¿¡ª",m_name);
#else
- msg_format("You captures %^s!", m_name);
+ msg_format("You capture %^s!", m_name);
#endif
cap_mon = m_list[c_ptr->m_idx].r_idx;
cap_mspeed = m_list[c_ptr->m_idx].mspeed;
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)
{
/* Powerful monsters can resist */
if ((r_ptr->flags1 & RF1_UNIQUE) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
#ifdef JP
note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª";
/* Attempt a saving throw */
if ((r_ptr->flags1 & (RF1_UNIQUE)) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* Resist */
do_stun = 0;
/* Attempt a saving throw */
if ((r_ptr->flags1 & RF1_UNIQUE) ||
(r_ptr->flags3 & RF3_NO_SLEEP) ||
- (r_ptr->level > randint((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
+ (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
{
/* 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;
}
}
else
{
- if ((r_ptr->level > rand_int(dam)) || (m_ptr->mflag2 & MFLAG_NOGENO))
+ if ((r_ptr->level > randint0(dam)) || (m_ptr->mflag2 & MFLAG2_NOGENO))
{
dam = 0;
angry = TRUE;
#endif
#ifdef JP
- take_hit(DAMAGE_GENO, randint((r_ptr->level+1)/2), "¥â¥ó¥¹¥¿¡¼¾ÃÌǤμöʸ¤ò¾§¤¨¤¿ÈèÏ«", -1);
+ take_hit(DAMAGE_GENO, randint1((r_ptr->level+1)/2), "¥â¥ó¥¹¥¿¡¼¾ÃÌǤμöʸ¤ò¾§¤¨¤¿ÈèÏ«", -1);
#else
- take_hit(DAMAGE_GENO, randint((r_ptr->level+1)/2), "the strain of casting Genocide One", -1);
+ take_hit(DAMAGE_GENO, randint1((r_ptr->level+1)/2), "the strain of casting Genocide One", -1);
#endif
dam = 0;
note = "is unaffected!";
#endif
get_angry = TRUE;
- if (one_in_(13)) m_ptr->mflag2 |= MFLAG_NOGENO;
+ if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
}
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;
}
- /* Default */
- default:
+ case GF_CRUSADE:
{
- /* Irrelevant */
- skipped = TRUE;
+ bool success = FALSE;
+ if (seen) obvious = TRUE;
- /* No damage */
- dam = 0;
+ if ((r_ptr->flags3 & (RF3_GOOD)) && !p_ptr->inside_arena)
+ {
+ if (r_ptr->flags3 & (RF3_NO_CONF)) dam -= 50;
+ if (dam < 1) dam = 1;
- break;
- }
- }
+ /* No need to tame your pet */
+ if (is_pet(m_ptr))
+ {
+#ifdef JP
+ note = "¤ÎÆ°¤¤¬Â®¤¯¤Ê¤Ã¤¿¡£";
+#else
+ note = " starts moving faster.";
+#endif
+ m_ptr->fast = MIN(200, m_ptr->fast + 100);
+ success = TRUE;
+ }
- /* Absolutely no effect */
+ /* Attempt a saving throw */
+ else if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
+ (r_ptr->flags1 & (RF1_UNIQUE)) ||
+ (m_ptr->mflag2 & MFLAG2_NOPET) ||
+ (p_ptr->cursed & TRC_AGGRAVATE) ||
+ ((r_ptr->level+10) > randint1(dam)))
+ {
+ /* Resist */
+ if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
+ }
+ else
+ {
+#ifdef JP
+note = "¤ò»ÙÇÛ¤·¤¿¡£";
+#else
+ note = " is tamed!";
+#endif
+
+ set_pet(m_ptr);
+ m_ptr->fast = MIN(200, m_ptr->fast + 100);
+
+ /* Learn about type */
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
+ success = TRUE;
+ }
+ }
+
+ if (!success)
+ {
+ if (!(r_ptr->flags3 & RF3_NO_FEAR))
+ {
+ do_fear = randint1(90)+10;
+ }
+ else if (seen)
+ {
+ if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_FEAR);
+ }
+ }
+
+ /* No "real" damage */
+ dam = 0;
+ break;
+ }
+
+ case GF_WOUNDS:
+ {
+ if (seen) obvious = TRUE;
+
+ if (r_ptr->flagsr & RFR_RES_ALL)
+ {
+#ifdef JP
+ note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª";
+#else
+ note = " is immune.";
+#endif
+ skipped = TRUE;
+ if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
+ break;
+ }
+
+ /* Attempt a saving throw */
+ if (randint0(100 + dam) < (r_ptr->level + 50))
+ {
+
+#ifdef JP
+note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£";
+#else
+ note = "is unaffected!";
+#endif
+ dam = 0;
+ }
+ break;
+ }
+
+ /* Default */
+ default:
+ {
+ /* Irrelevant */
+ skipped = TRUE;
+
+ /* No damage */
+ dam = 0;
+
+ break;
+ }
+ }
+
+
+ /* Absolutely no effect */
if (skipped) return (FALSE);
/* "Unique" monsters cannot be polymorphed */
/* Quest monsters cannot be polymorphed */
if (r_ptr->flags1 & RF1_QUESTOR) do_poly = FALSE;
- if (p_ptr->riding & (c_ptr->m_idx == p_ptr->riding)) do_poly = FALSE;
+ 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 && (randint(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
+ }
- tmp = m_ptr->confused + (do_conf / 2);
+ /* Hack -- Get new monster */
+ m_ptr = &m_list[c_ptr->m_idx];
+
+ /* 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);
- if (see_s)
- {
- msg_format("%^s%s", m_name, note);
- }
- else
- {
- mon_fight = TRUE;
- }
- }
+ {
+ monster_desc(m_name, m_ptr, MD_TRUE_NAME);
+ if (see_s)
+ {
+ msg_format("%^s%s", m_name, note);
+ }
+ else
+ {
+ mon_fight = TRUE;
+ }
+ }
monster_gain_exp(who, m_ptr->r_idx);
if (note && seen) msg_format("%^s%s", m_name, note);
/* Hack -- Pain message */
- else if (see_s)
- {
- message_pain(c_ptr->m_idx, dam);
- }
- else
- {
- mon_fight = TRUE;
- }
+ else if (see_s)
+ {
+ message_pain(c_ptr->m_idx, dam);
+ }
+ else
+ {
+ mon_fight = TRUE;
+ }
/* Hack -- handle sleep */
if (do_sleep) m_ptr->csleep = do_sleep;
/* Hack -- Pain message */
- else if (known)
+ else if (known && (dam || !do_fear))
{
message_pain(c_ptr->m_idx, dam);
}
int count = 0;
do
{
- switch (randint(28))
+ switch (randint1(28))
{
case 1: case 2:
if (!count)
msg_print("The ground trembles...");
#endif
- earthquake(ty, tx, 4 + rand_int(4));
+ earthquake(ty, tx, 4 + randint0(4));
if (!one_in_(6)) break;
}
case 3: case 4: case 5: case 6:
if (!one_in_(6)) break;
case 19: case 20: case 21: case 22:
{
- bool pet = FALSE, friendly = FALSE;
+ bool pet = !one_in_(3);
+ u32b mode = PM_ALLOW_GROUP;
- if (one_in_(3))
- {
- friendly = TRUE;
- }
- else
- {
- pet = TRUE;
- }
- count += summon_specific((pet ? -1 : 0), py, px, (pet ? p_ptr->lev*2/3+randint(p_ptr->lev/2) : dun_level), 0, TRUE, friendly, pet, FALSE, (bool)(!pet));
+ if (pet) mode |= PM_FORCE_PET;
+ else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
+
+ count += summon_specific((pet ? -1 : 0), py, px, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode);
if (!one_in_(6)) break;
}
case 23: case 24: case 25:
- if (p_ptr->hold_life && (rand_int(100) < 75)) break;
+ if (p_ptr->hold_life && (randint0(100) < 75)) break;
#ifdef JP
msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
#else
}
else
{
- (void)do_dec_stat(rand_int(6));
+ (void)do_dec_stat(randint0(6));
}
break;
}
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);
}
* We return "TRUE" if any "obvious" effects were observed. XXX XXX Actually,
* we just assume that the effects were obvious, for historical reasons.
*/
-static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int typ, int a_rad, int monspell)
+static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int typ, int flg, int monspell)
{
int k = 0;
+ int rlev = 0;
/* Hack -- assume obvious */
bool obvious = TRUE;
bool fuzzy = FALSE;
/* Source monster */
- monster_type *m_ptr;
+ monster_type *m_ptr = NULL;
/* Monster name (for attacks) */
char m_name[80];
/* Hack -- messages */
cptr act = NULL;
+ int get_damage = 0;
+
/* 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 && (rand_int(55) < (p_ptr->lev*3/5+20)) && who && (who != p_ptr->riding))
+ if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && (randint0(55) < (p_ptr->lev*3/5+20)) && who && (who != p_ptr->riding))
{
kawarimi(TRUE);
return FALSE;
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)) && !a_rad && !one_in_(10) && (typ != GF_PSY_SPEAR))
+ 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!");
/* Choose 'new' target */
- do
+ if (who > 0)
{
- t_y = m_list[who].fy - 1 + randint(3);
- t_x = m_list[who].fx - 1 + randint(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), monspell);
+ project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
disturb(1, 0);
return TRUE;
if (blind) fuzzy = TRUE;
- /* Get the source monster */
- m_ptr = &m_list[who];
+ if (who > 0)
+ {
+ /* Get the source monster */
+ m_ptr = &m_list[who];
+ /* Extract the monster level */
+ rlev = (((&r_info[m_ptr->r_idx])->level >= 1) ? (&r_info[m_ptr->r_idx])->level : 1);
- /* Get the monster name */
- monster_desc(m_name, m_ptr, 0);
+ /* Get the monster name */
+ monster_desc(m_name, m_ptr, 0);
+
+ /* Get the monster's real name (gotten before polymorph!) */
+ strcpy(killer, who_name);
+ }
+ else
+ {
+ switch (who)
+ {
+ case PROJECT_WHO_UNCTRL_POWER:
+#ifdef JP
+ strcpy(killer, "À©¸æ¤Ç¤¤Ê¤¤ÎϤÎÈÅή");
+#else
+ strcpy(killer, "uncontrollable power storm");
+#endif
+ break;
- /* Get the monster's real name (gotten before polymorph!) */
- strcpy(killer, who_name);
+ default:
+#ifdef JP
+ strcpy(killer, "æ«");
+#else
+ strcpy(killer, "a trap");
+#endif
+ break;
+ }
+
+ /* Paranoia */
+ strcpy(m_name, killer);
+ }
/* Analyze the damage */
switch (typ)
#else
if (fuzzy) msg_print("You are hit by acid!");
#endif
-
- acid_dam(dam, killer, monspell);
+
+ get_damage = acid_dam(dam, killer, monspell);
break;
}
if (fuzzy) msg_print("You are hit by fire!");
#endif
- fire_dam(dam, killer, monspell);
+ get_damage = fire_dam(dam, killer, monspell);
break;
}
if (fuzzy) msg_print("You are hit by cold!");
#endif
- cold_dam(dam, killer, monspell);
+ get_damage = cold_dam(dam, killer, monspell);
break;
}
if (fuzzy) msg_print("You are hit by lightning!");
#endif
- elec_dam(dam, killer, monspell);
+ get_damage = elec_dam(dam, killer, monspell);
break;
}
/* 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
do_dec_stat(A_CON);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
if (!(double_resist || p_ptr->resist_pois))
{
- set_poisoned(p_ptr->poisoned + rand_int(dam) + 10);
+ set_poisoned(p_ptr->poisoned + randint0(dam) + 10);
}
break;
}
/* 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_pois) dam = (2 * dam + 2) / 5;
if (double_resist) dam = (2 * dam + 2) / 5;
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
if (!(double_resist || p_ptr->resist_pois))
{
- set_poisoned(p_ptr->poisoned + rand_int(dam) + 10);
+ set_poisoned(p_ptr->poisoned + randint0(dam) + 10);
if (one_in_(5)) /* 6 */
{
if (fuzzy) msg_print("You are hit by something!");
#endif
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
dam /= 2;
else if (p_ptr->align < -10)
dam *= 2;
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->align > 10)
dam *= 2;
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
#endif
else if ((inventory[INVEN_RARM].name1 == ART_ZANTETSU) || (inventory[INVEN_LARM].name1 == ART_ZANTETSU))
- {
+ {
#ifdef JP
msg_print("Ìð¤ò»Â¤ê¼Î¤Æ¤¿¡ª");
#else
#endif
break;
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
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
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
if (!p_ptr->resist_sound)
{
- int k = (randint((dam > 40) ? 35 : (dam * 3 / 4 + 5)));
+ int k = (randint1((dam > 40) ? 35 : (dam * 3 / 4 + 5)));
(void)set_stun(p_ptr->stun + k);
}
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);
if (p_ptr->resist_neth)
{
if (!prace_is_(RACE_SPECTRE))
- dam *= 6; dam /= (randint(4) + 7);
- }
- else if (p_ptr->prace != RACE_ANDROID)
- {
- if (p_ptr->hold_life && (rand_int(100) < 75))
- {
-#ifdef JP
-msg_print("¤·¤«¤·¼«¸Ê¤ÎÀ¸Ì¿ÎϤò¼é¤ê¤¤Ã¤¿¡ª");
-#else
- msg_print("You keep hold of your life force!");
-#endif
-
- }
- else if (p_ptr->hold_life)
- {
-#ifdef JP
-msg_print("À¸Ì¿ÎϤ¬¾¯¤·ÂΤ«¤éÈ´¤±Íî¤Á¤¿µ¤¤¬¤¹¤ë¡ª");
-#else
- msg_print("You feel your life slipping away!");
-#endif
-
- lose_exp(200 + (p_ptr->exp / 1000) * MON_DRAIN_LIFE);
- }
- else
- {
-#ifdef JP
-msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
-#else
- msg_print("You feel your life draining away!");
-#endif
-
- lose_exp(200 + (p_ptr->exp / 100) * MON_DRAIN_LIFE);
- }
+ dam *= 6; dam /= (randint1(4) + 7);
}
+ else drain_exp(200 + (p_ptr->exp / 100), 200 + (p_ptr->exp / 1000), 75);
if (prace_is_(RACE_SPECTRE))
{
}
else
{
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
}
break;
if (!p_ptr->resist_sound)
{
- set_stun(p_ptr->stun + randint(40));
+ set_stun(p_ptr->stun + randint1(40));
}
if (!p_ptr->resist_conf)
{
- set_confused(p_ptr->confused + randint(5) + 5);
+ set_confused(p_ptr->confused + randint1(5) + 5);
}
if (one_in_(5))
inven_damage(set_cold_destroy, 3);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->resist_chaos)
{
- dam *= 6; dam /= (randint(4) + 7);
+ dam *= 6; dam /= (randint1(4) + 7);
}
if (!p_ptr->resist_conf)
{
- (void)set_confused(p_ptr->confused + rand_int(20) + 10);
+ (void)set_confused(p_ptr->confused + randint0(20) + 10);
}
if (!p_ptr->resist_chaos)
{
- (void)set_image(p_ptr->image + randint(10));
+ (void)set_image(p_ptr->image + randint1(10));
if (one_in_(3))
{
#ifdef JP
}
if (!p_ptr->resist_neth && !p_ptr->resist_chaos)
{
- if (p_ptr->prace == RACE_ANDROID)
- {
- }
- else if (p_ptr->hold_life && (rand_int(100) < 75))
- {
-#ifdef JP
-msg_print("¤·¤«¤·¼«¸Ê¤ÎÀ¸Ì¿ÎϤò¼é¤ê¤¤Ã¤¿¡ª");
-#else
- msg_print("You keep hold of your life force!");
-#endif
-
- }
- else if (p_ptr->hold_life)
- {
-#ifdef JP
-msg_print("À¸Ì¿ÎϤ¬¾¯¤·ÂΤ«¤éÈ´¤±Íî¤Á¤¿µ¤¤¬¤¹¤ë¡ª");
-#else
- msg_print("You feel your life slipping away!");
-#endif
-
- lose_exp(500 + (p_ptr->exp / 1000) * MON_DRAIN_LIFE);
- }
- else
- {
-#ifdef JP
-msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
-#else
- msg_print("You feel your life draining away!");
-#endif
-
- lose_exp(5000 + (p_ptr->exp / 100) * MON_DRAIN_LIFE);
- }
+ drain_exp(5000 + (p_ptr->exp / 100), 500 + (p_ptr->exp / 1000), 75);
}
if (!p_ptr->resist_chaos || one_in_(9))
{
inven_damage(set_elec_destroy, 2);
inven_damage(set_fire_destroy, 2);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->resist_shard)
{
- dam *= 6; dam /= (randint(4) + 7);
+ dam *= 6; dam /= (randint1(4) + 7);
}
else
{
inven_damage(set_cold_destroy, 2);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->resist_sound)
{
- dam *= 5; dam /= (randint(4) + 7);
+ dam *= 5; dam /= (randint1(4) + 7);
}
else
{
- int k = (randint((dam > 90) ? 35 : (dam / 3 + 5)));
+ int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
(void)set_stun(p_ptr->stun + k);
}
inven_damage(set_cold_destroy, 2);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->resist_conf)
{
- dam *= 5; dam /= (randint(4) + 7);
+ dam *= 5; dam /= (randint1(4) + 7);
}
if (!p_ptr->resist_conf)
{
- (void)set_confused(p_ptr->confused + randint(20) + 10);
+ (void)set_confused(p_ptr->confused + randint1(20) + 10);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
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
if (p_ptr->resist_disen)
{
- dam *= 6; dam /= (randint(4) + 7);
+ dam *= 6; dam /= (randint1(4) + 7);
}
else
{
(void)apply_disenchant(0);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->resist_nexus)
{
- dam *= 6; dam /= (randint(4) + 7);
+ dam *= 6; dam /= (randint1(4) + 7);
}
else
{
apply_nexus(m_ptr);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (!p_ptr->resist_sound)
{
- (void)set_stun(p_ptr->stun + randint(20));
+ (void)set_stun(p_ptr->stun + randint1(20));
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (!p_ptr->resist_sound)
{
- (void)set_stun(p_ptr->stun + randint(20));
+ (void)set_stun(p_ptr->stun + randint1(20));
}
if (p_ptr->resist_shard)
{
inven_damage(set_cold_destroy, 3);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (fuzzy) msg_print("You are hit by something slow!");
#endif
- (void)set_slow(p_ptr->slow + rand_int(4) + 4, FALSE);
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->resist_lite)
{
- dam *= 4; dam /= (randint(4) + 7);
+ dam *= 4; dam /= (randint1(4) + 7);
}
else if (!blind && !p_ptr->resist_blind)
{
- (void)set_blind(p_ptr->blind + randint(5) + 2);
+ (void)set_blind(p_ptr->blind + randint1(5) + 2);
}
if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))
{
dam = dam * 4 / 3;
}
if (p_ptr->wraith_form) dam *= 2;
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
if (p_ptr->wraith_form)
{
if (p_ptr->resist_dark)
{
- dam *= 4; dam /= (randint(4) + 7);
+ dam *= 4; dam /= (randint1(4) + 7);
if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE) || p_ptr->wraith_form) dam = 0;
}
else if (!blind && !p_ptr->resist_blind)
{
- (void)set_blind(p_ptr->blind + randint(5) + 2);
+ (void)set_blind(p_ptr->blind + randint1(5) + 2);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (p_ptr->resist_time)
{
dam *= 4;
- dam /= (randint(4) + 7);
+ dam /= (randint1(4) + 7);
#ifdef JP
msg_print("»þ´Ö¤¬Ä̤ê²á¤®¤Æ¤¤¤¯µ¤¤¬¤¹¤ë¡£");
#else
}
else
{
- switch (randint(10))
+ switch (randint1(10))
{
case 1: case 2: case 3: case 4: case 5:
{
case 6: case 7: case 8: case 9:
{
- switch (randint(6))
+ switch (randint1(6))
{
#ifdef JP
case 1: k = A_STR; act = "¶¯¤¯"; break;
}
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
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.");
teleport_player(5);
if (!p_ptr->ffall)
- (void)set_slow(p_ptr->slow + rand_int(4) + 4, FALSE);
+ (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
if (!(p_ptr->resist_sound || p_ptr->ffall))
{
- int k = (randint((dam > 90) ? 35 : (dam / 3 + 5)));
+ int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5)));
(void)set_stun(p_ptr->stun + k);
}
if (p_ptr->ffall)
inven_damage(set_cold_destroy, 2);
}
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (fuzzy) msg_print("You are hit by pure energy!");
#endif
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
break;
}
if (fuzzy) msg_print("You are hit by something!");
#endif
- (void)set_fast(p_ptr->fast + randint(5), FALSE);
+ (void)set_fast(p_ptr->fast + randint1(5), FALSE);
dam = 0;
break;
}
if (fuzzy) msg_print("You are hit by something slow!");
#endif
- (void)set_slow(p_ptr->slow + rand_int(4) + 4, FALSE);
+ (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
break;
}
case GF_SUPER_RAY:
{
#ifdef JP
-if (fuzzy) msg_print("ËâË¡¤Î¥ª¡¼¥é¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+if (fuzzy) msg_print("ËâË¡¤Î¥ª¡¼¥é¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+#else
+ if (fuzzy) msg_print("You are hit by an aura of magic!");
+#endif
+
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ break;
+ }
+
+ /* Pure damage */
+ case GF_PSY_SPEAR:
+ {
+#ifdef JP
+if (fuzzy) msg_print("¥¨¥Í¥ë¥®¡¼¤Î²ô¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+#else
+ if (fuzzy) msg_print("You are hit by an energy!");
+#endif
+
+ get_damage = take_hit(DAMAGE_FORCE, dam, killer, monspell);
+ break;
+ }
+
+ /* Pure damage */
+ case GF_METEOR:
+ {
+#ifdef JP
+if (fuzzy) msg_print("²¿¤«¤¬¶õ¤«¤é¤¢¤Ê¤¿¤ÎƬ¾å¤ËÍî¤Á¤Æ¤¤¿¡ª");
+#else
+ if (fuzzy) msg_print("Something falls from the sky on you!");
+#endif
+
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ if (!p_ptr->resist_shard || one_in_(13))
+ {
+ if (!p_ptr->immune_fire) inven_damage(set_fire_destroy, 2);
+ inven_damage(set_cold_destroy, 2);
+ }
+
+ break;
+ }
+
+ /* Ice -- cold plus stun plus cuts */
+ case GF_ICE:
+ {
+#ifdef JP
+if (fuzzy) msg_print("²¿¤«±Ô¤¯Î䤿¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+#else
+ if (fuzzy) msg_print("You are hit by something sharp and cold!");
+#endif
+
+ cold_dam(dam, killer, monspell);
+ if (!p_ptr->resist_shard)
+ {
+ (void)set_cut(p_ptr->cut + damroll(5, 8));
+ }
+ if (!p_ptr->resist_sound)
+ {
+ (void)set_stun(p_ptr->stun + randint1(15));
+ }
+
+ if ((!(p_ptr->resist_cold || IS_OPPOSE_COLD())) || one_in_(12))
+ {
+ if (!p_ptr->immune_cold) inven_damage(set_cold_destroy, 3);
+ }
+
+ break;
+ }
+
+ /* Death Ray */
+ case GF_DEATH_RAY:
+ {
+#ifdef JP
+if (fuzzy) msg_print("²¿¤«Èó¾ï¤ËÎ䤿¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+#else
+ if (fuzzy) msg_print("You are hit by something extremely cold!");
+#endif
+
+
+ if (p_ptr->mimic_form)
+ {
+ if (!(mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ }
+ else
+ {
+
+ switch (p_ptr->prace)
+ {
+ /* Some races are immune */
+ case RACE_GOLEM:
+ case RACE_SKELETON:
+ case RACE_ZOMBIE:
+ case RACE_VAMPIRE:
+ case RACE_DEMON:
+ case RACE_SPECTRE:
+ {
+ dam = 0;
+ break;
+ }
+ /* Hurt a lot */
+ default:
+ {
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ break;
+ }
+ }
+ }
+
+ break;
+ }
+
+ /* Mind blast */
+ case GF_MIND_BLAST:
+ {
+ if (randint0(100 + rlev/2) < (MAX(5, p_ptr->skill_sav)))
+ {
+#ifdef JP
+msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
+#else
+ msg_print("You resist the effects!");
+#endif
+ learn_spell(MS_MIND_BLAST);
+ }
+ else
+ {
+#ifdef JP
+msg_print("ÎîŪ¥¨¥Í¥ë¥®¡¼¤ÇÀº¿À¤¬¹¶·â¤µ¤ì¤¿¡£");
+#else
+ msg_print("Your mind is blasted by psyonic energy.");
+#endif
+
+ if (!p_ptr->resist_conf)
+ {
+ (void)set_confused(p_ptr->confused + randint0(4) + 4);
+ }
+
+ if (!p_ptr->resist_chaos && one_in_(3))
+ {
+ (void)set_image(p_ptr->image + randint0(250) + 150);
+ }
+
+ p_ptr->csp -= 50;
+ if (p_ptr->csp < 0)
+ {
+ p_ptr->csp = 0;
+ p_ptr->csp_frac = 0;
+ }
+ p_ptr->redraw |= PR_MANA;
+
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, MS_MIND_BLAST);
+ }
+ break;
+ }
+ /* Brain smash */
+ case GF_BRAIN_SMASH:
+ {
+ if (randint0(100 + rlev/2) < (MAX(5, p_ptr->skill_sav)))
+ {
+#ifdef JP
+msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
+#else
+ msg_print("You resist the effects!");
+#endif
+ learn_spell(MS_BRAIN_SMASH);
+ }
+ else
+ {
+#ifdef JP
+msg_print("ÎîŪ¥¨¥Í¥ë¥®¡¼¤ÇÀº¿À¤¬¹¶·â¤µ¤ì¤¿¡£");
+#else
+ msg_print("Your mind is blasted by psionic energy.");
+#endif
+
+ p_ptr->csp -= 100;
+ if (p_ptr->csp < 0)
+ {
+ p_ptr->csp = 0;
+ p_ptr->csp_frac = 0;
+ }
+ p_ptr->redraw |= PR_MANA;
+
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, MS_BRAIN_SMASH);
+ if (!p_ptr->resist_blind)
+ {
+ (void)set_blind(p_ptr->blind + 8 + randint0(8));
+ }
+ if (!p_ptr->resist_conf)
+ {
+ (void)set_confused(p_ptr->confused + randint0(4) + 4);
+ }
+ if (!p_ptr->free_act)
+ {
+ (void)set_paralyzed(p_ptr->paralyzed + randint0(4) + 4);
+ }
+ (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);
+
+ while (randint0(100 + rlev/2) > (MAX(5, p_ptr->skill_sav)))
+ (void)do_dec_stat(A_INT);
+ while (randint0(100 + rlev/2) > (MAX(5, p_ptr->skill_sav)))
+ (void)do_dec_stat(A_WIS);
+
+ if (!p_ptr->resist_chaos)
+ {
+ (void)set_image(p_ptr->image + randint0(250) + 150);
+ }
+ }
+ break;
+ }
+ /* cause 1 */
+ case GF_CAUSE_1:
+ {
+ if (randint0(100 + rlev/2) < p_ptr->skill_sav)
+ {
+#ifdef JP
+msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
- if (fuzzy) msg_print("You are hit by an aura of magic!");
+ msg_print("You resist the effects!");
#endif
-
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
+ learn_spell(MS_CAUSE_1);
+ }
+ else
+ {
+ curse_equipment(15, 0);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, MS_CAUSE_1);
+ }
break;
}
-
- /* Pure damage */
- case GF_PSY_SPEAR:
+ /* cause 2 */
+ case GF_CAUSE_2:
{
+ if (randint0(100 + rlev/2) < p_ptr->skill_sav)
+ {
#ifdef JP
-if (fuzzy) msg_print("¥¨¥Í¥ë¥®¡¼¤Î²ô¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
- if (fuzzy) msg_print("You are hit by an energy!");
+ msg_print("You resist the effects!");
#endif
-
- take_hit(DAMAGE_FORCE, dam, killer, monspell);
+ learn_spell(MS_CAUSE_2);
+ }
+ else
+ {
+ curse_equipment(25, MIN(rlev/2-15, 5));
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, MS_CAUSE_2);
+ }
break;
}
-
- /* Pure damage */
- case GF_METEOR:
+ /* cause 3 */
+ case GF_CAUSE_3:
{
+ if (randint0(100 + rlev/2) < p_ptr->skill_sav)
+ {
#ifdef JP
-if (fuzzy) msg_print("²¿¤«¤¬¶õ¤«¤é¤¢¤Ê¤¿¤ÎƬ¾å¤ËÍî¤Á¤Æ¤¤¿¡ª");
+msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
- if (fuzzy) msg_print("Something falls from the sky on you!");
+ msg_print("You resist the effects!");
#endif
-
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
- if (!p_ptr->resist_shard || one_in_(13))
+ learn_spell(MS_CAUSE_3);
+ }
+ else
{
- if (!p_ptr->immune_fire) inven_damage(set_fire_destroy, 2);
- inven_damage(set_cold_destroy, 2);
+ curse_equipment(33, MIN(rlev/2-15, 15));
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, MS_CAUSE_3);
}
-
break;
}
-
- /* Ice -- cold plus stun plus cuts */
- case GF_ICE:
+ /* cause 4 */
+ case GF_CAUSE_4:
{
+ if ((randint0(100 + rlev/2) < p_ptr->skill_sav) && !(m_ptr->r_idx == MON_KENSHIROU))
+ {
#ifdef JP
-if (fuzzy) msg_print("²¿¤«±Ô¤¯Î䤿¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+msg_print("¤·¤«¤·È빦¤òÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
- if (fuzzy) msg_print("You are hit by something sharp and cold!");
+ msg_print("You resist the effects!");
#endif
-
- cold_dam(dam, killer, monspell);
- if (!p_ptr->resist_shard)
- {
- (void)set_cut(p_ptr->cut + damroll(5, 8));
- }
- if (!p_ptr->resist_sound)
- {
- (void)set_stun(p_ptr->stun + randint(15));
+ learn_spell(MS_CAUSE_4);
}
-
- if ((!(p_ptr->resist_cold || p_ptr->oppose_cold || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))) || one_in_(12))
+ else
{
- if (!p_ptr->immune_cold) inven_damage(set_cold_destroy, 3);
+ get_damage = take_hit(DAMAGE_ATTACK, dam, killer, MS_CAUSE_4);
+ (void)set_cut(p_ptr->cut + damroll(10, 10));
}
-
break;
}
-
- /* Death Ray */
- case GF_DEATH_RAY:
+ /* Hand of Doom */
+ case GF_HAND_DOOM:
{
+ if (randint0(100 + rlev/2) < p_ptr->skill_sav)
+ {
#ifdef JP
-if (fuzzy) msg_print("²¿¤«Èó¾ï¤ËÎ䤿¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª");
+msg_format("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
#else
- if (fuzzy) msg_print("You are hit by something extremely cold!");
+ msg_format("You resist the effects!");
#endif
+ learn_spell(MS_HAND_DOOM);
-
- if (p_ptr->mimic_form)
- {
- if (!(mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
}
else
{
+#ifdef JP
+msg_print("¤¢¤Ê¤¿¤ÏÌ¿¤¬Çö¤Þ¤Ã¤Æ¤¤¤¯¤è¤¦¤Ë´¶¤¸¤¿¡ª");
+#else
+ msg_print("You feel your life fade away!");
+#endif
- switch (p_ptr->prace)
- {
- /* Some races are immune */
- case RACE_GOLEM:
- case RACE_SKELETON:
- case RACE_ZOMBIE:
- case RACE_VAMPIRE:
- case RACE_DEMON:
- case RACE_SPECTRE:
- {
- dam = 0;
- break;
- }
- /* Hurt a lot */
- default:
- {
- take_hit(DAMAGE_ATTACK, dam, killer, monspell);
- break;
- }
- }
- }
+ get_damage = take_hit(DAMAGE_ATTACK, dam, m_name, MS_HAND_DOOM);
+ curse_equipment(40, 20);
+ if (p_ptr->chp < 1) p_ptr->chp = 1;
+ }
break;
}
-
/* Default */
default:
{
}
}
+ 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, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
+
+ msg_format("The attack of %s has wounded %s!", m_name, m_name_self);
+#endif
+ project(0, 0, m_ptr->fy, m_ptr->fx, get_damage, GF_MISSILE, PROJECT_KILL, -1);
+ set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE);
+ }
+
if (p_ptr->riding && dam > 0)
{
rakubadam_p = (dam > 200) ? 200 : dam;
return (TRUE);
}
+
+/*
+ * Do disintegration effect on the terrain
+ * before we decide the region of the effect.
+ */
+static bool do_disintegration(int by, int bx, int y, int x)
+{
+ byte feat;
+
+ /* Disintegration balls explosions are stopped by perma-walls */
+ if (!in_disintegration_range(by, bx, y, x)) return FALSE;
+
+ /* Destroy mirror/glyph */
+ 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;
+
+ if ((feat < FEAT_PATTERN_START || feat > FEAT_PATTERN_XTRA2) &&
+ (feat < FEAT_DEEP_WATER || feat > FEAT_GRASS))
+ {
+ if (feat == FEAT_TREES || feat == FEAT_FLOWER || feat == FEAT_DEEP_GRASS)
+ cave_set_feat(y, x, FEAT_GRASS);
+ else
+ cave_set_feat(y, x, floor_type[randint0(100)]);
+ }
+
+ /* Update some things -- similar to GF_KILL_WALL */
+ p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
+
+ return TRUE;
+}
+
+
/*
* breath shape
- */
+ */
void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, bool disint_ball, bool real_breath)
{
- int by, bx;
+ int by = y1;
+ int bx = x1;
int brad = 0;
+ int brev = rad * rad / dist;
int bdis = 0;
int cdis;
-
- /* Not done yet */
- bool done = FALSE;
-
- by = y1;
- bx = x1;
-
- while (bdis <= distance(y1, x1, y2, x2) + rad)
+ int path_n = 0;
+ int mdis = distance(y1, x1, y2, x2) + rad;
+
+ while (bdis <= mdis)
{
+ int x, y;
+
+ if ((0 < dist) && (path_n < dist))
+ {
+ int ny = GRID_Y(path_g[path_n]);
+ int nx = GRID_X(path_g[path_n]);
+ int nd = distance(ny, nx, y1, x1);
+
+ /* Get next base point */
+ if (bdis >= nd)
+ {
+ by = ny;
+ bx = nx;
+ path_n++;
+ }
+ }
+
/* Travel from center outward */
for (cdis = 0; cdis <= brad; cdis++)
{
- int y,x;
/* Scan the maximal blast area of radius "cdis" */
for (y = by - cdis; y <= by + cdis; y++)
{
{
/* Ignore "illegal" locations */
if (!in_bounds(y, x)) continue;
-
+
/* Enforce a circular "ripple" */
if (distance(y1, x1, y, x) != bdis) continue;
-
+
/* Enforce an arc */
if (distance(by, bx, y, x) != cdis) continue;
-
+
+
if (disint_ball)
{
- /* Disintegration balls explosions are stopped by perma-walls */
- if (!in_disintegration_range(by, bx, y, x)) continue;
-
- if (real_breath && cave_valid_bold(y, x) &&
- (cave[y][x].feat < FEAT_PATTERN_START ||
- cave[y][x].feat > FEAT_PATTERN_XTRA2) &&
- (cave[y][x].feat < FEAT_DEEP_WATER ||
- cave[y][x].feat > FEAT_GRASS))
+ /* Disintegration are stopped only by perma-walls */
+ if (real_breath)
{
- if (cave[y][x].feat == FEAT_TREES)
- cave_set_feat(y, x, FEAT_GRASS);
- else
- {
- cave[y][x].feat = floor_type[rand_int(100)];
- cave[y][x].info &= ~(CAVE_MASK);
- cave[y][x].info |= CAVE_FLOOR;
- }
+ /* Destroy terrains */
+ if (!do_disintegration(by, bx, y, x)) continue;
+ }
+ else
+ {
+ /* No actual disintegration */
+ if (!in_disintegration_range(by, bx, y, x)) continue;
}
- /* Update some things -- similar to GF_KILL_WALL */
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
}
else
{
/* The blast is stopped by walls */
if (!los(by, bx, y, x)) continue;
}
-
+
/* Save this grid */
gy[*pgrids] = y;
gx[*pgrids] = x;
}
}
}
-
+
/* Encode some more "radius" info */
gm[bdis + 1] = *pgrids;
-
- /* Stop moving */
- if ((by == y2) && (bx == x2)) done = TRUE;
-
- /* Finish */
- if (done)
- {
- bdis++;
- continue;
- }
-
- /* Ripple outwards */
-/* mmove2(&by, &bx, y1, x1, y2, x2); */
-
- by = GRID_Y(path_g[bdis]);
- bx = GRID_X(path_g[bdis]);
-
+
+ /* Increase the size */
+ brad = rad * (path_n + brev) / (dist + brev);
+
/* Find the next ripple */
bdis++;
-
- /* Increase the size */
- brad = (rad * bdis) / dist;
}
-
+
/* Store the effect size */
*pgm_rad = bdis;
}
int y1, x1;
int y2, x2;
+ int by, bx;
int dist_hack = 0;
/* Attacker's name (prepared before polymorph)*/
char who_name[80];
+ /* Initialize by null string */
+ who_name[0] = '\0';
+
rakubadam_p = 0;
rakubadam_m = 0;
monster_target_y=py;
monster_target_x=px;
+ /* Initialize with nul string */
+ who_name[0] = '\0';
+
/* Hack -- Jump to target */
if (flg & (PROJECT_JUMP))
{
{
x1 = m_list[who].fx;
y1 = m_list[who].fy;
- monster_desc(who_name, &m_list[who], 0x88);
+ monster_desc(who_name, &m_list[who], MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
}
/* Oops */
}
}
if(project_o(0,0,y,x,dam,GF_SEEKER))notice=TRUE;
- if( cave[y][x].feat == FEAT_MIRROR )
+ if( is_mirror_grid(&cave[y][x]))
{
/* The target of monsterspell becomes tha mirror(broken) */
- monster_target_y=(s16b)y;
+ monster_target_y=(s16b)y;
monster_target_x=(s16b)x;
- cave_set_feat( y, x , FEAT_FLOOR );
- next_mirror( &oy,&ox );
+ remove_mirror(y,x);
+ next_mirror( &oy,&ox,y,x );
path_n = i+project_path(&(path_g[i+1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
for( j = last_i; j <=i ; j++ )
monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
/* Hack -- auto-recall */
- if (m_ptr->ml) monster_race_track((bool)(m_ptr->mflag2 & MFLAG_KAGE), m_ptr->r_idx);
+ if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx);
/* Hack - auto-track */
if (m_ptr->ml) health_track(cave[project_m_y][project_m_x].m_idx);
monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
/* Hack -- auto-recall */
- if (m_ptr->ml) monster_race_track((bool)(m_ptr->mflag2 & MFLAG_KAGE), m_ptr->r_idx);
+ if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx);
/* Hack - auto-track */
if (m_ptr->ml) health_track(cave[project_m_y][project_m_x].m_idx);
cave[y][x].feat == FEAT_DOOR_TAIL ||
(cave[y][x].feat >= FEAT_WALL_EXTRA &&
cave[y][x].feat <= FEAT_PERM_SOLID ))
- {
+ {
if( second_step )continue;
break;
}
- if( cave[y][x].feat == FEAT_MIRROR && !second_step )
+ if( is_mirror_grid(&cave[y][x]) && !second_step )
{
/* The target of monsterspell becomes tha mirror(broken) */
- monster_target_y=(s16b)y;
+ monster_target_y=(s16b)y;
monster_target_x=(s16b)x;
- cave_set_feat( y, x , FEAT_FLOOR );
+ remove_mirror(y,x);
for( j = 0; j <=i ; j++ )
{
y = GRID_Y(path_g[j]);
monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
/* Hack -- auto-recall */
- if (m_ptr->ml) monster_race_track((bool)(m_ptr->mflag2 & MFLAG_KAGE), m_ptr->r_idx);
+ if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx);
/* Hack - auto-track */
if (m_ptr->ml) health_track(cave[project_m_y][project_m_x].m_idx);
}
/* Only do visuals if requested */
- if (!blind && !(flg & (PROJECT_HIDE)))
+ 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" */
- y2 = y;
- x2 = x;
+ by = y;
+ bx = x;
- if (breath && (y1 == y2) && (x1 == x2))
+ if (breath && !path_n)
{
breath = FALSE;
- gm_rad = 1;
+ gm_rad = rad;
if (!old_hide)
{
flg &= ~(PROJECT_HIDE);
{
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 balls explosions are stopped by perma-walls */
- if (!in_disintegration_range(y2, x2, y, x)) continue;
-
- if (cave_valid_bold(y, x) &&
- (cave[y][x].feat < FEAT_PATTERN_START ||
- cave[y][x].feat > FEAT_PATTERN_XTRA2) &&
- (cave[y][x].feat < FEAT_DEEP_WATER ||
- cave[y][x].feat > FEAT_GRASS))
- {
- if (cave[y][x].feat == FEAT_TREES)
- cave_set_feat(y, x, FEAT_GRASS);
- else
- {
- cave[y][x].feat = floor_type[rand_int(100)];
- cave[y][x].info &= ~(CAVE_MASK);
- cave[y][x].info |= CAVE_FLOOR;
- }
- }
-
- /* Update some things -- similar to GF_KILL_WALL */
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
+ /* Disintegration are stopped only by perma-walls */
+ 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_NO_REF) && (!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;
/* Choose 'new' target */
do
{
- t_y = y_saver - 1 + randint(3);
- t_x = x_saver - 1 + randint(3);
+ t_y = y_saver - 1 + randint1(3);
+ 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;
}
- 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);
+ /* Reflected bolts randomly target either one */
+ 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);
+
+ /* 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 (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE | PROJECT_AIMED))
+ {
+ /*
+ * 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++;
+ }
+ }
+
+ /*
+ * This grid is the original target.
+ * Or aimed on your horse.
+ */
+ else if (((y == y2) && (x == x2)) || (flg & PROJECT_AIMED))
+ {
+ /* 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 ((y == y2) && (x == x2) && (y == py) && (x == px) && (flg & PROJECT_PLAYER))
+ if (one_in_(2))
+ {
+ /* Hit the mount with full damage */
+ }
+ else
{
+ /* Hit the player later */
+ flg |= PROJECT_PLAYER;
+
+ /* Don't affect the mount */
+ continue;
}
- else if (project_m(who, dist, y, x, dam, typ,flg)) notice = TRUE;
+ }
+
+ /*
+ * 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)
{
monster_type *m_ptr = &m_list[cave[y][x].m_idx];
/* Hack -- auto-recall */
- if (m_ptr->ml) monster_race_track((bool)(m_ptr->mflag2 & MFLAG_KAGE), m_ptr->r_idx);
+ if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx);
/* Hack - auto-track */
if (m_ptr->ml) health_track(cave[y][x].m_idx);
/* 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, rad, monspell)) notice = TRUE;
- }
- else if (project_p(who, who_name, d, y, x, dam, typ, rad, 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, rad, 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.
+ *
+ * Or aimed on your horse.
+ */
+ else if (flg & (PROJECT_BEAM | PROJECT_REFLECTABLE | PROJECT_AIMED))
+ {
+ /*
+ * 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, rad, monspell)) notice = TRUE;
}
+
+ /* Affect the player */
+ if (project_p(who, who_name, effective_dist, y, x, dam, typ, flg, monspell)) notice = TRUE;
}
}
{
for( y=0 ; y < cur_hgt ; y++ )
{
- if( cave[y][x].feat == FEAT_MIRROR &&
+ if( is_mirror_grid(&cave[y][x]) &&
distance(py,px,y,x) <= MAX_RANGE &&
distance(py,px,y,x) != 0 &&
player_has_los_bold(y,x)
if( mirror_num < 2 )return FALSE;
- point_x[0] = rand_int( mirror_num );
+ point_x[0] = randint0( mirror_num );
do {
- point_x[1] = rand_int( mirror_num );
+ point_x[1] = randint0( mirror_num );
}
while( point_x[0] == point_x[1] );
{
if( player_has_los_bold(y,x) ){
(void)project_m(0,0,y,x,dam,GF_MANA,
- (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP|PROJECT_NO_REF));
+ (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP));
}
}
}
#else
msg_print("The field broke a mirror");
#endif
- cave_set_feat( point_y[0] , point_x[0] , FEAT_FLOOR );
+ remove_mirror(point_y[0],point_x[0]);
}
return TRUE;
{
for( y = 0 ; y < cur_hgt ; y++ )
{
- if( cave[y][x].feat == FEAT_MIRROR )
+ if( is_mirror_grid(&cave[y][x]))
{
if(project_m(0,0,y,x,dam,GF_GENOCIDE,
- (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP|PROJECT_NO_REF)))
+ (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP)))
{
if( !cave[y][x].m_idx )
{
- cave_set_feat( y,x, FEAT_FLOOR );
+ remove_mirror(y,x);
}
}
}
OSDN Git Service
