*/
#include "angband.h"
+#include "spells-summon.h"
+#include "spells-status.h"
+#include "cmd-spell.h"
+#include "player-status.h"
static int damage;
* @param dam ものまねの威力
* @return なし
*/
-static void mane_info(char *p, int power, int dam)
+static void mane_info(char *p, int power, HIT_POINT dam)
{
- int plev = p_ptr->lev;
-#ifdef JP
- cptr s_dam = "損傷:";
- cptr s_dur = "期間:";
- cptr s_range = "範囲:";
- cptr s_heal = "回復:";
-#else
- cptr s_dam = "dam ";
- cptr s_dur = "dur ";
- cptr s_range = "range ";
- cptr s_heal = "heal ";
-#endif
+ PLAYER_LEVEL plev = p_ptr->lev;
strcpy(p, "");
if ((power > 2 && power < 41) || (power > 41 && power < 59) || (power == 75))
- sprintf(p, " %s%d", s_dam, dam);
+ sprintf(p, " %s%d", KWD_DAM, (int)dam);
else
{
switch (power)
{
case 41:
- sprintf(p, " %sd%d+%d", s_heal, plev * 3, plev);
+ sprintf(p, " %sd%d+%d", KWD_HEAL, plev * 3, plev);
break;
case 64:
- sprintf(p, " %sd%d+%d", s_dur, 20+plev, plev);
+ sprintf(p, " %sd%d+%d", KWD_DURATION, 20+plev, plev);
break;
case 66:
- sprintf(p, " %s%d", s_heal, plev*6);
+ sprintf(p, " %s%d", KWD_HEAL, plev*6);
break;
case 67:
- sprintf(p, " %sd7+7", s_dur);
+ sprintf(p, " %sd7+7", KWD_DURATION);
break;
case 68:
- sprintf(p, " %s10", s_range);
+ sprintf(p, " %s10", KWD_SPHERE);
break;
case 69:
- sprintf(p, " %s%d", s_range, plev * 5);
+ sprintf(p, " %s%d", KWD_SPHERE, plev * 5);
break;
case 79:
- sprintf(p, " %s5", s_range);
+ sprintf(p, " %s5", KWD_SPHERE);
break;
default:
break;
{
int i = 0;
int num = 0;
- int y = 1;
- int x = 18;
+ TERM_LEN y = 1;
+ TERM_LEN x = 18;
int minfail = 0;
- int plev = p_ptr->lev;
+ PLAYER_LEVEL plev = p_ptr->lev;
int chance = 0;
int ask;
char choice;
char out_val[160];
char comment[80];
- cptr p = _("能力", "power");
+ concptr p = _("能力", "power");
monster_power spell;
bool flag, redraw;
/* Show list */
redraw = TRUE;
-
- /* Save the screen */
screen_save();
/* Display a list of spells */
/* Reduce failure rate by INT/WIS adjustment */
chance -= 3 * (adj_mag_stat[p_ptr->stat_ind[spell.use_stat]] + adj_mag_stat[p_ptr->stat_ind[A_DEX]] - 2) / 2;
- if (spell.manedam) chance = chance * p_ptr->mane_dam[i] / spell.manedam;
+ if (spell.manedam) chance = chance * (baigaesi ? p_ptr->mane_dam[i] * 2 : p_ptr->mane_dam[i]) / spell.manedam;
chance += p_ptr->to_m_chance;
{
/* Hide list */
redraw = FALSE;
-
- /* Restore the screen */
screen_load();
}
/* Stop the loop */
flag = TRUE;
}
-
- /* Restore the screen */
if (redraw) screen_load();
- /* Show choices */
p_ptr->window |= (PW_SPELL);
-
- /* Window stuff */
- window_stuff();
+ handle_stuff();
/* Abort if needed */
if (!flag) return (FALSE);
*/
static bool use_mane(int spell)
{
- int dir;
- int plev = p_ptr->lev;
- u32b mode = (PM_ALLOW_GROUP | PM_FORCE_PET);
- u32b u_mode = 0L;
+ DIRECTION dir;
+ PLAYER_LEVEL plev = p_ptr->lev;
+ BIT_FLAGS mode = (PM_ALLOW_GROUP | PM_FORCE_PET);
+ BIT_FLAGS u_mode = 0L;
if (randint1(50+plev) < plev/10) u_mode = PM_ALLOW_UNIQUE;
/* spell code */
switch (spell)
{
+
case MS_SHRIEK:
msg_print(_("かん高い金切り声をあげた。", "You make a high pitched shriek."));
aggravate_monsters(0);
break;
+
case MS_XXX1:
break;
+
case MS_DISPEL:
{
MONSTER_IDX m_idx;
if (!target_set(TARGET_KILL)) return FALSE;
- m_idx = cave[target_row][target_col].m_idx;
+ m_idx = grid_array[target_row][target_col].m_idx;
if (!m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
if (!projectable(p_ptr->y, p_ptr->x, target_row, target_col)) break;
dispel_monster_status(m_idx);
break;
}
+
case MS_ROCKET:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("ロケットを発射した。", "You fire a rocket."));
-
fire_rocket(GF_ROCKET, dir, damage, 2);
break;
+
case MS_SHOOT:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("矢を放った。", "You fire an arrow."));
-
fire_bolt(GF_ARROW, dir, damage);
break;
+
case MS_XXX2:
break;
+
case MS_XXX3:
break;
+
case MS_XXX4:
break;
+
case MS_BR_ACID:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("酸のブレスを吐いた。", "You breathe acid."));
-
- fire_ball(GF_ACID, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_ACID, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_ELEC:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("稲妻のブレスを吐いた。", "You breathe lightning."));
-
- fire_ball(GF_ELEC, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_ELEC, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_FIRE:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("火炎のブレスを吐いた。", "You breathe fire."));
-
- fire_ball(GF_FIRE, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_FIRE, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_COLD:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("冷気のブレスを吐いた。", "You breathe frost."));
-
- fire_ball(GF_COLD, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_COLD, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_POIS:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("ガスのブレスを吐いた。", "You breathe gas."));
-
- fire_ball(GF_POIS, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_POIS, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_NETHER:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("地獄のブレスを吐いた。", "You breathe nether."));
-
- fire_ball(GF_NETHER, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_NETHER, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_LITE:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("閃光のブレスを吐いた。", "You breathe light."));
-
- fire_ball(GF_LITE, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_LITE, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_DARK:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("暗黒のブレスを吐いた。", "You breathe darkness."));
-
- fire_ball(GF_DARK, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_DARK, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_CONF:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("混乱のブレスを吐いた。", "You breathe confusion."));
-
- fire_ball(GF_CONFUSION, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_CONFUSION, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_SOUND:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("轟音のブレスを吐いた。", "You breathe sound."));
-
- fire_ball(GF_SOUND, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_SOUND, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_CHAOS:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("カオスのブレスを吐いた。", "You breathe chaos."));
-
- fire_ball(GF_CHAOS, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_CHAOS, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_DISEN:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("劣化のブレスを吐いた。", "You breathe disenchantment."));
-
- fire_ball(GF_DISENCHANT, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_DISENCHANT, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_NEXUS:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus."));
-
- fire_ball(GF_NEXUS, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_NEXUS, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_TIME:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("時間逆転のブレスを吐いた。", "You breathe time."));
-
- fire_ball(GF_TIME, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_TIME, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_INERTIA:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
-
- fire_ball(GF_INERTIAL, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_INERTIAL, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_GRAVITY:
if (!get_aim_dir(&dir)) return FALSE;
- else msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));
-
- fire_ball(GF_GRAVITY, dir, damage, (plev > 35 ? -3 : -2));
+ else msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));
+ fire_breath(GF_GRAVITY, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_SHARDS:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("破片のブレスを吐いた。", "You breathe shards."));
-
- fire_ball(GF_SHARDS, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_SHARDS, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_PLASMA:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma."));
- fire_ball(GF_PLASMA, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_PLASMA, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_FORCE:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("フォースのブレスを吐いた。", "You breathe force."));
- fire_ball(GF_FORCE, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_FORCE, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BR_MANA:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("魔力のブレスを吐いた。", "You breathe mana."));
- fire_ball(GF_MANA, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_MANA, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BALL_NUKE:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("放射能球を放った。", "You cast a ball of radiation."));
fire_ball(GF_NUKE, dir, damage, 2);
break;
+
case MS_BR_NUKE:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("放射性廃棄物のブレスを吐いた。", "You breathe toxic waste."));
- fire_ball(GF_NUKE, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_NUKE, dir, damage, (plev > 35 ? 3 : 2));
break;
+
case MS_BALL_CHAOS:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("純ログルスを放った。", "You invoke a raw Logrus."));
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("分解のブレスを吐いた。", "You breathe disintegration."));
- fire_ball(GF_DISINTEGRATE, dir, damage, (plev > 35 ? -3 : -2));
+ fire_breath(GF_DISINTEGRATE, dir, damage, (plev > 35 ? 3 : 2));
break;
case MS_BALL_ACID:
if (!get_aim_dir(&dir)) return FALSE;
teleport_player(plev * 5, 0L);
break;
case MS_WORLD:
- world_player = TRUE;
+ p_ptr->timewalk = TRUE;
if (damage == 1 || damage == 2)
msg_print(_("「『ザ・ワールド』！時は止まった！」", "You yell 'The World! Time has stopped!'"));
else if (damage == 3 || damage == 6)
msg_print(NULL);
/* Hack */
- p_ptr->energy_need -= 1000 + (100 + randint1(200)+200)*TURNS_PER_TICK/10;
-
- /* Redraw map */
+ p_ptr->energy_need -= 1000 + (100 + randint1(200) + 200) * TURNS_PER_TICK / 10;
p_ptr->redraw |= (PR_MAP);
-
- /* Update monsters */
p_ptr->update |= (PU_MONSTERS);
-
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
handle_stuff();
{
monster_type *m_ptr;
monster_race *r_ptr;
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
if (!target_set(TARGET_KILL)) return FALSE;
- if (!cave[target_row][target_col].m_idx) break;
+ if (!grid_array[target_row][target_col].m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
if (!projectable(p_ptr->y, p_ptr->x, target_row, target_col)) break;
- m_ptr = &m_list[cave[target_row][target_col].m_idx];
+ m_ptr = &m_list[grid_array[target_row][target_col].m_idx];
r_ptr = &r_info[m_ptr->r_idx];
monster_desc(m_name, m_ptr, 0);
if (r_ptr->flagsr & RFR_RES_TELE)
}
msg_format(_("%sを引き戻した。", "You command %s to return."), m_name);
- teleport_monster_to(cave[target_row][target_col].m_idx, p_ptr->y, p_ptr->x, 100, TELEPORT_PASSIVE);
+ teleport_monster_to(grid_array[target_row][target_col].m_idx, p_ptr->y, p_ptr->x, 100, TELEPORT_PASSIVE);
break;
}
case MS_TELE_AWAY:
(void)fire_beam(GF_AWAY_ALL, dir, plev);
break;
- case MS_TELE_LEVEL:
- {
- IDX target_m_idx;
- monster_type *m_ptr;
- monster_race *r_ptr;
- char m_name[80];
-
- if (!target_set(TARGET_KILL)) return FALSE;
- 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(p_ptr->y, p_ptr->x, 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);
- msg_format(_("%^sの足を指さした。", "You gesture at %^s's feet."), m_name);
- 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)))
- {
- msg_print(_("しかし効果がなかった！", "%^s is unaffected!"));
- }
- else teleport_level(target_m_idx);
+ case MS_TELE_LEVEL:
+ return teleport_level_other(p_ptr);
break;
- }
+
case MS_PSY_SPEAR:
if (!get_aim_dir(&dir)) return FALSE;
else msg_print(_("光の剣を放った。", "You throw a psycho-spear."));
(void)fire_beam(GF_PSY_SPEAR, dir, damage);
break;
+
case MS_DARKNESS:
msg_print(_("暗闇の中で手を振った。", "You gesture in shadow."));
(void)unlite_area(10, 3);
break;
+
case MS_MAKE_TRAP:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("呪文を唱えて邪悪に微笑んだ。", "You cast a spell and cackles evilly."));
msg_print(_("サイバーデーモンを召喚した！", "You summon Cyberdemons!"));
if (max_cyber > 4) max_cyber = 4;
for (k = 0;k < max_cyber; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_CYBER, mode);
+ summon_specific(-1, target_row, target_col, plev, SUMMON_CYBER, mode, '\0');
break;
}
case MS_S_MONSTER:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("仲間を召喚した。", "You summon help."));
for (k = 0;k < 1; k++)
- summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode));
+ summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode), '\0');
break;
}
case MS_S_MONSTERS:
int k;
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("モンスターを召喚した！", "You summon monsters!"));
- for (k = 0;k < 6; k++)
- summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode));
+ for (k = 0;k < A_MAX; k++)
+ summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode), '\0');
break;
}
case MS_S_ANT:
int k;
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("アリを召喚した。", "You summon ants."));
- for (k = 0;k < 6; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode);
+ for (k = 0;k < A_MAX; k++)
+ summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode, '\0');
break;
}
case MS_S_SPIDER:
int k;
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("蜘蛛を召喚した。", "You summon spiders."));
- for (k = 0;k < 6; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode);
+ for (k = 0;k < A_MAX; k++)
+ summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode, '\0');
break;
}
case MS_S_HOUND:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("ハウンドを召喚した。", "You summon hounds."));
for (k = 0;k < 4; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_HOUND, mode);
+ summon_specific(-1, target_row, target_col, plev, SUMMON_HOUND, mode, '\0');
break;
}
case MS_S_HYDRA:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("ヒドラを召喚した。", "You summon hydras."));
for (k = 0;k < 4; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_HYDRA, mode);
+ summon_specific(-1, target_row, target_col, plev, SUMMON_HYDRA, mode, '\0');
break;
}
case MS_S_ANGEL:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("天使を召喚した！", "You summon angel!"));
for (k = 0;k < 1; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_ANGEL, mode);
+ summon_specific(-1, target_row, target_col, plev, SUMMON_ANGEL, mode, '\0');
break;
}
case MS_S_DEMON:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("混沌の宮廷から悪魔を召喚した！", "You summon a demon from the Courts of Chaos!"));
for (k = 0;k < 1; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_DEMON, (mode | u_mode));
+ summon_specific(-1, target_row, target_col, plev, SUMMON_DEMON, (mode | u_mode), '\0');
break;
}
case MS_S_UNDEAD:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("アンデッドの強敵を召喚した！", "You summon an undead adversary!"));
for (k = 0;k < 1; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_UNDEAD, (mode | u_mode));
+ summon_specific(-1, target_row, target_col, plev, SUMMON_UNDEAD, (mode | u_mode), '\0');
break;
}
case MS_S_DRAGON:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("ドラゴンを召喚した！", "You summon dragon!"));
for (k = 0;k < 1; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_DRAGON, (mode | u_mode));
+ summon_specific(-1, target_row, target_col, plev, SUMMON_DRAGON, (mode | u_mode), '\0');
break;
}
case MS_S_HI_UNDEAD:
int k;
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("強力なアンデッドを召喚した！", "You summon greater undead!"));
- for (k = 0;k < 6; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode));
+ for (k = 0;k < A_MAX; k++)
+ summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
break;
}
case MS_S_HI_DRAGON:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("古代ドラゴンを召喚した！", "You summon ancient dragons!"));
for (k = 0;k < 4; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_HI_DRAGON, (mode | u_mode));
+ summon_specific(-1, target_row, target_col, plev, SUMMON_HI_DRAGON, (mode | u_mode), '\0');
break;
}
case MS_S_AMBERITE:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("アンバーの王族を召喚した！", "You summon Lords of Amber!"));
for (k = 0;k < 4; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_AMBERITES, (mode | PM_ALLOW_UNIQUE));
+ summon_specific(-1, target_row, target_col, plev, SUMMON_AMBERITES, (mode | PM_ALLOW_UNIQUE), '\0');
break;
}
case MS_S_UNIQUE:
if (!target_set(TARGET_KILL)) return FALSE;
msg_print(_("特別な強敵を召喚した！", "You summon special opponents!"));
for (k = 0;k < 4; k++)
- if (summon_specific(-1, target_row, target_col, plev, SUMMON_UNIQUE, (mode | PM_ALLOW_UNIQUE))) count++;
+ if (summon_specific(-1, target_row, target_col, plev, SUMMON_UNIQUE, (mode | PM_ALLOW_UNIQUE), '\0')) count++;
for (k = count;k < 4; k++)
- summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode));
+ summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
break;
}
default:
int n = 0, j;
int chance;
int minfail = 0;
- int plev = p_ptr->lev;
+ PLAYER_LEVEL plev = p_ptr->lev;
monster_power spell;
bool cast;
-
- /* not if confused */
- if (p_ptr->confused)
- {
- msg_print(_("混乱していて集中できない！", "You are too confused!"));
- return TRUE;
- }
+ if (cmd_limit_confused(p_ptr)) return FALSE;
if (!p_ptr->mane_num)
{
p_ptr->mane_dam[j] = p_ptr->mane_dam[j+1];
}
- /* Take a turn */
- p_ptr->energy_use = 100;
+ take_turn(p_ptr, 100);;
- /* Window stuff */
p_ptr->redraw |= (PR_IMITATION);
p_ptr->window |= (PW_PLAYER);
p_ptr->window |= (PW_SPELL);
OSDN Git Service
