* are included in all such copies. Other copyrights may also apply.
*/
-/* Purpose: Mane code */
+/* Purpose: Imitation code */
#include "angband.h"
}
}
- if (mode == 1)
- {
- f4 = ((RF4_BOLT_MASK | RF4_BEAM_MASK) & ~(RF4_ROCKET));
- f5 = RF5_BOLT_MASK | RF5_BEAM_MASK;
- f6 = RF6_BOLT_MASK | RF6_BEAM_MASK;
- }
- else if (mode == 2)
- {
- f4 = (RF4_BALL_MASK & ~(RF4_BREATH_MASK));
- f5 = (RF5_BALL_MASK & ~(RF5_BREATH_MASK));
- f6 = (RF6_BALL_MASK & ~(RF6_BREATH_MASK));
- }
- else if (mode == 3)
- {
- f4 = RF4_BREATH_MASK;
- f5 = RF5_BREATH_MASK;
- f6 = RF6_BREATH_MASK;
- }
- else if (mode == 4)
- {
- f4 = RF4_SUMMON_MASK;
- f5 = RF5_SUMMON_MASK;
- f6 = RF6_SUMMON_MASK;
- }
- else if (mode == 5)
- {
- f4 = ~(RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_SUMMON_MASK | RF4_INDIRECT_MASK | RF4_RIDING_MASK);
- f5 = ~(RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_SUMMON_MASK | RF5_INDIRECT_MASK | RF5_RIDING_MASK);
- f6 = (~(RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_SUMMON_MASK | RF6_INDIRECT_MASK | RF6_RIDING_MASK)) | (RF6_TRAPS | RF6_DARKNESS);
- }
+ set_rf_masks(&f4, &f5, &f6, mode);
for (i = 0, num = 0; i < 32; i++)
{
}
/* Build a prompt (accept all spells) */
+ (void)strnfmt(out_val, 78,
#ifdef JP
-(void) strnfmt(out_val, 78, "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¾§¤¨¤Þ¤¹¤«¡©",
+ "(%c-%c, '*'¤Ç°ìÍ÷, ESC) ¤É¤Î%s¤ò¾§¤¨¤Þ¤¹¤«¡©",
#else
- (void)strnfmt(out_val, 78, "(%c-%c, *=List, ESC=exit) Use which %s? ",
+ "(%c-%c, *=List, ESC=exit) Use which %s? ",
#endif
-
- I2A(0), I2A(num - 1), p);
+ I2A(0), I2A(num - 1), p);
if (use_menu) screen_save();
if (plev > spell.level) chance -= 3 * (plev - spell.level);
else chance += (spell.level - plev);
- chance += p_ptr->to_m_chance;
-
/* Reduce failure rate by INT/WIS adjustment */
chance -= 3 * (adj_mag_stat[p_ptr->stat_ind[A_INT]] - 1);
- if (p_ptr->heavy_spell) chance += 20;
- if(p_ptr->dec_mana && p_ptr->easy_spell) chance-=4;
- else if (p_ptr->easy_spell) chance-=3;
- else if (p_ptr->dec_mana) chance-=2;
+ chance = mod_spell_chance_1(chance);
need_mana = mod_need_mana(monster_powers[spellnum[i]].smana, 0, REALM_NONE);
/* Always a 5 percent chance of working */
if (chance > 95) chance = 95;
- if(p_ptr->dec_mana) chance--;
- if (p_ptr->heavy_spell) chance += 5;
- chance = MAX(chance,0);
+ chance = mod_spell_chance_2(chance);
/* Get info */
learned_info(comment, spellnum[i]);
/* Prompt */
#ifdef JP
-(void) strnfmt(tmp_val, 78, "%s¤ÎËâË¡¤ò¾§¤¨¤Þ¤¹¤«¡©", monster_powers[spellnum[i]].name);
+ (void) strnfmt(tmp_val, 78, "%s¤ÎËâË¡¤ò¾§¤¨¤Þ¤¹¤«¡©", monster_powers[spellnum[i]].name);
#else
(void)strnfmt(tmp_val, 78, "Use %s? ", monster_powers[spellnum[i]].name);
#endif
if (redraw) screen_load();
/* Show choices */
- if (show_choices)
- {
- /* Update */
- p_ptr->window |= (PW_SPELL);
+ p_ptr->window |= (PW_SPELL);
- /* Window stuff */
- window_stuff();
- }
+ /* Window stuff */
+ window_stuff();
/* Abort if needed */
if (!flag) return (FALSE);
break;
case MS_DISPEL:
{
- monster_type *m_ptr;
- char m_name[80];
+ int m_idx;
if (!target_set(TARGET_KILL)) return FALSE;
- if (!cave[target_row][target_col].m_idx) break;
- if (!los(py, px, target_row, target_col)) break;
- m_ptr = &m_list[cave[target_row][target_col].m_idx];
- monster_desc(m_name, m_ptr, 0);
- if (m_ptr->invulner)
- {
- m_ptr->invulner = 0;
-#ifdef JP
-msg_format("%s¤Ï¤â¤¦ÌµÅ¨¤Ç¤Ï¤Ê¤¤¡£", m_name);
-#else
- msg_format("%^s is no longer invulnerable.", m_name);
-#endif
- m_ptr->energy_need += ENERGY_NEED();
- }
- if (m_ptr->fast)
- {
- m_ptr->fast = 0;
-#ifdef JP
-msg_format("%s¤Ï¤â¤¦²Ã®¤µ¤ì¤Æ¤¤¤Ê¤¤¡£", m_name);
-#else
- msg_format("%^s is no longer fast.", m_name);
-#endif
- }
- if (m_ptr->slow)
- {
- m_ptr->slow = 0;
-#ifdef JP
-msg_format("%s¤Ï¤â¤¦¸ºÂ®¤µ¤ì¤Æ¤¤¤Ê¤¤¡£", m_name);
-#else
- msg_format("%^s is no longer slow.", m_name);
-#endif
- }
- p_ptr->redraw |= (PR_HEALTH);
- if (p_ptr->riding == cave[target_row][target_col].m_idx) p_ptr->redraw |= (PR_UHEALTH);
-
+ m_idx = cave[target_row][target_col].m_idx;
+ if (!m_idx) break;
+ if (!player_has_los_bold(target_row, target_col)) break;
+ if (!projectable(py, px, target_row, target_col)) break;
+ dispel_monster_status(m_idx);
break;
}
case MS_ROCKET:
break;
case MS_SLOW:
if (!get_aim_dir(&dir)) return FALSE;
- slow_monster(dir);
+ slow_monster(dir, plev);
break;
case MS_SLEEP:
if (!get_aim_dir(&dir)) return FALSE;
- sleep_monster(dir);
+ sleep_monster(dir, plev);
break;
case MS_SPEED:
(void)set_fast(randint1(20 + plev) + plev, FALSE);
(void)set_invuln(randint1(4) + 4, FALSE);
break;
case MS_BLINK:
- teleport_player(10);
+ teleport_player(10, 0L);
break;
case MS_TELEPORT:
- teleport_player(plev * 5);
+ teleport_player(plev * 5, 0L);
break;
case MS_WORLD:
world_player = TRUE;
if (!target_set(TARGET_KILL)) return FALSE;
if (!cave[target_row][target_col].m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
+ if (!projectable(py, px, target_row, target_col)) break;
m_ptr = &m_list[cave[target_row][target_col].m_idx];
r_ptr = &r_info[m_ptr->r_idx];
monster_desc(m_name, m_ptr, 0);
- if (r_ptr->flags3 & (RF3_RES_TELE))
+ if (r_ptr->flagsr & RFR_RES_TELE)
{
- if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags3 & (RF3_RES_ALL)))
+ if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL))
{
- r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
-msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª", m_name);
+ msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª", m_name);
#else
msg_format("%s is unaffected!", m_name);
#endif
}
else if (r_ptr->level > randint1(100))
{
- r_ptr->r_flags3 |= RF3_RES_TELE;
+ if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE;
#ifdef JP
-msg_format("%s¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª", m_name);
+ msg_format("%s¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª", m_name);
#else
msg_format("%s resists!", m_name);
#endif
msg_format("You command %s to return.", m_name);
#endif
- teleport_to_player(cave[target_row][target_col].m_idx, 100);
+ teleport_monster_to(cave[target_row][target_col].m_idx, py, px, 100, TELEPORT_PASSIVE);
break;
}
case MS_TELE_AWAY:
break;
case MS_TELE_LEVEL:
{
+ int target_m_idx;
monster_type *m_ptr;
monster_race *r_ptr;
char m_name[80];
if (!target_set(TARGET_KILL)) return FALSE;
- if (!cave[target_row][target_col].m_idx) break;
- if (!los(py, px, target_row, target_col)) break;
- m_ptr = &m_list[cave[target_row][target_col].m_idx];
+ target_m_idx = cave[target_row][target_col].m_idx;
+ if (!target_m_idx) break;
+ if (!player_has_los_bold(target_row, target_col)) break;
+ if (!projectable(py, px, target_row, target_col)) break;
+ m_ptr = &m_list[target_m_idx];
r_ptr = &r_info[m_ptr->r_idx];
monster_desc(m_name, m_ptr, 0);
#ifdef JP
- msg_format("%s¤Î¤ò»Ø¤µ¤·¤¿¡£", m_name);
+ msg_format("%^s¤Î¤ò»Ø¤µ¤·¤¿¡£", m_name);
#else
- msg_format("You gesture at %s's feet.", m_name);
+ msg_format("You gesture at %^s's feet.", m_name);
#endif
- if ((r_ptr->flags3 & RF3_RES_NEXU) || (r_ptr->flags3 & RF3_RES_TELE) ||
+ if ((r_ptr->flagsr & (RFR_EFF_RES_NEXU_MASK | RFR_RES_TELE)) ||
(r_ptr->flags1 & RF1_QUESTOR) || (r_ptr->level + randint1(50) > plev + randint1(60)))
{
#ifdef JP
msg_print("¤·¤«¤·¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª");
#else
- msg_format("%s are unaffected!", m_name);
-#endif
- }
- else if (!dun_level || one_in_(2))
- {
-#ifdef JP
- msg_format("%s¤Ï¾²¤òÆͤÇˤäÆÄÀ¤ó¤Ç¤¤¤Ã¤¿¡£", m_name);
-#else
- msg_format("%s sinks through the floor.", m_name);
+ msg_format("%^s is unaffected!", m_name);
#endif
- delete_monster_idx(cave[target_row][target_col].m_idx);
- }
- else
- {
-#ifdef JP
- msg_format("%s¤ÏÅ·°æ¤òÆͤÇˤäÆÃè¤ØÉ⤤¤Æ¤¤¤Ã¤¿¡£",m_name);
-#else
- msg_format("%s rises up through the ceiling.", m_name);
-#endif
- delete_monster_idx(cave[target_row][target_col].m_idx);
}
+ else teleport_level(target_m_idx);
break;
}
case MS_PSY_SPEAR:
if (plev > spell.level) chance -= 3 * (plev - spell.level);
else chance += (spell.level - plev);
- chance += p_ptr->to_m_chance;
-
/* Reduce failure rate by INT/WIS adjustment */
chance -= 3 * (adj_mag_stat[p_ptr->stat_ind[A_INT]] - 1);
- if (p_ptr->heavy_spell) chance += 20;
- if(p_ptr->dec_mana && p_ptr->easy_spell) chance-=4;
- else if (p_ptr->easy_spell) chance-=3;
- else if (p_ptr->dec_mana) chance-=2;
+ chance = mod_spell_chance_1(chance);
/* Not enough mana to cast */
if (need_mana > p_ptr->csp)
/* Always a 5 percent chance of working */
if (chance > 95) chance = 95;
- if(p_ptr->dec_mana) chance--;
- if (p_ptr->heavy_spell) chance += 5;
- chance = MAX(chance,0);
+ chance = mod_spell_chance_2(chance);
/* Failed spell */
if (randint0(100) < chance)
void learn_spell(int monspell)
{
if (p_ptr->action != ACTION_LEARN) return;
+ if (monspell < 0) return; /* Paranoia */
if (p_ptr->magic_num2[monspell]) return;
if (p_ptr->confused || p_ptr->blind || p_ptr->image || p_ptr->stun || p_ptr->paralyzed) return;
if (randint1(p_ptr->lev + 70) > monster_powers[monspell].level + 40)
p_ptr->redraw |= (PR_STATE);
}
}
+
+
+/*
+ * Extract monster spells mask for the given mode
+ */
+void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, int mode)
+{
+ switch (mode)
+ {
+ case MONSPELL_TYPE_BOLT:
+ *f4 = ((RF4_BOLT_MASK | RF4_BEAM_MASK) & ~(RF4_ROCKET));
+ *f5 = RF5_BOLT_MASK | RF5_BEAM_MASK;
+ *f6 = RF6_BOLT_MASK | RF6_BEAM_MASK;
+ break;
+
+ case MONSPELL_TYPE_BALL:
+ *f4 = (RF4_BALL_MASK & ~(RF4_BREATH_MASK));
+ *f5 = (RF5_BALL_MASK & ~(RF5_BREATH_MASK));
+ *f6 = (RF6_BALL_MASK & ~(RF6_BREATH_MASK));
+ break;
+
+ case MONSPELL_TYPE_BREATH:
+ *f4 = RF4_BREATH_MASK;
+ *f5 = RF5_BREATH_MASK;
+ *f6 = RF6_BREATH_MASK;
+ break;
+
+ case MONSPELL_TYPE_SUMMON:
+ *f4 = RF4_SUMMON_MASK;
+ *f5 = RF5_SUMMON_MASK;
+ *f6 = RF6_SUMMON_MASK;
+ break;
+
+ case MONSPELL_TYPE_OTHER:
+ *f4 = RF4_ATTACK_MASK & ~(RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_INDIRECT_MASK);
+ *f5 = RF5_ATTACK_MASK & ~(RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_INDIRECT_MASK);
+ *f6 = RF6_ATTACK_MASK & ~(RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_INDIRECT_MASK);
+ break;
+ }
+
+ return;
+}
OSDN Git Service
