*/
#include "angband.h"
+#include "cmd-pet.h"
-#define SPEAK_CHANCE 8
-#define GRINDNOISE 20
-#define CYBERNOISE 20
/*!
* @brief モンスターが敵に接近するための方向を決める /
* @param mm 移動するべき方角IDを返す参照ポインタ
* @return 方向が確定した場合TRUE、接近する敵がそもそもいない場合FALSEを返す
*/
-static bool get_enemy_dir(int m_idx, int *mm)
+static bool get_enemy_dir(MONSTER_IDX m_idx, int *mm)
{
int i;
int x = 0, y = 0;
- int t_idx;
+ IDX t_idx;
int start;
int plus = 1;
/* Scan thru all monsters */
for (i = start; ((i < start + m_max) && (i > start - m_max)); i+=plus)
{
- int dummy = (i % m_max);
+ IDX dummy = (i % m_max);
if (!dummy) continue;
* @param who 打撃を行ったモンスターの参照ID
* @return なし
*/
-void mon_take_hit_mon(int m_idx, int dam, bool *fear, cptr note, int who)
+void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note, IDX who)
{
monster_type *m_ptr = &m_list[m_idx];
{
if (seen)
{
-#ifdef JP
-msg_format("%^sはダメージを受けない。", m_name);
-#else
- msg_format("%^s is unharmed.", m_name);
-#endif
-
+ msg_format(_("%^sはダメージを受けない。", "%^s is unharmed."), m_name);
}
return;
{
if (seen)
{
-#ifdef JP
-msg_format("%^sはダメージを受けない。", m_name);
-#else
- msg_format("%^s is unharmed.", m_name);
-#endif
-
+ msg_format(_("%^sはダメージを受けない。", "%^s is unharmed."), m_name);
}
return;
}
}
/* Hurt it */
- m_ptr->hp -= dam;
+ m_ptr->hp -= (s16b)dam;
/* It is dead now... or is it? */
if (m_ptr->hp < 0)
/* Death by special attack */
else if (note)
{
-#ifdef JP
-msg_format("%^s%s", m_name, note);
-#else
- msg_format("%^s%s", m_name, note);
-#endif
-
+ msg_format(_("%^s%s", "%^s%s"), m_name, note);
}
/* Death by normal attack -- nonliving monster */
else if (!monster_living(r_ptr))
{
-#ifdef JP
-msg_format("%^sは破壊された。", m_name);
-#else
- msg_format("%^s is destroyed.", m_name);
-#endif
-
+ msg_format(_("%^sは破壊された。", "%^s is destroyed."), m_name);
}
/* Death by normal attack -- living monster */
else
{
-#ifdef JP
-msg_format("%^sは殺された。", m_name);
-#else
- msg_format("%^s is killed.", m_name);
-#endif
-
+ msg_format(_("%^sは殺された。", "%^s is killed."), m_name);
}
}
if (p_ptr->riding && (p_ptr->riding == m_idx) && (dam > 0))
{
- char m_name[80];
-
/* Extract monster name */
monster_desc(m_name, m_ptr, 0);
if (m_ptr->hp > m_ptr->maxhp/3) dam = (dam + 1) / 2;
if (rakuba((dam > 200) ? 200 : dam, FALSE))
{
-#ifdef JP
-msg_format("%^sに振り落とされた！", m_name);
-#else
- msg_format("You have thrown off from %s!", m_name);
-#endif
+ msg_format(_("%^sに振り落とされた！", "You have thrown off from %s!"), m_name);
}
}
* Note that this function is responsible for about one to five percent\n
* of the processor use in normal conditions...\n
*/
-static int mon_will_run(int m_idx)
+static bool mon_will_run(MONSTER_IDX m_idx)
{
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
u16b p_lev, m_lev;
- u16b p_chp, p_mhp;
- u16b m_chp, m_mhp;
+ HIT_POINT p_chp, p_mhp;
+ HIT_POINT m_chp, m_mhp;
u32b p_val, m_val;
#endif
* @param xp 適したマスのX座標を返す参照ポインタ
* @return 有効なマスがあった場合TRUEを返す
*/
-static bool get_moves_aux2(int m_idx, int *yp, int *xp)
+static bool get_moves_aux2(MONSTER_IDX m_idx, int *yp, int *xp)
{
int i, y, x, y1, x1, best = 999;
x1 = m_ptr->fx;
/* Monster can already cast spell to player */
- if (projectable(y1, x1, py, px)) return (FALSE);
+ if (projectable(y1, x1, p_ptr->y, p_ptr->x)) return (FALSE);
/* Set current grid cost */
now_cost = cave[y1][x1].cost;
if (now_cost < cost) continue;
- if (!projectable(y, x, py, px)) continue;
+ if (!projectable(y, x, p_ptr->y, p_ptr->x)) continue;
/* Accept louder sounds */
if (best < cost) continue;
* being close enough to chase directly. I have no idea what will\n
* happen if you combine "smell" with low "aaf" values.\n
*/
-static bool get_moves_aux(int m_idx, int *yp, int *xp, bool no_flow)
+static bool get_moves_aux(MONSTER_IDX m_idx, int *yp, int *xp, bool no_flow)
{
int i, y, x, y1, x1, best;
/* Can monster cast attack spell? */
if (r_ptr->flags4 & (RF4_ATTACK_MASK) ||
- r_ptr->flags5 & (RF5_ATTACK_MASK) ||
- r_ptr->flags6 & (RF6_ATTACK_MASK))
+ r_ptr->a_ability_flags1 & (RF5_ATTACK_MASK) ||
+ r_ptr->a_ability_flags2 & (RF6_ATTACK_MASK))
{
/* Can move spell castable grid? */
if (get_moves_aux2(m_idx, yp, xp)) return (TRUE);
x1 = m_ptr->fx;
/* Hack -- Player can see us, run towards him */
- if (player_has_los_bold(y1, x1) && projectable(py, px, y1, x1)) return (FALSE);
+ if (player_has_los_bold(y1, x1) && projectable(p_ptr->y, p_ptr->x, y1, x1)) return (FALSE);
/* Monster grid */
c_ptr = &cave[y1][x1];
else if (c_ptr->when)
{
/* Too old smell */
- if (cave[py][px].when - c_ptr->when > 127) return (FALSE);
+ if (cave[p_ptr->y][p_ptr->x].when - c_ptr->when > 127) return (FALSE);
use_scent = TRUE;
best = 0;
}
/* Hack -- Save the "twiddled" location */
- (*yp) = py + 16 * ddy_ddd[i];
- (*xp) = px + 16 * ddx_ddd[i];
+ (*yp) = p_ptr->y + 16 * ddy_ddd[i];
+ (*xp) = p_ptr->x + 16 * ddx_ddd[i];
}
/* No legal move (?) */
* but instead of heading directly for it, the monster should "swerve"\n
* around the player so that he has a smaller chance of getting hit.\n
*/
-static bool get_fear_moves_aux(int m_idx, int *yp, int *xp)
+static bool get_fear_moves_aux(MONSTER_IDX m_idx, int *yp, int *xp)
{
int y, x, y1, x1, fy, fx, gy = 0, gx = 0;
int score = -1;
*\n
* Return TRUE if a safe location is available.\n
*/
-static bool find_safety(int m_idx, int *yp, int *xp)
+static bool find_safety(MONSTER_IDX m_idx, int *yp, int *xp)
{
monster_type *m_ptr = &m_list[m_idx];
}
/* Check for absence of shot (more or less) */
- if (!projectable(py, px, y, x))
+ if (!projectable(p_ptr->y, p_ptr->x, y, x))
{
/* Calculate distance from player */
- dis = distance(y, x, py, px);
+ dis = distance(y, x, p_ptr->y, p_ptr->x);
/* Remember if further than previous */
if (dis > gdis)
*\n
* Return TRUE if a good location is available.\n
*/
-static bool find_hiding(int m_idx, int *yp, int *xp)
+static bool find_hiding(MONSTER_IDX m_idx, int *yp, int *xp)
{
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
if (!monster_can_enter(y, x, r_ptr, 0)) continue;
/* Check for hidden, available grid */
- if (!projectable(py, px, y, x) && clean_shot(fy, fx, y, x, FALSE))
+ if (!projectable(p_ptr->y, p_ptr->x, y, x) && clean_shot(fy, fx, y, x, FALSE))
{
/* Calculate distance from player */
- dis = distance(y, x, py, px);
+ dis = distance(y, x, p_ptr->y, p_ptr->x);
/* Remember if closer than previous */
if (dis < gdis && dis >= 2)
* @param mm 移動方向を返す方向IDの参照ポインタ
* @return 有効方向があった場合TRUEを返す
*/
-static bool get_moves(int m_idx, int *mm)
+static bool get_moves(MONSTER_IDX m_idx, int *mm)
{
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
- int y, ay, x, ax;
+ int y = 0, ay, x = 0, ax;
int move_val = 0;
- int y2 = py;
- int x2 = px;
+ int y2 = p_ptr->y;
+ int x2 = p_ptr->x;
bool done = FALSE;
bool will_run = mon_will_run(m_idx);
cave_type *c_ptr;
if (!done && !will_run && is_hostile(m_ptr) &&
(r_ptr->flags1 & RF1_FRIENDS) &&
- ((los(m_ptr->fy, m_ptr->fx, py, px) && projectable(m_ptr->fy, m_ptr->fx, py, px)) ||
+ ((los(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x) && projectable(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x)) ||
(cave[m_ptr->fy][m_ptr->fx].dist < MAX_SIGHT / 2)))
{
/*
/* Count room grids next to player */
for (i = 0; i < 8; i++)
{
- int xx = px + ddx_ddd[i];
- int yy = py + ddy_ddd[i];
+ int xx = p_ptr->x + ddx_ddd[i];
+ int yy = p_ptr->y + ddy_ddd[i];
if (!in_bounds2(yy, xx)) continue;
room++;
}
}
- if (cave[py][px].info & CAVE_ROOM) room -= 2;
- if (!r_ptr->flags4 && !r_ptr->flags5 && !r_ptr->flags6) room -= 2;
+ if (cave[p_ptr->y][p_ptr->x].info & CAVE_ROOM) room -= 2;
+ if (!r_ptr->flags4 && !r_ptr->a_ability_flags1 && !r_ptr->a_ability_flags2) room -= 2;
/* Not in a room and strong player */
if (room < (8 * (p_ptr->chp + p_ptr->csp)) /
for (i = 0; i < 8; i++)
{
/* Pick squares near player (semi-randomly) */
- y2 = py + ddy_ddd[(m_idx + i) & 7];
- x2 = px + ddx_ddd[(m_idx + i) & 7];
+ y2 = p_ptr->y + ddy_ddd[(m_idx + i) & 7];
+ x2 = p_ptr->x + ddx_ddd[(m_idx + i) & 7];
/* Already there? */
if ((m_ptr->fy == y2) && (m_ptr->fx == x2))
{
/* Attack the player */
- y2 = py;
- x2 = px;
+ y2 = p_ptr->y;
+ x2 = p_ptr->x;
break;
}
* @param t_idx 目標側モンスターの参照ID
* @return 実際に打撃処理が行われた場合TRUEを返す
*/
-static bool monst_attack_monst(int m_idx, int t_idx)
+static bool monst_attack_monst(MONSTER_IDX m_idx, IDX t_idx)
{
monster_type *m_ptr = &m_list[m_idx];
monster_type *t_ptr = &m_list[t_idx];
{
bool obvious = FALSE;
- int power = 0;
- int damage = 0;
+ HIT_POINT power = 0;
+ HIT_POINT damage = 0;
cptr act = NULL;
{
case RBM_HIT:
{
-#ifdef JP
-act = "%sを殴った。";
-#else
- act = "hits %s.";
-#endif
-
+ act = _("%sを殴った。", "hits %s.");
touched = TRUE;
break;
}
case RBM_TOUCH:
{
-#ifdef JP
-act = "%sを触った。";
-#else
- act = "touches %s.";
-#endif
-
+ act = _("%sを触った。", "touches %s.");
touched = TRUE;
break;
}
case RBM_PUNCH:
{
-#ifdef JP
-act = "%sをパンチした。";
-#else
- act = "punches %s.";
-#endif
-
+ act = _("%sをパンチした。", "punches %s.");
touched = TRUE;
break;
}
case RBM_KICK:
{
-#ifdef JP
-act = "%sを蹴った。";
-#else
- act = "kicks %s.";
-#endif
-
+ act = _("%sを蹴った。", "kicks %s.");
touched = TRUE;
break;
}
case RBM_CLAW:
{
-#ifdef JP
-act = "%sをひっかいた。";
-#else
- act = "claws %s.";
-#endif
-
+ act = _("%sをひっかいた。", "claws %s.");
touched = TRUE;
break;
}
case RBM_BITE:
{
-#ifdef JP
-act = "%sを噛んだ。";
-#else
- act = "bites %s.";
-#endif
-
+ act = _("%sを噛んだ。", "bites %s.");
touched = TRUE;
break;
}
case RBM_STING:
{
-#ifdef JP
-act = "%sを刺した。";
-#else
- act = "stings %s.";
-#endif
-
+ act = _("%sを刺した。", "stings %s.");
touched = TRUE;
break;
}
case RBM_SLASH:
{
-#ifdef JP
-act = "%sを斬った。";
-#else
- act = "slashes %s.";
-#endif
-
+ act = _("%sを斬った。", "slashes %s.");
break;
}
case RBM_BUTT:
{
-#ifdef JP
-act = "%sを角で突いた。";
-#else
- act = "butts %s.";
-#endif
-
+ act = _("%sを角で突いた。", "butts %s.");
touched = TRUE;
break;
}
case RBM_CRUSH:
{
-#ifdef JP
-act = "%sに体当りした。";
-#else
- act = "crushes %s.";
-#endif
-
+ act = _("%sに体当りした。", "crushes %s.");
touched = TRUE;
break;
}
case RBM_ENGULF:
{
-#ifdef JP
-act = "%sを飲み込んだ。";
-#else
- act = "engulfs %s.";
-#endif
-
+ act = _("%sを飲み込んだ。", "engulfs %s.");
touched = TRUE;
break;
}
case RBM_CHARGE:
{
-#ifdef JP
-act = "%sに請求書をよこした。";
-#else
- act = "charges %s.";
-#endif
-
+ act = _("%sに請求書をよこした。", "charges %s.");
touched = TRUE;
break;
}
case RBM_CRAWL:
{
-#ifdef JP
-act = "%sの体の上を這い回った。";
-#else
- act = "crawls on %s.";
-#endif
-
+ act = _("%sの体の上を這い回った。", "crawls on %s.");
touched = TRUE;
break;
}
case RBM_DROOL:
{
-#ifdef JP
-act = "%sによだれをたらした。";
-#else
- act = "drools on %s.";
-#endif
-
+ act = _("%sによだれをたらした。", "drools on %s.");
touched = FALSE;
break;
}
case RBM_SPIT:
{
-#ifdef JP
-act = "%sに唾を吐いた。";
-#else
- act = "spits on %s.";
-#endif
-
+ act = _("%sに唾を吐いた。", "spits on %s.");
touched = FALSE;
break;
}
case RBM_EXPLODE:
{
if (see_either) disturb(1, 1);
-#ifdef JP
-act = "爆発した。";
-#else
- act = "explodes.";
-#endif
-
+ act = _("爆発した。", "explodes.");
explode = TRUE;
touched = FALSE;
break;
case RBM_GAZE:
{
-#ifdef JP
-act = "%sをにらんだ。";
-#else
- act = "gazes at %s.";
-#endif
-
+ act = _("%sをにらんだ。", "gazes at %s.");
touched = FALSE;
break;
}
case RBM_WAIL:
{
-#ifdef JP
-act = "%sに泣きついた。";
-#else
- act = "wails at %s.";
-#endif
-
+ act = _("%sに泣きついた。", "wails at %s.");
touched = FALSE;
break;
}
case RBM_SPORE:
{
-#ifdef JP
-act = "%sに胞子を飛ばした。";
-#else
- act = "releases spores at %s.";
-#endif
-
+ act = _("%sに胞子を飛ばした。", "releases spores at %s.");
touched = FALSE;
break;
}
case RBM_XXX4:
{
-#ifdef JP
-act = "%sにXXX4を飛ばした。";
-#else
- act = "projects XXX4's at %s.";
-#endif
-
+ act = _("%sにXXX4を飛ばした。", "projects XXX4's at %s.");
touched = FALSE;
break;
}
case RBM_BEG:
{
-#ifdef JP
-act = "%sに金をせがんだ。";
-#else
- act = "begs %s for money.";
-#endif
-
+ act = _("%sに金をせがんだ。", "begs %s for money.");
touched = FALSE;
break;
}
case RBM_INSULT:
{
-#ifdef JP
-act = "%sを侮辱した。";
-#else
- act = "insults %s.";
-#endif
-
+ act = _("%sを侮辱した。", "insults %s.");
touched = FALSE;
break;
}
case RBM_MOAN:
{
-#ifdef JP
-act = "%sにむかってうめいた。";
-#else
- act = "moans at %s.";
-#endif
-
+ act = _("%sにむかってうめいた。", "moans at %s.");
touched = FALSE;
break;
}
case RBM_SHOW:
{
-#ifdef JP
-act = "%sにむかって歌った。";
-#else
- act = "sings to %s.";
-#endif
-
+ act = _("%sにむかって歌った。", "sings to %s.");
touched = FALSE;
break;
}
break;
case RBE_DR_LIFE:
- pt = GF_OLD_DRAIN;
+ pt = GF_HYPODYNAMIA;
effect_type = BLOW_EFFECT_TYPE_HEAL;
break;
case RBE_INERTIA:
- pt = GF_INERTIA;
+ pt = GF_INERTIAL;
break;
case RBE_STUN:
/* Special message */
if (see_m && did_heal)
{
-#ifdef JP
- msg_format("%sは体力を回復したようだ。", m_name);
-#else
- msg_format("%^s appears healthier.", m_name);
-#endif
+ msg_format(_("%sは体力を回復したようだ。", "%^s appears healthier."), m_name);
}
}
break;
{
if (see_either)
{
-#ifdef JP
- msg_format("%^sは突然熱くなった！", m_name);
-#else
- msg_format("%^s is suddenly very hot!", m_name);
-#endif
+ msg_format(_("%^sは突然熱くなった！", "%^s is suddenly very hot!"), m_name);
}
if (m_ptr->ml && is_original_ap_and_seen(t_ptr)) tr_ptr->r_flags2 |= RF2_AURA_FIRE;
project(t_idx, 0, m_ptr->fy, m_ptr->fx,
{
if (see_either)
{
-#ifdef JP
- msg_format("%^sは突然寒くなった！", m_name);
-#else
- msg_format("%^s is suddenly very cold!", m_name);
-#endif
+ msg_format(_("%^sは突然寒くなった！", "%^s is suddenly very cold!"), m_name);
}
if (m_ptr->ml && is_original_ap_and_seen(t_ptr)) tr_ptr->r_flags3 |= RF3_AURA_COLD;
project(t_idx, 0, m_ptr->fy, m_ptr->fx,
{
if (see_either)
{
-#ifdef JP
- msg_format("%^sは電撃を食らった！", m_name);
-#else
- msg_format("%^s gets zapped!", m_name);
-#endif
+ msg_format(_("%^sは電撃を食らった！", "%^s gets zapped!"), m_name);
}
if (m_ptr->ml && is_original_ap_and_seen(t_ptr)) tr_ptr->r_flags2 |= RF2_AURA_ELEC;
project(t_idx, 0, m_ptr->fy, m_ptr->fx,
/* Cancel Invulnerability */
(void)set_monster_invulner(m_idx, 0, FALSE);
-
-#ifdef JP
- mon_take_hit_mon(m_idx, m_ptr->hp + 1, &fear, "は爆発して粉々になった。", m_idx);
-#else
- mon_take_hit_mon(m_idx, m_ptr->hp + 1, &fear, " explodes into tiny shreds.", m_idx);
-#endif
-
+ mon_take_hit_mon(m_idx, m_ptr->hp + 1, &fear, _("は爆発して粉々になった。", " explodes into tiny shreds."), m_idx);
blinked = FALSE;
}
{
if (see_m)
{
-#ifdef JP
- msg_print("泥棒は笑って逃げ...ようとしたがバリアに防がれた。");
-#else
- msg_print("The thief flees laughing...? But magic barrier obstructs it.");
-#endif
+ msg_print(_("泥棒は笑って逃げ...ようとしたがバリアに防がれた。", "The thief flees laughing...? But magic barrier obstructs it."));
}
else if (known)
{
{
if (see_m)
{
-#ifdef JP
- msg_print("泥棒は笑って逃げた！");
-#else
- msg_print("The thief flees laughing!");
-#endif
+ msg_print(_("泥棒は笑って逃げた！", "The thief flees laughing!"));
}
else if (known)
{
*\n
* A "direction" of "5" means "pick a random direction".\n
*/
-static void process_monster(int m_idx)
+static void process_monster(MONSTER_IDX m_idx)
{
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
- int i, d, oy, ox, ny, nx;
+ int i, d;
+ POSITION oy, ox, ny, nx;
int mm[8];
/* Acquire the monster name */
monster_desc(m_name, m_ptr, 0);
-
-#ifdef JP
- msg_format("%sは消え去った！", m_name);
-#else
- msg_format("%^s disappears!", m_name);
-#endif
+ msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
}
if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
monster_desc(m_name, m_ptr, 0);
/* Oops */
-#ifdef JP
- msg_format("%sは消え去った！", m_name);
-#else
- msg_format("%^s disappears!", m_name);
-#endif
+ msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
}
/* Generate treasure, etc */
if (sad)
{
-#ifdef JP
- msg_print("少しの間悲しい気分になった。");
-#else
- msg_print("You feel sad for a moment.");
-#endif
+ msg_print(_("少しの間悲しい気分になった。", "You feel sad for a moment."));
}
return;
}
if (m_ptr->r_idx == MON_SHURYUUDAN)
-#ifdef JP
- mon_take_hit_mon(m_idx, 1, &fear, "は爆発して粉々になった。", m_idx);
-#else
- mon_take_hit_mon(m_idx, 1, &fear, " explodes into tiny shreds.", m_idx);
-#endif
+ mon_take_hit_mon(m_idx, 1, &fear, _("は爆発して粉々になった。", " explodes into tiny shreds."), m_idx);
if ((is_pet(m_ptr) || is_friendly(m_ptr)) && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) && !p_ptr->inside_battle)
{
if (is_riding_mon && riding_pinch < 2)
{
-#ifdef JP
- msg_format("%sは傷の痛さの余りあなたの束縛から逃れようとしている。", m_name);
-#else
- msg_format("%^s seems to be in so much pain, and trying to escape from your restriction.", m_name);
-#endif
+ msg_format(_("%sは傷の痛さの余りあなたの束縛から逃れようとしている。",
+ "%^s seems to be in so much pain, and trying to escape from your restriction."), m_name);
riding_pinch++;
disturb(1, 1);
}
{
if (is_riding_mon)
{
-#ifdef JP
- msg_format("%sはあなたの束縛から脱出した。", m_name);
-#else
- msg_format("%^s succeeded to escape from your restriction!", m_name);
-#endif
+ msg_format(_("%sはあなたの束縛から脱出した。", "%^s succeeded to escape from your restriction!"), m_name);
if (rakuba(-1, FALSE))
{
-#ifdef JP
- msg_print("地面に落とされた。");
-#else
- msg_print("You have fallen from riding pet.");
-#endif
+ msg_print(_("地面に落とされた。", "You have fallen from riding pet."));
}
}
if (see_m)
{
if ((r_ptr->flags2 & RF2_CAN_SPEAK) && (m_ptr->r_idx != MON_GRIP) && (m_ptr->r_idx != MON_WOLF) && (m_ptr->r_idx != MON_FANG) &&
- player_has_los_bold(m_ptr->fy, m_ptr->fx) && projectable(m_ptr->fy, m_ptr->fx, py, px))
+ player_has_los_bold(m_ptr->fy, m_ptr->fx) && projectable(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x))
{
-#ifdef JP
- msg_format("%^s「ピンチだ！退却させてもらう！」", m_name);
-#else
- msg_format("%^s says 'It is the pinch! I will retreat'.", m_name);
-#endif
+ msg_format(_("%^s「ピンチだ！退却させてもらう！」", "%^s says 'It is the pinch! I will retreat'."), m_name);
}
-#ifdef JP
- msg_format("%^sがテレポート・レベルの巻物を読んだ。", m_name);
- msg_format("%^sが消え去った。", m_name);
-#else
- msg_format("%^s read a scroll of teleport level.", m_name);
- msg_format("%^s disappears.", m_name);
-#endif
+ msg_format(_("%^sがテレポート・レベルの巻物を読んだ。", "%^s read a scroll of teleport level."), m_name);
+ msg_format(_("%^sが消え去った。", "%^s disappears."), m_name);
}
if (is_riding_mon && rakuba(-1, FALSE))
{
-#ifdef JP
- msg_print("地面に落とされた。");
-#else
- msg_print("You have fallen from riding pet.");
-#endif
+ msg_print(_("地面に落とされた。", "You have fallen from riding pet."));
}
/* Check for quest completion */
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sが目を覚ました。", m_name);
-#else
- msg_format("%^s wakes up.", m_name);
-#endif
+ msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
}
/* Hack -- Count the wakings */
{
char m_name[80];
monster_desc(m_name, m_ptr, is_pet(m_ptr) ? MD_ASSUME_VISIBLE : 0);
-#ifdef JP
- msg_format("%^sは突然敵にまわった！", m_name);
-#else
- msg_format("%^s suddenly becomes hostile!", m_name);
-#endif
+ msg_format(_("%^sは突然敵にまわった！", "%^s suddenly becomes hostile!"), m_name);
}
set_hostile(m_ptr);
}
- if (r_ptr->flags6 & RF6_SPECIAL)
+ if (r_ptr->a_ability_flags2 & RF6_SPECIAL)
{
/* Hack -- Ohmu scatters molds! */
if (m_ptr->r_idx == MON_OHMU)
for (k = 0; k < 6; k++)
{
- if (summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_BIZARRE1, (PM_ALLOW_GROUP | p_mode)))
+ if (summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_MOLD, (PM_ALLOW_GROUP | p_mode)))
{
if (m_list[hack_m_idx_ii].ml) count++;
}
!m_ptr->ml && (m_ptr->cdis <= MAX_SIGHT))
{
if (disturb_minor) disturb(FALSE, FALSE);
-#ifdef JP
- msg_print("重厚な足音が聞こえた。");
-#else
- msg_print("You hear heavy steps.");
-#endif
+ msg_print(_("重厚な足音が聞こえた。", "You hear heavy steps."));
}
/* Some monsters can speak */
if ((ap_r_ptr->flags2 & RF2_CAN_SPEAK) && aware &&
one_in_(SPEAK_CHANCE) &&
player_has_los_bold(oy, ox) &&
- projectable(oy, ox, py, px))
+ projectable(oy, ox, p_ptr->y, p_ptr->x))
{
char m_name[80];
char monmessage[1024];
if (m_ptr->ml)
monster_desc(m_name, m_ptr, 0);
else
-#ifdef JP
- strcpy(m_name, "それ");
-#else
- strcpy(m_name, "It");
-#endif
+ strcpy(m_name, _("それ", "It"));
/* Select the file for monster quotes */
if (MON_MONFEAR(m_ptr))
-#ifdef JP
- filename = "monfear_j.txt";
-#else
- filename = "monfear.txt";
-#endif
+ filename = _("monfear_j.txt", "monfear.txt");
else if (is_pet(m_ptr))
-#ifdef JP
- filename = "monpet_j.txt";
-#else
- filename = "monpet.txt";
-#endif
+ filename = _("monpet_j.txt", "monpet.txt");
else if (is_friendly(m_ptr))
-#ifdef JP
- filename = "monfrien_j.txt";
-#else
- filename = "monfrien.txt";
-#endif
+ filename = _("monfrien_j.txt", "monfrien.txt");
else
-#ifdef JP
- filename = "monspeak_j.txt";
-#else
- filename = "monspeak.txt";
-#endif
+ filename = _("monspeak_j.txt", "monspeak.txt");
/* Get the monster line */
if (get_rnd_line(filename, m_ptr->ap_r_idx, monmessage) == 0)
{
/* Say something */
-#ifdef JP
-msg_format("%^s%s", m_name, monmessage);
-#else
- msg_format("%^s %s", m_name, monmessage);
-#endif
-
+ msg_format(_("%^s%s", "%^s %s"), m_name, monmessage);
}
}
}
(void)get_moves(m_idx, mm);
/* Restore the leash */
- p_ptr->pet_follow_distance = dis;
+ p_ptr->pet_follow_distance = (s16b)dis;
}
}
}
{
/* Message */
if (have_flag(f_ptr->flags, FF_GLASS))
-#ifdef JP
- msg_print("ガラスが砕ける音がした！");
-#else
- msg_print("You hear a glass was crashed!");
-#endif
+ msg_print(_("ガラスが砕ける音がした！", "You hear a glass was crashed!"));
else
-#ifdef JP
- msg_print("ドアを叩き開ける音がした！");
-#else
- msg_print("You hear a door burst open!");
-#endif
+ msg_print(_("ドアを叩き開ける音がした！", "You hear a door burst open!"));
/* Disturb (sometimes) */
if (disturb_minor) disturb(0, 0);
/* Describe observable breakage */
if (c_ptr->info & CAVE_MARK)
{
-#ifdef JP
- msg_print("守りのルーンが壊れた！");
-#else
- msg_print("The rune of protection is broken!");
-#endif
+ msg_print(_("守りのルーンが壊れた！", "The rune of protection is broken!"));
}
/* Forget the rune */
/* Describe observable breakage */
if (c_ptr->info & CAVE_MARK)
{
-#ifdef JP
- msg_print("ルーンが爆発した！");
-#else
- msg_print("The rune explodes!");
-#endif
-
+ msg_print(_("ルーンが爆発した！", "The rune explodes!"));
project(0, 2, ny, nx, 2 * (p_ptr->lev + damroll(7, 7)), GF_MANA, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
}
}
else
{
-#ifdef JP
- msg_print("爆発のルーンは解除された。");
-#else
- msg_print("An explosive rune was disarmed.");
-#endif
+ msg_print(_("爆発のルーンは解除された。", "An explosive rune was disarmed."));
}
/* Forget the rune */
if (one_in_(GRINDNOISE))
{
if (have_flag(f_ptr->flags, FF_GLASS))
-#ifdef JP
- msg_print("何かの砕ける音が聞こえる。");
-#else
- msg_print("There is a crashing sound.");
-#endif
+ msg_print(_("何かの砕ける音が聞こえる。", "There is a crashing sound."));
else
-#ifdef JP
- msg_print("ギシギシいう音が聞こえる。");
-#else
- msg_print("There is a grinding sound.");
-#endif
+ msg_print(_("ギシギシいう音が聞こえる。", "There is a grinding sound."));
}
cave_alter_feat(ny, nx, FF_HURT_DISI);
}
/* Hack -- Update the new location */
- c_ptr->m_idx = m_idx;
+ c_ptr->m_idx = (s16b)m_idx;
/* Move the monster */
m_ptr->fy = ny;
/* Possible disturb */
if (m_ptr->ml &&
(disturb_move ||
- (disturb_near && (m_ptr->mflag & MFLAG_VIEW) && projectable(py, px, m_ptr->fy, m_ptr->fx)) ||
+ (disturb_near && (m_ptr->mflag & MFLAG_VIEW) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)) ||
(disturb_high && ap_r_ptr->r_tkills && ap_r_ptr->level >= p_ptr->lev)))
{
/* Disturb */
if (m_ptr->ml && player_can_see_bold(ny, nx))
{
/* Dump a message */
-#ifdef JP
- msg_format("%^sは%sを拾おうとしたが、だめだった。", m_name, o_name);
-#else
- msg_format("%^s tries to pick up %s, but fails.", m_name, o_name);
-#endif
+ msg_format(_("%^sは%sを拾おうとしたが、だめだった。", "%^s tries to pick up %s, but fails."), m_name, o_name);
}
}
}
if (player_can_see_bold(ny, nx))
{
/* Dump a message */
-#ifdef JP
- msg_format("%^sが%sを拾った。", m_name, o_name);
-#else
- msg_format("%^s picks up %s.", m_name, o_name);
-#endif
+ msg_format(_("%^sが%sを拾った。", "%^s picks up %s."), m_name, o_name);
}
/* Excise the object */
o_ptr->iy = o_ptr->ix = 0;
/* Memorize monster */
- o_ptr->held_m_idx = m_idx;
+ o_ptr->held_m_idx = (s16b)m_idx;
/* Build a stack */
o_ptr->next_o_idx = m_ptr->hold_o_idx;
if (player_has_los_bold(ny, nx))
{
/* Dump a message */
-#ifdef JP
- msg_format("%^sが%sを破壊した。", m_name, o_name);
-#else
- msg_format("%^s destroys %s.", m_name, o_name);
-#endif
+ msg_format(_("%^sが%sを破壊した。", "%^s destroys %s."), m_name, o_name);
}
/* Delete the object */
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sは戦いを決意した！", m_name);
-#else
- msg_format("%^s turns to fight!", m_name);
-#endif
+ msg_format(_("%^sは戦いを決意した！", "%^s turns to fight!"), m_name);
}
if (m_ptr->ml) chg_virtue(V_COMPASSION, -1);
*/
void process_monsters(void)
{
- int i;
- int fx, fy;
+ IDX i;
+ POSITION fx, fy;
bool test;
}
/* Handle "sight" and "aggravation" */
- else if ((m_ptr->cdis <= MAX_SIGHT) &&
+ else if ((m_ptr->cdis <= MAX_SIGHT || p_ptr->inside_battle) &&
(player_has_los_bold(fy, fx) || (p_ptr->cursed & TRC_AGGRAVATE)))
{
/* We can "see" or "feel" the player */
test = TRUE;
}
-#if 0 /* (cave[py][px].when == cave[fy][fx].when) is always FALSE... */
+#if 0 /* (cave[p_ptr->y][p_ptr->x].when == cave[fy][fx].when) is always FALSE... */
/* Hack -- Monsters can "smell" the player from far away */
/* Note that most monsters have "aaf" of "20" or so */
else if (!(m_ptr->mflag2 & MFLAG2_NOFLOW) &&
- cave_have_flag_bold(py, px, FF_MOVE) &&
- (cave[py][px].when == cave[fy][fx].when) &&
+ cave_have_flag_bold(p_ptr->y, p_ptr->x, FF_MOVE) &&
+ (cave[p_ptr->y][p_ptr->x].when == cave[fy][fx].when) &&
(cave[fy][fx].dist < MONSTER_FLOW_DEPTH) &&
(cave[fy][fx].dist < r_ptr->aaf))
{
* @return mproc_type モンスターの時限ステータスID
* @return 残りターン値
*/
-int get_mproc_idx(int m_idx, int mproc_type)
+int get_mproc_idx(MONSTER_IDX m_idx, int mproc_type)
{
s16b *cur_mproc_list = mproc_list[mproc_type];
int i;
* @return mproc_type 追加したいモンスターの時限ステータスID
* @return なし
*/
-static void mproc_add(int m_idx, int mproc_type)
+static void mproc_add(MONSTER_IDX m_idx, int mproc_type)
{
- if (mproc_max[mproc_type] < max_m_idx) mproc_list[mproc_type][mproc_max[mproc_type]++] = m_idx;
+ if (mproc_max[mproc_type] < max_m_idx) mproc_list[mproc_type][mproc_max[mproc_type]++] = (s16b)m_idx;
}
* @return mproc_type 削除したいモンスターの時限ステータスID
* @return なし
*/
-static void mproc_remove(int m_idx, int mproc_type)
+static void mproc_remove(MONSTER_IDX m_idx, int mproc_type)
{
int mproc_idx = get_mproc_idx(m_idx, mproc_type);
if (mproc_idx >= 0) mproc_list[mproc_type][mproc_idx] = mproc_list[mproc_type][--mproc_max[mproc_type]];
void mproc_init(void)
{
monster_type *m_ptr;
- int i, cmi;
+ MONSTER_IDX i;
+ int cmi;
/* Reset "mproc_max[]" */
for (cmi = 0; cmi < MAX_MTIMED; cmi++) mproc_max[cmi] = 0;
* @param v セットする値
* @return 別途更新処理が必要な場合TRUEを返す
*/
-bool set_monster_csleep(int m_idx, int v)
+bool set_monster_csleep(MONSTER_IDX m_idx, int v)
{
monster_type *m_ptr = &m_list[m_idx];
bool notice = FALSE;
}
/* Use the value */
- m_ptr->mtimed[MTIMED_CSLEEP] = v;
+ m_ptr->mtimed[MTIMED_CSLEEP] = (s16b)v;
if (!notice) return FALSE;
* @param v セットする値
* @return 別途更新処理が必要な場合TRUEを返す
*/
-bool set_monster_fast(int m_idx, int v)
+bool set_monster_fast(MONSTER_IDX m_idx, int v)
{
monster_type *m_ptr = &m_list[m_idx];
bool notice = FALSE;
}
/* Use the value */
- m_ptr->mtimed[MTIMED_FAST] = v;
+ m_ptr->mtimed[MTIMED_FAST] = (s16b)v;
if (!notice) return FALSE;
/*
* Set "m_ptr->mtimed[MTIMED_SLOW]", notice observable changes
*/
-bool set_monster_slow(int m_idx, int v)
+bool set_monster_slow(MONSTER_IDX m_idx, int v)
{
monster_type *m_ptr = &m_list[m_idx];
bool notice = FALSE;
}
/* Use the value */
- m_ptr->mtimed[MTIMED_SLOW] = v;
+ m_ptr->mtimed[MTIMED_SLOW] = (s16b)v;
if (!notice) return FALSE;
* @param v セットする値
* @return 別途更新処理が必要な場合TRUEを返す
*/
-bool set_monster_stunned(int m_idx, int v)
+bool set_monster_stunned(MONSTER_IDX m_idx, int v)
{
monster_type *m_ptr = &m_list[m_idx];
bool notice = FALSE;
}
/* Use the value */
- m_ptr->mtimed[MTIMED_STUNNED] = v;
+ m_ptr->mtimed[MTIMED_STUNNED] = (s16b)v;
return notice;
}
* @param v セットする値
* @return 別途更新処理が必要な場合TRUEを返す
*/
-bool set_monster_confused(int m_idx, int v)
+bool set_monster_confused(MONSTER_IDX m_idx, int v)
{
monster_type *m_ptr = &m_list[m_idx];
bool notice = FALSE;
}
/* Use the value */
- m_ptr->mtimed[MTIMED_CONFUSED] = v;
+ m_ptr->mtimed[MTIMED_CONFUSED] = (s16b)v;
return notice;
}
* @param v セットする値
* @return 別途更新処理が必要な場合TRUEを返す
*/
-bool set_monster_monfear(int m_idx, int v)
+bool set_monster_monfear(MONSTER_IDX m_idx, int v)
{
monster_type *m_ptr = &m_list[m_idx];
bool notice = FALSE;
}
/* Use the value */
- m_ptr->mtimed[MTIMED_MONFEAR] = v;
+ m_ptr->mtimed[MTIMED_MONFEAR] = (s16b)v;
if (!notice) return FALSE;
* @param energy_need TRUEならば無敵解除時に行動ターン消費を行う
* @return 別途更新処理が必要な場合TRUEを返す
*/
-bool set_monster_invulner(int m_idx, int v, bool energy_need)
+bool set_monster_invulner(MONSTER_IDX m_idx, int v, bool energy_need)
{
monster_type *m_ptr = &m_list[m_idx];
bool notice = FALSE;
}
/* Use the value */
- m_ptr->mtimed[MTIMED_INVULNER] = v;
+ m_ptr->mtimed[MTIMED_INVULNER] = (s16b)v;
if (!notice) return FALSE;
* @param mtimed_idx 更新するモンスターの時限ステータスID
* @return なし
*/
-static void process_monsters_mtimed_aux(int m_idx, int mtimed_idx)
+static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
{
monster_type *m_ptr = &m_list[m_idx];
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sが目を覚ました。", m_name);
-#else
- msg_format("%^s wakes up.", m_name);
-#endif
+ msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
}
if (is_original_ap_and_seen(m_ptr))
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sはもう加速されていない。", m_name);
-#else
- msg_format("%^s is no longer fast.", m_name);
-#endif
+ msg_format(_("%^sはもう加速されていない。", "%^s is no longer fast."), m_name);
}
}
break;
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sはもう減速されていない。", m_name);
-#else
- msg_format("%^s is no longer slow.", m_name);
-#endif
+ msg_format(_("%^sはもう減速されていない。", "%^s is no longer slow."), m_name);
}
}
break;
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sは朦朧状態から立ち直った。", m_name);
-#else
- msg_format("%^s is no longer stunned.", m_name);
-#endif
+ msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
}
}
break;
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sは混乱から立ち直った。", m_name);
-#else
- msg_format("%^s is no longer confused.", m_name);
-#endif
+ msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
}
}
break;
monster_desc(m_name, m_ptr, 0);
/* Dump a message */
-#ifdef JP
- msg_format("%^sはもう無敵でない。", m_name);
-#else
- msg_format("%^s is no longer invulnerable.", m_name);
-#endif
+ msg_format(_("%^sはもう無敵でない。", "%^s is no longer invulnerable."), m_name);
}
}
break;
* @param m_idx 魔力消去を受けるモンスターの参照ID
* @return なし
*/
-void dispel_monster_status(int m_idx)
+void dispel_monster_status(MONSTER_IDX m_idx)
{
monster_type *m_ptr = &m_list[m_idx];
char m_name[80];
monster_desc(m_name, m_ptr, 0);
if (set_monster_invulner(m_idx, 0, TRUE))
{
-#ifdef JP
- if (m_ptr->ml) msg_format("%sはもう無敵ではない。", m_name);
-#else
- if (m_ptr->ml) msg_format("%^s is no longer invulnerable.", m_name);
-#endif
+ if (m_ptr->ml) msg_format(_("%sはもう無敵ではない。", "%^s is no longer invulnerable."), m_name);
}
if (set_monster_fast(m_idx, 0))
{
-#ifdef JP
- if (m_ptr->ml) msg_format("%sはもう加速されていない。", m_name);
-#else
- if (m_ptr->ml) msg_format("%^s is no longer fast.", m_name);
-#endif
+ if (m_ptr->ml) msg_format(_("%sはもう加速されていない。", "%^s is no longer fast."), m_name);
}
if (set_monster_slow(m_idx, 0))
{
-#ifdef JP
- if (m_ptr->ml) msg_format("%sはもう減速されていない。", m_name);
-#else
- if (m_ptr->ml) msg_format("%^s is no longer slow.", m_name);
-#endif
+ if (m_ptr->ml) msg_format(_("%sはもう減速されていない。", "%^s is no longer slow."), m_name);
}
}
monster_desc(m_name, m_ptr, 0);
if (who == 1)
-#ifdef JP
- msg_print("「『ザ・ワールド』！時は止まった！」");
-#else
- msg_format("%s yells 'The World! Time has stopped!'", m_name);
-#endif
+ msg_format(_("「『ザ・ワールド』！時は止まった！」", "%s yells 'The World! Time has stopped!'"), m_name);
else if (who == 3)
-#ifdef JP
- msg_print("「時よ！」");
-#else
- msg_format("%s yells 'Time!'", m_name);
-#endif
+ msg_format(_("「時よ！」", "%s yells 'Time!'"), m_name);
else msg_print("hek!");
msg_print(NULL);
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
world_monster = 0;
- if (vs_player || (player_has_los_bold(m_ptr->fy, m_ptr->fx) && projectable(py, px, m_ptr->fy, m_ptr->fx)))
+ if (vs_player || (player_has_los_bold(m_ptr->fy, m_ptr->fx) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)))
{
-#ifdef JP
- msg_print("「時は動きだす…」");
-#else
- msg_print("You feel time flowing around you once more.");
-#endif
+ msg_print(_("「時は動きだす…」", "You feel time flowing around you once more."));
msg_print(NULL);
}
* @param s_idx 撃破されたモンスター種族の参照ID
* @return なし
*/
-void monster_gain_exp(int m_idx, int s_idx)
+void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx)
{
monster_type *m_ptr;
monster_race *r_ptr;
hallu_race = &r_info[randint1(max_r_idx - 1)];
}
while (!hallu_race->name || (hallu_race->flags1 & RF1_UNIQUE));
-
-#ifdef JP
- msg_format("%sは%sに進化した。", m_name, r_name + hallu_race->name);
-#else
- msg_format("%^s evolved into %s.", m_name, r_name + hallu_race->name);
-#endif
+ msg_format(_("%sは%sに進化した。", "%^s evolved into %s."), m_name, r_name + hallu_race->name);
}
else
{
-#ifdef JP
- msg_format("%sは%sに進化した。", m_name, r_name + r_ptr->name);
-#else
- msg_format("%^s evolved into %s.", m_name, r_name + r_ptr->name);
-#endif
+ msg_format(_("%sは%sに進化した。", "%^s evolved into %s."), m_name, r_name + r_ptr->name);
}
}
OSDN Git Service
