/* File: mspells1.c */
-/* Purpose: Monster spells (attack player) */
-
/*
- * 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.
*/
-#include "angband.h"
+/* Purpose: Monster spells (attack player) */
+#include "angband.h"
-#ifdef DRS_SMART_OPTIONS
/*
* And now for Intelligent monster attacks (including spells).
if (smart_learn)
{
/* Hack -- Occasionally forget player status */
- if (m_ptr->smart && (randint0(100) < 1)) m_ptr->smart = 0L;
+ /* Only save SM_FRIENDLY, SM_PET or SM_CLONED */
+ if (m_ptr->smart && (randint0(100) < 1)) m_ptr->smart &= (SM_FRIENDLY | SM_PET | SM_CLONED);
/* Use the memorized flags */
smart = m_ptr->smart;
{
/* Know basic info */
if (p_ptr->resist_acid) smart |= (SM_RES_ACID);
- if (p_ptr->oppose_acid) smart |= (SM_OPP_ACID);
+ if (IS_OPPOSE_ACID()) smart |= (SM_OPP_ACID);
if (p_ptr->immune_acid) smart |= (SM_IMM_ACID);
if (p_ptr->resist_elec) smart |= (SM_RES_ELEC);
- if (p_ptr->oppose_elec) smart |= (SM_OPP_ELEC);
+ if (IS_OPPOSE_ELEC()) smart |= (SM_OPP_ELEC);
if (p_ptr->immune_elec) smart |= (SM_IMM_ELEC);
if (p_ptr->resist_fire) smart |= (SM_RES_FIRE);
- if (p_ptr->oppose_fire) smart |= (SM_OPP_FIRE);
+ if (IS_OPPOSE_FIRE()) smart |= (SM_OPP_FIRE);
if (p_ptr->immune_fire) smart |= (SM_IMM_FIRE);
if (p_ptr->resist_cold) smart |= (SM_RES_COLD);
- if (p_ptr->oppose_cold) smart |= (SM_OPP_COLD);
+ if (IS_OPPOSE_COLD()) smart |= (SM_OPP_COLD);
if (p_ptr->immune_cold) smart |= (SM_IMM_COLD);
/* Know poison info */
if (p_ptr->resist_pois) smart |= (SM_RES_POIS);
- if (p_ptr->oppose_pois) smart |= (SM_OPP_POIS);
+ if (IS_OPPOSE_POIS()) smart |= (SM_OPP_POIS);
/* Know special resistances */
if (p_ptr->resist_neth) smart |= (SM_RES_NETH);
(*f6p) = f6;
}
-#endif /* DRS_SMART_OPTIONS */
-
/*
* Determine if there is a space near the player in which
/* Only check a circular area */
if (distance(y1, x1, y, x)>2) continue;
-#if 0
- /* Hack: no summon on glyph of warding */
- if (cave[y][x].feat == FEAT_GLYPH) continue;
- if (cave[y][x].feat == FEAT_MINOR_GLYPH) continue;
-#endif
-
/* ...nor on the Pattern */
- if ((cave[y][x].feat >= FEAT_PATTERN_START)
- && (cave[y][x].feat <= FEAT_PATTERN_XTRA2)) continue;
+ if (pattern_tile(y, x)) continue;
- /* Require empty floor grid in line of sight */
- if ((cave_empty_bold(y, x) || (cave[y][x].feat == FEAT_TREES)) && los(y1, x1, y, x) && los(y, x, y1, x1)) return (TRUE);
+ /* Require empty floor grid in line of projection */
+ if (cave_empty_bold(y, x) && projectable(y1, x1, y, x) && projectable(y, x, y1, x1)) return (TRUE);
}
}
}
-static bool raise_possible(int y, int x)
+bool raise_possible(monster_type *m_ptr)
{
int xx, yy;
+ int y = m_ptr->fy;
+ int x = m_ptr->fx;
s16b this_o_idx, next_o_idx = 0;
cave_type *c_ptr;
{
if (distance(y, x, yy, xx) > 5) continue;
if (!los(y, x, yy, xx)) continue;
+ if (!projectable(y, x, yy, xx)) continue;
c_ptr = &cave[yy][xx];
/* Scan the pile of objects */
/* Known to be worthless? */
if (o_ptr->tval == TV_CORPSE)
- return TRUE;
+ {
+ if (!monster_has_hostile_align(m_ptr, 0, 0, &r_info[o_ptr->pval])) return TRUE;
+ }
}
}
}
}
}
/* Pets may not shoot through the character - TNB */
- if ((y == py) && (x == px))
+ if (player_bold(y, x))
{
if (friend) return (FALSE);
}
*/
static void bolt(int m_idx, int typ, int dam_hp, int monspell, bool learnable)
{
- int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_PLAYER;
+ int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_PLAYER | PROJECT_REFLECTABLE;
/* Target the player with a bolt attack */
(void)project(m_idx, 0, py, px, dam_hp, typ, flg, (learnable ? monspell : -1));
static void beam(int m_idx, int typ, int dam_hp, int monspell, bool learnable)
{
- int flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_THRU | PROJECT_PLAYER | PROJECT_NO_REF;
+ int flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_THRU | PROJECT_PLAYER;
/* Target the player with a bolt attack */
(void)project(m_idx, 0, py, px, dam_hp, typ, flg, (learnable ? monspell : -1));
/* Handle breath attacks */
if (breath) rad = 0 - rad;
- if (typ == GF_ROCKET) flg |= PROJECT_STOP;
+ switch (typ)
+ {
+ case GF_ROCKET:
+ flg |= PROJECT_STOP;
+ break;
+ case GF_DRAIN_MANA:
+ case GF_MIND_BLAST:
+ case GF_BRAIN_SMASH:
+ case GF_CAUSE_1:
+ case GF_CAUSE_2:
+ case GF_CAUSE_3:
+ case GF_CAUSE_4:
+ case GF_HAND_DOOM:
+ flg |= (PROJECT_HIDE | PROJECT_AIMED);
+ break;
+ }
/* Target the player with a ball attack */
(void)project(m_idx, rad, y, x, dam_hp, typ, flg, (learnable ? monspell : -1));
{
if (!(new_curse & TRC_HEAVY_MASK)) continue;
}
+ else if (power == 1)
+ {
+ if (new_curse & TRC_SPECIAL_MASK) continue;
+ }
else if (power == 0)
{
if (new_curse & TRC_HEAVY_MASK) continue;
}
- if (((o_ptr->tval < TV_BOW) || (o_ptr->tval > TV_SWORD)) && (new_curse == TRC_LOW_MELEE)) continue;
- if (((o_ptr->tval < TV_BOOTS) || (o_ptr->tval > TV_DRAG_ARMOR)) && (new_curse == TRC_LOW_AC)) continue;
+ if (((o_ptr->tval < TV_WEAPON_BEGIN) || (o_ptr->tval > TV_WEAPON_END)) && (new_curse == TRC_LOW_MELEE)) continue;
+ if (((o_ptr->tval < TV_ARMOR_BEGIN) || (o_ptr->tval > TV_ARMOR_END)) && (new_curse == TRC_LOW_AC)) continue;
break;
}
return new_curse;
bool changed = FALSE;
int curse_power = 0;
u32b new_curse;
- u32b o1, o2, o3;
+ u32b oflgs[TR_FLAG_SIZE];
object_type *o_ptr = &inventory[INVEN_RARM + randint0(12)];
char o_name[MAX_NLEN];
if (!o_ptr->k_idx) return;
- object_flags(o_ptr, &o1, &o2, &o3);
+ object_flags(o_ptr, oflgs);
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Extra, biased saving throw for blessed items */
- if ((o3 & TR3_BLESSED) && (randint1(888) > chance))
+ if (have_flag(oflgs, TR_BLESSED) && (randint1(888) > chance))
{
#ifdef JP
msg_format("%s¤Ï¼ö¤¤¤òÄ·¤ÍÊÖ¤·¤¿¡ª", o_name,
changed = TRUE;
o_ptr->curse_flags |= TRC_CURSED;
}
- if (heavy_chance >= 50) curse_power = 2;
+ if (heavy_chance >= 50) curse_power++;
new_curse = get_curse(curse_power, o_ptr);
if (!(o_ptr->curse_flags & new_curse))
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
- /* Invulnabilty */
- if (p_ptr->invuln) return (TRUE);
+ /* Invulnabilty (including the song) */
+ if (IS_INVULN()) return (TRUE);
/* Wraith form */
if (p_ptr->wraith_form) return (TRUE);
/* Berserk Strength */
if (p_ptr->shero && (p_ptr->pclass != CLASS_BERSERKER)) return (TRUE);
- /* Invulnability song */
- if (music_singing(MUSIC_INVULN)) return (TRUE);
-
/* Demon Lord */
if (p_ptr->mimic_form == MIMIC_DEMON_LORD) return (TRUE);
/* Elemental resistances */
if (r_ptr->flags4 & RF4_BR_ACID)
{
- if (!p_ptr->immune_acid && p_ptr->oppose_acid) return (TRUE);
-
+ if (!p_ptr->immune_acid && (p_ptr->oppose_acid || music_singing(MUSIC_RESIST))) return (TRUE);
if (p_ptr->special_defense & DEFENSE_ACID) return (TRUE);
}
{
if (!((p_ptr->prace == RACE_DEMON) && p_ptr->lev > 44))
{
- if(!p_ptr->immune_fire && p_ptr->oppose_fire) return (TRUE);
-
- if(p_ptr->special_defense & DEFENSE_FIRE) return(TRUE);
+ if (!p_ptr->immune_fire && (p_ptr->oppose_fire || music_singing(MUSIC_RESIST))) return (TRUE);
+ if (p_ptr->special_defense & DEFENSE_FIRE) return (TRUE);
}
}
if (r_ptr->flags4 & RF4_BR_ELEC)
{
- if (!p_ptr->immune_elec && p_ptr->oppose_elec) return (TRUE);
-
+ if (!p_ptr->immune_elec && (p_ptr->oppose_elec || music_singing(MUSIC_RESIST))) return (TRUE);
if (p_ptr->special_defense & DEFENSE_ELEC) return (TRUE);
}
if (r_ptr->flags4 & RF4_BR_COLD)
{
- if (!p_ptr->immune_cold && p_ptr->oppose_cold) return (TRUE);
-
+ if (!p_ptr->immune_cold && (p_ptr->oppose_cold || music_singing(MUSIC_RESIST))) return (TRUE);
if (p_ptr->special_defense & DEFENSE_COLD) return (TRUE);
}
{
if (!((p_ptr->pclass == CLASS_NINJA) && p_ptr->lev > 44))
{
- if (p_ptr->oppose_pois) return (TRUE);
-
+ if (p_ptr->oppose_pois || music_singing(MUSIC_RESIST)) return (TRUE);
if (p_ptr->special_defense & DEFENSE_POIS) return (TRUE);
}
}
- /* Elemental resist music */
- if (music_singing(MUSIC_RESIST))
- {
- if (r_ptr->flags4 & (RF4_BR_ACID | RF4_BR_FIRE | RF4_BR_ELEC | RF4_BR_COLD | RF4_BR_POIS)) return (TRUE);
- }
-
/* Ultimate resistance */
if (p_ptr->ult_res) return (TRUE);
if (p_ptr->tsuyoshi) return (TRUE);
/* Elemental Brands */
- if ((p_ptr->special_attack & ATTACK_ACID) && !(r_ptr->flags3 & RF3_IM_ACID)) return (TRUE);
- if ((p_ptr->special_attack & ATTACK_FIRE) && !(r_ptr->flags3 & RF3_IM_FIRE)) return (TRUE);
- if ((p_ptr->special_attack & ATTACK_ELEC) && !(r_ptr->flags3 & RF3_IM_ELEC)) return (TRUE);
- if ((p_ptr->special_attack & ATTACK_COLD) && !(r_ptr->flags3 & RF3_IM_COLD)) return (TRUE);
- if ((p_ptr->special_attack & ATTACK_POIS) && !(r_ptr->flags3 & RF3_IM_POIS)) return (TRUE);
+ if ((p_ptr->special_attack & ATTACK_ACID) && !(r_ptr->flagsr & RFR_EFF_IM_ACID_MASK)) return (TRUE);
+ if ((p_ptr->special_attack & ATTACK_FIRE) && !(r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)) return (TRUE);
+ if ((p_ptr->special_attack & ATTACK_ELEC) && !(r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK)) return (TRUE);
+ if ((p_ptr->special_attack & ATTACK_COLD) && !(r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)) return (TRUE);
+ if ((p_ptr->special_attack & ATTACK_POIS) && !(r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)) return (TRUE);
/* Speed */
if (p_ptr->pspeed < 145)
{
- if (p_ptr->fast) return (TRUE);
-
- if (music_singing(MUSIC_SPEED)) return (TRUE);
-
- if (music_singing(MUSIC_SHERO)) return (TRUE);
+ if (IS_FAST()) return (TRUE);
}
/* Light speed */
byte summon[96], summon_num = 0;
byte tactic[96], tactic_num = 0;
byte annoy[96], annoy_num = 0;
- byte invul[96], invul_num = 0;
+ byte invul[96], invul_num = 0;
byte haste[96], haste_num = 0;
byte world[96], world_num = 0;
byte special[96], special_num = 0;
if (special_num)
{
bool success = FALSE;
- switch(m_ptr->r_idx)
+ switch (m_ptr->r_idx)
{
case MON_OHMU:
- if (randint0(100) < 50) success = TRUE;
+ case MON_BANOR:
+ case MON_LUPART:
break;
case MON_BANORLUPART:
if (randint0(100) < 70) success = TRUE;
break;
- default: break;
+ case MON_ROLENTO:
+ if (randint0(100) < 40) success = TRUE;
+ break;
+ default:
+ if (randint0(100) < 50) success = TRUE;
+ break;
}
if (success) return (special[randint0(special_num)]);
}
}
/* Raise-dead if possible (sometimes) */
- if (raise_num && (randint0(100) < 40) && raise_possible(m_ptr->fy, m_ptr->fx))
+ if (raise_num && (randint0(100) < 40))
{
/* Choose raise-dead spell */
return (raise[randint0(raise_num)]);
}
/* Attack spell (most of the time) */
- if (p_ptr->invuln)
+ if (IS_INVULN())
{
if (psy_spe_num && (randint0(100) < 50))
{
/*
+ * Return TRUE if a spell is inate spell.
+ */
+bool spell_is_inate(u16b spell)
+{
+ if (spell < 32 * 4) /* Set RF4 */
+ {
+ if ((1L << (spell - 32 * 3)) & RF4_NOMAGIC_MASK) return TRUE;
+ }
+ else if (spell < 32 * 5) /* Set RF5 */
+ {
+ if ((1L << (spell - 32 * 4)) & RF5_NOMAGIC_MASK) return TRUE;
+ }
+ else if (spell < 32 * 6) /* Set RF6 */
+ {
+ if ((1L << (spell - 32 * 5)) & RF6_NOMAGIC_MASK) return TRUE;
+ }
+
+ /* This spell is not "inate" */
+ return FALSE;
+}
+
+
+/*
* Creatures can cast spells, shoot missiles, and breathe.
*
* Returns "TRUE" if a spell (or whatever) was (successfully) cast.
*/
bool make_attack_spell(int m_idx)
{
- int k, chance, thrown_spell = 0, rlev, failrate;
+ int k, thrown_spell = 0, rlev, failrate;
byte spell[96], num = 0;
u32b f4, f5, f6;
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
char m_name[80];
+#ifndef JP
char m_poss[80];
- char ddesc[80];
+#endif
bool no_inate = FALSE;
bool do_disi = FALSE;
int dam = 0;
+ u32b mode = 0L;
int s_num_6 = (easy_band ? 2 : 6);
int s_num_4 = (easy_band ? 1 : 4);
bool maneable = player_has_los_bold(m_ptr->fy, m_ptr->fx);
bool learnable = (seen && maneable && !world_monster);
- /* Assume "normal" target */
- bool normal = TRUE;
+ /* Check "projectable" */
+ bool direct;
- /* Assume "projectable" */
- bool direct = TRUE;
+ bool in_no_magic_dungeon = (d_info[dungeon_type].flags1 & DF1_NO_MAGIC) && dun_level
+ && (!p_ptr->inside_quest || is_fixed_quest_idx(p_ptr->inside_quest));
/* Cannot cast spells when confused */
if (m_ptr->confused)
if (m_ptr->mflag & MFLAG_NICE) return (FALSE);
if (!is_hostile(m_ptr)) return (FALSE);
- /* Hack -- Extract the spell probability */
- chance = (r_ptr->freq_inate + r_ptr->freq_spell) / 2;
-
- /* Not allowed to cast spells */
- if (!chance) return (FALSE);
-
-
- if (stupid_monsters)
- {
- /* Only do spells occasionally */
- if (randint0(100) >= chance) return (FALSE);
- }
- else
- {
- if (randint0(100) >= chance) return (FALSE);
- /* Sometimes forbid inate attacks (breaths) */
- if (randint0(100) >= (chance * 2)) no_inate = TRUE;
- }
+ /* Sometimes forbid inate attacks (breaths) */
+ if (randint0(100) >= (r_ptr->freq_spell * 2)) no_inate = TRUE;
/* XXX XXX XXX Handle "track_target" option (?) */
f5 = r_ptr->flags5;
f6 = r_ptr->flags6;
- /* Hack -- require projectable player */
- if (normal)
+ /*** require projectable player ***/
+
+ /* Check range */
+ if ((m_ptr->cdis > MAX_RANGE) && !m_ptr->target_y) return (FALSE);
+
+ /* Check path */
+ if (projectable(m_ptr->fy, m_ptr->fx, y, x))
+ {
+ /* Breath disintegration to the glyph if possible */
+ if (!have_flag(f_flags_bold(y, x), FF_PROJECT) && (f4 & RF4_BR_DISI) && one_in_(2)) do_disi = TRUE;
+ }
+
+ /* Check path to next grid */
+ else
{
- /* Check range */
- if ((m_ptr->cdis > MAX_RANGE) && !m_ptr->target_y) return (FALSE);
+ bool success = FALSE;
- /* Check path */
- if (projectable(m_ptr->fy, m_ptr->fx, y, x))
+ if ((f4 & RF4_BR_DISI) &&
+ (m_ptr->cdis < MAX_RANGE/2) &&
+ in_disintegration_range(m_ptr->fy, m_ptr->fx, y, x) &&
+ (one_in_(10) || (projectable(y, x, m_ptr->fy, m_ptr->fx) && one_in_(2))))
{
- /* Breath disintegration to the glyph */
- if ((!cave_floor_bold(y,x)) && (r_ptr->flags4 & RF4_BR_DISI) && one_in_(2)) do_disi = TRUE;
+ do_disi = TRUE;
+ success = TRUE;
}
-
- /* Check path to next grid */
else
{
- bool success = FALSE;
-
- if ((r_ptr->flags4 & RF4_BR_DISI) &&
- (m_ptr->cdis < MAX_RANGE/2) &&
- in_disintegration_range(m_ptr->fy, m_ptr->fx, y, x) &&
- (one_in_(10) || (projectable(y, x, m_ptr->fy, m_ptr->fx) && one_in_(2))))
- {
- do_disi = TRUE;
- success = TRUE;
- }
- else
+ int i;
+ int tonari;
+ int tonari_y[4][8] = {{-1,-1,-1,0,0,1,1,1},
+ {-1,-1,-1,0,0,1,1,1},
+ {1,1,1,0,0,-1,-1,-1},
+ {1,1,1,0,0,-1,-1,-1}};
+ int tonari_x[4][8] = {{-1,0,1,-1,1,-1,0,1},
+ {1,0,-1,1,-1,1,0,-1},
+ {-1,0,1,-1,1,-1,0,1},
+ {1,0,-1,1,-1,1,0,-1}};
+
+ if (m_ptr->fy < py && m_ptr->fx < px) tonari = 0;
+ else if (m_ptr->fy < py) tonari = 1;
+ else if (m_ptr->fx < px) tonari = 2;
+ else tonari = 3;
+
+ for (i = 0; i < 8; i++)
{
- int i;
- int tonari;
- int tonari_y[4][8] = {{-1,-1,-1,0,0,1,1,1},
- {-1,-1,-1,0,0,1,1,1},
- {1,1,1,0,0,-1,-1,-1},
- {1,1,1,0,0,-1,-1,-1}};
- int tonari_x[4][8] = {{-1,0,1,-1,1,-1,0,1},
- {1,0,-1,1,-1,1,0,-1},
- {-1,0,1,-1,1,-1,0,1},
- {1,0,-1,1,-1,1,0,-1}};
-
- if (m_ptr->fy < py && m_ptr->fx < px) tonari = 0;
- else if (m_ptr->fy < py) tonari = 1;
- else if (m_ptr->fx < px) tonari = 2;
- else tonari = 3;
-
- for (i = 0; i < 8; i++)
- {
- int next_x = x + tonari_x[tonari][i];
- int next_y = y + tonari_y[tonari][i];
- cave_type *c_ptr;
-
- /* Access the next grid */
- c_ptr = &cave[next_y][next_x];
+ int next_x = x + tonari_x[tonari][i];
+ int next_y = y + tonari_y[tonari][i];
+ cave_type *c_ptr;
- /* Skip door, rubble, wall */
- if ((c_ptr->feat >= FEAT_DOOR_HEAD) && (c_ptr->feat <= FEAT_PERM_SOLID)) continue;
+ /* Access the next grid */
+ c_ptr = &cave[next_y][next_x];
- /* Skip tree */
- if (c_ptr->feat == FEAT_TREES) continue;
-
- /* Skip mountain */
- if (c_ptr->feat == FEAT_MOUNTAIN) continue;
-
- if (projectable(m_ptr->fy, m_ptr->fx, next_y, next_x))
- {
- y = next_y;
- x = next_x;
- success = TRUE;
- break;
- }
- }
- }
+ /* Skip door, rubble, wall, tree, mountain, etc. */
+ if (!have_flag(f_flags_grid(c_ptr), FF_PROJECT)) continue;
- if (!success)
- {
- if (m_ptr->target_y && m_ptr->target_x)
+ if (projectable(m_ptr->fy, m_ptr->fx, next_y, next_x))
{
- y = m_ptr->target_y;
- x = m_ptr->target_x;
- f4 &= (RF4_INDIRECT_MASK);
- f5 &= (RF5_INDIRECT_MASK);
- f6 &= (RF6_INDIRECT_MASK);
+ y = next_y;
+ x = next_x;
success = TRUE;
+ break;
}
}
+ }
- /* No spells */
- if (!success) return FALSE;
+ if (!success)
+ {
+ if (m_ptr->target_y && m_ptr->target_x)
+ {
+ y = m_ptr->target_y;
+ x = m_ptr->target_x;
+ f4 &= (RF4_INDIRECT_MASK);
+ f5 &= (RF5_INDIRECT_MASK);
+ f6 &= (RF6_INDIRECT_MASK);
+ success = TRUE;
+ }
}
+
+ /* No spells */
+ if (!success) return FALSE;
}
reset_target(m_ptr);
/* Extract the monster level */
rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
- if (!stupid_monsters)
+ /* Forbid inate attacks sometimes */
+ if (no_inate)
{
- /* Forbid inate attacks sometimes */
- if (no_inate) f4 &= 0x500000FF;
+ f4 &= ~(RF4_NOMAGIC_MASK);
+ f5 &= ~(RF5_NOMAGIC_MASK);
+ f6 &= ~(RF6_NOMAGIC_MASK);
}
if (!p_ptr->csp)
{
f5 &= ~(RF5_DRAIN_MANA);
}
- if ((p_ptr->pclass == CLASS_NINJA) && (r_ptr->flags3 & (RF3_UNDEAD | RF3_HURT_LITE)))
+
+ if ((p_ptr->pclass == CLASS_NINJA) &&
+ ((r_ptr->flags3 & (RF3_UNDEAD | RF3_HURT_LITE)) ||
+ (r_ptr->flags7 & RF7_DARK_MASK)))
{
f6 &= ~(RF6_DARKNESS);
}
- if (dun_level && (!p_ptr->inside_quest || (p_ptr->inside_quest < MIN_RANDOM_QUEST)) && (d_info[dungeon_type].flags1 & DF1_NO_MAGIC))
+ if (in_no_magic_dungeon && !(r_ptr->flags2 & RF2_STUPID))
{
f4 &= (RF4_NOMAGIC_MASK);
f5 &= (RF5_NOMAGIC_MASK);
f6 &= (RF6_NOMAGIC_MASK);
}
- /* Hack -- allow "desperate" spells */
- if ((r_ptr->flags2 & (RF2_SMART)) &&
- (m_ptr->hp < m_ptr->maxhp / 10) &&
- (randint0(100) < 50))
+ if (r_ptr->flags2 & RF2_SMART)
{
- /* Require intelligent spells */
- f4 &= (RF4_INT_MASK);
- f5 &= (RF5_INT_MASK);
- f6 &= (RF6_INT_MASK);
+ /* Hack -- allow "desperate" spells */
+ if ((m_ptr->hp < m_ptr->maxhp / 10) &&
+ (randint0(100) < 50))
+ {
+ /* Require intelligent spells */
+ f4 &= (RF4_INT_MASK);
+ f5 &= (RF5_INT_MASK);
+ f6 &= (RF6_INT_MASK);
+ }
- /* No spells left */
- if (!f4 && !f5 && !f6) return (FALSE);
+ /* Hack -- decline "teleport level" in some case */
+ if ((f6 & RF6_TELE_LEVEL) && TELE_LEVEL_IS_INEFF(0))
+ {
+ f6 &= ~(RF6_TELE_LEVEL);
+ }
}
+ /* No spells left */
+ if (!f4 && !f5 && !f6) return (FALSE);
+
/* Remove the "ineffective" spells */
remove_bad_spells(m_idx, &f4, &f5, &f6);
- if (p_ptr->inside_arena)
+ if (p_ptr->inside_arena || p_ptr->inside_battle)
{
f4 &= ~(RF4_SUMMON_MASK);
f5 &= ~(RF5_SUMMON_MASK);
- f6 &= ~(RF6_SUMMON_MASK);
+ f6 &= ~(RF6_SUMMON_MASK | RF6_TELE_LEVEL);
+
+ if (m_ptr->r_idx == MON_ROLENTO) f6 &= ~(RF6_SPECIAL);
}
/* No spells left */
if (!f4 && !f5 && !f6) return (FALSE);
- if (!stupid_monsters)
+ if (!(r_ptr->flags2 & RF2_STUPID))
{
/* Check for a clean bolt shot */
if (((f4 & RF4_BOLT_MASK) ||
(f5 & RF5_BOLT_MASK) ||
(f6 & RF6_BOLT_MASK)) &&
- !(r_ptr->flags2 & RF2_STUPID) &&
- !clean_shot(m_ptr->fy, m_ptr->fx, py, px, FALSE))
+ !clean_shot(m_ptr->fy, m_ptr->fx, py, px, FALSE))
{
/* Remove spells that will only hurt friends */
f4 &= ~(RF4_BOLT_MASK);
if (((f4 & RF4_SUMMON_MASK) ||
(f5 & RF5_SUMMON_MASK) ||
(f6 & RF6_SUMMON_MASK)) &&
- !(r_ptr->flags2 & RF2_STUPID) &&
- !(summon_possible(y, x)))
+ !(summon_possible(y, x)))
{
/* Remove summoning spells */
f4 &= ~(RF4_SUMMON_MASK);
f6 &= ~(RF6_SUMMON_MASK);
}
+ /* Check for a possible raise dead */
+ if ((f6 & RF6_RAISE_DEAD) && !raise_possible(m_ptr))
+ {
+ /* Remove raise dead spell */
+ f6 &= ~(RF6_RAISE_DEAD);
+ }
+
+ /* Special moves restriction */
+ if (f6 & RF6_SPECIAL)
+ {
+ if ((m_ptr->r_idx == MON_ROLENTO) && !summon_possible(y, x))
+ {
+ f6 &= ~(RF6_SPECIAL);
+ }
+ }
+
/* No spells left */
if (!f4 && !f5 && !f6) return (FALSE);
}
if (!num) return (FALSE);
/* Stop if player is dead or gone */
- if (!alive || death) return (FALSE);
+ if (!p_ptr->playing || p_ptr->is_dead) return (FALSE);
/* Stop if player is leaving */
if (p_ptr->leaving) return (FALSE);
/* Get the monster name (or "it") */
monster_desc(m_name, m_ptr, 0x00);
+#ifndef JP
/* Get the monster possessive ("his"/"her"/"its") */
- monster_desc(m_poss, m_ptr, 0x22);
-
- /* Hack -- Get the "died from" name */
- monster_desc(ddesc, m_ptr, 0x288);
+ monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
+#endif
- if (stupid_monsters)
- {
- /* Choose a spell to cast */
- thrown_spell = spell[randint0(num)];
- }
+ if (do_disi)
+ thrown_spell = 96+31;
else
{
int attempt = 10;
- if (do_disi) thrown_spell = 96+31;
- else
+ while(attempt--)
{
- while(attempt--)
- {
- thrown_spell = choose_attack_spell(m_idx, spell, num);
- if (thrown_spell) break;
- }
+ thrown_spell = choose_attack_spell(m_idx, spell, num);
+ if (thrown_spell) break;
}
+ }
- /* Abort if no spell was chosen */
- if (!thrown_spell) return (FALSE);
+ /* Abort if no spell was chosen */
+ if (!thrown_spell) return (FALSE);
- /* Calculate spell failure rate */
- failrate = 25 - (rlev + 3) / 4;
+ /* Calculate spell failure rate */
+ failrate = 25 - (rlev + 3) / 4;
- /* Hack -- Stupid monsters will never fail (for jellies and such) */
- if (r_ptr->flags2 & RF2_STUPID) failrate = 0;
+ /* Hack -- Stupid monsters will never fail (for jellies and such) */
+ if (r_ptr->flags2 & RF2_STUPID) failrate = 0;
- /* Check for spell failure (inate attacks never fail) */
- if ((thrown_spell >= 128) && ((m_ptr->stunned && one_in_(2)) || (randint0(100) < failrate)))
- {
- disturb(1, 0);
- /* Message */
- if (thrown_spell != (160+7)) /* Not RF6_SPECIAL */
- {
+ /* Check for spell failure (inate attacks never fail) */
+ if (!spell_is_inate(thrown_spell)
+ && (in_no_magic_dungeon || (m_ptr->stunned && one_in_(2)) || (randint0(100) < failrate)))
+ {
+ disturb(1, 0);
+ /* Message */
#ifdef JP
-msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
+ msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
#else
- msg_format("%^s tries to cast a spell, but fails.", m_name);
+ msg_format("%^s tries to cast a spell, but fails.", m_name);
#endif
- }
- return (TRUE);
- }
+ return (TRUE);
}
+ /* Projectable? */
+ direct = player_bold(y, x);
+
/* Cast the spell. */
switch (thrown_spell)
{
/* RF4_SHRIEK */
case 96+0:
{
- if (!direct) break;
disturb(1, 0);
#ifdef JP
msg_format("%^s¤¬¤«¤ó¹â¤¤¶âÀÚ¤êÀ¼¤ò¤¢¤²¤¿¡£", m_name);
/* RF4_DISPEL */
case 96+2:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
set_tim_ffall(0, TRUE);
set_tim_sh_touki(0, TRUE);
set_tim_sh_fire(0, TRUE);
+ set_tim_sh_holy(0, TRUE);
+ set_tim_eyeeye(0, TRUE);
set_magicdef(0, TRUE);
set_resist_magic(0, TRUE);
set_oppose_acid(0, TRUE);
}
if (p_ptr->riding)
{
- m_list[p_ptr->riding].invulner = 0;
- m_list[p_ptr->riding].fast = 0;
- m_list[p_ptr->riding].slow = 0;
+ monster_type *riding_ptr = &m_list[p_ptr->riding];
+ if (riding_ptr->invulner)
+ {
+ riding_ptr->invulner = 0;
+ riding_ptr->energy_need += ENERGY_NEED();
+ }
+ riding_ptr->fast = 0;
+ riding_ptr->slow = 0;
p_ptr->update |= PU_BONUS;
if (p_ptr->health_who == p_ptr->riding) p_ptr->redraw |= PR_HEALTH;
p_ptr->redraw |= (PR_UHEALTH);
break;
}
- /* RF4_XXX4X4 */
+ /* RF4_ROCKET */
case 96+3:
{
disturb(1, 0);
/* RF4_SHOOT */
case 96+4:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬´ñ̯¤Ê²»¤òȯ¤·¤¿¡£", m_name);
/* RF5_DRAIN_MANA */
case 128+9:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
- if (p_ptr->csp)
- {
- int r1;
-
- /* Basic message */
-#ifdef JP
-msg_format("%^s¤ËÀº¿À¥¨¥Í¥ë¥®¡¼¤òµÛ¤¤¼è¤é¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª", m_name);
-#else
- msg_format("%^s draws psychic energy from you!", m_name);
-#endif
-
-
- /* Attack power */
- r1 = (randint1(rlev) / 2) + 1;
-
- /* Full drain */
- if (r1 >= p_ptr->csp)
- {
- r1 = p_ptr->csp;
- p_ptr->csp = 0;
- p_ptr->csp_frac = 0;
- }
-
- /* Partial drain */
- else
- {
- p_ptr->csp -= r1;
- }
-
- learn_spell(MS_DRAIN_MANA);
-
- /* Redraw mana */
- p_ptr->redraw |= (PR_MANA);
- /* Window stuff */
- p_ptr->window |= (PW_PLAYER);
- p_ptr->window |= (PW_SPELL);
-
- /* Heal the monster */
- if (m_ptr->hp < m_ptr->maxhp)
- {
- /* Heal */
- m_ptr->hp += (6 * r1);
- if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
-
- /* Redraw (later) if needed */
- if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
- if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
-
- /* Special message */
- if (seen)
- {
-#ifdef JP
-msg_format("%^s¤Ïµ¤Ê¬¤¬Îɤµ¤½¤¦¤À¡£", m_name);
-#else
- msg_format("%^s appears healthier.", m_name);
-#endif
-
- }
- }
- }
+ dam = (randint1(rlev) / 2) + 1;
+ breath(y, x, m_idx, GF_DRAIN_MANA, dam, 0, FALSE, MS_DRAIN_MANA, learnable);
update_smart_learn(m_idx, DRS_MANA);
break;
}
/* RF5_MIND_BLAST */
case 128+10:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
if (!seen)
{
}
dam = damroll(7, 7);
- 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;
-
- take_hit(DAMAGE_ATTACK, dam, ddesc, MS_MIND_BLAST);
- }
+ breath(y, x, m_idx, GF_MIND_BLAST, dam, 0, FALSE, MS_MIND_BLAST, learnable);
break;
}
/* RF5_BRAIN_SMASH */
case 128+11:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
if (!seen)
{
}
dam = damroll(12, 12);
- 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;
-
- take_hit(DAMAGE_ATTACK, dam, ddesc, 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);
- }
- }
+ breath(y, x, m_idx, GF_BRAIN_SMASH, dam, 0, FALSE, MS_BRAIN_SMASH, learnable);
break;
}
/* RF5_CAUSE_1 */
case 128+12:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
#endif
dam = damroll(3, 8);
- if (randint0(100 + rlev/2) < p_ptr->skill_sav)
- {
-#ifdef JP
-msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
-#else
- msg_print("You resist the effects!");
-#endif
- learn_spell(MS_CAUSE_1);
- }
- else
- {
- curse_equipment(33, 0);
- take_hit(DAMAGE_ATTACK, dam, ddesc, MS_CAUSE_1);
- }
+ breath(y, x, m_idx, GF_CAUSE_1, dam, 0, FALSE, MS_CAUSE_1, learnable);
break;
}
/* RF5_CAUSE_2 */
case 128+13:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
#endif
dam = damroll(8, 8);
- if (randint0(100 + rlev/2) < p_ptr->skill_sav)
- {
-#ifdef JP
-msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
-#else
- msg_print("You resist the effects!");
-#endif
- learn_spell(MS_CAUSE_2);
- }
- else
- {
- curse_equipment(50, 5);
- take_hit(DAMAGE_ATTACK, dam, ddesc, MS_CAUSE_2);
- }
+ breath(y, x, m_idx, GF_CAUSE_2, dam, 0, FALSE, MS_CAUSE_2, learnable);
break;
}
/* RF5_CAUSE_3 */
case 128+14:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤òÂçÀ¼¤Ç¶«¤ó¤À¡£", m_name);
#endif
dam = damroll(10, 15);
- if (randint0(100 + rlev/2) < p_ptr->skill_sav)
- {
-#ifdef JP
-msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
-#else
- msg_print("You resist the effects!");
-#endif
- learn_spell(MS_CAUSE_3);
- }
- else
- {
- curse_equipment(80, 15);
- take_hit(DAMAGE_ATTACK, dam, ddesc, MS_CAUSE_3);
- }
+ breath(y, x, m_idx, GF_CAUSE_3, dam, 0, FALSE, MS_CAUSE_3, learnable);
break;
}
/* RF5_CAUSE_4 */
case 128+15:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", m_name);
#endif
dam = damroll(15, 15);
- if ((randint0(100 + rlev/2) < p_ptr->skill_sav) && !(m_ptr->r_idx == MON_KENSHIROU))
- {
-#ifdef JP
-msg_print("¤·¤«¤·È빦¤òÄ·¤ÍÊÖ¤·¤¿¡ª");
-#else
- msg_print("You resist the effects!");
-#endif
- learn_spell(MS_CAUSE_4);
- }
- else
- {
- take_hit(DAMAGE_ATTACK, dam, ddesc, MS_CAUSE_4);
- (void)set_cut(p_ptr->cut + damroll(10, 10));
- }
+ breath(y, x, m_idx, GF_CAUSE_4, dam, 0, FALSE, MS_CAUSE_4, learnable);
break;
}
/* RF5_BO_ACID */
case 128+16:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_ELEC */
case 128+17:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_FIRE */
case 128+18:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_COLD */
case 128+19:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_NETH */
case 128+21:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_WATE */
case 128+22:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_MANA */
case 128+23:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_PLAS */
case 128+24:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_BO_ICEE */
case 128+25:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_MISSILE */
case 128+26:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_SCARE */
case 128+27:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢¶²¤í¤·¤²¤Ê²»¤¬Ê¹¤³¤¨¤¿¡£", m_name);
/* RF5_BLIND */
case 128+28:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF5_CONF */
case 128+29:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢Æ¬¤òǺ¤Þ¤¹²»¤¬¤·¤¿¡£", m_name);
/* RF5_SLOW */
case 128+30:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
msg_format("%^s¤¬¤¢¤Ê¤¿¤Î¶ÚÎϤòµÛ¤¤¼è¤í¤¦¤È¤·¤¿¡ª", m_name);
/* RF5_HOLD */
case 128+31:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
else
{
#ifdef JP
-msg_format("%^s¤¬¼«Ê¬¤ÎÂΤËÇ°¤òÁ÷¤Ã¤¿¡£", m_name, m_poss);
+msg_format("%^s¤¬¼«Ê¬¤ÎÂΤËÇ°¤òÁ÷¤Ã¤¿¡£", m_name);
#else
msg_format("%^s concentrates on %s body.", m_name, m_poss);
#endif
/* RF6_HAND_DOOM */
case 160+1:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
-msg_format("%^s¤¬ÇËÌǤμê¤òÊü¤Ã¤¿¡ª", m_name);
+msg_format("%^s¤¬<ÇËÌǤμê>¤òÊü¤Ã¤¿¡ª", m_name);
#else
msg_format("%^s invokes the Hand of Doom!", m_name);
#endif
-
- if (randint0(100 + rlev/2) < p_ptr->skill_sav)
- {
-#ifdef JP
-msg_format("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª");
-#else
- msg_format("You resist the effects!");
-#endif
- learn_spell(MS_HAND_DOOM);
-
- }
- else
- {
- int dummy = (((s32b) ((40 + randint1(20)) * (p_ptr->chp))) / 100);
-#ifdef JP
-msg_print("¤¢¤Ê¤¿¤ÏÌ¿¤¬Çö¤Þ¤Ã¤Æ¤¤¤¯¤è¤¦¤Ë´¶¤¸¤¿¡ª");
-#else
- msg_print("Your feel your life fade away!");
-#endif
-
- take_hit(DAMAGE_ATTACK, dummy, m_name, MS_HAND_DOOM);
- curse_equipment(100, 20);
-
- if (p_ptr->chp < 1) p_ptr->chp = 1;
- }
+ dam = (((s32b) ((40 + randint1(20)) * (p_ptr->chp))) / 100);
+ breath(y, x, m_idx, GF_HAND_DOOM, dam, 0, FALSE, MS_HAND_DOOM, learnable);
break;
}
/* Message */
#ifdef JP
-msg_format("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", m_name, m_poss);
+msg_format("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", m_name);
#else
msg_format("%^s recovers %s courage.", m_name, m_poss);
#endif
#endif
teleport_away(m_idx, 10, FALSE);
- p_ptr->update |= (PU_MONSTERS | PU_MON_LITE);
+ p_ptr->update |= (PU_MONSTERS);
break;
}
case 160+5:
{
int i, oldfy, oldfx;
- u32b f1 = 0 , f2 = 0 , f3 = 0;
+ u32b flgs[TR_FLAG_SIZE];
object_type *o_ptr;
oldfy = m_ptr->fy;
o_ptr = &inventory[i];
if(!cursed_p(o_ptr))
{
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
- if((f3 & TR3_TELEPORT) || (p_ptr->muta1 & MUT1_VTELEPORT) || (p_ptr->pclass == CLASS_IMITATOR))
+ if((have_flag(flgs, TR_TELEPORT)) || (p_ptr->muta1 & MUT1_VTELEPORT) || (p_ptr->pclass == CLASS_IMITATOR))
{
#ifdef JP
if(get_check_strict("¤Ä¤¤¤Æ¤¤¤¤Þ¤¹¤«¡©", CHECK_OKAY_CANCEL))
int k;
disturb(1, 0);
- switch(m_ptr->r_idx)
+ switch (m_ptr->r_idx)
{
case MON_OHMU:
- if (p_ptr->inside_arena || p_ptr->inside_battle) return FALSE;
- for (k = 0; k < 6; k++)
- {
- count += summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_BIZARRE1, TRUE, FALSE, FALSE, FALSE, FALSE);
- }
+ /* Moved to process_monster(), like multiplication */
return FALSE;
-
+
case MON_BANORLUPART:
{
int dummy_hp = (m_ptr->hp + 1) / 2;
if (p_ptr->inside_arena || p_ptr->inside_battle || !summon_possible(m_ptr->fy, m_ptr->fx)) return FALSE;
delete_monster_idx(cave[m_ptr->fy][m_ptr->fx].m_idx);
- summon_named_creature(dummy_y, dummy_x, MON_BANOR, FALSE, FALSE, is_friendly(m_ptr), FALSE);
+ summon_named_creature(0, dummy_y, dummy_x, MON_BANOR, mode);
m_list[hack_m_idx_ii].hp = dummy_hp;
m_list[hack_m_idx_ii].maxhp = dummy_maxhp;
- summon_named_creature(dummy_y, dummy_x, MON_LUPART, FALSE, FALSE, is_friendly(m_ptr), FALSE);
+ summon_named_creature(0, dummy_y, dummy_x, MON_LUPART, mode);
m_list[hack_m_idx_ii].hp = dummy_hp;
m_list[hack_m_idx_ii].maxhp = dummy_maxhp;
break;
}
- case MON_BANOR:
- case MON_LUPART:
+
+ case MON_BANOR:
+ case MON_LUPART:
{
int dummy_hp = 0;
int dummy_maxhp = 0;
delete_monster_idx(k);
}
}
- summon_named_creature(dummy_y, dummy_x, MON_BANORLUPART, FALSE, FALSE, is_friendly(m_ptr), FALSE);
+ summon_named_creature(0, dummy_y, dummy_x, MON_BANORLUPART, mode);
m_list[hack_m_idx_ii].hp = dummy_hp;
m_list[hack_m_idx_ii].maxhp = dummy_maxhp;
break;
}
- default: return FALSE;
+
+ case MON_ROLENTO:
+#ifdef JP
+ if (blind) msg_format("%^s¤¬²¿¤«ÂçÎ̤ËÅꤲ¤¿¡£", m_name);
+ else msg_format("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£", m_name);
+#else
+ if (blind) msg_format("%^s spreads something.", m_name);
+ else msg_format("%^s throws some hand grenades.", m_name);
+#endif
+
+ {
+ int num = 1 + randint1(3);
+
+ for (k = 0; k < num; k++)
+ {
+ count += summon_named_creature(m_idx, y, x, MON_SHURYUUDAN, mode);
+ }
+ }
+#ifdef JP
+ if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¤Ð¤é¤Þ¤«¤ì¤ë²»¤¬¤¹¤ë¡£");
+#else
+ if (blind && count) msg_print("You hear many things are scattered nearby.");
+#endif
+ break;
+
+ default:
+ if (r_ptr->d_char == 'B')
+ {
+ disturb(1, 0);
+ if (one_in_(3) || !direct)
+ {
+#ifdef JP
+ msg_format("%^s¤ÏÆÍÁ³»ë³¦¤«¤é¾Ã¤¨¤¿!", m_name);
+#else
+ msg_format("%^s suddenly go out of your sight!", m_name);
+#endif
+ teleport_away(m_idx, 10, FALSE);
+ p_ptr->update |= (PU_MONSTERS);
+ }
+ else
+ {
+ int get_damage = 0;
+ bool fear; /* dummy */
+
+#ifdef JP
+ msg_format("%^s¤¬¤¢¤Ê¤¿¤òÄϤó¤Ç¶õÃ椫¤éÅꤲÍ¤¿¡£", m_name);
+#else
+ msg_format("%^s holds you, and drops from the sky.", m_name);
+#endif
+ dam = damroll(4, 8);
+ teleport_player_to(m_ptr->fy, m_ptr->fx, FALSE);
+
+ sound(SOUND_FALL);
+
+ if (p_ptr->ffall)
+ {
+#ifdef JP
+ msg_print("¤¢¤Ê¤¿¤ÏÀŤ«¤ËÃåÃϤ·¤¿¡£");
+#else
+ msg_print("You float gently down to the ground.");
+#endif
+ }
+ else
+ {
+#ifdef JP
+ msg_print("¤¢¤Ê¤¿¤ÏÃÏÌ̤ËᤤĤ±¤é¤ì¤¿¡£");
+#else
+ msg_print("You crashed into the ground.");
+#endif
+ dam += damroll(6, 8);
+ }
+
+ /* Mega hack -- this special action deals damage to the player. Therefore the code of "eyeeye" is necessary.
+ -- henkma
+ */
+ get_damage = take_hit(DAMAGE_NOESCAPE, dam, m_name, -1);
+ if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead)
+ {
+#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) mon_take_hit_mon(p_ptr->riding, dam, &fear, extract_note_dies(real_r_ptr(&m_list[p_ptr->riding])), m_idx);
+ }
+ break;
+ }
+
+ /* Something is wrong */
+ else return FALSE;
}
break;
}
/* RF6_TELE_TO */
case 160+8:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
msg_format("%^s¤¬¤¢¤Ê¤¿¤ò°ú¤Ìᤷ¤¿¡£", m_name);
/* RF6_TELE_AWAY */
case 160+9:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
msg_format("%^s¤Ë¥Æ¥ì¥Ý¡¼¥È¤µ¤»¤é¤ì¤¿¡£", m_name);
/* RF6_TELE_LEVEL */
case 160+10:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«´ñ̯¤Ê¸ÀÍÕ¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
}
else
{
- teleport_player_level();
+ teleport_level(0);
}
learn_spell(MS_TELE_LEVEL);
update_smart_learn(m_idx, DRS_NEXUS);
/* RF6_PSY_SPEAR */
case 160+11:
{
- if (x!=px || y!=py) return (FALSE);
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF6_DARKNESS */
case 160+12:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
/* RF6_TRAPS */
case 160+13:
{
- if (!direct) break;
disturb(1, 0);
#ifdef JP
if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤Æ¼Ù°¤ËÈù¾Ð¤ó¤À¡£", m_name);
/* RF6_FORGET */
case 160+14:
{
- if (x!=px || y!=py) return (FALSE);
- if (!direct) break;
+ if (!direct) return (FALSE);
disturb(1, 0);
#ifdef JP
msg_format("%^s¤¬¤¢¤Ê¤¿¤Îµ²±¤ò¾Ãµî¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¡£", m_name);
break;
}
- /* RF6_SUMMON_KIN */
+ /* RF6_S_KIN */
case 160+16:
{
disturb(1, 0);
- if (m_ptr->r_idx == MON_ROLENTO)
- {
-#ifdef JP
- if (blind)
- msg_format("%^s¤¬²¿¤«ÂçÎ̤ËÅꤲ¤¿¡£", m_name);
- else
- msg_format("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£", m_name);
-#else
- if (blind)
- msg_format("%^s spreads something.", m_name);
- else
- msg_format("%^s throws some hand grenades.", m_name);
-#endif
- }
- else if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
+ if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
{
#ifdef JP
if (blind)
#endif
}
- if(m_ptr->r_idx == MON_ROLENTO)
- {
- int num = 1 + randint1(3);
- for (k = 0; k < num; k++)
- {
- count += summon_named_creature(y, x, MON_SHURYUUDAN, FALSE, FALSE, is_friendly(m_ptr), is_pet(m_ptr));
- }
- }
- else if(m_ptr->r_idx == MON_LOUSY)
- {
- int num = 2 + randint1(3);
- for (k = 0; k < num; k++)
- {
- count += summon_specific(m_idx, y, x, rlev, SUMMON_LOUSE, TRUE, FALSE, FALSE, FALSE, FALSE);
- }
- }
- else if(m_ptr->r_idx == MON_BULLGATES)
+ switch (m_ptr->r_idx)
{
- int num = 2 + randint1(3);
- for (k = 0; k < num; k++)
+ case MON_MENELDOR:
+ case MON_GWAIHIR:
+ case MON_THORONDOR:
{
- count += summon_named_creature(y, x, 921, FALSE, FALSE, is_friendly(m_ptr), is_pet(m_ptr));
+ int num = 4 + randint1(3);
+ for (k = 0; k < num; k++)
+ {
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+ }
}
- }
- else if (m_ptr->r_idx == MON_CALDARM)
- {
- int num = randint1(3);
- for (k = 0; k < num; k++)
+ break;
+
+ case MON_BULLGATES:
{
- count += summon_named_creature(y, x, 930, FALSE, FALSE, is_friendly(m_ptr), is_pet(m_ptr));
+ int num = 2 + randint1(3);
+ for (k = 0; k < num; k++)
+ {
+ count += summon_named_creature(m_idx, y, x, MON_IE, mode);
+ }
}
- }
- else if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
- {
- int num = 2 + randint1(3);
+ break;
- if (r_info[MON_JORMUNGAND].cur_num < r_info[MON_JORMUNGAND].max_num && one_in_(6))
+ case MON_SERPENT:
+ case MON_ZOMBI_SERPENT:
{
+ int num = 2 + randint1(3);
+
+ if (r_info[MON_JORMUNGAND].cur_num < r_info[MON_JORMUNGAND].max_num && one_in_(6))
+ {
#ifdef JP
- msg_print("ÃÏÌ̤«¤é¿å¤¬¿á¤½Ð¤·¤¿¡ª");
+ msg_print("ÃÏÌ̤«¤é¿å¤¬¿á¤½Ð¤·¤¿¡ª");
#else
- msg_print("Water blew off from the ground!");
+ msg_print("Water blew off from the ground!");
#endif
- fire_ball_hide(GF_WATER_FLOW, 0, 3, 8);
+ fire_ball_hide(GF_WATER_FLOW, 0, 3, 8);
+ }
+
+ for (k = 0; k < num; k++)
+ {
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_GUARDIANS, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+ }
}
+ break;
- for (k = 0; k < num; k++)
+ case MON_CALDARM:
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_GUARDIANS, TRUE, FALSE, FALSE, TRUE, FALSE);
+ int num = randint1(3);
+ for (k = 0; k < num; k++)
+ {
+ count += summon_named_creature(m_idx, y, x, MON_LOCKE_CLONE, mode);
+ }
}
- }
- else
- {
+ break;
+ case MON_LOUSY:
+ {
+ int num = 2 + randint1(3);
+ for (k = 0; k < num; k++)
+ {
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_LOUSE, PM_ALLOW_GROUP);
+ }
+ }
+ break;
+
+ default:
summon_kin_type = r_ptr->d_char; /* Big hack */
for (k = 0; k < 4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_KIN, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_KIN, PM_ALLOW_GROUP);
}
+ break;
}
#ifdef JP
-if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
+ if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
#else
if (blind && count) msg_print("You hear many things appear nearby.");
#endif
-
break;
}
for (k = 0; k < 1; k++)
{
- count += summon_specific(m_idx, y, x, rlev, 0, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
#ifdef JP
if (blind && count) msg_print("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < s_num_6; k++)
{
- count += summon_specific(m_idx, y, x, rlev, 0, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
#ifdef JP
if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < s_num_6; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_ANT, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_ANT, PM_ALLOW_GROUP);
}
#ifdef JP
if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < s_num_6; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_SPIDER, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_SPIDER, PM_ALLOW_GROUP);
}
#ifdef JP
if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < s_num_4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_HOUND, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_HOUND, PM_ALLOW_GROUP);
}
#ifdef JP
if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < s_num_4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_HYDRA, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_HYDRA, PM_ALLOW_GROUP);
}
#ifdef JP
if (blind && count) msg_print("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < num; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, PM_ALLOW_GROUP);
}
if (count < 2)
for (k = 0; k < 1; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_DEMON, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_DEMON, PM_ALLOW_GROUP);
}
#ifdef JP
if (blind && count) msg_print("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < 1; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_UNDEAD, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_UNDEAD, PM_ALLOW_GROUP);
}
#ifdef JP
if (blind && count) msg_print("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < 1; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_DRAGON, TRUE, FALSE, FALSE, FALSE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_DRAGON, PM_ALLOW_GROUP);
}
#ifdef JP
if (blind && count) msg_print("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£");
for (k = 0; k < 30; k++)
{
- if (!summon_possible(cy, cx) || !cave_floor_bold(cy, cx))
+ if (!summon_possible(cy, cx) || !cave_empty_bold(cy, cx))
{
int j;
for (j = 100; j > 0; j--)
{
scatter(&cy, &cx, y, x, 2, 0);
- if (cave_floor_bold(cy, cx)) break;
+ if (cave_empty_bold(cy, cx)) break;
}
if (!j) break;
}
- if (!cave_floor_bold(cy, cx)) continue;
+ if (!cave_empty_bold(cy, cx)) continue;
- if (summon_named_creature(cy, cx, MON_NAZGUL, FALSE, FALSE, is_friendly(m_ptr), is_pet(m_ptr)))
+ if (summon_named_creature(m_idx, cy, cx, MON_NAZGUL, mode))
{
y = cy;
x = cx;
}
}
#ifdef JP
-msg_format("¡Ö%dɤ¤½¤í¤Ã¤Æ¡¢¥ê¥ó¥°¥ì¥ó¥¸¥ã¡¼¡ª¡×", count);
+msg_format("¡Ö%d¿Í¤½¤í¤Ã¤Æ¡¢¥ê¥ó¥°¥ì¥ó¥¸¥ã¡¼¡ª¡×", count);
#else
msg_format("They say 'The %d meets! We are the Ring-Ranger!'.", count);
#endif
for (k = 0; k < s_num_6; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
}
if (blind && count)
for (k = 0; k < s_num_4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_DRAGON, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_DRAGON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
if (blind && count)
{
for (k = 0; k < s_num_4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_AMBERITES, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_AMBERITES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
if (blind && count)
{
for (k = 0; k < s_num_4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
if (r_ptr->flags3 & RF3_GOOD)
{
for (k = count; k < s_num_4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_ANGEL, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
}
else
{
for (k = count; k < s_num_4; k++)
{
- count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, TRUE, FALSE, FALSE, TRUE, FALSE);
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
}
if (blind && count)
if (seen && maneable && !world_monster && (p_ptr->pclass == CLASS_IMITATOR))
{
- if (thrown_spell != 167)
+ if (thrown_spell != 167) /* Not RF6_SPECIAL */
{
- if (mane_num == MAX_MANE)
+ if (p_ptr->mane_num == MAX_MANE)
{
int i;
- mane_num--;
- for (i = 0;i < mane_num;i++)
+ p_ptr->mane_num--;
+ for (i = 0;i < p_ptr->mane_num;i++)
{
- mane_spell[i] = mane_spell[i+1];
- mane_dam[i] = mane_dam[i+1];
+ p_ptr->mane_spell[i] = p_ptr->mane_spell[i+1];
+ p_ptr->mane_dam[i] = p_ptr->mane_dam[i+1];
}
}
- mane_spell[mane_num] = thrown_spell - 96;
- mane_dam[mane_num] = dam;
- mane_num++;
+ p_ptr->mane_spell[p_ptr->mane_num] = thrown_spell - 96;
+ p_ptr->mane_dam[p_ptr->mane_num] = dam;
+ p_ptr->mane_num++;
new_mane = TRUE;
p_ptr->redraw |= (PR_MANE);
}
/* Remember what the monster did to us */
- if (seen)
+ if (seen && is_original_ap(m_ptr))
{
/* Inate spell */
if (thrown_spell < 32 * 4)
{
r_ptr->r_flags4 |= (1L << (thrown_spell - 32 * 3));
- if (r_ptr->r_cast_inate < MAX_UCHAR) r_ptr->r_cast_inate++;
+ if (r_ptr->r_cast_spell < MAX_UCHAR) r_ptr->r_cast_spell++;
}
/* Bolt or Ball */
/* Always take note of monsters that kill you */
- if (death && (r_ptr->r_deaths < MAX_SHORT) && !p_ptr->inside_arena)
+ if (p_ptr->is_dead && (r_ptr->r_deaths < MAX_SHORT) && !p_ptr->inside_arena)
{
- r_ptr->r_deaths++;
+ r_ptr->r_deaths++; /* Ignore appearance difference */
}
/* A spell was cast */