if (message)
{
msg_format(_("木は%s。", "A tree %s"), message);
- cave_set_feat(floor_ptr, y, x, one_in_(3) ? feat_brake : feat_grass);
+ cave_set_feat(caster_ptr, y, x, one_in_(3) ? feat_brake : feat_grass);
/* Observe */
if (g_ptr->info & (CAVE_MARK)) obvious = TRUE;
if (is_hidden_door(g_ptr))
{
/* Pick a door */
- disclose_grid(caster_ptr->current_floor_ptr, y, x);
+ disclose_grid(caster_ptr, y, x);
/* Check line of sight */
if (known)
}
/* Destroy the trap */
- cave_alter_feat(y, x, FF_DISARM);
+ cave_alter_feat(caster_ptr, y, x, FF_DISARM);
}
/* Locked doors are unlocked */
FEAT_IDX old_feat = g_ptr->feat;
/* Unlock the door */
- cave_alter_feat(y, x, FF_DISARM);
+ cave_alter_feat(caster_ptr, y, x, FF_DISARM);
/* Check line of sound */
if (known && (old_feat != g_ptr->feat))
}
/* Destroy the feature */
- cave_alter_feat(y, x, FF_TUNNEL);
+ cave_alter_feat(caster_ptr, y, x, FF_TUNNEL);
}
/* Remove "unsafe" flag if player is not blind */
s16b old_mimic = g_ptr->mimic;
feature_type *mimic_f_ptr = &f_info[get_feat_mimic(g_ptr)];
- cave_alter_feat(y, x, FF_SPIKE);
+ cave_alter_feat(caster_ptr, y, x, FF_SPIKE);
g_ptr->mimic = old_mimic;
note_spot(y, x);
}
/* Destroy the wall */
- cave_alter_feat(y, x, FF_HURT_ROCK);
+ cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK);
caster_ptr->update |= (PU_FLOW);
}
{
if (!cave_naked_bold(caster_ptr, floor_ptr, y, x)) break;
if (player_bold(caster_ptr, y, x)) break;
- cave_set_feat(floor_ptr, y, x, feat_door[DOOR_DOOR].closed);
+ cave_set_feat(caster_ptr, y, x, feat_door[DOOR_DOOR].closed);
if (g_ptr->info & (CAVE_MARK)) obvious = TRUE;
break;
}
case GF_MAKE_TRAP:
{
- place_trap(floor_ptr, y, x);
+ place_trap(caster_ptr, y, x);
break;
}
{
if (!cave_naked_bold(caster_ptr, floor_ptr, y, x)) break;
if (player_bold(caster_ptr, y, x)) break;
- cave_set_feat(floor_ptr, y, x, feat_tree);
+ cave_set_feat(caster_ptr, y, x, feat_tree);
if (g_ptr->info & (CAVE_MARK)) obvious = TRUE;
break;
}
{
if (!cave_naked_bold(caster_ptr, floor_ptr, y, x)) break;
if (player_bold(caster_ptr, y, x)) break;
- cave_set_feat(floor_ptr, y, x, feat_granite);
+ cave_set_feat(caster_ptr, y, x, feat_granite);
break;
}
if (dam == 1)
{
if (!have_flag(f_ptr->flags, FF_FLOOR)) break;
- cave_set_feat(floor_ptr, y, x, feat_shallow_lava);
+ cave_set_feat(caster_ptr, y, x, feat_shallow_lava);
}
else if (dam)
{
- cave_set_feat(floor_ptr, y, x, feat_deep_lava);
+ cave_set_feat(caster_ptr, y, x, feat_deep_lava);
}
break;
if (dam == 1)
{
if (!have_flag(f_ptr->flags, FF_FLOOR)) break;
- cave_set_feat(floor_ptr, y, x, feat_shallow_water);
+ cave_set_feat(caster_ptr, y, x, feat_shallow_water);
}
else if (dam)
{
- cave_set_feat(floor_ptr, y, x, feat_deep_water);
+ cave_set_feat(caster_ptr, y, x, feat_deep_water);
}
break;
{
if (is_mirror_grid(g_ptr))
{
- msg_print(_("鏡が割れた！", "The mirror was crashed!"));
+ msg_print(_("鏡が割れた！", "The mirror was shattered!"));
sound(SOUND_GLASS);
remove_mirror(caster_ptr, y, x);
project(caster_ptr, 0, 2, y, x, caster_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
{
if (known && (g_ptr->info & CAVE_MARK))
{
- msg_format(_("%sが割れた！", "The %s was crashed!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
+ msg_format(_("%sが割れた！", "The %s crumbled!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
sound(SOUND_GLASS);
}
/* Destroy the wall */
- cave_alter_feat(y, x, FF_HURT_ROCK);
+ cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK);
caster_ptr->update |= (PU_FLOW);
}
{
if (is_mirror_grid(g_ptr) && caster_ptr->lev < 40)
{
- msg_print(_("鏡が割れた！", "The mirror was crashed!"));
+ msg_print(_("鏡が割れた！", "The mirror was shattered!"));
sound(SOUND_GLASS);
remove_mirror(caster_ptr, y, x);
project(caster_ptr, 0, 2, y, x, caster_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
{
if (known && (g_ptr->info & CAVE_MARK))
{
- msg_format(_("%sが割れた！", "The %s was crashed!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
+ msg_format(_("%sが割れた！", "The %s crumbled!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
sound(SOUND_GLASS);
}
/* Destroy the wall */
- cave_alter_feat(y, x, FF_HURT_ROCK);
+ cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK);
caster_ptr->update |= (PU_FLOW);
}
/* But not protect monsters and other objects */
if (have_flag(f_ptr->flags, FF_HURT_DISI) && !have_flag(f_ptr->flags, FF_PERMANENT))
{
- cave_alter_feat(y, x, FF_HURT_DISI);
+ cave_alter_feat(caster_ptr, y, x, FF_HURT_DISI);
/* Update some things -- similar to GF_KILL_WALL */
caster_ptr->update |= (PU_FLOW);
identify_item(caster_ptr, o_ptr);
/* Auto-inscription */
- autopick_alter_item((-this_o_idx), FALSE);
+ autopick_alter_item(caster_ptr, (-this_o_idx), FALSE);
break;
}
DEPTH caster_lev = (who > 0) ? r_info[m_caster_ptr->r_idx].level : (caster_ptr->lev * 2);
/* Nobody here */
- if (!g_ptr->m_idx) return (FALSE);
+ if (!g_ptr->m_idx) return FALSE;
/* Never affect projector */
- if (who && (g_ptr->m_idx == who)) return (FALSE);
- if ((g_ptr->m_idx == caster_ptr->riding) && !who && !(typ == GF_OLD_HEAL) && !(typ == GF_OLD_SPEED) && !(typ == GF_STAR_HEAL)) return (FALSE);
+ if (who && (g_ptr->m_idx == who)) return FALSE;
+ if ((g_ptr->m_idx == caster_ptr->riding) && !who && !(typ == GF_OLD_HEAL) && !(typ == GF_OLD_SPEED) && !(typ == GF_STAR_HEAL)) return FALSE;
if (sukekaku && ((m_ptr->r_idx == MON_SUKE) || (m_ptr->r_idx == MON_KAKU))) return FALSE;
/* Don't affect already death monsters */
/* Prevents problems with chain reactions of exploding monsters */
- if (m_ptr->hp < 0) return (FALSE);
+ if (m_ptr->hp < 0) return FALSE;
/* Reduce damage by distance */
dam = (dam + r) / (r + 1);
delete_monster_idx(g_ptr->m_idx);
- return (TRUE);
+ return TRUE;
}
else
{
if (seen) obvious = TRUE;
if (genocide_aux(caster_ptr, g_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One")))
{
- if (seen_msg) msg_format(_("%sは消滅した！", "%^s disappered!"), m_name);
+ if (seen_msg) msg_format(_("%sは消滅した！", "%^s disappeared!"), m_name);
chg_virtue(caster_ptr, V_VITALITY, -1);
return TRUE;
}
}
/* Absolutely no effect */
- if (skipped) return (FALSE);
+ if (skipped) return FALSE;
/* "Unique" monsters cannot be polymorphed */
if (r_ptr->flags1 & (RF1_UNIQUE)) do_poly = FALSE;
bool fear = FALSE;
/* Hurt the monster, check for fear and death */
- if (mon_take_hit(g_ptr->m_idx, dam, &fear, note_dies))
+ if (mon_take_hit(caster_ptr, g_ptr->m_idx, dam, &fear, note_dies))
{
/* Dead monster */
}
{
caster_ptr->health_who = g_ptr->m_idx;
caster_ptr->redraw |= (PR_HEALTH);
- handle_stuff();
+ handle_stuff(caster_ptr);
}
/* Verify this code */
/* Player is not here */
- if (!player_bold(target_ptr, y, x)) return (FALSE);
+ if (!player_bold(target_ptr, y, x)) return FALSE;
if ((target_ptr->special_defense & NINJA_KAWARIMI) && dam && (randint0(55) < (target_ptr->lev * 3 / 5 + 20)) && who && (who != target_ptr->riding))
{
}
/* Player cannot hurt himself */
- if (!who) return (FALSE);
- if (who == target_ptr->riding) return (FALSE);
+ if (!who) return FALSE;
+ if (who == target_ptr->riding) return FALSE;
if ((target_ptr->reflect || ((target_ptr->special_defense & KATA_FUUJIN) && !target_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
{
/* Standard damage -- also poisons player */
case GF_POIS:
{
- bool double_resist = IS_OPPOSE_POIS();
+ bool double_resist = is_oppose_pois(target_ptr);
if (fuzzy) msg_print(_("毒で攻撃された！", "You are hit by poison!"));
if (target_ptr->resist_pois) dam = (dam + 2) / 3;
/* Standard damage -- also poisons / mutates player */
case GF_NUKE:
{
- bool double_resist = IS_OPPOSE_POIS();
+ bool double_resist = is_oppose_pois(target_ptr);
if (fuzzy) msg_print(_("放射能で攻撃された！", "You are hit by radiation!"));
if (target_ptr->resist_pois) dam = (2 * dam + 2) / 5;
(void)set_stun(target_ptr, target_ptr->stun + plus_stun);
}
- if (!(target_ptr->resist_fire || IS_OPPOSE_FIRE() || target_ptr->immune_fire))
+ if (!(target_ptr->resist_fire || is_oppose_fire(target_ptr) || target_ptr->immune_fire))
{
inventory_damage(target_ptr, set_acid_destroy, 3);
}
(void)set_stun(target_ptr, target_ptr->stun + randint1(15));
}
- if ((!(target_ptr->resist_cold || IS_OPPOSE_COLD())) || one_in_(12))
+ if ((!(target_ptr->resist_cold || is_oppose_cold(target_ptr))) || one_in_(12))
{
if (!target_ptr->immune_cold) inventory_damage(target_ptr, set_cold_destroy, 3);
}
ax = ABS(dx);
/* Handle adjacent (or identical) grids */
- if ((ax < 2) && (ay < 2)) return (TRUE);
+ if ((ax < 2) && (ay < 2)) return TRUE;
/* Paranoia -- require "safe" origin */
- /* if (!in_bounds(floor_ptr, y1, x1)) return (FALSE); */
+ /* if (!in_bounds(floor_ptr, y1, x1)) return FALSE; */
/* Directly South/North */
if (!dx)
{
for (ty = y1 + 1; ty < y2; ty++)
{
- if (cave_stop_disintegration(floor_ptr, ty, x1)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, ty, x1)) return FALSE;
}
}
{
for (ty = y1 - 1; ty > y2; ty--)
{
- if (cave_stop_disintegration(floor_ptr, ty, x1)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, ty, x1)) return FALSE;
}
}
/* Assume los */
- return (TRUE);
+ return TRUE;
}
/* Directly East/West */
{
for (tx = x1 + 1; tx < x2; tx++)
{
- if (cave_stop_disintegration(floor_ptr, y1, tx)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, y1, tx)) return FALSE;
}
}
{
for (tx = x1 - 1; tx > x2; tx--)
{
- if (cave_stop_disintegration(floor_ptr, y1, tx)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, y1, tx)) return FALSE;
}
}
/* Assume los */
- return (TRUE);
+ return TRUE;
}
/* Extract some signs */
{
if (ay == 2)
{
- if (!cave_stop_disintegration(floor_ptr, y1 + sy, x1)) return (TRUE);
+ if (!cave_stop_disintegration(floor_ptr, y1 + sy, x1)) return TRUE;
}
}
{
if (ax == 2)
{
- if (!cave_stop_disintegration(floor_ptr, y1, x1 + sx)) return (TRUE);
+ if (!cave_stop_disintegration(floor_ptr, y1, x1 + sx)) return TRUE;
}
}
/* the LOS exactly meets the corner of a tile. */
while (x2 - tx)
{
- if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
qy += m;
else if (qy > f2)
{
ty += sy;
- if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
qy -= f1;
tx += sx;
}
/* the LOS exactly meets the corner of a tile. */
while (y2 - ty)
{
- if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
qx += m;
else if (qx > f2)
{
tx += sx;
- if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+ if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
qx -= f1;
ty += sy;
}
/* Calculate the projection path */
path_n = project_path(caster_ptr->current_floor_ptr, path_g, (project_length ? project_length : MAX_RANGE), y1, x1, y2, x2, flg);
- handle_stuff();
+ handle_stuff(caster_ptr);
/* Giga-Hack SEEKER & SUPER_RAY */
if (m_ptr->ml)
{
- if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
- health_track(caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
+ if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+ health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
}
}
}
if (m_ptr->ml)
{
- if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
- health_track(caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
+ if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+ health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
}
}
}
if (m_ptr->ml)
{
- if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
- health_track(caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
+ if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+ health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
}
}
}
}
/* Speed -- ignore "non-explosions" */
- if (!grids) return (FALSE);
+ if (!grids) return FALSE;
/* Display the "blast area" if requested */
}
}
-
/* Find the closest point in the blast */
if (breath)
{
effective_dist = dist;
}
-
/* There is the riding player on this monster */
if (caster_ptr->riding && player_bold(caster_ptr, y, x))
{
if (m_ptr->ml)
{
- if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
- health_track(caster_ptr->current_floor_ptr->grid_array[y][x].m_idx);
+ if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+ health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].m_idx);
}
}
}
}
-
/* Check player */
if (flg & (PROJECT_KILL))
{
OSDN Git Service
