extern void bolt(int m_idx, int typ, int dam_hp, int monspell, bool learnable);
extern void breath(int y, int x, int m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, bool learnable);
+/* mspells2.c */
+extern void monst_breath_monst(int m_idx, int y, int x, int typ, int dam_hp, int rad, bool breath, int monspell, bool learnable);
+
/* mspells3.c */
extern bool do_cmd_cast_learned(void);
extern void learn_spell(int monspell);
extern void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, int mode);
/* mspells4.c */
-extern void spell_RF4_SHRIEK(int m_idx, cptr m_name);
-extern void spell_RF4_DISPEL(bool blind, cptr m_name);
-extern int spell_RF4_ROCKET(bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx, bool learnable);
-extern int spell_RF4_SHOOT(bool blind, cptr m_name, monster_race* r_ptr, int m_idx, bool learnable);
-extern int spell_RF4_BREATH(int GF_TYPE, bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx, bool learnable);
-extern int spell_RF4_BA_CHAO(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF4_BA_NUKE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_ACID(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_ELEC(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_FIRE(monster_type* m_ptr, bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_COLD(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_POIS(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_NETH(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_WATE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_MANA(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_DARK(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_DRAIN_MANA(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_MIND_BLAST(bool seen, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BRAIN_SMASH(bool seen, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_CAUSE_1(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_CAUSE_2(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_CAUSE_3(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_CAUSE_4(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_ACID(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_ELEC(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_FIRE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_COLD(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BA_LITE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_NETH(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_WATE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_MANA(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_PLAS(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_BO_ICEE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern int spell_RF5_MISSILE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable);
-extern void spell_RF5_SCARE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx);
-extern void spell_RF5_BLIND(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx);
-extern void spell_RF5_CONF(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx);
-extern void spell_RF5_SLOW(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx);
-extern void spell_RF5_HOLD(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx);
-extern void spell_RF6_HASTE(bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx);
-extern int spell_RF6_HAND_DOOM(bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx, bool learnable);
-extern void spell_RF6_HEAL(bool blind, bool seen, cptr m_name, monster_type* m_ptr, int rlev, int m_idx);
-extern void spell_RF6_INVULNER(bool seen, cptr m_name, monster_type* m_ptr, int m_idx);
-extern void spell_RF6_BLINK(cptr m_name, int m_idx);
-extern void spell_RF6_TPORT(cptr m_name, int m_idx);
-extern int spell_RF6_WORLD(cptr m_name, monster_type* m_ptr, int m_idx);
-extern int spell_RF6_SPECIAL(cptr m_name, monster_type* m_ptr, monster_race* r_ptr, u32b mode, bool blind, bool direct, int y, int x, int m_idx);
-extern void spell_RF6_TELE_TO(cptr m_name, monster_type* m_ptr);
-extern void spell_RF6_TELE_AWAY(cptr m_name, int m_idx);
-extern void spell_RF6_TELE_LEVEL(bool blind, cptr m_name, int m_idx, int rlev);
-extern int spell_RF6_PSY_SPEAR(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int m_idx, bool learnable);
-extern void spell_RF6_DARKNESS(bool blind, cptr m_name, bool can_use_lite_area);
-extern void spell_RF6_TRAPS(bool blind, cptr m_name, int y, int x);
-extern void spell_RF6_FORGET(cptr m_name, int rlev);
-extern void spell_RF6_RAISE_DEAD(bool blind, cptr m_name, int m_idx, monster_type* m_ptr);
-extern void spell_RF6_S_KIN(bool blind, cptr m_name, monster_type* m_ptr, monster_race* r_ptr, int m_idx, int y, int x, int rlev, u32b mode);
-extern void spell_RF6_S_CYBER(bool blind, cptr m_name, int m_idx, int y, int x);
-extern void spell_RF6_S_MONSTER(bool blind, cptr m_name, int m_idx, int y, int x, int rlev);
-extern void spell_RF6_S_MONSTERS(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6);
-extern void spell_RF6_S_ANT(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6);
-extern void spell_RF6_S_SPIDER(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6);
-extern void spell_RF6_S_HOUND(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4);
-extern void spell_RF6_S_HYDRA(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4);
-extern void spell_RF6_S_ANGEL(bool blind, cptr m_name, monster_race* r_ptr, int m_idx, int y, int x, int rlev);
-extern void spell_RF6_S_DEMON(bool blind, cptr m_name, int m_idx, int y, int x, int rlev);
-extern void spell_RF6_S_UNDEAD(bool blind, cptr m_name, int m_idx, int y, int x, int rlev);
-extern void spell_RF6_S_DRAGON(bool blind, cptr m_name, int m_idx, int y, int x, int rlev);
-extern void spell_RF6_S_HI_UNDEAD(monster_type* m_ptr, bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6, u32b mode);
-extern void spell_RF6_S_HI_DRAGON(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4);
-extern void spell_RF6_S_AMBERITES(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4);
-extern void spell_RF6_S_UNIQUE(bool blind, cptr m_name, int m_idx, monster_type* m_ptr, int y, int x, int rlev, int s_num_4);
+
+/* spells monster to player */
+extern void MP_spell_RF4_SHRIEK(int m_idx);
+extern void MP_spell_RF4_DISPEL(int m_idx);
+extern int MP_spell_RF4_ROCKET(int y, int x, int m_idx);
+extern int spell_RF4_SHOOT(int m_idx);
+extern int spell_RF4_BREATH(int GF_TYPE, int y, int x, int m_idx);
+extern int spell_RF4_BA_CHAO(int y, int x, int m_idx);
+extern int spell_RF4_BA_NUKE(int y, int x, int m_idx);
+extern int spell_RF5_BA_ACID(int y, int x, int m_idx);
+extern int spell_RF5_BA_ELEC(int y, int x, int m_idx);
+extern int spell_RF5_BA_FIRE(int y, int x, int m_idx);
+extern int spell_RF5_BA_COLD(int y, int x, int m_idx);
+extern int spell_RF5_BA_POIS(int y, int x, int m_idx);
+extern int spell_RF5_BA_NETH(int y, int x, int m_idx);
+extern int spell_RF5_BA_WATE(int y, int x, int m_idx);
+extern int spell_RF5_BA_MANA(int y, int x, int m_idx);
+extern int spell_RF5_BA_DARK(int y, int x, int m_idx);
+extern int spell_RF5_DRAIN_MANA(int y, int x, int m_idx);
+extern int spell_RF5_MIND_BLAST(int y, int x, int m_idx);
+extern int spell_RF5_BRAIN_SMASH(int y, int x, int m_idx);
+extern int spell_RF5_CAUSE_1(int y, int x, int m_idx);
+extern int spell_RF5_CAUSE_2(int y, int x, int m_idx);
+extern int spell_RF5_CAUSE_3(int y, int x, int m_idx);
+extern int spell_RF5_CAUSE_4(int y, int x, int m_idx);
+extern int spell_RF5_BO_ACID(int y, int x, int m_idx);
+extern int spell_RF5_BO_ELEC(int y, int x, int m_idx);
+extern int spell_RF5_BO_FIRE(int y, int x, int m_idx);
+extern int spell_RF5_BO_COLD(int y, int x, int m_idx);
+extern int spell_RF5_BA_LITE(int y, int x, int m_idx);
+extern int spell_RF5_BO_NETH(int y, int x, int m_idx);
+extern int spell_RF5_BO_WATE(int y, int x, int m_idx);
+extern int spell_RF5_BO_MANA(int y, int x, int m_idx);
+extern int spell_RF5_BO_PLAS(int y, int x, int m_idx);
+extern int spell_RF5_BO_ICEE(int y, int x, int m_idx);
+extern int spell_RF5_MISSILE(int y, int x, int m_idx);
+extern void spell_RF5_SCARE(int y, int x, int m_idx);
+extern void spell_RF5_BLIND(int y, int x, int m_idx);
+extern void spell_RF5_CONF(int y, int x, int m_idx);
+extern void spell_RF5_SLOW(int y, int x, int m_idx);
+extern void spell_RF5_HOLD(int y, int x, int m_idx);
+extern void spell_RF6_HASTE(int m_idx);
+extern int spell_RF6_HAND_DOOM(int y, int x, int m_idx);
+extern void spell_RF6_HEAL(int m_idx);
+extern void spell_RF6_INVULNER(int m_idx);
+extern void spell_RF6_BLINK(int m_idx);
+extern void spell_RF6_TPORT(int m_idx);
+extern int spell_RF6_WORLD(int m_idx);
+extern int spell_RF6_SPECIAL(int y, int x, int m_idx);
+extern void spell_RF6_TELE_TO(int m_idx);
+extern void spell_RF6_TELE_AWAY(int m_idx);
+extern void spell_RF6_TELE_LEVEL(int m_idx);
+extern int spell_RF6_PSY_SPEAR(int m_idx);
+extern void spell_RF6_DARKNESS(int m_idx);
+extern void spell_RF6_TRAPS(int y, int x, int m_idx);
+extern void spell_RF6_FORGET(int m_idx);
+extern void spell_RF6_RAISE_DEAD(int m_idx);
+extern void spell_RF6_S_KIN(int y, int x, int m_idx);
+extern void spell_RF6_S_CYBER(int y, int x, int m_idx);
+extern void spell_RF6_S_MONSTER(int y, int x, int m_idx);
+extern void spell_RF6_S_MONSTERS(int y, int x, int m_idx);
+extern void spell_RF6_S_ANT(int y, int x, int m_idx);
+extern void spell_RF6_S_SPIDER(int y, int x, int m_idx);
+extern void spell_RF6_S_HOUND(int y, int x, int m_idx);
+extern void spell_RF6_S_HYDRA(int y, int x, int m_idx);
+extern void spell_RF6_S_ANGEL(int y, int x, int m_idx);
+extern void spell_RF6_S_DEMON(int y, int x, int m_idx);
+extern void spell_RF6_S_UNDEAD(int y, int x, int m_idx);
+extern void spell_RF6_S_DRAGON(int y, int x, int m_idx);
+extern void spell_RF6_S_HI_UNDEAD(int y, int x, int m_idx);
+extern void spell_RF6_S_HI_DRAGON(int y, int x, int m_idx);
+extern void spell_RF6_S_AMBERITES(int y, int x, int m_idx);
+extern void spell_RF6_S_UNIQUE(int y, int x, int m_idx);
+
+/* spells monster to monster */
+extern void MM_spell_RF4_SHRIEK(int m_idx, int t_idx);
+extern void MM_spell_RF4_DISPEL(int m_idx, int t_idx);
+extern int MM_spell_RF4_ROCKET(int y, int x, int m_idx, int t_idx);
/* hissatsu.c */
extern void hissatsu_info(char *p, int power);
/* Cast the spell. */
switch (thrown_spell)
{
- case 96 + 0: spell_RF4_SHRIEK(m_idx, m_name); break; /* RF4_SHRIEK */
+ case 96 + 0: MP_spell_RF4_SHRIEK(m_idx); break; /* RF4_SHRIEK */
case 96 + 1: break; /* RF4_XXX1 */
- case 96 + 2: spell_RF4_DISPEL(blind, m_name); break; /* RF4_DISPEL */
- case 96 + 3: dam = spell_RF4_ROCKET(blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_ROCKET */
- case 96 + 4: dam = spell_RF4_SHOOT(blind, m_name, r_ptr, m_idx, learnable); break; /* RF4_SHOOT */
+ case 96 + 2: MP_spell_RF4_DISPEL(m_idx); break; /* RF4_DISPEL */
+ case 96 + 3: dam = MP_spell_RF4_ROCKET(y, x, m_idx); break; /* RF4_ROCKET */
+ case 96 + 4: dam = spell_RF4_SHOOT(m_idx); break; /* RF4_SHOOT */
case 96 + 5: break; /* RF4_XXX2 */
case 96 + 6: break; /* RF4_XXX3 */
case 96 + 7: break; /* RF4_XXX4 */
- case 96 + 8: dam = spell_RF4_BREATH(GF_ACID, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_ACID */
- case 96 + 9: dam = spell_RF4_BREATH(GF_ELEC, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_ELEC */
- case 96 + 10: dam = spell_RF4_BREATH(GF_FIRE, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_FIRE */
- case 96 + 11: dam = spell_RF4_BREATH(GF_COLD, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_COLD */
- case 96 + 12: dam = spell_RF4_BREATH(GF_POIS, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_POIS */
- case 96 + 13: dam = spell_RF4_BREATH(GF_NETHER, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_NETH */
- case 96 + 14: dam = spell_RF4_BREATH(GF_LITE, blind, m_name, m_ptr, y_br_lite, x_br_lite, m_idx, learnable); break; /* RF4_BR_LITE */
- case 96 + 15: dam = spell_RF4_BREATH(GF_DARK, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_DARK */
- case 96 + 16: dam = spell_RF4_BREATH(GF_CONFUSION, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_CONF */
- case 96 + 17: dam = spell_RF4_BREATH(GF_SOUND, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_SOUN */
- case 96 + 18: dam = spell_RF4_BREATH(GF_CHAOS, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_CHAO */
- case 96 + 19: dam = spell_RF4_BREATH(GF_DISENCHANT, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_DISE */
- case 96 + 20: dam = spell_RF4_BREATH(GF_NEXUS, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_NEXU */
- case 96 + 21: dam = spell_RF4_BREATH(GF_TIME, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_TIME */
- case 96 + 22: dam = spell_RF4_BREATH(GF_INERTIA, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_INER */
- case 96 + 23: dam = spell_RF4_BREATH(GF_GRAVITY, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_GRAV */
- case 96 + 24: dam = spell_RF4_BREATH(GF_SHARDS, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_SHAR */
- case 96 + 25: dam = spell_RF4_BREATH(GF_PLASMA, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_PLAS */
- case 96 + 26: dam = spell_RF4_BREATH(GF_FORCE, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_WALL */
- case 96 + 27: dam = spell_RF4_BREATH(GF_MANA, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_MANA */
- case 96 + 28: dam = spell_RF4_BA_NUKE(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF4_BA_NUKE */
- case 96 + 29: dam = spell_RF4_BREATH(GF_NUKE, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_NUKE */
- case 96 + 30: dam = spell_RF4_BA_CHAO(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF4_BA_CHAO */
- case 96 + 31: dam = spell_RF4_BREATH(GF_DISINTEGRATE, blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF4_BR_DISI */
- case 128 + 0: dam = spell_RF5_BA_ACID(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_ACID */
- case 128 + 1: dam = spell_RF5_BA_ELEC(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_ELEC */
- case 128 + 2: dam = spell_RF5_BA_FIRE(m_ptr, blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_FIRE */
- case 128 + 3: dam = spell_RF5_BA_COLD(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_COLD */
- case 128 + 4: dam = spell_RF5_BA_POIS(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_POIS */
- case 128 + 5: dam = spell_RF5_BA_NETH(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_NETH */
- case 128 + 6: dam = spell_RF5_BA_WATE(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_WATE */
- case 128 + 7: dam = spell_RF5_BA_MANA(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_MANA */
- case 128 + 8: dam = spell_RF5_BA_DARK(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_DARK */
- case 128 + 9: dam = spell_RF5_DRAIN_MANA(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_DRAIN_MANA */
- case 128 + 10: dam = spell_RF5_MIND_BLAST(seen, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_MIND_BLAST */
- case 128 + 11: dam = spell_RF5_BRAIN_SMASH(seen, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_MIND_BLAST */
- case 128 + 12: dam = spell_RF5_CAUSE_1(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_CAUSE_1 */
- case 128 + 13: dam = spell_RF5_CAUSE_2(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_CAUSE_2 */
- case 128 + 14: dam = spell_RF5_CAUSE_3(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_CAUSE_3 */
- case 128 + 15: dam = spell_RF5_CAUSE_4(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_CAUSE_4 */
- case 128 + 16: dam = spell_RF5_BO_ACID(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_ACID */
- case 128 + 17: dam = spell_RF5_BO_ELEC(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_ELEC */
- case 128 + 18: dam = spell_RF5_BO_FIRE(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_FIRE */
- case 128 + 19: dam = spell_RF5_BO_COLD(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_COLD */
- case 128 + 20: dam = spell_RF5_BA_LITE(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BA_LITE */
- case 128 + 21: dam = spell_RF5_BO_NETH(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_NETH */
- case 128 + 22: dam = spell_RF5_BO_WATE(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_WATE */
- case 128 + 23: dam = spell_RF5_BO_MANA(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_MANA */
- case 128 + 24: dam = spell_RF5_BO_PLAS(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_PLAS */
- case 128 + 25: dam = spell_RF5_BO_ICEE(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_BO_ICEE */
- case 128 + 26: dam = spell_RF5_MISSILE(blind, m_name, r_ptr, rlev, y, x, m_idx, learnable); break; /* RF5_MISSILE */
- case 128 + 27: spell_RF5_SCARE(blind, m_name, r_ptr, rlev, y, x, m_idx); break; /* RF5_SCARE */
- case 128 + 28: spell_RF5_BLIND(blind, m_name, r_ptr, rlev, y, x, m_idx); break; /* RF5_BLIND */
- case 128 + 29: spell_RF5_CONF(blind, m_name, r_ptr, rlev, y, x, m_idx); break; /* RF5_CONF */
- case 128 + 30: spell_RF5_SLOW(blind, m_name, r_ptr, rlev, y, x, m_idx); break; /* RF5_SLOW */
- case 128 + 31: spell_RF5_HOLD(blind, m_name, r_ptr, rlev, y, x, m_idx); break; /* RF5_HOLD */
- case 160 + 0: spell_RF6_HASTE(blind, m_name, m_ptr, y, x, m_idx); break; /* RF6_HASTE */
- case 160 + 1: dam = spell_RF6_HAND_DOOM(blind, m_name, m_ptr, y, x, m_idx, learnable); break; /* RF6_HAND_DOOM */
- case 160 + 2: spell_RF6_HEAL(blind, seen, m_name, m_ptr, rlev, m_idx); break; /* RF6_HEAL */
- case 160 + 3: spell_RF6_INVULNER(seen, m_name, m_ptr, m_idx); break; /* RF6_INVULNER */
- case 160 + 4: spell_RF6_BLINK(m_name, m_idx); break; /* RF6_BLINK */
- case 160 + 5: spell_RF6_TPORT(m_name, m_idx); break; /* RF6_TPORT */
- case 160 + 6: dam = spell_RF6_WORLD(m_name, m_ptr, m_idx); break; /* RF6_WORLD */
+ case 96 + 8: dam = spell_RF4_BREATH(GF_ACID, y, x, m_idx); break; /* RF4_BR_ACID */
+ case 96 + 9: dam = spell_RF4_BREATH(GF_ELEC, y, x, m_idx); break; /* RF4_BR_ELEC */
+ case 96 + 10: dam = spell_RF4_BREATH(GF_FIRE, y, x, m_idx); break; /* RF4_BR_FIRE */
+ case 96 + 11: dam = spell_RF4_BREATH(GF_COLD, y, x, m_idx); break; /* RF4_BR_COLD */
+ case 96 + 12: dam = spell_RF4_BREATH(GF_POIS, y, x, m_idx); break; /* RF4_BR_POIS */
+ case 96 + 13: dam = spell_RF4_BREATH(GF_NETHER, y, x, m_idx); break; /* RF4_BR_NETH */
+ case 96 + 14: dam = spell_RF4_BREATH(GF_LITE, y_br_lite, x_br_lite, m_idx); break; /* RF4_BR_LITE */
+ case 96 + 15: dam = spell_RF4_BREATH(GF_DARK, y, x, m_idx); break; /* RF4_BR_DARK */
+ case 96 + 16: dam = spell_RF4_BREATH(GF_CONFUSION, y, x, m_idx); break; /* RF4_BR_CONF */
+ case 96 + 17: dam = spell_RF4_BREATH(GF_SOUND, y, x, m_idx); break; /* RF4_BR_SOUN */
+ case 96 + 18: dam = spell_RF4_BREATH(GF_CHAOS, y, x, m_idx); break; /* RF4_BR_CHAO */
+ case 96 + 19: dam = spell_RF4_BREATH(GF_DISENCHANT, y, x, m_idx); break; /* RF4_BR_DISE */
+ case 96 + 20: dam = spell_RF4_BREATH(GF_NEXUS, y, x, m_idx); break; /* RF4_BR_NEXU */
+ case 96 + 21: dam = spell_RF4_BREATH(GF_TIME, y, x, m_idx); break; /* RF4_BR_TIME */
+ case 96 + 22: dam = spell_RF4_BREATH(GF_INERTIA, y, x, m_idx); break; /* RF4_BR_INER */
+ case 96 + 23: dam = spell_RF4_BREATH(GF_GRAVITY, y, x, m_idx); break; /* RF4_BR_GRAV */
+ case 96 + 24: dam = spell_RF4_BREATH(GF_SHARDS, y, x, m_idx); break; /* RF4_BR_SHAR */
+ case 96 + 25: dam = spell_RF4_BREATH(GF_PLASMA, y, x, m_idx); break; /* RF4_BR_PLAS */
+ case 96 + 26: dam = spell_RF4_BREATH(GF_FORCE, y, x, m_idx); break; /* RF4_BR_WALL */
+ case 96 + 27: dam = spell_RF4_BREATH(GF_MANA, y, x, m_idx); break; /* RF4_BR_MANA */
+ case 96 + 28: dam = spell_RF4_BA_NUKE(y, x, m_idx); break; /* RF4_BA_NUKE */
+ case 96 + 29: dam = spell_RF4_BREATH(GF_NUKE, y, x, m_idx); break; /* RF4_BR_NUKE */
+ case 96 + 30: dam = spell_RF4_BA_CHAO(y, x, m_idx); break; /* RF4_BA_CHAO */
+ case 96 + 31: dam = spell_RF4_BREATH(GF_DISINTEGRATE, y, x, m_idx); break; /* RF4_BR_DISI */
+ case 128 + 0: dam = spell_RF5_BA_ACID(y, x, m_idx); break; /* RF5_BA_ACID */
+ case 128 + 1: dam = spell_RF5_BA_ELEC(y, x, m_idx); break; /* RF5_BA_ELEC */
+ case 128 + 2: dam = spell_RF5_BA_FIRE(y, x, m_idx); break; /* RF5_BA_FIRE */
+ case 128 + 3: dam = spell_RF5_BA_COLD(y, x, m_idx); break; /* RF5_BA_COLD */
+ case 128 + 4: dam = spell_RF5_BA_POIS(y, x, m_idx); break; /* RF5_BA_POIS */
+ case 128 + 5: dam = spell_RF5_BA_NETH(y, x, m_idx); break; /* RF5_BA_NETH */
+ case 128 + 6: dam = spell_RF5_BA_WATE(y, x, m_idx); break; /* RF5_BA_WATE */
+ case 128 + 7: dam = spell_RF5_BA_MANA(y, x, m_idx); break; /* RF5_BA_MANA */
+ case 128 + 8: dam = spell_RF5_BA_DARK(y, x, m_idx); break; /* RF5_BA_DARK */
+ case 128 + 9: dam = spell_RF5_DRAIN_MANA(y, x, m_idx); break; /* RF5_DRAIN_MANA */
+ case 128 + 10: dam = spell_RF5_MIND_BLAST(y, x, m_idx); break; /* RF5_MIND_BLAST */
+ case 128 + 11: dam = spell_RF5_BRAIN_SMASH(y, x, m_idx); break; /* RF5_MIND_BLAST */
+ case 128 + 12: dam = spell_RF5_CAUSE_1(y, x, m_idx); break; /* RF5_CAUSE_1 */
+ case 128 + 13: dam = spell_RF5_CAUSE_2(y, x, m_idx); break; /* RF5_CAUSE_2 */
+ case 128 + 14: dam = spell_RF5_CAUSE_3(y, x, m_idx); break; /* RF5_CAUSE_3 */
+ case 128 + 15: dam = spell_RF5_CAUSE_4(y, x, m_idx); break; /* RF5_CAUSE_4 */
+ case 128 + 16: dam = spell_RF5_BO_ACID(y, x, m_idx); break; /* RF5_BO_ACID */
+ case 128 + 17: dam = spell_RF5_BO_ELEC(y, x, m_idx); break; /* RF5_BO_ELEC */
+ case 128 + 18: dam = spell_RF5_BO_FIRE(y, x, m_idx); break; /* RF5_BO_FIRE */
+ case 128 + 19: dam = spell_RF5_BO_COLD(y, x, m_idx); break; /* RF5_BO_COLD */
+ case 128 + 20: dam = spell_RF5_BA_LITE(y, x, m_idx); break; /* RF5_BA_LITE */
+ case 128 + 21: dam = spell_RF5_BO_NETH(y, x, m_idx); break; /* RF5_BO_NETH */
+ case 128 + 22: dam = spell_RF5_BO_WATE(y, x, m_idx); break; /* RF5_BO_WATE */
+ case 128 + 23: dam = spell_RF5_BO_MANA(y, x, m_idx); break; /* RF5_BO_MANA */
+ case 128 + 24: dam = spell_RF5_BO_PLAS(y, x, m_idx); break; /* RF5_BO_PLAS */
+ case 128 + 25: dam = spell_RF5_BO_ICEE(y, x, m_idx); break; /* RF5_BO_ICEE */
+ case 128 + 26: dam = spell_RF5_MISSILE(y, x, m_idx); break; /* RF5_MISSILE */
+ case 128 + 27: spell_RF5_SCARE(y, x, m_idx); break; /* RF5_SCARE */
+ case 128 + 28: spell_RF5_BLIND(y, x, m_idx); break; /* RF5_BLIND */
+ case 128 + 29: spell_RF5_CONF(y, x, m_idx); break; /* RF5_CONF */
+ case 128 + 30: spell_RF5_SLOW(y, x, m_idx); break; /* RF5_SLOW */
+ case 128 + 31: spell_RF5_HOLD(y, x, m_idx); break; /* RF5_HOLD */
+ case 160 + 0: spell_RF6_HASTE(m_idx); break; /* RF6_HASTE */
+ case 160 + 1: dam = spell_RF6_HAND_DOOM(y, x, m_idx); break; /* RF6_HAND_DOOM */
+ case 160 + 2: spell_RF6_HEAL(m_idx); break; /* RF6_HEAL */
+ case 160 + 3: spell_RF6_INVULNER(m_idx); break; /* RF6_INVULNER */
+ case 160 + 4: spell_RF6_BLINK(m_idx); break; /* RF6_BLINK */
+ case 160 + 5: spell_RF6_TPORT(m_idx); break; /* RF6_TPORT */
+ case 160 + 6: dam = spell_RF6_WORLD(m_idx); break; /* RF6_WORLD */
/* RF6_SPECIAL */
case 160 + 7:
- dam = spell_RF6_SPECIAL(m_name, m_ptr, r_ptr, mode, blind, direct, y, x, m_idx);
+ dam = spell_RF6_SPECIAL(y, x, m_idx);
if (dam < 0) return FALSE;
break;
- case 160 + 8: spell_RF6_TELE_TO(m_name, m_ptr); break; /* RF6_TELE_TO */
- case 160 + 9: spell_RF6_TELE_AWAY(m_name, m_idx); break; /* RF6_TELE_AWAY */
- case 160 + 10: spell_RF6_TELE_LEVEL(blind, m_name, m_idx, rlev); break; /* RF6_TELE_LEVEL */
- case 160 + 11: spell_RF6_PSY_SPEAR(blind, m_name, r_ptr, rlev, m_idx, learnable); break; /* RF6_PSY_SPEAR */
- case 160 + 12: spell_RF6_DARKNESS(blind, m_name, can_use_lite_area); break; /* RF6_DARKNESS */
- case 160 + 13: spell_RF6_TRAPS(blind, m_name, y, x); break; /* RF6_TRAPS */
- case 160 + 14: spell_RF6_FORGET(m_name, rlev); break; /* RF6_FORGET */
- case 160 + 15: spell_RF6_RAISE_DEAD(blind, m_name, m_idx, m_ptr); break; /* RF6_RAISE_DEAD */
- case 160 + 16: spell_RF6_S_KIN(blind, m_name, m_ptr, r_ptr, m_idx, y, x, rlev, mode); break; /* RF6_S_KIN */
- case 160 + 17: spell_RF6_S_CYBER(blind, m_name, m_idx, y, x); break; /* RF6_S_CYBER */
- case 160 + 18: spell_RF6_S_MONSTER(blind, m_name, m_idx, y, x, rlev); break; /* RF6_S_MONSTER */
- case 160 + 19: spell_RF6_S_MONSTERS(blind, m_name, m_idx, y, x, rlev, s_num_6); break; /* RF6_S_MONSTER */
- case 160 + 20: spell_RF6_S_ANT(blind, m_name, m_idx, y, x, rlev, s_num_6); break; /* RF6_S_ANT */
- case 160 + 21: spell_RF6_S_SPIDER(blind, m_name, m_idx, y, x, rlev, s_num_6); break; /* RF6_S_SPIDER */
- case 160 + 22: spell_RF6_S_HOUND(blind, m_name, m_idx, y, x, rlev, s_num_4); break; /* RF6_S_HOUND */
- case 160 + 23: spell_RF6_S_HYDRA(blind, m_name, m_idx, y, x, rlev, s_num_4); break; /* RF6_S_HYDRA */
- case 160 + 24: spell_RF6_S_ANGEL(blind, m_name, r_ptr, m_idx, y, x, rlev); break; /* RF6_S_ANGEL */
- case 160 + 25: spell_RF6_S_DEMON(blind, m_name, m_idx, y, x, rlev); break; /* RF6_S_DEMON */
- case 160 + 26: spell_RF6_S_UNDEAD(blind, m_name, m_idx, y, x, rlev); break; /* RF6_S_UNDEAD */
- case 160 + 27: spell_RF6_S_DRAGON(blind, m_name, m_idx, y, x, rlev); break; /* RF6_S_DRAGON */
- case 160 + 28: spell_RF6_S_HI_UNDEAD(m_ptr, blind, m_name, m_idx, y, x, rlev, s_num_6, mode); break; /* RF6_S_HI_UNDEAD */
- case 160 + 29: spell_RF6_S_HI_DRAGON(blind, m_name, m_idx, y, x, rlev, s_num_4); break; /* RF6_S_HI_DRAGON */
- case 160 + 30: spell_RF6_S_AMBERITES(blind, m_name, m_idx, y, x, rlev, s_num_4); break; /* RF6_S_AMBERITES */
- case 160 + 31: spell_RF6_S_UNIQUE(blind, m_name, m_idx, m_ptr, y, x, rlev, s_num_4); break; /* RF6_S_UNIQUE */
+ case 160 + 8: spell_RF6_TELE_TO(m_idx); break; /* RF6_TELE_TO */
+ case 160 + 9: spell_RF6_TELE_AWAY(m_idx); break; /* RF6_TELE_AWAY */
+ case 160 + 10: spell_RF6_TELE_LEVEL(m_idx); break; /* RF6_TELE_LEVEL */
+ case 160 + 11: spell_RF6_PSY_SPEAR(m_idx); break; /* RF6_PSY_SPEAR */
+ case 160 + 12: spell_RF6_DARKNESS(m_idx); break; /* RF6_DARKNESS */
+ case 160 + 13: spell_RF6_TRAPS(y, x, m_idx); break; /* RF6_TRAPS */
+ case 160 + 14: spell_RF6_FORGET(m_idx); break; /* RF6_FORGET */
+ case 160 + 15: spell_RF6_RAISE_DEAD(m_idx); break; /* RF6_RAISE_DEAD */
+ case 160 + 16: spell_RF6_S_KIN(y, x, m_idx); break; /* RF6_S_KIN */
+ case 160 + 17: spell_RF6_S_CYBER(y, x, m_idx); break; /* RF6_S_CYBER */
+ case 160 + 18: spell_RF6_S_MONSTER(y, x, m_idx); break; /* RF6_S_MONSTER */
+ case 160 + 19: spell_RF6_S_MONSTERS(y, x, m_idx); break; /* RF6_S_MONSTER */
+ case 160 + 20: spell_RF6_S_ANT(y, x, m_idx); break; /* RF6_S_ANT */
+ case 160 + 21: spell_RF6_S_SPIDER(y, x, m_idx); break; /* RF6_S_SPIDER */
+ case 160 + 22: spell_RF6_S_HOUND(y, x, m_idx); break; /* RF6_S_HOUND */
+ case 160 + 23: spell_RF6_S_HYDRA(y, x, m_idx); break; /* RF6_S_HYDRA */
+ case 160 + 24: spell_RF6_S_ANGEL(y, x, m_idx); break; /* RF6_S_ANGEL */
+ case 160 + 25: spell_RF6_S_DEMON(y, x, m_idx); break; /* RF6_S_DEMON */
+ case 160 + 26: spell_RF6_S_UNDEAD(y, x, m_idx); break; /* RF6_S_UNDEAD */
+ case 160 + 27: spell_RF6_S_DRAGON(y, x, m_idx); break; /* RF6_S_DRAGON */
+ case 160 + 28: spell_RF6_S_HI_UNDEAD(y, x, m_idx); break; /* RF6_S_HI_UNDEAD */
+ case 160 + 29: spell_RF6_S_HI_DRAGON(y, x, m_idx); break; /* RF6_S_HI_DRAGON */
+ case 160 + 30: spell_RF6_S_AMBERITES(y, x, m_idx); break; /* RF6_S_AMBERITES */
+ case 160 + 31: spell_RF6_S_UNIQUE(y, x, m_idx); break; /* RF6_S_UNIQUE */
}
if ((p_ptr->action == ACTION_LEARN) && thrown_spell > 175)
#include "angband.h"
-void spell_RF4_SHRIEK(int m_idx, cptr m_name)
+cptr monster_name(int m_idx)
{
+ char m_name[80];
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_desc(m_name, m_ptr, 0x00);
+ return m_name;
+}
+
+/* 2 monster each is near by player, return true */
+bool monster_near_player(int m_idx, int t_idx)
+{
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_type *t_ptr = &m_list[t_idx];
+ return (m_ptr->cdis <= MAX_SIGHT) || (t_ptr->cdis <= MAX_SIGHT);
+}
+
+/* player can see monster, return true */
+bool see_monster(int m_idx)
+{
+ monster_type *m_ptr = &m_list[m_idx];
+ return is_seen(m_ptr);
+}
+
+bool spell_learnable(int m_idx)
+{
+ monster_type *m_ptr = &m_list[m_idx];
+ /* Extract the "see-able-ness" */
+ bool seen = (!p_ptr->blind && m_ptr->ml);
+
+ bool maneable = player_has_los_bold(m_ptr->fy, m_ptr->fx);
+ return (seen && maneable && !world_monster);
+}
+
+int monster_level_idx(int m_idx)
+{
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
+ return rlev;
+}
+
+int spell_core(int SPELL_NUM, int hp, int y, int x, int m_idx, int SPELL_TYPE)
+{
+ int dam;
+
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ bool learnable = spell_learnable(m_idx);
+
+ switch (SPELL_NUM)
+ {
+ case RF4_ROCKET:
+ dam = (hp / 4) > 800 ? 800 : (hp / 4);
+ if (SPELL_TYPE == SPELL_MON_TO_PLAYER)
+ {
+ breath(y, x, m_idx, GF_ROCKET, dam, 2, FALSE, MS_ROCKET, learnable);
+ update_smart_learn(m_idx, DRS_SHARD);
+ }
+ else if (SPELL_TYPE == SPELL_MON_TO_MON)
+ {
+ monst_breath_monst(m_idx, y, x, GF_ROCKET, dam, 2, FALSE, MS_ROCKET, learnable);
+ }
+ break;
+ }
+ return dam;
+}
+
+void MP_spell_RF4_SHRIEK(int m_idx)
+{
+ cptr m_name = monster_name(m_idx);
disturb(1, 1);
msg_format(_("%^s¤¬¤«¤ó¹â¤¤¶âÀÚ¤êÀ¼¤ò¤¢¤²¤¿¡£", "%^s makes a high pitched shriek."), m_name);
aggravate_monsters(m_idx);
}
-void spell_RF4_DISPEL(bool blind, cptr m_name)
+void MM_spell_RF4_SHRIEK(int m_idx, int t_idx)
+{
+ cptr m_name = monster_name(m_idx);
+ cptr t_name = monster_name(t_idx);
+ bool known = monster_near_player(m_idx, t_idx);
+ bool see_m = see_monster(m_idx);
+ if (known)
+ {
+ if (see_m)
+ {
+ msg_format(_("%^s¤¬%s¤Ë¸þ¤«¤Ã¤Æ¶«¤ó¤À¡£", "%^s shrieks at %s."), m_name, t_name);
+ }
+ else
+ {
+ mon_fight = TRUE;
+ }
+ }
+ (void)set_monster_csleep(t_idx, 0);
+}
+
+void MP_spell_RF4_DISPEL(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."), m_name);
else
msg_format(_("%^s¤¬ËâÎϾõî¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a dispel magic."), m_name);
dispel_player();
if (p_ptr->riding) dispel_monster_status(p_ptr->riding);
-#ifdef JP
if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
- msg_print("¤ä¤ê¤ä¤¬¤Ã¤¿¤Ê¡ª");
-#endif
+ msg_print(_("¤ä¤ê¤ä¤¬¤Ã¤¿¤Ê¡ª", ""));
+
learn_spell(MS_DISPEL);
}
-int spell_RF4_ROCKET(bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx, bool learnable)
+void MM_spell_RF4_DISPEL(int m_idx, int t_idx)
{
- int dam;
+ cptr m_name = monster_name(m_idx);
+ cptr t_name = monster_name(t_idx);
+ bool known = monster_near_player(m_idx, t_idx);
+ bool see_m = see_monster(m_idx);
+ if (known)
+ {
+ if (see_m)
+ {
+ msg_format(_("%^s¤¬%s¤ËÂФ·¤ÆËâÎϾõî¤Î¼öʸ¤òÇ°¤¸¤¿¡£",
+ "%^s invokes a dispel magic at %s."), m_name, t_name);
+ }
+ else
+ {
+ mon_fight = TRUE;
+ }
+ }
+
+ if (t_idx == p_ptr->riding) dispel_player();
+ dispel_monster_status(t_idx);
+}
+
+int MP_spell_RF4_ROCKET(int y, int x, int m_idx)
+{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¼Í¤Ã¤¿¡£", "%^s shoots something."), m_name);
else
msg_format(_("%^s¤¬¥í¥±¥Ã¥È¤òȯ¼Í¤·¤¿¡£", "%^s fires a rocket."), m_name);
- dam = ((m_ptr->hp / 4) > 800 ? 800 : (m_ptr->hp / 4));
- breath(y, x, m_idx, GF_ROCKET,
- dam, 2, FALSE, MS_ROCKET, learnable);
- update_smart_learn(m_idx, DRS_SHARD);
- return dam;
+ return spell_core(RF4_ROCKET, m_ptr->hp, y, x, m_idx, SPELL_MON_TO_PLAYER);
}
-int spell_RF4_SHOOT(bool blind, cptr m_name, monster_race* r_ptr, int m_idx, bool learnable)
+int MM_spell_RF4_ROCKET(int y, int x, int m_idx, int t_idx)
{
+ cptr m_name = monster_name(m_idx);
+ cptr t_name = monster_name(t_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+
+ bool known = monster_near_player(m_idx, t_idx);
+ bool see_either = see_monster(m_idx) || see_monster(t_idx);
+ if (known)
+ {
+ if (see_either)
+ {
+ disturb(1, 1);
+
+ if (p_ptr->blind)
+ {
+ msg_format(_("%^s¤¬²¿¤«¤ò¼Í¤Ã¤¿¡£", "%^s shoots something."), m_name);
+ }
+ else
+ {
+ msg_format(_("%^s¤¬%s¤Ë¥í¥±¥Ã¥È¤òȯ¼Í¤·¤¿¡£", "%^s fires a rocket at %s."), m_name, t_name);
+ }
+ }
+ else
+ {
+ mon_fight = TRUE;
+ }
+ }
+ return spell_core(RF4_ROCKET, m_ptr->hp, y, x, m_idx, SPELL_MON_TO_MON);
+}
+
+int spell_RF4_SHOOT(int m_idx)
+{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬´ñ̯¤Ê²»¤òȯ¤·¤¿¡£", "%^s makes a strange noise."), m_name);
else
msg_format(_("%^s¤¬Ìð¤òÊü¤Ã¤¿¡£", "%^s fires an arrow."), m_name);
return dam;
}
-int spell_RF4_BREATH(int GF_TYPE, bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx, bool learnable)
+int spell_RF4_BREATH(int GF_TYPE, int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
int dam, ms_type, drs_type;
cptr type_s;
bool smart_learn = TRUE;
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
switch (GF_TYPE)
{
{
msg_format(_("¡Ö¥ÜÄë¥Ó¥ë¥«¥Ã¥¿¡¼¡ª¡ª¡ª¡×", "'Boty-Build cutter!!!'"));
}
- else if (blind)
+ else if (p_ptr->blind)
{
msg_format(_("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "%^s breathes."), m_name);
}
return dam;
}
-int spell_RF4_BA_CHAO(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF4_BA_CHAO(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
+
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬¶²¤í¤·¤²¤Ë¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles frighteningly."), m_name);
else
msg_format(_("%^s¤¬½ã¥í¥°¥ë¥¹¤òÊü¤Ã¤¿¡£", "%^s invokes a raw Logrus."), m_name);
return dam;
}
-int spell_RF4_BA_NUKE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF4_BA_NUKE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬Êü¼Íǽµå¤òÊü¤Ã¤¿¡£", "%^s casts a ball of radiation."), m_name);
return dam;
}
-int spell_RF5_BA_ACID(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_ACID(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam, rad;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts an acid ball."), m_name);
return dam;
}
-int spell_RF5_BA_ELEC(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_ELEC(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam, rad;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥µ¥ó¥À¡¼¡¦¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a lightning ball."), m_name);
return dam;
}
-int spell_RF5_BA_FIRE(monster_type* m_ptr, bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_FIRE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam, rad;
disturb(1, 1);
if (m_ptr->r_idx == MON_ROLENTO)
{
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%s¤¬²¿¤«¤òÅꤲ¤¿¡£", "%^s throws something."), m_name);
else
msg_format(_("%s¤Ï¼êÜØÃƤòÅꤲ¤¿¡£", "%^s throws a hand grenade."), m_name);
}
else
{
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a fire ball."), m_name);
return dam;
}
-int spell_RF5_BA_COLD(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_COLD(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam, rad;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a frost ball."), m_name);
return dam;
}
-int spell_RF5_BA_POIS(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_POIS(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬°½±À¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a stinking cloud."), m_name);
return dam;
}
-int spell_RF5_BA_NETH(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_NETH(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ÃϹöµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a nether ball."), m_name);
return dam;
}
-int spell_RF5_BA_WATE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_WATE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬Î®¤ì¤ë¤è¤¦¤Ê¿È¿¶¤ê¤ò¤·¤¿¡£", "%^s gestures fluidly."), m_name);
return dam;
}
-int spell_RF5_BA_MANA(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_MANA(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."), m_name);
else
msg_format(_("%^s¤¬ËâÎϤÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a mana storm."), m_name);
return dam;
}
-int spell_RF5_BA_DARK(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_DARK(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."), m_name);
else
msg_format(_("%^s¤¬°Å¹õ¤ÎÍò¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a darkness storm."), m_name);
return dam;
}
-int spell_RF5_DRAIN_MANA(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_DRAIN_MANA(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
return dam;
}
-int spell_RF5_MIND_BLAST(bool seen, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_MIND_BLAST(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ bool seen = (!p_ptr->blind && m_ptr->ml);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
if (!seen)
return dam;
}
-int spell_RF5_BRAIN_SMASH(bool seen, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BRAIN_SMASH(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ bool seen = (!p_ptr->blind && m_ptr->ml);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
if (!seen)
return dam;
}
-int spell_RF5_CAUSE_1(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_CAUSE_1(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤ò»Ø¤µ¤·¤Æ¼ö¤Ã¤¿¡£", "%^s points at you and curses."), m_name);
return dam;
}
-int spell_RF5_CAUSE_2(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_CAUSE_2(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤ò»Ø¤µ¤·¤Æ¶²¤í¤·¤²¤Ë¼ö¤Ã¤¿¡£", "%^s points at you and curses horribly."), m_name);
return dam;
}
-int spell_RF5_CAUSE_3(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_CAUSE_3(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤òÂçÀ¼¤Ç¶«¤ó¤À¡£", "%^s mumbles loudly."), m_name);
else
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤ò»Ø¤µ¤·¤Æ¶²¤í¤·¤²¤Ë¼öʸ¤ò¾§¤¨¤¿¡ª", "%^s points at you, incanting terribly!"), m_name);
return dam;
}
-int spell_RF5_CAUSE_4(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_CAUSE_4(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", "%^s screams the word 'DIE!'"), m_name);
else
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤ÎÈ빦¤òÆͤ¤¤Æ¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£",
return dam;
}
-int spell_RF5_BO_ACID(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_ACID(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a acid bolt."), m_name);
return dam;
}
-int spell_RF5_BO_ELEC(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_ELEC(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a lightning bolt."), m_name);
return dam;
}
-int spell_RF5_BO_FIRE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_FIRE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a fire bolt."), m_name);
return dam;
}
-int spell_RF5_BO_COLD(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_COLD(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥¢¥¤¥¹¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a frost bolt."), m_name);
}
-int spell_RF5_BA_LITE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BA_LITE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles powerfully."), m_name);
else
msg_format(_("%^s¤¬¥¹¥¿¡¼¥Ð¡¼¥¹¥È¤Î¼öʸ¤òÇ°¤¸¤¿¡£", "%^s invokes a starburst."), m_name);
}
-int spell_RF5_BO_NETH(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_NETH(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ÃϹö¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a nether bolt."), m_name);
return dam;
}
-int spell_RF5_BO_WATE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_WATE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥¦¥©¡¼¥¿¡¼¡¦¥Ü¥ë¥È¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a water bolt."), m_name);
return dam;
}
-int spell_RF5_BO_MANA(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_MANA(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâÎϤÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a mana bolt."), m_name);
return dam;
}
-int spell_RF5_BO_PLAS(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_PLAS(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
return dam;
}
-int spell_RF5_BO_ICEE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_BO_ICEE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¶Ë´¨¤ÎÌð¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts an ice bolt."), m_name);
}
-int spell_RF5_MISSILE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx, bool learnable)
+int spell_RF5_MISSILE(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", "%^s casts a magic missile."), m_name);
return dam;
}
-void spell_RF5_SCARE(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx)
+void spell_RF5_SCARE(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢¶²¤í¤·¤²¤Ê²»¤¬Ê¹¤³¤¨¤¿¡£", "%^s mumbles, and you hear scary noises."), m_name);
else
msg_format(_("%^s¤¬¶²¤í¤·¤²¤Ê¸¸³Ð¤òºî¤ê½Ð¤·¤¿¡£", "%^s casts a fearful illusion."), m_name);
update_smart_learn(m_idx, DRS_FEAR);
}
-void spell_RF5_BLIND(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx)
+void spell_RF5_BLIND(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¼öʸ¤ò¾§¤¨¤Æ¤¢¤Ê¤¿¤ÎÌܤò¤¯¤é¤Þ¤·¤¿¡ª",
update_smart_learn(m_idx, DRS_BLIND);
}
-void spell_RF5_CONF(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx)
+void spell_RF5_CONF(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢Æ¬¤òǺ¤Þ¤¹²»¤¬¤·¤¿¡£",
"%^s mumbles, and you hear puzzling noises."), m_name);
else
update_smart_learn(m_idx, DRS_CONF);
}
-void spell_RF5_SLOW(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx)
+void spell_RF5_SLOW(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
disturb(1, 1);
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤Î¶ÚÎϤòµÛ¤¤¼è¤í¤¦¤È¤·¤¿¡ª",
update_smart_learn(m_idx, DRS_FREE);
}
-void spell_RF5_HOLD(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int y, int x, int m_idx)
+void spell_RF5_HOLD(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤ÎÌܤò¤¸¤Ã¤È¸«¤Ä¤á¤¿¡ª", "%^s stares deep into your eyes!"), m_name);
update_smart_learn(m_idx, DRS_FREE);
}
-void spell_RF6_HASTE(bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx)
+void spell_RF6_HASTE(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
{
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
}
}
}
-int spell_RF6_HAND_DOOM(bool blind, cptr m_name, monster_type* m_ptr, int y, int x, int m_idx, bool learnable)
+int spell_RF6_HAND_DOOM(int y, int x, int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
int dam;
disturb(1, 1);
msg_format(_("%^s¤¬<ÇËÌǤμê>¤òÊü¤Ã¤¿¡ª", "%^s invokes the Hand of Doom!"), m_name);
return dam;
}
-void spell_RF6_HEAL(bool blind, bool seen, cptr m_name, monster_type* m_ptr,int rlev, int m_idx)
+void spell_RF6_HEAL(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ int rlev = monster_level_idx(m_idx);
+ bool seen = (!p_ptr->blind && m_ptr->ml);
disturb(1, 1);
/* Message */
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¼«Ê¬¤Î½ý¤Ë½¸Ã椷¤¿¡£", "%^s concentrates on %s wounds."), m_name);
msg_format(_("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", "%^s recovers %s courage."), m_name);
}
}
-void spell_RF6_INVULNER(bool seen, cptr m_name, monster_type* m_ptr, int m_idx)
+void spell_RF6_INVULNER(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ bool seen = (!p_ptr->blind && m_ptr->ml);
disturb(1, 1);
/* Message */
if (!MON_INVULNER(m_ptr)) (void)set_monster_invulner(m_idx, randint1(4) + 4, FALSE);
}
-void spell_RF6_BLINK(cptr m_name, int m_idx)
+void spell_RF6_BLINK(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
disturb(1, 1);
if (teleport_barrier(m_idx))
{
}
}
-void spell_RF6_TPORT(cptr m_name, int m_idx)
+void spell_RF6_TPORT(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
disturb(1, 1);
if (teleport_barrier(m_idx))
{
}
}
-int spell_RF6_WORLD(cptr m_name, monster_type* m_ptr, int m_idx)
+int spell_RF6_WORLD(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
int who = 0;
disturb(1, 1);
if (m_ptr->r_idx == MON_DIO) who = 1;
return who;
}
-int spell_RF6_SPECIAL(cptr m_name, monster_type* m_ptr, monster_race* r_ptr, u32b mode, bool blind, bool direct, int y, int x, int m_idx)
+int spell_RF6_SPECIAL(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ u32b mode = 0L;
+ bool direct = player_bold(y, x);
int k, dam, count=0;
disturb(1, 1);
}
case MON_ROLENTO:
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«ÂçÎ̤ËÅꤲ¤¿¡£", "%^s spreads something."), m_name);
else
msg_format(_("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£", "%^s throws some hand grenades."), m_name);
}
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¤Ð¤é¤Þ¤«¤ì¤ë²»¤¬¤¹¤ë¡£", "You hear many things are scattered nearby."));
break;
}
-void spell_RF6_TELE_TO(cptr m_name, monster_type* m_ptr)
+void spell_RF6_TELE_TO(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
disturb(1, 1);
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤ò°ú¤Ìᤷ¤¿¡£", "%^s commands you to return."), m_name);
learn_spell(MS_TELE_TO);
}
-void spell_RF6_TELE_AWAY(cptr m_name, int m_idx)
+void spell_RF6_TELE_AWAY(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
disturb(1, 1);
msg_format(_("%^s¤Ë¥Æ¥ì¥Ý¡¼¥È¤µ¤»¤é¤ì¤¿¡£", "%^s teleports you away."), m_name);
teleport_player_away(m_idx, 100);
}
-void spell_RF6_TELE_LEVEL(bool blind, cptr m_name, int m_idx, int rlev)
+void spell_RF6_TELE_LEVEL(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«´ñ̯¤Ê¸ÀÍÕ¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles strangely."), m_name);
else
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤Î¤ò»Ø¤µ¤·¤¿¡£", "%^s gestures at your feet."), m_name);
update_smart_learn(m_idx, DRS_NEXUS);
}
-int spell_RF6_PSY_SPEAR(bool blind, cptr m_name, monster_race* r_ptr, int rlev, int m_idx, bool learnable)
+int spell_RF6_PSY_SPEAR(int m_idx)
{
+ bool learnable = spell_learnable(m_idx);
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int dam;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¸÷¤Î·õ¤òÊü¤Ã¤¿¡£", "%^s throw a Psycho-Spear."), m_name);
return dam;
}
-void spell_RF6_DARKNESS(bool blind, cptr m_name, bool can_use_lite_area)
+void spell_RF6_DARKNESS(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ bool can_use_lite_area = FALSE;
+
+ if ((p_ptr->pclass == CLASS_NINJA) &&
+ !(r_ptr->flags3 & (RF3_UNDEAD | RF3_HURT_LITE)) &&
+ !(r_ptr->flags7 & RF7_DARK_MASK))
+ can_use_lite_area = TRUE;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else if (can_use_lite_area)
msg_format(_("%^s¤¬ÊÕ¤ê¤òÌÀ¤ë¤¯¾È¤é¤·¤¿¡£", "%^s cast a spell to light up."), m_name);
else
msg_format(_("%^s¤¬°Å°Ç¤ÎÃæ¤Ç¼ê¤ò¿¶¤Ã¤¿¡£", "%^s gestures in shadow."), m_name);
- if (can_use_lite_area) (void)lite_area(0, 3);
+ if (can_use_lite_area)
+ {
+ (void)lite_area(0, 3);
+ }
else
{
learn_spell(MS_DARKNESS);
}
}
-void spell_RF6_TRAPS(bool blind, cptr m_name, int y, int x)
+void spell_RF6_TRAPS(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤Æ¼Ù°¤ËÈù¾Ð¤ó¤À¡£",
"%^s mumbles, and then cackles evilly."), m_name);
else
(void)trap_creation(y, x);
}
-void spell_RF6_FORGET(cptr m_name, int rlev)
+void spell_RF6_FORGET(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
disturb(1, 1);
msg_format(_("%^s¤¬¤¢¤Ê¤¿¤Îµ²±¤ò¾Ãµî¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¡£",
learn_spell(MS_FORGET);
}
-void spell_RF6_RAISE_DEAD(bool blind, cptr m_name, int m_idx, monster_type* m_ptr)
+void spell_RF6_RAISE_DEAD(int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬»à¼ÔÉü³è¤Î¼öʸ¤ò¾§¤¨¤¿¡£",
animate_dead(m_idx, m_ptr->fy, m_ptr->fx);
}
-void spell_RF6_S_KIN(bool blind, cptr m_name, monster_type* m_ptr, monster_race* r_ptr, int m_idx, int y, int x, int rlev, u32b mode)
+void spell_RF6_S_KIN(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int count = 0, k;
+ u32b mode = 0L;
disturb(1, 1);
if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
{
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥À¥ó¥¸¥ç¥ó¤Î¼ç¤ò¾¤´¤·¤¿¡£",
}
else
{
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
#ifdef JP
break;
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear many things appear nearby."));
}
-void spell_RF6_S_CYBER(bool blind, cptr m_name, int m_idx, int y, int x)
+void spell_RF6_S_CYBER(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
int count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´¤·¤¿¡ª",
count = summon_cyber(m_idx, y, x);
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("½Å¸ü¤Ê²»¤¬¶á¤¯¤Çʹ¤³¤¨¤ë¡£", "You hear heavy steps nearby."));
}
-void spell_RF6_S_MONSTER(bool blind, cptr m_name, int m_idx, int y, int x, int rlev)
+void spell_RF6_S_MONSTER(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤ÇÃç´Ö¤ò¾¤´¤·¤¿¡ª", "%^s magically summons help!"), m_name);
{
count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear something appear nearby."));
}
-void spell_RF6_S_MONSTERS(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6)
+void spell_RF6_S_MONSTERS(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¥â¥ó¥¹¥¿¡¼¤ò¾¤´¤·¤¿¡ª", "%^s magically summons monsters!"), m_name);
- for (k = 0; k < s_num_6; k++)
+ for (k = 0; k < S_NUM_6; k++)
{
count += summon_specific(m_idx, y, x, rlev, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear many things appear nearby."));
}
-void spell_RF6_S_ANT(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6)
+void spell_RF6_S_ANT(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¥¢¥ê¤ò¾¤´¤·¤¿¡£", "%^s magically summons ants."), m_name);
- for (k = 0; k < s_num_6; k++)
+ for (k = 0; k < S_NUM_6; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_ANT, PM_ALLOW_GROUP);
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear many things appear nearby."));
}
-void spell_RF6_S_SPIDER(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6)
+void spell_RF6_S_SPIDER(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¥¯¥â¤ò¾¤´¤·¤¿¡£", "%^s magically summons spiders."), m_name);
- for (k = 0; k < s_num_6; k++)
+ for (k = 0; k < S_NUM_6; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_SPIDER, PM_ALLOW_GROUP);
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear many things appear nearby."));
}
-void spell_RF6_S_HOUND(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4)
+void spell_RF6_S_HOUND(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¥Ï¥¦¥ó¥É¤ò¾¤´¤·¤¿¡£", "%^s magically summons hounds."), m_name);
- for (k = 0; k < s_num_4; k++)
+ for (k = 0; k < S_NUM_4; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_HOUND, PM_ALLOW_GROUP);
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear many things appear nearby."));
}
-void spell_RF6_S_HYDRA(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4)
+void spell_RF6_S_HYDRA(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¥Ò¥É¥é¤ò¾¤´¤·¤¿¡£", "%^s magically summons hydras."), m_name);
- for (k = 0; k < s_num_4; k++)
+ for (k = 0; k < S_NUM_4; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_HYDRA, PM_ALLOW_GROUP);
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear many things appear nearby."));
}
-void spell_RF6_S_ANGEL(bool blind, cptr m_name, monster_race* r_ptr, int m_idx, int y, int x, int rlev)
+void spell_RF6_S_ANGEL(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
int num = 1;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤ÇÅ·»È¤ò¾¤´¤·¤¿¡ª", "%^s magically summons an angel!"), m_name);
if (count < 2)
{
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear something appear nearby."));
}
else
{
- if (blind)
+ if (p_ptr->blind)
msg_print(_("¿¤¯¤Î¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear many things appear nearby."));
}
}
-void spell_RF6_S_DEMON(bool blind, cptr m_name, int m_idx, int y, int x, int rlev)
+void spell_RF6_S_DEMON(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤ÏËâË¡¤Çº®Æ٤εÜÄ¤é°Ëâ¤ò¾¤´¤·¤¿¡ª",
count += summon_specific(m_idx, y, x, rlev, SUMMON_DEMON, PM_ALLOW_GROUP);
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear something appear nearby."));
}
-void spell_RF6_S_UNDEAD(bool blind, cptr m_name, int m_idx, int y, int x, int rlev)
+void spell_RF6_S_UNDEAD(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¥¢¥ó¥Ç¥Ã¥É¤Î¶¯Å¨¤ò¾¤´¤·¤¿¡ª",
count += summon_specific(m_idx, y, x, rlev, SUMMON_UNDEAD, PM_ALLOW_GROUP);
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear something appear nearby."));
}
-void spell_RF6_S_DRAGON(bool blind, cptr m_name, int m_idx, int y, int x, int rlev)
+void spell_RF6_S_DRAGON(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¥É¥é¥´¥ó¤ò¾¤´¤·¤¿¡ª", "%^s magically summons a dragon!"), m_name);
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_DRAGON, PM_ALLOW_GROUP);
}
- if (blind && count)
+ if (p_ptr->blind && count)
msg_print(_("²¿¤«¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬¤¹¤ë¡£", "You hear something appear nearby."));
}
-void spell_RF6_S_HI_UNDEAD(monster_type* m_ptr, bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_6, u32b mode)
+void spell_RF6_S_HI_UNDEAD(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+ int rlev = monster_level_idx(m_idx);
+ u32b mode = 0L;
int k, count = 0;
disturb(1, 1);
int cy = y;
int cx = x;
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤ÇÍ©µ´ÀïÂâ¤ò¾¤´¤·¤¿¡ª", "%^s magically summons rangers of Nazgul!"), m_name);
}
else
{
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¶¯ÎϤʥ¢¥ó¥Ç¥Ã¥É¤ò¾¤´¤·¤¿¡ª",
"%^s magically summons greater undead!"), m_name);
- for (k = 0; k < s_num_6; k++)
+ for (k = 0; k < S_NUM_6; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
}
- if (blind && count)
+ if (p_ptr->blind && count)
{
msg_print(_("´Ö¶á¤Ç²¿¤«Â¿¤¯¤Î¤â¤Î¤¬Ç礤²ó¤ë²»¤¬Ê¹¤³¤¨¤ë¡£",
"You hear many creepy things appear nearby."));
}
-void spell_RF6_S_HI_DRAGON(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4)
+void spell_RF6_S_HI_DRAGON(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤Ç¸ÅÂå¥É¥é¥´¥ó¤ò¾¤´¤·¤¿¡ª", "%^s magically summons ancient dragons!"), m_name);
- for (k = 0; k < s_num_4; k++)
+ for (k = 0; k < S_NUM_4; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_HI_DRAGON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
- if (blind && count)
+ if (p_ptr->blind && count)
{
msg_print(_("¿¤¯¤ÎÎ϶¯¤¤¤â¤Î¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬Ê¹¤³¤¨¤ë¡£",
"You hear many powerful things appear nearby."));
}
}
-void spell_RF6_S_AMBERITES(bool blind, cptr m_name, int m_idx, int y, int x, int rlev, int s_num_4)
+void spell_RF6_S_AMBERITES(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬¥¢¥ó¥Ð¡¼¤Î²¦Â²¤ò¾¤´¤·¤¿¡ª", "%^s magically summons Lords of Amber!"), m_name);
- for (k = 0; k < s_num_4; k++)
+ for (k = 0; k < S_NUM_4; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_AMBERITES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
- if (blind && count)
+ if (p_ptr->blind && count)
{
msg_print(_("ÉÔ»à¤Î¼Ô¤¬¶á¤¯¤Ë¸½¤ì¤ë¤Î¤¬Ê¹¤³¤¨¤¿¡£", "You hear immortal beings appear nearby."));
}
}
-void spell_RF6_S_UNIQUE(bool blind, cptr m_name, int m_idx, monster_type* m_ptr, int y, int x, int rlev, int s_num_4)
+void spell_RF6_S_UNIQUE(int y, int x, int m_idx)
{
+ cptr m_name = monster_name(m_idx);
+ monster_type *m_ptr = &m_list[m_idx];
+ int rlev = monster_level_idx(m_idx);
int k, count = 0;
bool uniques_are_summoned = FALSE;
int non_unique_type = SUMMON_HI_UNDEAD;
disturb(1, 1);
- if (blind)
+ if (p_ptr->blind)
msg_format(_("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", "%^s mumbles."), m_name);
else
msg_format(_("%^s¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´¤·¤¿¡ª", "%^s magically summons special opponents!"), m_name);
- for (k = 0; k < s_num_4; k++)
+ for (k = 0; k < S_NUM_4; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
else if (m_ptr->sub_align & SUB_ALIGN_GOOD)
non_unique_type = SUMMON_ANGEL;
- for (k = count; k < s_num_4; k++)
+ for (k = count; k < S_NUM_4; k++)
{
count += summon_specific(m_idx, y, x, rlev, non_unique_type, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
- if (blind && count)
+ if (p_ptr->blind && count)
{
msg_format(_("¿¤¯¤Î%s¤¬´Ö¶á¤Ë¸½¤ì¤¿²»¤¬Ê¹¤³¤¨¤ë¡£", "You hear many %s appear nearby."),
uniques_are_summoned ? _("Î϶¯¤¤¤â¤Î", "powerful things") : _("¤â¤Î", "things"));
OSDN Git Service
