bool go_up = FALSE;
/* Player grid */
- cave_type *c_ptr = &cave[py][px];
+ cave_type *c_ptr = &cave[p_ptr->y][p_ptr->x];
feature_type *f_ptr = &f_info[c_ptr->feat];
int up_num = 0;
void do_cmd_go_down(void)
{
/* Player grid */
- cave_type *c_ptr = &cave[py][px];
+ cave_type *c_ptr = &cave[p_ptr->y][p_ptr->x];
feature_type *f_ptr = &f_info[c_ptr->feat];
bool fall_trap = FALSE;
}
/* Save old player position */
- p_ptr->oldpx = px;
- p_ptr->oldpy = py;
+ p_ptr->oldpx = p_ptr->x;
+ p_ptr->oldpy = p_ptr->y;
dungeon_type = (byte)target_dungeon;
/*
for (i = 0; i < num; i++)
{
if (randint1(100)<dun_level)
- activate_hi_summon(py, px, FALSE);
+ activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
else
(void)summon_specific(0, y, x, mon_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
}
* @param feat 地形ID
* @return 開いた地形である場合TRUEを返す / Return TRUE if the given feature is an open door
*/
-static bool is_open(int feat)
+static bool is_open(IDX feat)
{
return have_flag(f_info[feat].flags, FF_CLOSE) && (feat != feat_state(feat, FF_CLOSE));
}
* @details Return the number of features around (or under) the character.
* Usually look for doors and floor traps.
*/
-static int count_dt(int *y, int *x, bool (*test)(int feat), bool under)
+static int count_dt(POSITION *y, POSITION *x, bool (*test)(IDX feat), bool under)
{
int d, count, xx, yy;
if ((d == 8) && !under) continue;
/* Extract adjacent (legal) location */
- yy = py + ddy_ddd[d];
- xx = px + ddx_ddd[d];
+ yy = p_ptr->y + ddy_ddd[d];
+ xx = p_ptr->x + ddx_ddd[d];
/* Get the cave */
c_ptr = &cave[yy][xx];
* @details
* If requested, count only trapped chests.
*/
-static int count_chests(int *y, int *x, bool trapped)
+static int count_chests(POSITION *y, POSITION *x, bool trapped)
{
- int d, count, o_idx;
+ int d, count;
+ IDX o_idx;
object_type *o_ptr;
for (d = 0; d < 9; d++)
{
/* Extract adjacent (legal) location */
- int yy = py + ddy_ddd[d];
- int xx = px + ddx_ddd[d];
+ int yy = p_ptr->y + ddy_ddd[d];
+ int xx = p_ptr->x + ddx_ddd[d];
/* No (visible) chest is there */
if ((o_idx = chest_check(yy, xx, FALSE)) == 0) continue;
* @param x 方角を確認したX座標
* @return 方向ID
*/
-static int coords_to_dir(int y, int x)
+static DIRECTION coords_to_dir(POSITION y, POSITION x)
{
int d[3][3] = { {7, 4, 1}, {8, 5, 2}, {9, 6, 3} };
int dy, dx;
- dy = y - py;
- dx = x - px;
+ dy = y - p_ptr->y;
+ dx = x - p_ptr->x;
/* Paranoia */
if (ABS(dx) > 1 || ABS(dy) > 1) return (0);
*/
void do_cmd_open(void)
{
- int y, x, dir;
-
- s16b o_idx;
+ POSITION y, x;
+ DIRECTION dir;
+ IDX o_idx;
bool more = FALSE;
cave_type *c_ptr;
/* Get requested location */
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = p_ptr->y + ddy[dir];
+ x = p_ptr->x + ddx[dir];
/* Get requested grid */
c_ptr = &cave[y][x];
*/
void do_cmd_close(void)
{
- int y, x, dir;
+ POSITION y, x;
+ DIRECTION dir;
bool more = FALSE;
s16b feat;
/* Get requested location */
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = p_ptr->y + ddy[dir];
+ x = p_ptr->x + ddx[dir];
/* Get grid and contents */
c_ptr = &cave[y][x];
if (get_rep_dir(&dir,FALSE))
{
/* Get location */
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = p_ptr->y + ddy[dir];
+ x = p_ptr->x + ddx[dir];
/* Get grid */
c_ptr = &cave[y][x];
*/
void do_cmd_disarm(void)
{
- int y, x, dir;
-
+ POSITION y, x;
+ DIRECTION dir;
s16b o_idx;
bool more = FALSE;
/* See if only one target */
if (num_traps || num_chests)
{
- bool too_many = (num_traps && num_chests) || (num_traps > 1) ||
- (num_chests > 1);
+ bool too_many = (num_traps && num_chests) || (num_traps > 1) || (num_chests > 1);
if (!too_many) command_dir = coords_to_dir(y, x);
}
}
s16b feat;
/* Get location */
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = p_ptr->y + ddy[dir];
+ x = p_ptr->x + ddx[dir];
/* Get grid and contents */
c_ptr = &cave[y][x];
s16b feat;
/* Bash location */
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = p_ptr->y + ddy[dir];
+ x = p_ptr->x + ddx[dir];
/* Get grid */
c_ptr = &cave[y][x];
feature_type *f_ptr;
/* Get location */
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = p_ptr->y + ddy[dir];
+ x = p_ptr->x + ddx[dir];
/* Get grid */
c_ptr = &cave[y][x];
s16b feat;
/* Get location */
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = p_ptr->y + ddy[dir];
+ x = p_ptr->x + ddx[dir];
/* Get grid and contents */
c_ptr = &cave[y][x];
}
/* Hack again -- Is there a special encounter ??? */
- if (p_ptr->wild_mode && !cave_have_flag_bold(py, px, FF_TOWN))
+ if (p_ptr->wild_mode && !cave_have_flag_bold(p_ptr->y, p_ptr->x, FF_TOWN))
{
- int tmp = 120 + p_ptr->lev*10 - wilderness[py][px].level + 5;
+ int tmp = 120 + p_ptr->lev*10 - wilderness[p_ptr->y][p_ptr->x].level + 5;
if (tmp < 1)
tmp = 1;
- if (((wilderness[py][px].level + 5) > (p_ptr->lev / 2)) && randint0(tmp) < (21-p_ptr->skill_stl))
+ if (((wilderness[p_ptr->y][p_ptr->x].level + 5) > (p_ptr->lev / 2)) && randint0(tmp) < (21-p_ptr->skill_stl))
{
/* Inform the player of his horrible fate :=) */
msg_print(_("襲撃だ！", "You are ambushed !"));
p_ptr->energy_use = 100;
if (pickup) mpe_mode |= MPE_DO_PICKUP;
- (void)move_player_effect(py, px, mpe_mode);
+ (void)move_player_effect(p_ptr->y, p_ptr->x, mpe_mode);
}
}
/* Predict the "target" location */
- tx = px + 99 * ddx[dir];
- ty = py + 99 * ddy[dir];
+ tx = p_ptr->x + 99 * ddx[dir];
+ ty = p_ptr->y + 99 * ddy[dir];
/* Check for "target request" */
if ((dir == 5) && target_okay())
}
/* Get projection path length */
- tdis = project_path(path_g, project_length, py, px, ty, tx, PROJECT_PATH|PROJECT_THRU) - 1;
+ tdis = project_path(path_g, project_length, p_ptr->y, p_ptr->x, ty, tx, PROJECT_PATH|PROJECT_THRU) - 1;
project_length = 0; /* reset to default */
/* Don't shoot at my feet */
- if (tx == px && ty == py)
+ if (tx == p_ptr->x && ty == p_ptr->y)
{
p_ptr->energy_use = 0;
{
/* Start at the player */
- y = py;
- x = px;
+ y = p_ptr->y;
+ x = p_ptr->x;
/* Get local object */
q_ptr = &forge;
/* Calculate the new location (see "project()") */
ny = y;
nx = x;
- mmove2(&ny, &nx, py, px, ty, tx);
+ mmove2(&ny, &nx, p_ptr->y, p_ptr->x, ty, tx);
/* Shatter Arrow */
if (snipe_type == SP_KILL_WALL)
/* Monster here, Try to hit it */
if (cave[y][x].m_idx)
{
- int armour;
- cave_type *c_ptr = &cave[y][x];
+ cave_type *c_mon_ptr = &cave[y][x];
- monster_type *m_ptr = &m_list[c_ptr->m_idx];
+ monster_type *m_ptr = &m_list[c_mon_ptr->m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
/* Check the visibility */
int now_exp = p_ptr->weapon_exp[0][j_ptr->sval];
if (now_exp < s_info[p_ptr->pclass].w_max[0][j_ptr->sval])
{
- int amount = 0;
+ SUB_EXP amount = 0;
if (now_exp < WEAPON_EXP_BEGINNER) amount = 80;
else if (now_exp < WEAPON_EXP_SKILLED) amount = 25;
else if ((now_exp < WEAPON_EXP_EXPERT) && (p_ptr->lev > 19)) amount = 10;
}
}
- /* Some shots have hit bonus */
- armour = r_ptr->ac;
- if (p_ptr->concent)
- {
- armour *= (8 - p_ptr->concent);
- armour /= 8;
- }
-
/* Did we hit it (penalize range) */
if (test_hit_fire(chance - cur_dis, m_ptr, m_ptr->ml, o_name))
{
if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
/* Hack -- Track this monster */
- health_track(c_ptr->m_idx);
+ health_track(c_mon_ptr->m_idx);
}
}
tdam = mon_damage_mod(m_ptr, tdam, FALSE);
}
- /* Complex message */
- if (p_ptr->wizard || cheat_xtra)
- {
- msg_format(_("%d/%d のダメージを与えた。", "You do %d (out of %d) damage."), tdam, m_ptr->hp);
- }
+ msg_format_wizard(CHEAT_MONSTER,
+ _("%dのダメージを与えた。(残りHP %d/%d(%d))", "You do %d damage. (left HP %d/%d(%d))"),
+ tdam, m_ptr->hp - tdam, m_ptr->maxhp, m_ptr->max_maxhp);
/* Sniper */
if (snipe_type == SP_EXPLODE)
}
/* Hit the monster, check for death */
- if (mon_take_hit(c_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_ptr(m_ptr))))
+ if (mon_take_hit(c_mon_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_ptr(m_ptr))))
{
/* Dead monster */
}
}
/* Message */
- message_pain(c_ptr->m_idx, tdam);
+ message_pain(c_mon_ptr->m_idx, tdam);
/* Anger the monster */
if (tdam > 0) anger_monster(m_ptr);
msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name);
}
- set_target(m_ptr, py, px);
+ set_target(m_ptr, p_ptr->y, p_ptr->x);
/* Sniper */
if (snipe_type == SP_RUSH)
{
int n = randint1(5) + 3;
- int m_idx = c_ptr->m_idx;
+ IDX m_idx = c_mon_ptr->m_idx;
for ( ; cur_dis <= tdis; )
{
- int ox = nx;
- int oy = ny;
+ POSITION ox = nx;
+ POSITION oy = ny;
if (!n) break;
/* Calculate the new location (see "project()") */
- mmove2(&ny, &nx, py, px, ty, tx);
+ mmove2(&ny, &nx, p_ptr->y, p_ptr->x, ty, tx);
/* Stopped by wilderness boundary */
if (!in_bounds2(ny, nx)) break;
m_ptr->fy = ny;
/* Update the monster (new location) */
- update_mon(c_ptr->m_idx, TRUE);
+ update_mon(c_mon_ptr->m_idx, TRUE);
lite_spot(ny, nx);
lite_spot(oy, ox);
if (stick_to)
{
- int m_idx = cave[y][x].m_idx;
+ IDX m_idx = cave[y][x].m_idx;
monster_type *m_ptr = &m_list[m_idx];
- int o_idx = o_pop();
+ IDX o_idx = o_pop();
if (!o_idx)
{
return;
}
+ if (j_ptr->sval == SV_HARP)
+ {
+ msg_print(_("この武器で射撃はできない。", "It's not for firing."));
+ flush();
+ return;
+ }
+
if (p_ptr->special_defense & KATA_MUSOU)
{
if (shuriken >= 0)
{
- ty = randint0(101)-50+py;
- tx = randint0(101)-50+px;
+ ty = randint0(101)-50+p_ptr->y;
+ tx = randint0(101)-50+p_ptr->x;
}
else
{
if (!get_aim_dir(&dir)) return FALSE;
/* Predict the "target" location */
- tx = px + 99 * ddx[dir];
- ty = py + 99 * ddy[dir];
+ tx = p_ptr->x + 99 * ddx[dir];
+ ty = p_ptr->y + 99 * ddy[dir];
/* Check for "target request" */
if ((dir == 5) && target_okay())
p_ptr->energy_use -= p_ptr->lev;
/* Start at the player */
- y = py;
- x = px;
+ y = p_ptr->y;
+ x = p_ptr->x;
/* Hack -- Handle stuff */
/* Calculate the new location (see "project()") */
ny[cur_dis] = y;
nx[cur_dis] = x;
- mmove2(&ny[cur_dis], &nx[cur_dis], py, px, ty, tx);
+ mmove2(&ny[cur_dis], &nx[cur_dis], p_ptr->y, p_ptr->x, ty, tx);
/* Stopped by walls/doors */
if (!cave_have_flag_bold(ny[cur_dis], nx[cur_dis], FF_PROJECT))
/* Modify the damage */
tdam = mon_damage_mod(m_ptr, tdam, FALSE);
- /* Complex message */
- if (p_ptr->wizard)
- {
- msg_format(_("%d/%dのダメージを与えた。", "You do %d (out of %d) damage."), tdam, m_ptr->hp);
- }
+ msg_format_wizard(CHEAT_MONSTER, _("%dのダメージを与えた。(残りHP %d/%d(%d))", "You do %d damage. (left HP %d/%d(%d))"),
+ tdam, m_ptr->hp - tdam, m_ptr->maxhp, m_ptr->max_maxhp);
/* Hit the monster, check for death */
if (mon_take_hit(c_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_ptr(m_ptr))))
{
msg_format(_("%sが返ってきた。", "%s comes back."), o2_name);
}
- y = py;
- x = px;
+ y = p_ptr->y;
+ x = p_ptr->x;
}
}
else
{
int x, y, d;
bool wall = FALSE;
- feature_type *f_ptr = &f_info[cave[py][px].feat];
+ feature_type *f_ptr = &f_info[cave[p_ptr->y][p_ptr->x].feat];
/* Reset the "queue" */
flow_head = flow_tail = 0;
*/
void do_cmd_travel(void)
{
- int x, y, i;
+ POSITION x, y;
+ int i;
int dx, dy, sx, sy;
feature_type *f_ptr;
}
else if (!tgt_pt(&x, &y)) return;
- if ((x == px) && (y == py))
+ if ((x == p_ptr->x) && (y == p_ptr->y))
{
msg_print(_("すでにそこにいます！", "You are already there!!"));
return;
travel.dir = 0;
/* Decides first direction */
- dx = abs(px - x);
- dy = abs(py - y);
- sx = ((x == px) || (dx < dy)) ? 0 : ((x > px) ? 1 : -1);
- sy = ((y == py) || (dy < dx)) ? 0 : ((y > py) ? 1 : -1);
+ dx = abs(p_ptr->x - x);
+ dy = abs(p_ptr->y - y);
+ sx = ((x == p_ptr->x) || (dx < dy)) ? 0 : ((x > p_ptr->x) ? 1 : -1);
+ sy = ((y == p_ptr->y) || (dy < dx)) ? 0 : ((y > p_ptr->y) ? 1 : -1);
for (i = 1; i <= 9; i++)
{
OSDN Git Service
