X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fspells1.c;h=4c83e3917d803824a9bcdbaeb6f5415d773f78bb;hb=7358da8a134c7f9911e69e1ec6162e51aed82ed0;hp=6ed4b0e4d4d7afb43c8e597d41f73c0735f04d22;hpb=3e4319de33500689dee9dec2bd11dd62df554cc5;p=hengband%2Fhengband.git diff --git a/src/spells1.c b/src/spells1.c index 6ed4b0e4d..4c83e3917 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1,34 +1,39 @@ -/* File: spells1.c */ - -/* +/*! + * @file spells1.c + * @brief 魔法による遠隔処理の実装 / Spell projection + * @date 2014/07/10 + * @author + *
  * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
- *
  * This software may be copied and distributed for educational, research,
  * and not for profit purposes provided that this copyright and statement
  * are included in all such copies.  Other copyrights may also apply.
+ * 
*/ -/* Purpose: Spell projection */ - #include "angband.h" /* ToDo: Make this global */ -/* 1/x chance of reducing stats (for elemental attacks) */ -#define HURT_CHANCE 16 +#define HURT_CHANCE 16 /*!< 属性攻撃を受けた際に能力値低下を起こす確率(1/X) / 1/x chance of reducing stats (for elemental attacks) */ +static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */ +static int rakubadam_p; /*!< 落馬した際のダメージ量 */ -static int rakubadam_m; -static int rakubadam_p; +int project_length = 0; /*!< 投射の射程距離 */ -int project_length = 0; -/* +/*! + * @brief 配置した鏡リストの次を取得する / * Get another mirror. for SEEKER + * @param next_y 次の鏡のy座標を返す参照ポインタ + * @param next_x 次の鏡のx座標を返す参照ポインタ + * @param cury 現在の鏡のy座標 + * @param curx 現在の鏡のx座標 */ static void next_mirror( int* next_y , int* next_x , int cury, int curx) { - int mirror_x[10],mirror_y[10]; /* ¶À¤Ï¤â¤Ã¤È¾¯¤Ê¤¤ */ - int mirror_num=0; /* ¶À¤Î¿ô */ + int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */ + int mirror_num=0; /* 鏡の数 */ int x,y; int num; @@ -55,8 +60,11 @@ static void next_mirror( int* next_y , int* next_x , int cury, int curx) return; } -/* +/*! + * @brief 万色表現用にランダムな色を選択する関数 / * Get a legal "multi-hued" color for drawing "spells" + * @param max 色IDの最大値 + * @return 選択した色ID */ static byte mh_attr(int max) { @@ -83,13 +91,16 @@ static byte mh_attr(int max) } -/* +/*! + * @brief 魔法属性に応じたエフェクトの色を返す / * Return a color to use for the bolt/ball spells + * @param type 魔法属性 + * @return 対応する色ID */ static byte spell_color(int type) { /* Check if A.B.'s new graphics should be used (rr9) */ - if (streq(ANGBAND_GRAF, "new")) + if (streq(ANGBAND_GRAF, "new") || streq(ANGBAND_GRAF, "ne2")) { /* Analyze */ switch (type) @@ -118,7 +129,7 @@ static byte spell_color(int type) case GF_SOUND: return (0x09); case GF_SHARDS: return (0x08); case GF_FORCE: return (0x09); - case GF_INERTIA: return (0x09); + case GF_INERTIAL: return (0x09); case GF_GRAVITY: return (0x09); case GF_TIME: return (0x09); case GF_LITE_WEAK: return (0x06); @@ -182,14 +193,22 @@ static byte spell_color(int type) } -/* +/*! + * @brief 始点から終点にかけた方向毎にボルトのキャラクタを返す / * Find the attr/char pair to use for a spell effect - * + * @param y 始点Y座標 + * @param x 始点X座標 + * @param ny 終点Y座標 + * @param nx 終点X座標 + * @param typ 魔法の効果属性 + * @return 方向キャラID + * @details + *
  * It is moving (or has moved) from (x,y) to (nx,ny).
- *
  * If the distance is not "one", we (may) return "*".
+ * 
*/ -u16b bolt_pict(int y, int x, int ny, int nx, int typ) +u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ) { int base; @@ -228,9 +247,19 @@ u16b bolt_pict(int y, int x, int ny, int nx, int typ) } -/* +/*! + * @brief 始点から終点への経路を返す / * Determine the path taken by a projection. - * + * @param gp 経路座標リストを返す参照ポインタ + * @param range 距離 + * @param y1 始点Y座標 + * @param x1 始点X座標 + * @param y2 終点Y座標 + * @param x2 終点X座標 + * @param flg フラグID + * @return リストの長さ + * @details + *
  * The projection will always start from the grid (y1,x1), and will travel
  * towards the grid (y2,x2), touching one grid per unit of distance along
  * the major axis, and stopping when it enters the destination grid or a
@@ -267,8 +296,9 @@ u16b bolt_pict(int y, int x, int ny, int nx, int typ)
  *
  * This algorithm is similar to, but slightly different from, the one used
  * by "update_view_los()", and very different from the one used by "los()".
+ * 
*/ -sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) +sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg) { int y, x; @@ -375,7 +405,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) else if (!(flg & (PROJECT_PATH))) { /* Always stop at non-initial wall grids */ - if ((n > 0) && !have_flag(f_flags_bold(y, x), FF_PROJECT)) break; + if ((n > 0) && !cave_have_flag_bold(y, x, FF_PROJECT)) break; } /* Sometimes stop at non-initial monsters/players */ @@ -464,7 +494,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) else if (!(flg & (PROJECT_PATH))) { /* Always stop at non-initial wall grids */ - if ((n > 0) && !have_flag(f_flags_bold(y, x), FF_PROJECT)) break; + if ((n > 0) && !cave_have_flag_bold(y, x, FF_PROJECT)) break; } /* Sometimes stop at non-initial monsters/players */ @@ -535,7 +565,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) else if (!(flg & (PROJECT_PATH))) { /* Always stop at non-initial wall grids */ - if ((n > 0) && !have_flag(f_flags_bold(y, x), FF_PROJECT)) break; + if ((n > 0) && !cave_have_flag_bold(y, x, FF_PROJECT)) break; } /* Sometimes stop at non-initial monsters/players */ @@ -565,17 +595,25 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) /* * Mega-Hack -- track "affected" monsters (see "project()" comments) */ -static int project_m_n; -static int project_m_x; -static int project_m_y; +static int project_m_n; /*!< 魔法効果範囲内にいるモンスターの数 */ +static POSITION project_m_x; /*!< 処理中のモンスターX座標 */ +static POSITION project_m_y; /*!< 処理中のモンスターY座標 */ /* Mega-Hack -- monsters target */ -static s16b monster_target_x; -static s16b monster_target_y; - - -/* - * We are called from "project()" to "damage" terrain features - * +static POSITION monster_target_x; /*!< モンスターの攻撃目標X座標 */ +static POSITION monster_target_y; /*!< モンスターの攻撃目標Y座標 */ + + +/*! + * @brief 汎用的なビーム/ボルト/ボール系による地形効果処理 / We are called from "project()" to "damage" terrain features + * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player") + * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball) + * @param y 目標Y座標 / Target y location (or location to travel "towards") + * @param x 目標X座標 / Target x location (or location to travel "towards") + * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player) + * @param typ 効果属性 / Type of damage to apply to monsters (and objects) + * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE + * @details + *
  * We are called both for "beam" effects and "ball" effects.
  *
  * The "r" parameter is the "distance from ground zero".
@@ -588,6 +626,7 @@ static s16b monster_target_y;
  * XXX XXX XXX We also "see" grids which are "memorized", probably a hack
  *
  * XXX XXX XXX Perhaps we should affect doors?
+ * 
*/ static bool project_f(int who, int r, int y, int x, int dam, int typ) { @@ -613,38 +652,18 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) case GF_POIS: case GF_NUKE: case GF_DEATH_RAY: -#ifdef JP - message = "¸Ï¤ì¤¿";break; -#else - message = "was blasted.";break; -#endif + message = _("枯れた", "was blasted."); break; case GF_TIME: -#ifdef JP - message = "½Ì¤ó¤À";break; -#else - message = "shrank.";break; -#endif + message = _("縮んだ", "shrank."); break; case GF_ACID: -#ifdef JP - message = "ÍϤ±¤¿";break; -#else - message = "melted.";break; -#endif + message = _("溶けた", "melted."); break; case GF_COLD: case GF_ICE: -#ifdef JP - message = "Åà¤ê¡¢ºÕ¤±»¶¤Ã¤¿";break; -#else - message = "was frozen and smashed.";break; -#endif + message = _("凍り、砕け散った", "was frozen and smashed."); break; case GF_FIRE: case GF_ELEC: case GF_PLASMA: -#ifdef JP - message = "dz¤¨¤¿";break; -#else - message = "burns up!";break; -#endif + message = _("燃えた", "burns up!"); break; case GF_METEOR: case GF_CHAOS: case GF_MANA: @@ -656,28 +675,17 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) case GF_DISENCHANT: case GF_FORCE: case GF_GRAVITY: -#ifdef JP - message = "Ê´ºÕ¤µ¤ì¤¿";break; -#else - message = "was crushed.";break; -#endif + message = _("粉砕された", "was crushed."); break; default: message = NULL;break; } if (message) { -#ifdef JP - msg_format("ÌÚ¤Ï%s¡£", message); -#else - msg_format("A tree %s", message); -#endif - cave_set_feat(y, x, (one_in_(3) ? FEAT_DEEP_GRASS : FEAT_GRASS)); + msg_format(_("木は%s。", "A tree %s"), message); + cave_set_feat(y, x, one_in_(3) ? feat_brake : feat_grass); /* Observe */ if (c_ptr->info & (CAVE_MARK)) obvious = TRUE; - - /* Update some things */ - p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE); } } @@ -741,12 +749,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) /* Check line of sight */ if (known) { -#ifdef JP - msg_print("¤Þ¤Ð¤æ¤¤Á®¸÷¤¬Áö¤Ã¤¿¡ª"); -#else - msg_print("There is a bright flash of light!"); -#endif - + msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!")); obvious = TRUE; } @@ -765,12 +768,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) /* Check line of sound */ if (known && (old_feat != c_ptr->feat)) { -#ifdef JP - msg_print("¥«¥Á¥Ã¤È²»¤¬¤·¤¿¡ª"); -#else - msg_print("Click!"); -#endif - + msg_print(_("カチッと音がした!", "Click!")); obvious = TRUE; } } @@ -799,22 +797,10 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) if (known) { /* Message */ -#ifdef JP - msg_print("¤Þ¤Ð¤æ¤¤Á®¸÷¤¬Áö¤Ã¤¿¡ª"); -#else - msg_print("There is a bright flash of light!"); -#endif - + msg_print(_("まばゆい閃光が走った!", "There is a bright flash of light!")); obvious = TRUE; } - /* Visibility change */ - if (have_flag(f_ptr->flags, FF_DOOR)) - { - /* Update some things */ - p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE); - } - /* Destroy the feature */ cave_alter_feat(y, x, FF_TUNNEL); } @@ -854,12 +840,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) if (known && have_flag(mimic_f_ptr->flags, FF_OPEN)) { /* Message */ -#ifdef JP - msg_format("%s¤Ë²¿¤«¤¬¤Ä¤Ã¤«¤¨¤Æ³«¤«¤Ê¤¯¤Ê¤Ã¤¿¡£", f_name + mimic_f_ptr->name); -#else - msg_format("The %s seems stuck.", f_name + mimic_f_ptr->name); -#endif - + msg_format(_("%sに何かがつっかえて開かなくなった。", "The %s seems stuck."), f_name + mimic_f_ptr->name); obvious = TRUE; } } @@ -874,12 +855,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) /* Message */ if (known && (c_ptr->info & (CAVE_MARK))) { -#ifdef JP - msg_format("%s¤¬ÍϤ±¤ÆÅ¥¤Ë¤Ê¤Ã¤¿¡ª", f_name + f_info[get_feat_mimic(c_ptr)].name); -#else - msg_format("The %s turns into mud!", f_name + f_info[get_feat_mimic(c_ptr)].name); -#endif - + msg_format(_("%sが溶けて泥になった!", "The %s turns into mud!"), f_name + f_info[get_feat_mimic(c_ptr)].name); obvious = TRUE; } @@ -887,7 +863,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) cave_alter_feat(y, x, FF_HURT_ROCK); /* Update some things */ - p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE); + p_ptr->update |= (PU_FLOW); } break; @@ -903,14 +879,11 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) if (player_bold(y, x)) break; /* Create a closed door */ - cave_set_feat(y, x, FEAT_DOOR_HEAD + 0x00); + cave_set_feat(y, x, feat_door[DOOR_DOOR].closed); /* Observe */ if (c_ptr->info & (CAVE_MARK)) obvious = TRUE; - /* Update some things */ - p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE); - break; } @@ -933,13 +906,11 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) if (player_bold(y, x)) break; /* Create a closed door */ - cave_set_feat(y, x, FEAT_TREES); + cave_set_feat(y, x, feat_tree); /* Observe */ if (c_ptr->info & (CAVE_MARK)) obvious = TRUE; - /* Update some things */ - p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE); break; } @@ -951,7 +922,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) /* Create a glyph */ c_ptr->info |= CAVE_OBJECT; - c_ptr->mimic = FEAT_GLYPH; + c_ptr->mimic = feat_glyph; /* Notice */ note_spot(y, x); @@ -971,10 +942,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) if (player_bold(y, x)) break; /* Place a wall */ - cave_set_feat(y, x, FEAT_WALL); - - /* Update some things */ - p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE); + cave_set_feat(y, x, feat_granite); break; } @@ -982,52 +950,46 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) case GF_LAVA_FLOW: { + /* Ignore permanent grid */ + if (have_flag(f_ptr->flags, FF_PERMANENT)) break; + /* Shallow Lava */ if (dam == 1) { - /* Ignore permanent grid */ - if (cave_perma_bold(y, x)) break; - /* Ignore grid without enough space */ - if (!have_flag(f_flags_bold(y, x), FF_FLOOR)) break; + if (!have_flag(f_ptr->flags, FF_FLOOR)) break; /* Place a shallow lava */ - cave_set_feat(y, x, FEAT_SHAL_LAVA); + cave_set_feat(y, x, feat_shallow_lava); } /* Deep Lava */ else if (dam) { - /* Ignore permanent grid */ - if (cave_perma_bold(y, x)) break; - /* Place a deep lava */ - cave_set_feat(y, x, FEAT_DEEP_LAVA); + cave_set_feat(y, x, feat_deep_lava); } break; } case GF_WATER_FLOW: { + /* Ignore permanent grid */ + if (have_flag(f_ptr->flags, FF_PERMANENT)) break; + /* Shallow Water */ if (dam == 1) { - /* Ignore permanent grid */ - if (cave_perma_bold(y, x)) break; - /* Ignore grid without enough space */ - if (!have_flag(f_flags_bold(y, x), FF_FLOOR)) break; + if (!have_flag(f_ptr->flags, FF_FLOOR)) break; - /* Place a shallow lava */ - cave_set_feat(y, x, FEAT_SHAL_WATER); + /* Place a shallow water */ + cave_set_feat(y, x, feat_shallow_water); } /* Deep Water */ else if (dam) { - /* Ignore permanent grid */ - if (cave_perma_bold(y, x)) break; - - /* Place a deep lava */ - cave_set_feat(y, x, FEAT_DEEP_WATER); + /* Place a deep water */ + cave_set_feat(y, x, feat_deep_water); } break; } @@ -1055,6 +1017,11 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) /* Mega-Hack -- Update the monster in the affected grid */ /* This allows "spear of light" (etc) to work "correctly" */ if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE); + + if (p_ptr->special_defense & NINJA_S_STEALTH) + { + if (player_bold(y, x)) set_superstealth(FALSE); + } } break; @@ -1070,16 +1037,27 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) /* Turn off the light. */ if (do_dark) { - for (j = 0; j < 9; j++) + if (dun_level || !is_daytime()) { - if (have_flag(f_flags_bold(y + ddy_ddd[j], x + ddx_ddd[j]), FF_GLOW)) + for (j = 0; j < 9; j++) { - do_dark = FALSE; - break; + int by = y + ddy_ddd[j]; + int bx = x + ddx_ddd[j]; + + if (in_bounds2(by, bx)) + { + cave_type *cc_ptr = &cave[by][bx]; + + if (have_flag(f_info[get_feat_mimic(cc_ptr)].flags, FF_GLOW)) + { + do_dark = FALSE; + break; + } + } } - } - if (!do_dark) break; + if (!do_dark) break; + } c_ptr->info &= ~(CAVE_GLOW); @@ -1109,40 +1087,69 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) /* All done */ break; } + case GF_SHARDS: case GF_ROCKET: { if (is_mirror_grid(c_ptr)) { -#ifdef JP - msg_print("¶À¤¬³ä¤ì¤¿¡ª"); -#else - msg_print("The mirror was crashed!"); -#endif + msg_print(_("鏡が割れた!", "The mirror was crashed!")); + sound(SOUND_GLASS); remove_mirror(y, x); project(0, 2, y, x, p_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1); } + + if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 50)) + { + /* Message */ + if (known && (c_ptr->info & CAVE_MARK)) + { + msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name); + sound(SOUND_GLASS); + } + + /* Destroy the wall */ + cave_alter_feat(y, x, FF_HURT_ROCK); + + /* Update some things */ + p_ptr->update |= (PU_FLOW); + } break; } + case GF_SOUND: { if (is_mirror_grid(c_ptr) && p_ptr->lev < 40) - { -#ifdef JP - msg_print("¶À¤¬³ä¤ì¤¿¡ª"); -#else - msg_print("The mirror was crashed!"); -#endif + { + msg_print(_("鏡が割れた!", "The mirror was crashed!")); + sound(SOUND_GLASS); remove_mirror(y, x); project(0, 2, y, x, p_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1); } + + if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 200)) + { + /* Message */ + if (known && (c_ptr->info & CAVE_MARK)) + { + msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name); + sound(SOUND_GLASS); + } + + /* Destroy the wall */ + cave_alter_feat(y, x, FF_HURT_ROCK); + + /* Update some things */ + p_ptr->update |= (PU_FLOW); + } break; } case GF_DISINTEGRATE: { - /* Destroy mirror */ - if (is_mirror_grid(c_ptr)) remove_mirror(y, x); + /* Destroy mirror/glyph */ + if (is_mirror_grid(c_ptr) || is_glyph_grid(c_ptr) || is_explosive_rune_grid(c_ptr)) + remove_mirror(y, x); /* Permanent features don't get effect */ /* But not protect monsters and other objects */ @@ -1151,7 +1158,7 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) cave_alter_feat(y, x, FF_HURT_DISI); /* Update some things -- similar to GF_KILL_WALL */ - p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE); + p_ptr->update |= (PU_FLOW); } break; } @@ -1164,7 +1171,17 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) -/* +/*! + * @brief 汎用的なビーム/ボルト/ボール系によるアイテムオブジェクトへの効果処理 / Handle a beam/bolt/ball causing damage to a monster. + * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player") + * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball) + * @param y 目標Y座標 / Target y location (or location to travel "towards") + * @param x 目標X座標 / Target x location (or location to travel "towards") + * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player) + * @param typ 効果属性 / Type of damage to apply to monsters (and objects) + * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE + * @details + *
  * We are called from "project()" to "damage" objects
  *
  * We are called both for "beam" effects and "ball" effects.
@@ -1179,12 +1196,13 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
  * XXX XXX XXX We also "see" grids which are "memorized", probably a hack
  *
  * We return "TRUE" if the effect of the projection is "obvious".
+ * 
*/ -static bool project_o(int who, int r, int y, int x, int dam, int typ) +static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ) { cave_type *c_ptr = &cave[y][x]; - s16b this_o_idx, next_o_idx = 0; + OBJECT_IDX this_o_idx, next_o_idx = 0; bool obvious = FALSE; bool known = player_has_los_bold(y, x); @@ -1239,12 +1257,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ) if (hates_acid(o_ptr)) { do_kill = TRUE; -#ifdef JP -note_kill = "Í»¤±¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " melt!" : " melts!"); -#endif - + note_kill = _("融けてしまった!", (plural ? " melt!" : " melts!")); if (have_flag(flgs, TR_IGNORE_ACID)) ignore = TRUE; } break; @@ -1256,12 +1269,7 @@ note_kill = "Í» if (hates_elec(o_ptr)) { do_kill = TRUE; -#ifdef JP -note_kill = "²õ¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " are destroyed!" : " is destroyed!"); -#endif - + note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!")); if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE; } break; @@ -1272,13 +1280,8 @@ note_kill = " { if (hates_fire(o_ptr)) { - do_kill = TRUE; -#ifdef JP -note_kill = "dz¤¨¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " burn up!" : " burns up!"); -#endif - + do_kill = TRUE; + note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!")); if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE; } break; @@ -1289,12 +1292,7 @@ note_kill = "dz { if (hates_cold(o_ptr)) { -#ifdef JP -note_kill = "ºÕ¤±»¶¤Ã¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " shatter!" : " shatters!"); -#endif - + note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!")); do_kill = TRUE; if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE; } @@ -1307,24 +1305,14 @@ note_kill = " if (hates_fire(o_ptr)) { do_kill = TRUE; -#ifdef JP -note_kill = "dz¤¨¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " burn up!" : " burns up!"); -#endif - + note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!")); if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE; } if (hates_elec(o_ptr)) { ignore = FALSE; do_kill = TRUE; -#ifdef JP -note_kill = "²õ¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " are destroyed!" : " is destroyed!"); -#endif - + note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!")); if (have_flag(flgs, TR_IGNORE_ELEC)) ignore = TRUE; } break; @@ -1335,25 +1323,15 @@ note_kill = " { if (hates_fire(o_ptr)) { - do_kill = TRUE; -#ifdef JP -note_kill = "dz¤¨¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " burn up!" : " burns up!"); -#endif - + do_kill = TRUE; + note_kill = _("燃えてしまった!", (plural ? " burn up!" : " burns up!")); if (have_flag(flgs, TR_IGNORE_FIRE)) ignore = TRUE; } if (hates_cold(o_ptr)) { ignore = FALSE; do_kill = TRUE; -#ifdef JP -note_kill = "ºÕ¤±»¶¤Ã¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " shatter!" : " shatters!"); -#endif - + note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!")); if (have_flag(flgs, TR_IGNORE_COLD)) ignore = TRUE; } break; @@ -1366,13 +1344,8 @@ note_kill = " case GF_SOUND: { if (hates_cold(o_ptr)) - { -#ifdef JP -note_kill = "ºÕ¤±»¶¤Ã¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " shatter!" : " shatters!"); -#endif - + { + note_kill = _("砕け散ってしまった!", (plural ? " shatter!" : " shatters!")); do_kill = TRUE; } break; @@ -1384,36 +1357,21 @@ note_kill = " case GF_SUPER_RAY: { do_kill = TRUE; -#ifdef JP -note_kill = "²õ¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " are destroyed!" : " is destroyed!"); -#endif - + note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!")); break; } case GF_DISINTEGRATE: { do_kill = TRUE; -#ifdef JP -note_kill = "¾øȯ¤·¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " evaporate!" : " evaporates!"); -#endif - + note_kill = _("蒸発してしまった!", (plural ? " evaporate!" : " evaporates!")); break; } case GF_CHAOS: { do_kill = TRUE; -#ifdef JP -note_kill = "²õ¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " are destroyed!" : " is destroyed!"); -#endif - + note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!")); if (have_flag(flgs, TR_RES_CHAOS)) ignore = TRUE; else if ((o_ptr->tval == TV_SCROLL) && (o_ptr->sval == SV_SCROLL_CHAOS)) ignore = TRUE; break; @@ -1425,13 +1383,8 @@ note_kill = " { if (object_is_cursed(o_ptr)) { - do_kill = TRUE; -#ifdef JP -note_kill = "²õ¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª"; -#else - note_kill = (plural ? " are destroyed!" : " is destroyed!"); -#endif - + do_kill = TRUE; + note_kill = _("壊れてしまった!", (plural ? " are destroyed!" : " is destroyed!")); } break; } @@ -1462,14 +1415,9 @@ note_kill = " object_known(o_ptr); /* Notice */ - if (known && o_ptr->marked) + if (known && (o_ptr->marked & OM_FOUND)) { -#ifdef JP -msg_print("¥«¥Á¥Ã¤È²»¤¬¤·¤¿¡ª"); -#else - msg_print("Click!"); -#endif - + msg_print(_("カチッと音がした!", "Click!")); obvious = TRUE; } } @@ -1494,29 +1442,17 @@ msg_print(" { if (!note_kill) { -#ifdef JP -note_kill = "³¥¤Ë¤Ê¤Ã¤¿¡£"; -#else - note_kill = (plural ? " become dust." : " becomes dust."); -#endif + note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust.")); } continue; } else if (summon_named_creature(who, y, x, o_ptr->pval, mode)) { -#ifdef JP -note_kill = "À¸¤­Ê֤ä¿¡£"; -#else - note_kill = "rivived."; -#endif + note_kill = _("生き返った。", " revived."); } else if (!note_kill) { -#ifdef JP -note_kill = "³¥¤Ë¤Ê¤Ã¤¿¡£"; -#else - note_kill = (plural ? " become dust." : " becomes dust."); -#endif + note_kill = _("灰になった。", (plural ? " become dust." : " becomes dust.")); } } do_kill = TRUE; @@ -1531,7 +1467,7 @@ note_kill = " if (do_kill) { /* Effect "observed" */ - if (known && o_ptr->marked) + if (known && (o_ptr->marked & OM_FOUND)) { obvious = TRUE; object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); @@ -1541,16 +1477,10 @@ note_kill = " if (is_art || ignore) { /* Observe the resist */ - if (known && o_ptr->marked) - { -#ifdef JP -msg_format("%s¤Ï±Æ¶Á¤ò¼õ¤±¤Ê¤¤¡ª", - o_name); -#else - msg_format("The %s %s unaffected!", - o_name, (plural ? "are" : "is")); -#endif - + if (known && (o_ptr->marked & OM_FOUND)) + { + msg_format(_("%sは影響を受けない!", + (plural ? "The %s are unaffected!" : "The %s is unaffected!")), o_name); } } @@ -1558,14 +1488,9 @@ msg_format("%s else { /* Describe if needed */ - if (known && o_ptr->marked && note_kill) + if (known && (o_ptr->marked & OM_FOUND) && note_kill) { -#ifdef JP -msg_format("%s¤Ï%s", o_name, note_kill); -#else - msg_format("The %s%s", o_name, note_kill); -#endif - + msg_format(_("%sは%s", "The %s%s"), o_name, note_kill); } k_idx = o_ptr->k_idx; @@ -1592,11 +1517,19 @@ msg_format("%s } -/* - * Helper function for "project()" below. - * - * Handle a beam/bolt/ball causing damage to a monster. - * +/*! + * @brief 汎用的なビーム/ボルト/ボール系によるモンスターへの効果処理 / Handle a beam/bolt/ball causing damage to a monster. + * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player") + * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball) + * @param y 目標Y座標 / Target y location (or location to travel "towards") + * @param x 目標X座標 / Target x location (or location to travel "towards") + * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player) + * @param typ 効果属性 / Type of damage to apply to monsters (and objects) + * @param flg 効果フラグ + * @param see_s_msg TRUEならばメッセージを表示する + * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE + * @details + *
  * This routine takes a "source monster" (by index) which is mostly used to
  * determine if the player is causing the damage, and a "radius" (see below),
  * which is used to decrease the power of explosions with distance, and a
@@ -1604,28 +1537,31 @@ msg_format("%s
  * (polymorph and teleport being the obvious ones), a default damage, which
  * is modified as needed based on various properties, and finally a "damage
  * type" (see below).
- *
+ * 
+ *
  * Note that this routine can handle "no damage" attacks (like teleport) by
  * taking a "zero" damage, and can even take "parameters" to attacks (like
  * confuse) by accepting a "damage", using it to calculate the effect, and
  * then setting the damage to zero.  Note that the "damage" parameter is
  * divided by the radius, so monsters not at the "epicenter" will not take
  * as much damage (or whatever)...
- *
+ * 
+ *
  * Note that "polymorph" is dangerous, since a failure in "place_monster()"'
  * may result in a dereference of an invalid pointer.  XXX XXX XXX
- *
+ * 
+ *
  * Various messages are produced, and damage is applied.
- *
+ * 
+ *
  * Just "casting" a substance (i.e. plasma) does not make you immune, you must
  * actually be "made" of that substance, or "breathe" big balls of it.
- *
  * We assume that "Plasma" monsters, and "Plasma" breathers, are immune
  * to plasma.
- *
  * We assume "Nether" is an evil, necromantic force, so it doesn't hurt undead,
  * and hurts evil less.  If can breath nether, then it resists it as well.
- *
+ * 
+ *
  * Damage reductions use the following formulas:
  *   Note that "dam = dam * 6 / (randint1(6) + 6);"
  *     gives avg damage of .655, ranging from .858 to .500
@@ -1637,22 +1573,26 @@ msg_format("%s
  *     gives avg damage of .327, ranging from .427 to .250
  *   Note that "dam = dam * 2 / (randint1(6) + 6);"
  *     gives something simple.
- *
+ * 
+ *
  * In this function, "result" messages are postponed until the end, where
  * the "note" string is appended to the monster name, if not NULL.  So,
  * to make a spell have "no effect" just set "note" to NULL.  You should
  * also set "notice" to FALSE, or the player will learn what the spell does.
- *
+ * 
+ *
  * We attempt to return "TRUE" if the player saw anything "useful" happen.
+ * "flg" was added.
+ * 
*/ -/* "flg" was added. */ -static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) +static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, bool see_s_msg) { int tmp; cave_type *c_ptr = &cave[y][x]; monster_type *m_ptr = &m_list[c_ptr->m_idx]; + monster_type *caster_ptr = (who > 0) ? &m_list[who] : NULL; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -1660,8 +1600,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) /* Is the monster "seen"? */ bool seen = m_ptr->ml; + bool seen_msg = is_seen(m_ptr); - bool slept = (bool)(m_ptr->csleep > 0); + bool slept = (bool)MON_CSLEEP(m_ptr); /* Were the effects "obvious" (if seen)? */ bool obvious = FALSE; @@ -1669,9 +1610,6 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) /* Can the player know about this effect? */ bool known = ((m_ptr->cdis <= MAX_SIGHT) || p_ptr->inside_battle); - /* Can the player see the source of this effect? */ - bool see_s = ((who <= 0) || m_list[who].ml); - /* Were the effects "irrelevant"? */ bool skipped = FALSE; @@ -1703,12 +1641,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) /* Hold the monster name */ char m_name[80]; - -#ifndef JP char m_poss[10]; -#endif - int photo = 0; + PARAMETER_VALUE photo = 0; /* Assume no note */ cptr note = NULL; @@ -1719,7 +1654,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) int ty = m_ptr->fy; int tx = m_ptr->fx; - int caster_lev = (who > 0) ? r_info[m_list[who].r_idx].level : p_ptr->lev * 2; + int caster_lev = (who > 0) ? r_info[caster_ptr->r_idx].level : (p_ptr->lev * 2); /* Nobody here */ if (!c_ptr->m_idx) return (FALSE); @@ -1740,13 +1675,10 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) /* Get the monster name (BEFORE polymorphing) */ monster_desc(m_name, m_ptr, 0); -#ifndef JP /* Get the monster possessive ("his"/"her"/"its") */ monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE); -#endif - - if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 0); + if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 1); /* Analyze the damage type */ switch (typ) @@ -1758,13 +1690,9 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } break; @@ -1777,25 +1705,16 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_IM_ACID) { -#ifdef JP -note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists a lot."; -#endif - + note = _("にはかなり耐性がある!", " resists a lot."); dam /= 9; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID); } break; } @@ -1807,25 +1726,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_IM_ELEC) { -#ifdef JP -note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists a lot."; -#endif - - dam /= 9; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC); + note = _("にはかなり耐性がある!", " resists a lot."); + dam /= 9; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC); } break; } @@ -1837,36 +1747,22 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_IM_FIRE) { -#ifdef JP -note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists a lot."; -#endif - + note = _("にはかなり耐性がある!", " resists a lot."); dam /= 9; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_FIRE); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_FIRE); } else if (r_ptr->flags3 & (RF3_HURT_FIRE)) { -#ifdef JP -note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£"; -#else - note = " is hit hard."; -#endif - + note = _("はひどい痛手をうけた。", " is hit hard."); dam *= 2; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE); } break; } @@ -1878,36 +1774,22 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_IM_COLD) { -#ifdef JP -note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists a lot."; -#endif - + note = _("にはかなり耐性がある!", " resists a lot."); dam /= 9; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); } else if (r_ptr->flags3 & (RF3_HURT_COLD)) - { -#ifdef JP -note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£"; -#else - note = " is hit hard."; -#endif - + { + note = _("はひどい痛手をうけた。", " is hit hard."); dam *= 2; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); } break; } @@ -1919,25 +1801,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_IM_POIS) { -#ifdef JP -note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists a lot."; -#endif - + note = _("にはかなり耐性がある!", " resists a lot."); dam /= 9; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); } break; } @@ -1949,25 +1822,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_IM_POIS) { -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); } else if (one_in_(3)) do_poly = TRUE; break; @@ -1979,26 +1843,17 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags3 & RF3_GOOD) - { + { + note = _("はひどい痛手をうけた。", " is hit hard."); dam *= 2; -#ifdef JP -note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¼õ¤±¤¿¡£"; -#else - note = " is hit hard."; -#endif - - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); } break; } @@ -2009,46 +1864,27 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags3 & RF3_GOOD) - { + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; -#ifdef JP -note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " is immune."; -#endif - - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= RF3_GOOD; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_GOOD; } else if (r_ptr->flags3 & RF3_EVIL) { - dam *= 2; -#ifdef JP -note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¼õ¤±¤¿¡£"; -#else - note = " is hit hard."; -#endif - - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL; + dam *= 2; + note = _("はひどい痛手をうけた。", " is hit hard."); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL; } else - { -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; } break; @@ -2060,14 +1896,10 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } break; @@ -2080,25 +1912,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_PLAS) - { -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS); } break; } @@ -2110,50 +1933,31 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_NETH) { if (r_ptr->flags3 & RF3_UNDEAD) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " is immune."; -#endif - + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); } else { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; } - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NETH); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NETH); } else if (r_ptr->flags3 & RF3_EVIL) - { + { + note = _("はいくらか耐性を示した。", " resists somewhat."); dam /= 2; -#ifdef JP - note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ­¤ò¼¨¤·¤¿¡£"; -#else - note = " resists somewhat."; -#endif - - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); } break; } @@ -2165,38 +1969,24 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_WATE) { if ((m_ptr->r_idx == MON_WATER_ELEM) || (m_ptr->r_idx == MON_UNMAKER)) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " is immune."; -#endif - + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; } else - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; } - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE); } break; } @@ -2207,37 +1997,23 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_CHAO) - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_CHAO); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_CHAO); } else if ((r_ptr->flags3 & RF3_DEMON) && one_in_(3)) - { -#ifdef JP - note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ­¤ò¼¨¤·¤¿¡£"; -#else - note = " resists somewhat."; -#endif - + { + note = _("はいくらか耐性を示した。", " resists somewhat."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); } else { @@ -2253,26 +2029,17 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_SHAR) { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - - dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); + note = _("には耐性がある。", " resists."); + dam *= 3; dam /= randint1(6) + 6; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); } break; } @@ -2284,25 +2051,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_SHAR) - { -#ifdef JP - note = "¤Ï¤¤¤¯¤é¤«ÂÑÀ­¤ò¼¨¤·¤¿¡£"; -#else - note = " resists somewhat."; -#endif - + { + note = _("はいくらか耐性を示した。", " resists somewhat."); dam /= 2; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); } break; } @@ -2315,25 +2073,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_SOUN) { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - - dam *= 2; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN); + note = _("には耐性がある。", " resists."); + dam *= 2; dam /= randint1(6) + 6; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN); } else do_stun = (10 + randint1(15) + r) / (r + 1); break; @@ -2346,25 +2095,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags3 & RF3_NO_CONF) { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - - dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + note = _("には耐性がある。", " resists."); + dam *= 3; dam /= randint1(6) + 6; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } else do_conf = (10 + randint1(15) + r) / (r + 1); break; @@ -2377,25 +2117,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_DISE) { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - - dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE); + note = _("には耐性がある。", " resists."); + dam *= 3; dam /= randint1(6) + 6; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE); } break; } @@ -2406,26 +2137,17 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_NEXU) - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU); } break; } @@ -2436,57 +2158,39 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_WALL) - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL); } else do_stun = (randint1(15) + r) / (r + 1); break; } /* Inertia -- breathers resist */ - case GF_INERTIA: + case GF_INERTIAL: { if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_INER) - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER); } else { @@ -2499,17 +2203,10 @@ note = " /* Normal monsters slow down */ else { - if (!m_ptr->slow) + if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50)) { -#ifdef JP - note = "¤ÎÆ°¤­¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£"; -#else - note = " starts moving slower."; -#endif + note = _("の動きが遅くなった。", " starts moving slower."); } - m_ptr->slow = MIN(200, m_ptr->slow + 50); - if (c_ptr->m_idx == p_ptr->riding) - p_ptr->update |= (PU_BONUS); } } break; @@ -2522,25 +2219,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_TIME) { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + note = _("には耐性がある。", " resists."); dam *= 3; dam /= randint1(6) + 6; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME); } else do_time = (dam + 1) / 2; break; @@ -2554,38 +2242,24 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_TELE) { if (r_ptr->flags1 & (RF1_UNIQUE)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には効果がなかった。", " is unaffected!"); resist_tele = TRUE; } else if (r_ptr->level > randint1(100)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には耐性がある!", " resists!"); resist_tele = TRUE; } } @@ -2595,16 +2269,11 @@ note = " if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) do_dist = 0; if (r_ptr->flagsr & RFR_RES_GRAV) - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある!", " resists!"); dam *= 3; dam /= randint1(6) + 6; do_dist = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV); } else { @@ -2618,17 +2287,10 @@ note = " /* Normal monsters slow down */ else { - if (!m_ptr->slow) + if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50)) { -#ifdef JP -note = "¤ÎÆ°¤­¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£"; -#else - note = " starts moving slower."; -#endif + note = _("の動きが遅くなった。", " starts moving slower."); } - m_ptr->slow = MIN(200, m_ptr->slow + 50); - if (c_ptr->m_idx == p_ptr->riding) - p_ptr->update |= (PU_BONUS); } /* 2. stun */ @@ -2641,12 +2303,7 @@ note = " /* Resist */ do_stun = 0; /* No obvious effect */ -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected!"); obvious = FALSE; } } @@ -2662,13 +2319,9 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } break; @@ -2682,26 +2335,16 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags3 & RF3_HURT_ROCK) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); -#ifdef JP -note = "¤ÎÈéÉ椬¤¿¤À¤ì¤¿¡ª"; -note_dies = "¤Ï¾øȯ¤·¤¿¡ª"; -#else - note = " loses some skin!"; - note_dies = " evaporates!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); + note = _("の皮膚がただれた!", " loses some skin!"); + note_dies = _("は蒸発した!", " evaporates!"); dam *= 2; } break; @@ -2712,50 +2355,34 @@ note_dies = " if (seen) obvious = TRUE; /* PSI only works if the monster can see you! -- RG */ - if (!(los(m_ptr->fy, m_ptr->fx, py, px))) + if (!(los(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x))) { -#ifdef JP - if (seen) msg_format("%s¤Ï¤¢¤Ê¤¿¤¬¸«¤¨¤Ê¤¤¤Î¤Ç±Æ¶Á¤µ¤ì¤Ê¤¤¡ª", m_name); -#else - if (seen) msg_format("%^s can't see you, and isn't affected!", m_name); -#endif + if (seen_msg) + msg_format(_("%sはあなたが見えないので影響されない!", "%^s can't see you, and isn't affected!"), m_name); skipped = TRUE; break; } if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags2 & RF2_EMPTY_MIND) { dam = 0; -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); + note = _("には完全な耐性がある!", " is immune."); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); } else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) || (r_ptr->flags3 & RF3_ANIMAL) || (r_ptr->level > randint1(3 * dam))) - { + { + note = _("には耐性がある!", " resists!"); dam /= 3; -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - /* * Powerful demons & undead can turn a mindcrafter's @@ -2766,29 +2393,21 @@ note_dies = " one_in_(2)) { note = NULL; -#ifdef JP - msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª", m_name); -#else - msg_format("%^s%s corrupted mind backlashes your attack!", - m_name, (seen ? "'s" : "s")); -#endif + msg_format(_("%^sの堕落した精神は攻撃を跳ね返した!", + (seen ? "%^s's corrupted mind backlashes your attack!" : + "%^ss corrupted mind backlashes your attack!")), m_name); /* Saving throw */ - if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav) + if ((randint0(100 + r_ptr->level / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW()) { -#ifdef JP - msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif - + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); } else { /* Injure +/- confusion */ monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE); take_hit(DAMAGE_ATTACK, dam, killer, -1); /* has already been /3 */ - if (one_in_(4)) + if (one_in_(4) && !CHECK_MULTISHADOW()) { switch (randint1(4)) { @@ -2801,12 +2420,7 @@ note_dies = " case 3: { if (r_ptr->flags3 & RF3_NO_FEAR) -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected."; -#endif - + note = _("には効果がなかった。", " is unaffected."); else set_afraid(p_ptr->afraid + 3 + randint1(dam)); break; @@ -2836,23 +2450,13 @@ note_dies = " do_fear = 3 + randint1(dam); break; default: -#ifdef JP - note = "¤Ï̲¤ê¹þ¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª"; -#else - note = " falls asleep!"; -#endif - + note = _("は眠り込んでしまった!", " falls asleep!"); do_sleep = 3 + randint1(dam); break; } } -#ifdef JP - note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£"; -#else - note_dies = " collapses, a mindless husk."; -#endif - + note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk."); break; } @@ -2861,37 +2465,23 @@ note_dies = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags2 & RF2_EMPTY_MIND) { - dam = 0; -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif - + dam = 0; + note = _("には完全な耐性がある!", " is immune."); } else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) || (r_ptr->flags3 & RF3_ANIMAL) || (r_ptr->level > randint1(3 * dam))) - { + { + note = _("には耐性がある!", " resists!"); dam /= 3; -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif - /* * Powerful demons & undead can turn a mindcrafter's @@ -2902,37 +2492,26 @@ note_dies = " (one_in_(2))) { note = NULL; -#ifdef JP - msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª", m_name); -#else - msg_format("%^s%s corrupted mind backlashes your attack!", - m_name, (seen ? "'s" : "s")); -#endif - + msg_format(_("%^sの堕落した精神は攻撃を跳ね返した!", + (seen ? "%^s's corrupted mind backlashes your attack!" : + "%^ss corrupted mind backlashes your attack!")), m_name); /* Saving throw */ - if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav) + if ((randint0(100 + r_ptr->level / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW()) { -#ifdef JP - msg_print("¤¢¤Ê¤¿¤Ï¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif - + msg_print(_("あなたは効力を跳ね返した!", "You resist the effects!")); } else { /* Injure + mana drain */ monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE); -#ifdef JP - msg_print("ĶǽÎϥѥ¤òµÛ¤¤¤È¤é¤ì¤¿¡ª"); -#else - msg_print("Your psychic energy is drained!"); -#endif - - p_ptr->csp -= damroll(5, dam) / 2; - if (p_ptr->csp < 0) p_ptr->csp = 0; - p_ptr->redraw |= PR_MANA; - p_ptr->window |= (PW_SPELL); + if (!CHECK_MULTISHADOW()) + { + msg_print(_("超能力パワーを吸いとられた!", "Your psychic energy is drained!")); + p_ptr->csp -= damroll(5, dam) / 2; + if (p_ptr->csp < 0) p_ptr->csp = 0; + p_ptr->redraw |= PR_MANA; + p_ptr->window |= (PW_SPELL); + } take_hit(DAMAGE_ATTACK, dam, killer, -1); /* has already been /3 */ } dam = 0; @@ -2941,25 +2520,18 @@ note_dies = " else if (dam > 0) { int b = damroll(5, dam) / 4; -#ifdef JP - msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¶ìÄˤòĶǽÎϥѥ¤ËÊÑ´¹¤·¤¿¡ª", m_name); -#else - msg_format("You convert %s%s pain into psychic energy!", - m_name, (seen ? "'s" : "s")); -#endif + cptr str = (p_ptr->pclass == CLASS_MINDCRAFTER) ? _("超能力パワー", "psychic energy") : _("魔力", "mana"); + cptr msg = _("あなたは%sの苦痛を%sに変換した!", + (seen ? "You convert %s's pain into %s!" : + "You convert %ss pain into %s!")); + msg_format(msg, m_name, str); b = MIN(p_ptr->msp, p_ptr->csp + b); p_ptr->csp = b; p_ptr->redraw |= PR_MANA; p_ptr->window |= (PW_SPELL); } - -#ifdef JP - note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£"; -#else - note_dies = " collapses, a mindless husk."; -#endif - + note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk."); break; } @@ -2968,14 +2540,10 @@ note_dies = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (one_in_(4)) @@ -3006,13 +2574,9 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } break; @@ -3024,14 +2588,10 @@ note_dies = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } break; @@ -3045,13 +2605,9 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("には効果がなかった!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ @@ -3062,7 +2618,7 @@ note_dies = " /* Memorize a flag */ if (r_ptr->flags3 & RF3_NO_CONF) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } /* Resist */ @@ -3076,23 +2632,15 @@ note_dies = " (r_ptr->level > p_ptr->lev / 2) && (one_in_(2))) { - note = NULL; -#ifdef JP - msg_format("%^s¤ÎÂÄÍ¤¿Àº¿À¤Ï¹¶·â¤òÄ·¤ÍÊÖ¤·¤¿¡ª", m_name); -#else - msg_format("%^s%s corrupted mind backlashes your attack!", - m_name, (seen ? "'s" : "s")); -#endif + note = NULL; + msg_format(_("%^sの堕落した精神は攻撃を跳ね返した!", + (seen ? "%^s's corrupted mind backlashes your attack!" : + "%^ss corrupted mind backlashes your attack!")), m_name); /* Saving throw */ if (randint0(100 + r_ptr->level/2) < p_ptr->skill_sav) { -#ifdef JP - msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif - + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); } else { @@ -3108,12 +2656,7 @@ note_dies = " default: { if (r_ptr->flags3 & RF3_NO_FEAR) -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected."; -#endif - + note = _("には効果がなかった。", " is unaffected."); else set_afraid(p_ptr->afraid + dam); } @@ -3123,12 +2666,7 @@ note_dies = " else { /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } } @@ -3136,12 +2674,7 @@ note = " { if ((dam > 29) && (randint1(100) < dam)) { -#ifdef JP -note = "¤¬¤¢¤Ê¤¿¤ËÎì°¤·¤¿¡£"; -#else - note = " is in your thrall!"; -#endif - + note = _("があなたに隷属した。", " is in your thrall!"); set_pet(m_ptr); } else @@ -3173,38 +2706,24 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } do_stun = (randint1(15) + 1) / (r + 1); if (r_ptr->flagsr & RFR_IM_COLD) - { -#ifdef JP - note = "¤Ë¤Ï¤«¤Ê¤êÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists a lot."; -#endif - + { + note = _("にはかなり耐性がある!", " resists a lot."); dam /= 9; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); } else if (r_ptr->flags3 & (RF3_HURT_COLD)) { -#ifdef JP - note = "¤Ï¤Ò¤É¤¤Ä˼ê¤ò¤¦¤±¤¿¡£"; -#else - note = " is hit hard."; -#endif - + note = _("はひどい痛手をうけた。", " is hit hard."); dam *= 2; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); } break; } @@ -3216,34 +2735,21 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (!monster_living(r_ptr)) { - if (seen) + if (is_original_ap_and_seen(m_ptr)) { - if (is_original_ap(m_ptr)) - { - if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); - if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); - if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); - } + if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); + if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); + if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); } - -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; dam = 0; } @@ -3258,34 +2764,21 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (!monster_living(r_ptr)) { - if (seen) + if (is_original_ap_and_seen(m_ptr)) { - if (is_original_ap(m_ptr)) - { - if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); - if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); - if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); - } + if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); + if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); + if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); } - -#ifdef JP -note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " is immune."; -#endif - + note = _("には完全な耐性がある!", " is immune."); obvious = FALSE; dam = 0; } @@ -3293,13 +2786,8 @@ note = " (randint1(888) != 666)) || (((r_ptr->level + randint1(20)) > randint1((caster_lev / 2) + randint1(10))) && randint1(100) != 66)) - { -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + { + note = _("には耐性がある!", " resists!"); obvious = FALSE; dam = 0; } @@ -3313,14 +2801,10 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt to polymorph (see below) */ @@ -3330,13 +2814,8 @@ note = " if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags1 & RF1_QUESTOR) || (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected!"; -#endif - + { + note = _("には効果がなかった。", " is unaffected."); do_poly = FALSE; obvious = FALSE; } @@ -3353,13 +2832,9 @@ note = " { if (seen) obvious = TRUE; - if (is_pet(m_ptr) || (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_NAZGUL | RF7_UNIQUE2))) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected!"; -#endif + if ((p_ptr->inside_arena) || is_pet(m_ptr) || (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_NAZGUL | RF7_UNIQUE2))) + { + note = _("には効果がなかった。", " is unaffected."); } else { @@ -3369,12 +2844,7 @@ note = " /* Attempt to clone. */ if (multiply_monster(c_ptr->m_idx, TRUE, 0L)) { -#ifdef JP -note = "¤¬Ê¬Îö¤·¤¿¡ª"; -#else - note = " spawns!"; -#endif - + note = _("が分裂した!", " spawns!"); } } @@ -3391,56 +2861,44 @@ note = " if (seen) obvious = TRUE; /* Wake up */ - m_ptr->csleep = 0; - - if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE); + (void)set_monster_csleep(c_ptr->m_idx, 0); if (m_ptr->maxhp < m_ptr->max_maxhp) { -#ifdef JP -msg_format("%^s¤Î¶¯¤µ¤¬Ìá¤Ã¤¿¡£", m_name); -#else - msg_format("%^s recovers %s vitality.", m_name, m_poss); -#endif + if (seen_msg) msg_format(_("%^sの強さが戻った。", "%^s recovers %s vitality."), m_name, m_poss); m_ptr->maxhp = m_ptr->max_maxhp; } - if (!dam) break; + + if (!dam) + { + /* Redraw (later) if needed */ + if (p_ptr->health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH); + if (p_ptr->riding == c_ptr->m_idx) p_ptr->redraw |= (PR_UHEALTH); + break; + } + + /* Fall through */ } case GF_OLD_HEAL: { if (seen) obvious = TRUE; /* Wake up */ - m_ptr->csleep = 0; - - if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE); - - if (m_ptr->stunned) + (void)set_monster_csleep(c_ptr->m_idx, 0); + if (MON_STUNNED(m_ptr)) { -#ifdef JP -msg_format("%^s¤ÏÛ¯Û°¾õÂÖ¤«¤éΩ¤Áľ¤Ã¤¿¡£", m_name); -#else - msg_format("%^s is no longer stunned.", m_name); -#endif - m_ptr->stunned = 0; + if (seen_msg) msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name); + (void)set_monster_stunned(c_ptr->m_idx, 0); } - if (m_ptr->confused) + if (MON_CONFUSED(m_ptr)) { -#ifdef JP -msg_format("%^s¤Ïº®Í𤫤éΩ¤Áľ¤Ã¤¿¡£", m_name); -#else - msg_format("%^s is no longer confused.", m_name); -#endif - m_ptr->confused = 0; + if (seen_msg) msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name); + (void)set_monster_confused(c_ptr->m_idx, 0); } - if (m_ptr->monfear) + if (MON_MONFEAR(m_ptr)) { -#ifdef JP -msg_format("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", m_name); -#else - msg_format("%^s recovers %s courage.", m_name, m_poss); -#endif - m_ptr->monfear = 0; + if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name); + (void)set_monster_monfear(c_ptr->m_idx, 0); } /* Heal */ @@ -3449,41 +2907,39 @@ msg_format("%^s /* No overflow */ if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp; - chg_virtue(V_VITALITY, 1); - - if (r_ptr->flags1 & RF1_UNIQUE) - chg_virtue(V_INDIVIDUALISM, 1); - - if (is_friendly(m_ptr)) - chg_virtue(V_HONOUR, 1); - else if (!(r_ptr->flags3 & RF3_EVIL)) - { - if (r_ptr->flags3 & RF3_GOOD) - chg_virtue(V_COMPASSION, 2); - else - chg_virtue(V_COMPASSION, 1); + if (!who) + { + chg_virtue(V_VITALITY, 1); + + if (r_ptr->flags1 & RF1_UNIQUE) + chg_virtue(V_INDIVIDUALISM, 1); + + if (is_friendly(m_ptr)) + chg_virtue(V_HONOUR, 1); + else if (!(r_ptr->flags3 & RF3_EVIL)) + { + if (r_ptr->flags3 & RF3_GOOD) + chg_virtue(V_COMPASSION, 2); + else + chg_virtue(V_COMPASSION, 1); + } + + if (r_ptr->flags3 & RF3_ANIMAL) + chg_virtue(V_NATURE, 1); } if (m_ptr->r_idx == MON_LEPER) { heal_leper = TRUE; - chg_virtue(V_COMPASSION, 5); + if (!who) chg_virtue(V_COMPASSION, 5); } - - if (r_ptr->flags3 & RF3_ANIMAL) - chg_virtue(V_NATURE, 1); /* Redraw (later) if needed */ if (p_ptr->health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH); if (p_ptr->riding == c_ptr->m_idx) p_ptr->redraw |= (PR_UHEALTH); /* Message */ -#ifdef JP -note = "¤ÏÂÎÎϤò²óÉü¤·¤¿¤è¤¦¤À¡£"; -#else - note = " looks healthier."; -#endif - + note = _("は体力を回復したようだ。", " looks healthier."); /* No "real" damage */ dam = 0; @@ -3497,23 +2953,18 @@ note = " if (seen) obvious = TRUE; /* Speed up */ - if (!m_ptr->fast) + if (set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100)) { -#ifdef JP -note = "¤ÎÆ°¤­¤¬Â®¤¯¤Ê¤Ã¤¿¡£"; -#else - note = " starts moving faster."; -#endif + note = _("の動きが速くなった。", " starts moving faster."); } - m_ptr->fast = MIN(200, m_ptr->fast + 100); - if (c_ptr->m_idx == p_ptr->riding) - p_ptr->update |= (PU_BONUS); - - if (r_ptr->flags1 & RF1_UNIQUE) - chg_virtue(V_INDIVIDUALISM, 1); - if (is_friendly(m_ptr)) - chg_virtue(V_HONOUR, 1); + if (!who) + { + if (r_ptr->flags1 & RF1_UNIQUE) + chg_virtue(V_INDIVIDUALISM, 1); + if (is_friendly(m_ptr)) + chg_virtue(V_HONOUR, 1); + } /* No "real" damage */ dam = 0; @@ -3527,44 +2978,27 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Powerful monsters can resist */ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + { + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } /* Normal monsters slow down */ else { - if (!m_ptr->slow) + if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50)) { -#ifdef JP -note = "¤ÎÆ°¤­¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£"; -#else - note = " starts moving slower."; -#endif + note = _("の動きが遅くなった。", " starts moving slower."); } - m_ptr->slow = MIN(200, m_ptr->slow + 50); - - if (c_ptr->m_idx == p_ptr->riding) - p_ptr->update |= (PU_BONUS); } /* No "real" damage */ @@ -3579,14 +3013,10 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ @@ -3597,27 +3027,16 @@ note = " /* Memorize a flag */ if (r_ptr->flags3 & RF3_NO_SLEEP) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); } - /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } else { /* Go to sleep (much) later */ -#ifdef JP -note = "¤Ï̲¤ê¹þ¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª"; -#else - note = " falls asleep!"; -#endif - + note = _("は眠り込んでしまった!", " falls asleep!"); do_sleep = 500; } @@ -3634,37 +3053,23 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("には効果がなかった!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ if ((r_ptr->flags1 & RF1_UNIQUE) || !(r_ptr->flags3 & RF3_EVIL) || (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + { + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } else { /* Go to sleep (much) later */ -#ifdef JP -note = "¤ÏÆ°¤±¤Ê¤¯¤Ê¤Ã¤¿¡ª"; -#else - note = " is suspended!"; -#endif - + note = _("は動けなくなった!", " is suspended!"); do_sleep = 500; } @@ -3679,37 +3084,23 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + { + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } else { /* Go to sleep (much) later */ -#ifdef JP -note = "¤ÏÆ°¤±¤Ê¤¯¤Ê¤Ã¤¿¡ª"; -#else - note = " is suspended!"; -#endif - + note = _("は動けなくなった!", " is suspended!"); do_sleep = 500; } @@ -3738,14 +3129,10 @@ note = " if (seen) obvious = TRUE; if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } @@ -3761,39 +3148,24 @@ note = " /* Memorize a flag */ if (r_ptr->flags3 & RF3_NO_CONF) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } /* Resist */ /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else if (p_ptr->cursed & TRC_AGGRAVATE) { -#ifdef JP -note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª"; -#else - note = " hates you too much!"; -#endif - + note = _("はあなたに敵意を抱いている!", " hates you too much!"); if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else { -#ifdef JP -note = "¤ÏÆÍÁ³Í§¹¥Åª¤Ë¤Ê¤Ã¤¿¤è¤¦¤À¡ª"; -#else - note = " suddenly seems friendly!"; -#endif - + note = _("は突然友好的になったようだ!", " suddenly seems friendly!"); set_pet(m_ptr); chg_virtue(V_INDIVIDUALISM, -1); @@ -3825,14 +3197,10 @@ note = " } if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } @@ -3846,33 +3214,18 @@ note = " (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else if (p_ptr->cursed & TRC_AGGRAVATE) { -#ifdef JP -note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª"; -#else - note = " hates you too much!"; -#endif - + note = _("はあなたに敵意を抱いている!", " hates you too much!"); if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else { -#ifdef JP -note = "¤Ï´û¤Ë¤¢¤Ê¤¿¤ÎÅÛÎì¤À¡ª"; -#else - note = " is in your thrall!"; -#endif - + note = _("は既にあなたの奴隷だ!", " is in your thrall!"); set_pet(m_ptr); } @@ -3900,14 +3253,10 @@ note = " } if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } @@ -3921,33 +3270,19 @@ note = " (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else if (p_ptr->cursed & TRC_AGGRAVATE) { -#ifdef JP -note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª"; -#else - note = " hates you too much!"; -#endif - + note = _("はあなたに敵意を抱いている!", " hates you too much!"); if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else { -#ifdef JP -note = "¤Ï´û¤Ë¤¢¤Ê¤¿¤ÎÅÛÎì¤À¡ª"; -#else - note = " is in your thrall!"; -#endif - + note = _("は既にあなたの奴隷だ!", " is in your thrall!"); set_pet(m_ptr); } @@ -3976,14 +3311,10 @@ note = " } if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } @@ -4000,38 +3331,24 @@ note = " /* Memorize a flag */ if (r_ptr->flags3 & (RF3_NO_CONF)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } /* Resist */ /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else if (p_ptr->cursed & TRC_AGGRAVATE) { -#ifdef JP -note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª"; -#else - note = " hates you too much!"; -#endif - + note = _("はあなたに敵意を抱いている!", " hates you too much!"); if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else { -#ifdef JP -note = "¤Ï¤Ê¤Ä¤¤¤¿¡£"; -#else - note = " is tamed!"; -#endif - + note = _("はなついた。", " is tamed!"); set_pet(m_ptr); if (r_ptr->flags3 & RF3_ANIMAL) @@ -4066,20 +3383,12 @@ note = " if (r_ptr->flags3 & (RF3_NO_CONF)) dam -= 30; if (dam < 1) dam = 1; -#ifdef JP -msg_format("%s¤ò¸«¤Ä¤á¤¿¡£",m_name); -#else - msg_format("You stare into %s.", m_name); -#endif + msg_format(_("%sを見つめた。", "You stare into %s."), m_name); if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } @@ -4094,33 +3403,19 @@ msg_format("%s { /* Resist */ /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else if (p_ptr->cursed & TRC_AGGRAVATE) { -#ifdef JP -note = "¤Ï¤¢¤Ê¤¿¤ËŨ°Õ¤òÊú¤¤¤Æ¤¤¤ë¡ª"; -#else - note = " hates you too much!"; -#endif - + note = _("はあなたに敵意を抱いている!", " hates you too much!"); if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET; } else { -#ifdef JP -note = "¤ò»ÙÇÛ¤·¤¿¡£"; -#else - note = " is tamed!"; -#endif - + note = _("を支配した。", " is tamed!"); set_pet(m_ptr); if (r_ptr->flags3 & RF3_ANIMAL) @@ -4138,14 +3433,10 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Get confused later */ @@ -4159,19 +3450,14 @@ note = " /* Memorize a flag */ if (r_ptr->flags3 & (RF3_NO_CONF)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } /* Resist */ do_conf = 0; /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } @@ -4185,14 +3471,10 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } do_stun = damroll((caster_lev / 20) + 3 , (dam)) + 1; @@ -4205,12 +3487,7 @@ note = " do_stun = 0; /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } @@ -4238,24 +3515,15 @@ note = " /* Hurt by light */ if (r_ptr->flags3 & (RF3_HURT_LITE)) { - if (seen) - { - /* Obvious effect */ - obvious = TRUE; + /* Obvious effect */ + if (seen) obvious = TRUE; - /* Memorize the effects */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); - } + /* Memorize the effects */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); /* Special effect */ -#ifdef JP -note = "¤Ï¸÷¤Ë¿È¤ò¤¹¤¯¤á¤¿¡ª"; -note_dies = "¤Ï¸÷¤ò¼õ¤±¤Æ¤·¤Ü¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª"; -#else - note = " cringes from the light!"; - note_dies = " shrivels away in the light!"; -#endif - + note = _("は光に身をすくめた!", " cringes from the light!"); + note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!"); } /* Normally no damage */ @@ -4276,38 +3544,23 @@ note_dies = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_LITE) - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある!", " resists!"); dam *= 2; dam /= (randint1(6)+6); - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE); } else if (r_ptr->flags3 & (RF3_HURT_LITE)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); -#ifdef JP - note = "¤Ï¸÷¤Ë¿È¤ò¤¹¤¯¤á¤¿¡ª"; - note_dies = "¤Ï¸÷¤ò¼õ¤±¤Æ¤·¤Ü¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª"; -#else - note = " cringes from the light!"; - note_dies = " shrivels away in the light!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); + note = _("は光に身をすくめた!", " cringes from the light!"); + note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!"); dam *= 2; } break; @@ -4320,26 +3573,17 @@ note_dies = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flagsr & RFR_RES_DARK) - { -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists."; -#endif - + { + note = _("には耐性がある!", " resists!"); dam *= 2; dam /= (randint1(6)+6); - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK); } break; } @@ -4356,24 +3600,15 @@ note_dies = " /* Hurt by rock remover */ if (r_ptr->flags3 & (RF3_HURT_ROCK)) { - if (seen) - { - /* Notice effect */ - obvious = TRUE; + /* Notice effect */ + if (seen) obvious = TRUE; - /* Memorize the effects */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); - } + /* Memorize the effects */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); /* Cute little message */ -#ifdef JP -note = "¤ÎÈéÉ椬¤¿¤À¤ì¤¿¡ª"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " loses some skin!"; - note_dies = " dissolves!"; -#endif - + note = _("の皮膚がただれた!", " loses some skin!"); + note_dies = _("はドロドロに溶けた!", " dissolves!"); } /* Usually, ignore the effects */ @@ -4399,35 +3634,22 @@ note_dies = " { if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には効果がなかった。", " is unaffected."); resists_tele = TRUE; } else if (r_ptr->level > randint1(100)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には耐性がある!", " resists!"); resists_tele = TRUE; } } if (!resists_tele) { - if (seen) - { - obvious = TRUE; - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); - } + if (seen) obvious = TRUE; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); do_dist = dam; } } @@ -4457,35 +3679,22 @@ note = " { if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には効果がなかった。", " is unaffected."); resists_tele = TRUE; } else if (r_ptr->level > randint1(100)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には耐性がある!", " resists!"); resists_tele = TRUE; } } if (!resists_tele) { - if (seen) - { - obvious = TRUE; - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); - } + if (seen) obvious = TRUE; + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); do_dist = dam; } } @@ -4511,24 +3720,14 @@ note = " { if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には効果がなかった。", " is unaffected."); resists_tele = TRUE; } else if (r_ptr->level > randint1(100)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; + note = _("には耐性がある!", " resists!"); resists_tele = TRUE; } } @@ -4559,14 +3758,11 @@ note = " /* Only affect undead */ if (r_ptr->flags3 & (RF3_UNDEAD)) { - if (seen) - { - /* Learn about type */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); + /* Obvious */ + if (seen) obvious = TRUE; - /* Obvious */ - obvious = TRUE; - } + /* Learn about type */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); /* Apply some fear */ do_fear = damroll(3, (dam / 2)) + 1; @@ -4575,12 +3771,7 @@ note = " if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10) { /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; do_fear = 0; } @@ -4610,14 +3801,11 @@ note = " /* Only affect evil */ if (r_ptr->flags3 & (RF3_EVIL)) { - if (seen) - { - /* Learn about type */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); + /* Obvious */ + if (seen) obvious = TRUE; - /* Obvious */ - obvious = TRUE; - } + /* Learn about type */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); /* Apply some fear */ do_fear = damroll(3, (dam / 2)) + 1; @@ -4626,12 +3814,7 @@ note = " if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10) { /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; do_fear = 0; } @@ -4670,12 +3853,7 @@ note = " (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; do_fear = 0; } @@ -4698,24 +3876,15 @@ note = " /* Only affect undead */ if (r_ptr->flags3 & (RF3_UNDEAD)) { - if (seen) - { - /* Learn about type */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); + /* Obvious */ + if (seen) obvious = TRUE; - /* Obvious */ - obvious = TRUE; - } + /* Learn about type */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); /* Message */ -#ifdef JP -note = "¤Ï¿È¿Ì¤¤¤·¤¿¡£"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " shudders."; - note_dies = " dissolves!"; -#endif - + note = _("は身震いした。", " shudders."); + note_dies = _("はドロドロに溶けた!", " dissolves!"); } /* Others ignore */ @@ -4744,24 +3913,15 @@ note_dies = " /* Only affect evil */ if (r_ptr->flags3 & (RF3_EVIL)) { - if (seen) - { - /* Learn about type */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); + /* Obvious */ + if (seen) obvious = TRUE; - /* Obvious */ - obvious = TRUE; - } + /* Learn about type */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); /* Message */ -#ifdef JP -note = "¤Ï¿È¿Ì¤¤¤·¤¿¡£"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " shudders."; - note_dies = " dissolves!"; -#endif - + note = _("は身震いした。", " shudders."); + note_dies = _("はドロドロに溶けた!", " dissolves!"); } /* Others ignore */ @@ -4789,24 +3949,15 @@ note_dies = " /* Only affect good */ if (r_ptr->flags3 & (RF3_GOOD)) { - if (seen) - { - /* Learn about type */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); + /* Obvious */ + if (seen) obvious = TRUE; - /* Obvious */ - obvious = TRUE; - } + /* Learn about type */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); /* Message */ -#ifdef JP -note = "¤Ï¿È¿Ì¤¤¤·¤¿¡£"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " shudders."; - note_dies = " dissolves!"; -#endif - + note = _("は身震いした。", " shudders."); + note_dies = _("はドロドロに溶けた!", " dissolves!"); } /* Others ignore */ @@ -4838,14 +3989,8 @@ note_dies = " if (seen) obvious = TRUE; /* Message */ -#ifdef JP -note = "¤Ï¿È¿Ì¤¤¤·¤¿¡£"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " shudders."; - note_dies = " dissolves!"; -#endif - + note = _("は身震いした。", " shudders."); + note_dies = _("はドロドロに溶けた!", " dissolves!"); } /* Others ignore */ @@ -4873,24 +4018,15 @@ note_dies = " /* Only affect demons */ if (r_ptr->flags3 & (RF3_DEMON)) { - if (seen) - { - /* Learn about type */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); + /* Obvious */ + if (seen) obvious = TRUE; - /* Obvious */ - obvious = TRUE; - } + /* Learn about type */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); /* Message */ -#ifdef JP -note = "¤Ï¿È¿Ì¤¤¤·¤¿¡£"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " shudders."; - note_dies = " dissolves!"; -#endif - + note = _("は身震いした。", " shudders."); + note_dies = _("はドロドロに溶けた!", " dissolves!"); } /* Others ignore */ @@ -4919,15 +4055,8 @@ note_dies = " if (seen) obvious = TRUE; /* Message */ -#ifdef JP -note = "¤Ï¿È¿Ì¤¤¤·¤¿¡£"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " shudders."; - note_dies = " dissolves!"; -#endif - - + note = _("は身震いした。", " shudders."); + note_dies = _("はドロドロに溶けた!", " dissolves!"); break; } @@ -4937,28 +4066,22 @@ note_dies = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } - if ((r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (r_ptr->flags5 & ~(RF5_NOMAGIC_MASK)) || (r_ptr->flags6 & ~(RF6_NOMAGIC_MASK))) + if ((r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK)) || (r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK))) { if (who > 0) { - monster_type *caster_ptr = &m_list[who]; - /* Heal the monster */ if (caster_ptr->hp < caster_ptr->maxhp) { /* Heal */ - caster_ptr->hp += 6 * dam; + caster_ptr->hp += dam; if (caster_ptr->hp > caster_ptr->maxhp) caster_ptr->hp = caster_ptr->maxhp; /* Redraw (later) if needed */ @@ -4966,37 +4089,24 @@ note_dies = " if (p_ptr->riding == who) p_ptr->redraw |= (PR_UHEALTH); /* Special message */ - if (caster_ptr->ml) + if (see_s_msg) { /* Get the monster name */ monster_desc(killer, caster_ptr, 0); -#ifdef JP - msg_format("%^s¤Ïµ¤Ê¬¤¬Îɤµ¤½¤¦¤À¡£", killer); -#else - msg_format("%^s appears healthier.", killer); -#endif + msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer); } } } else { /* Message */ -#ifdef JP - msg_format("%s¤«¤éÀº¿À¥¨¥Í¥ë¥®¡¼¤òµÛ¤¤¤È¤Ã¤¿¡£", m_name); -#else - msg_format("You draw psychic energy from %s.", m_name); -#endif - + msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), m_name); (void)hp_player(dam); } } else { -#ifdef JP - msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name); -#else - msg_format("%s is unaffected.", m_name); -#endif + if (see_s_msg) msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name); } dam = 0; break; @@ -5007,21 +4117,13 @@ note_dies = " { if (seen) obvious = TRUE; /* Message */ -#ifdef JP - if (!who) msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", m_name); -#else - if (!who) msg_format("You gaze intently at %s.", m_name); -#endif + if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } @@ -5033,44 +4135,27 @@ note_dies = " /* Memorize a flag */ if (r_ptr->flags3 & (RF3_NO_CONF)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); - } -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + } + note = _("には効果がなかった。", " is unaffected."); dam = 0; } else if (r_ptr->flags2 & RF2_EMPTY_MIND) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); + note = _("には完全な耐性がある!", " is immune."); dam = 0; } else if (r_ptr->flags2 & RF2_WEIRD_MIND) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); + note = _("には耐性がある。", " resists."); dam /= 3; } else { -#ifdef JP - note = "¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£"; - note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£"; -#else - note = " is blasted by psionic energy."; - note_dies = " collapses, a mindless husk."; -#endif + note = _("は精神攻撃を食らった。", " is blasted by psionic energy."); + note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk."); if (who > 0) do_conf = randint0(4) + 4; else do_conf = randint0(8) + 8; @@ -5083,21 +4168,13 @@ note_dies = " { if (seen) obvious = TRUE; /* Message */ -#ifdef JP - if (!who) msg_format("%s¤ò¤¸¤Ã¤Èâˤó¤À¡£", m_name); -#else - if (!who) msg_format("You gaze intently at %s.", m_name); -#endif + if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } @@ -5109,44 +4186,27 @@ note_dies = " /* Memorize a flag */ if (r_ptr->flags3 & (RF3_NO_CONF)) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); - } -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + } + note = _("には効果がなかった。", " is unaffected."); dam = 0; } else if (r_ptr->flags2 & RF2_EMPTY_MIND) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); + note = _("には完全な耐性がある!", " is immune."); dam = 0; } else if (r_ptr->flags2 & RF2_WEIRD_MIND) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); -#ifdef JP - note = "¤Ë¤ÏÂÑÀ­¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); + note = _("には耐性がある!", " resists!"); dam /= 3; } else { -#ifdef JP - note = "¤ÏÀº¿À¹¶·â¤ò¿©¤é¤Ã¤¿¡£"; - note_dies = "¤ÎÀº¿À¤ÏÊø²õ¤·¡¢ÆùÂΤÏÈ´¤±³Ì¤È¤Ê¤Ã¤¿¡£"; -#else - note = " is blasted by psionic energy."; - note_dies = " collapses, a mindless husk."; -#endif + note = _("は精神攻撃を食らった。", " is blasted by psionic energy."); + note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk."); if (who > 0) { @@ -5158,9 +4218,7 @@ note_dies = " do_conf = randint0(8) + 8; do_stun = randint0(8) + 8; } - m_ptr->slow = MIN(200, m_ptr->slow + 10); - if (c_ptr->m_idx == p_ptr->riding) - p_ptr->update |= (PU_BONUS); + (void)set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 10); } break; } @@ -5170,32 +4228,20 @@ note_dies = " { if (seen) obvious = TRUE; /* Message */ -#ifdef JP - if (!who) msg_format("%s¤ò»Øº¹¤·¤Æ¼ö¤¤¤ò¤«¤±¤¿¡£", m_name); -#else - if (!who) msg_format("You point at %s and curses.", m_name); -#endif + if (!who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; } break; @@ -5206,32 +4252,20 @@ note_dies = " { if (seen) obvious = TRUE; /* Message */ -#ifdef JP - if (!who) msg_format("%s¤ò»Øº¹¤·¤Æ¶²¤í¤·¤²¤Ë¼ö¤¤¤ò¤«¤±¤¿¡£", m_name); -#else - if (!who) msg_format("You point at %s and curses horribly.", m_name); -#endif + if (!who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; } break; @@ -5242,32 +4276,20 @@ note_dies = " { if (seen) obvious = TRUE; /* Message */ -#ifdef JP - if (!who) msg_format("%s¤ò»Øº¹¤·¡¢¶²¤í¤·¤²¤Ë¼öʸ¤ò¾§¤¨¤¿¡ª", m_name); -#else - if (!who) msg_format("You point at %s, incanting terribly!", m_name); -#endif + if (!who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた!", "You point at %s, incanting terribly!"), m_name); if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ if (randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; } break; @@ -5278,32 +4300,22 @@ note_dies = " { if (seen) obvious = TRUE; /* Message */ -#ifdef JP - if (!who) msg_format("%s¤ÎÈ빦¤òÆͤ¤¤Æ¡¢¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", m_name); -#else - if (!who) msg_format("You point at %s, screaming the word, 'DIE!'.", m_name); -#endif + if (!who) + msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", + "You point at %s, screaming the word, 'DIE!'."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ - if ((randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) && ((who <= 0) || (m_list[who].r_idx != MON_KENSHIROU))) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + if ((randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) && ((who <= 0) || (caster_ptr->r_idx != MON_KENSHIROU))) + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; } break; @@ -5315,24 +4327,16 @@ note_dies = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags1 & RF1_UNIQUE) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = "is unaffected!"; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; } else @@ -5346,11 +4350,7 @@ note_dies = " } else { -#ifdef JP - note = "¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª"; -#else - note = "resists!"; -#endif + note = _("は耐性を持っている!", "resists!"); dam = 0; } } @@ -5363,17 +4363,13 @@ note_dies = " int nokori_hp; if ((p_ptr->inside_quest && (quest[p_ptr->inside_quest].type == QUEST_TYPE_KILL_ALL) && !is_pet(m_ptr)) || (r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_NAZGUL)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (r_ptr->flags1 & RF1_QUESTOR) || m_ptr->parent_m_idx) - { -#ifdef JP -msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£",m_name); -#else - msg_format("%^s is unaffected.", m_name); -#endif + { + msg_format(_("%sには効果がなかった。", "%s is unaffected."), m_name); skipped = TRUE; break; } - if (is_pet(m_ptr)) nokori_hp = m_ptr->maxhp*4L; + if (is_pet(m_ptr)) nokori_hp = m_ptr->maxhp * 4L; else if ((p_ptr->pclass == CLASS_BEASTMASTER) && monster_living(r_ptr)) nokori_hp = m_ptr->maxhp * 3 / 10; else @@ -5381,38 +4377,23 @@ msg_format("%s if (m_ptr->hp >= nokori_hp) { -#ifdef JP -msg_format("¤â¤Ã¤È¼å¤é¤»¤Ê¤¤¤È¡£"); -#else - msg_format("You need to weaken %s more.", m_name); -#endif + msg_format(_("もっと弱らせないと。", "You need to weaken %s more."), m_name); skipped = TRUE; } else if (m_ptr->hp < randint0(nokori_hp)) { if (m_ptr->mflag2 & MFLAG2_CHAMELEON) choose_new_monster(c_ptr->m_idx, FALSE, MON_CHAMELEON); -#ifdef JP -msg_format("%s¤òÊᤨ¤¿¡ª",m_name); -#else - msg_format("You capture %^s!", m_name); -#endif - cap_mon = m_list[c_ptr->m_idx].r_idx; - cap_mspeed = m_list[c_ptr->m_idx].mspeed; - cap_hp = m_list[c_ptr->m_idx].hp; - cap_maxhp = m_list[c_ptr->m_idx].max_maxhp; - if (m_list[c_ptr->m_idx].nickname) - cap_nickname = quark_add(quark_str(m_list[c_ptr->m_idx].nickname)); - else - cap_nickname = 0; + msg_format(_("%sを捕えた!", "You capture %^s!"), m_name); + cap_mon = m_ptr->r_idx; + cap_mspeed = m_ptr->mspeed; + cap_hp = m_ptr->hp; + cap_maxhp = m_ptr->max_maxhp; + cap_nickname = m_ptr->nickname; /* Quark transfer */ if (c_ptr->m_idx == p_ptr->riding) { if (rakuba(-1, FALSE)) { -#ifdef JP -msg_print("ÃÏÌ̤ËÍî¤È¤µ¤ì¤¿¡£"); -#else - msg_format("You have fallen from %s.", m_name); -#endif + msg_format(_("地面に落とされた。", "You have fallen from %s."), m_name); } } @@ -5422,11 +4403,7 @@ msg_print(" } else { -#ifdef JP -msg_format("¤¦¤Þ¤¯Êá¤Þ¤¨¤é¤ì¤Ê¤«¤Ã¤¿¡£"); -#else - msg_format("You failed to capture %s.", m_name); -#endif + msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), m_name); skipped = TRUE; } break; @@ -5448,35 +4425,23 @@ msg_format(" if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } if (r_ptr->flags2 & RF2_EMPTY_MIND) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune!"; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); break; } - if (m_ptr->csleep) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune!"; -#endif + if (MON_CSLEEP(m_ptr)) + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; skipped = TRUE; break; @@ -5492,31 +4457,18 @@ note = " /* Powerful monsters can resist */ if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + { + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } /* Normal monsters slow down */ else { - if (!m_ptr->slow) + if (set_monster_slow(c_ptr->m_idx, MON_SLOW(m_ptr) + 50)) { -#ifdef JP -note = "¤ÎÆ°¤­¤¬ÃÙ¤¯¤Ê¤Ã¤¿¡£"; -#else - note = " starts moving slower."; -#endif + note = _("の動きが遅くなった。", " starts moving slower."); } - m_ptr->slow = MIN(200, m_ptr->slow + 50); - - if (c_ptr->m_idx == p_ptr->riding) - p_ptr->update |= (PU_BONUS); } } @@ -5532,12 +4484,7 @@ note = " do_stun = 0; /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } } @@ -5552,38 +4499,24 @@ note = " /* Memorize a flag */ if (r_ptr->flags3 & RF3_NO_SLEEP) { - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); } /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("には効果がなかった。", " is unaffected."); obvious = FALSE; } else { /* Go to sleep (much) later */ -#ifdef JP -note = "¤Ï̲¤ê¹þ¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª"; -#else - note = " falls asleep!"; -#endif - + note = _("は眠り込んでしまった!", " falls asleep!"); do_sleep = 500; } } if (!done) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune!"; -#endif + { + note = _("には効果がなかった。", " is unaffected."); } /* No "real" damage */ @@ -5594,102 +4527,42 @@ note = " /* GENOCIDE */ case GF_GENOCIDE: { - bool angry = FALSE; if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には効果がなかった。", " is unaffected."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } - if (((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & (RF7_UNIQUE2)) || (c_ptr->m_idx == p_ptr->riding)) || p_ptr->inside_arena || p_ptr->inside_quest) + if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One"))) { - dam = 0; - angry = TRUE; + if (seen_msg) msg_format(_("%sは消滅した!", "%^s disappered!"), m_name); + chg_virtue(V_VITALITY, -1); + return TRUE; } - else - { - if ((r_ptr->level > randint0(dam)) || (m_ptr->mflag2 & MFLAG2_NOGENO)) - { - dam = 0; - angry = TRUE; - } - else - { - delete_monster_idx(c_ptr->m_idx); -#ifdef JP - msg_format("%s¤Ï¾ÃÌǤ·¤¿¡ª",m_name); -#else - msg_format("%^s disappered!",m_name); -#endif - -#ifdef JP - take_hit(DAMAGE_GENO, randint1((r_ptr->level+1)/2), "¥â¥ó¥¹¥¿¡¼¾ÃÌǤμöʸ¤ò¾§¤¨¤¿ÈèÏ«", -1); -#else - take_hit(DAMAGE_GENO, randint1((r_ptr->level+1)/2), "the strain of casting Genocide One", -1); -#endif - dam = 0; - - chg_virtue(V_VITALITY, -1); - - skipped = TRUE; - /* Redraw */ - p_ptr->redraw |= (PR_HP); - - /* Window stuff */ - p_ptr->window |= (PW_PLAYER); - return TRUE; - } - } - if (angry) - { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = "is unaffected!"; -#endif - get_angry = TRUE; - if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO; - } + skipped = TRUE; break; } case GF_PHOTO: { -#ifdef JP - if (!who) msg_format("%s¤ò¼Ì¿¿¤Ë»£¤Ã¤¿¡£", m_name); -#else - if (!who) msg_format("You take a photograph of %s.", m_name); -#endif + if (!who) msg_format(_("%sを写真に撮った。", "You take a photograph of %s."), m_name); /* Hurt by light */ if (r_ptr->flags3 & (RF3_HURT_LITE)) { - if (seen) - { - /* Obvious effect */ - obvious = TRUE; + /* Obvious effect */ + if (seen) obvious = TRUE; - /* Memorize the effects */ - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); - } + /* Memorize the effects */ + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); /* Special effect */ -#ifdef JP - note = "¤Ï¸÷¤Ë¿È¤ò¤¹¤¯¤á¤¿¡ª"; - note_dies = "¤Ï¸÷¤ò¼õ¤±¤Æ¤·¤Ü¤ó¤Ç¤·¤Þ¤Ã¤¿¡ª"; -#else - note = " cringes from the light!"; - note_dies = " shrivels away in the light!"; -#endif - + note = _("は光に身をすくめた!", " cringes from the light!"); + note_dies = _("は光を受けてしぼんでしまった!", " shrivels away in the light!"); } /* Normally no damage */ @@ -5711,14 +4584,10 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); dam = 0; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } break; @@ -5737,13 +4606,8 @@ note = " /* No need to tame your pet */ if (is_pet(m_ptr)) { -#ifdef JP - note = "¤ÎÆ°¤­¤¬Â®¤¯¤Ê¤Ã¤¿¡£"; -#else - note = " starts moving faster."; -#endif - - m_ptr->fast = MIN(200, m_ptr->fast + 100); + note = _("の動きが速くなった。", " starts moving faster."); + (void)set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100); success = TRUE; } @@ -5759,17 +4623,12 @@ note = " } else { -#ifdef JP -note = "¤ò»ÙÇÛ¤·¤¿¡£"; -#else - note = " is tamed!"; -#endif - + note = _("を支配した。", " is tamed!"); set_pet(m_ptr); - m_ptr->fast = MIN(200, m_ptr->fast + 100); + (void)set_monster_fast(c_ptr->m_idx, MON_FAST(m_ptr) + 100); /* Learn about type */ - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); success = TRUE; } } @@ -5780,10 +4639,7 @@ note = " { do_fear = randint1(90)+10; } - else if (seen) - { - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_FEAR); - } + else if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_FEAR); } /* No "real" damage */ @@ -5796,26 +4652,17 @@ note = " if (seen) obvious = TRUE; if (r_ptr->flagsr & RFR_RES_ALL) - { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ­¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + { + note = _("には完全な耐性がある!", " is immune."); skipped = TRUE; - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } /* Attempt a saving throw */ if (randint0(100 + dam) < (r_ptr->level + 50)) - { - -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + { + note = _("には効果がなかった。", " is unaffected."); dam = 0; } break; @@ -5861,11 +4708,7 @@ note = " /* Modify the damage */ tmp = dam; dam = mon_damage_mod(m_ptr, dam, (bool)(typ == GF_PSY_SPEAR)); -#ifdef JP - if ((tmp > 0) && (dam == 0)) note = "¤Ï¥À¥á¡¼¥¸¤ò¼õ¤±¤Æ¤¤¤Ê¤¤¡£"; -#else - if ((tmp > 0) && (dam == 0)) note = " is unharmed."; -#endif + if ((tmp > 0) && (dam == 0)) note = _("はダメージを受けていない。", " is unharmed."); /* Check for death */ if (dam > m_ptr->hp) @@ -5873,181 +4716,141 @@ note = " /* Extract method of death */ note = note_dies; } - - /* Mega-Hack -- Handle "polymorph" -- monsters get a saving throw */ - else if (do_poly && (randint1(90) > r_ptr->level)) + else { - if (polymorph_monster(y, x)) + /* Sound and Impact resisters never stun */ + if (do_stun && + !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) && + !(r_ptr->flags3 & RF3_NO_STUN)) { /* Obvious */ if (seen) obvious = TRUE; - /* Monster polymorphs */ -#ifdef JP - note = "¤¬ÊѿȤ·¤¿¡ª"; -#else - note = " changes!"; -#endif - - - /* Turn off the damage */ - dam = 0; + /* Get stunned */ + if (MON_STUNNED(m_ptr)) + { + note = _("はひどくもうろうとした。", " is more dazed."); + tmp = MON_STUNNED(m_ptr) + (do_stun / 2); + } + else + { + note = _("はもうろうとした。", " is dazed."); + tmp = do_stun; + } - /* Hack -- Get new monster */ - m_ptr = &m_list[c_ptr->m_idx]; + /* Apply stun */ + (void)set_monster_stunned(c_ptr->m_idx, tmp); - /* Hack -- Get new race */ - r_ptr = &r_info[m_ptr->r_idx]; + /* Get angry */ + get_angry = TRUE; } - else - { - /* No polymorph */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - - } - } - /* Handle "teleport" */ - else if (do_dist) - { - /* Obvious */ - if (seen) obvious = TRUE; - - /* Message */ -#ifdef JP - note = "¤¬¾Ã¤¨µî¤Ã¤¿¡ª"; -#else - note = " disappears!"; -#endif - - chg_virtue(V_VALOUR, -1); + /* Confusion and Chaos resisters (and sleepers) never confuse */ + if (do_conf && + !(r_ptr->flags3 & RF3_NO_CONF) && + !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK)) + { + /* Obvious */ + if (seen) obvious = TRUE; - /* Teleport */ - teleport_away(c_ptr->m_idx, do_dist, (bool)(!who)); + /* Already partially confused */ + if (MON_CONFUSED(m_ptr)) + { + note = _("はさらに混乱したようだ。", " looks more confused."); + tmp = MON_CONFUSED(m_ptr) + (do_conf / 2); + } - /* Hack -- get new location */ - y = m_ptr->fy; - x = m_ptr->fx; + /* Was not confused */ + else + { + note = _("は混乱したようだ。", " looks confused."); + tmp = do_conf; + } - /* Hack -- get new grid */ - c_ptr = &cave[y][x]; - } + /* Apply confusion */ + (void)set_monster_confused(c_ptr->m_idx, tmp); - /* Sound and Impact resisters never stun */ - else if (do_stun && - !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) && - !(r_ptr->flags3 & RF3_NO_STUN)) - { - /* Obvious */ - if (seen) obvious = TRUE; + /* Get angry */ + get_angry = TRUE; + } - /* Get stunned */ - if (m_ptr->stunned) + if (do_time) { -#ifdef JP - note = "¤Ï¤Ò¤É¤¯¤â¤¦¤í¤¦¤È¤·¤¿¡£"; -#else - note = " is more dazed."; -#endif + /* Obvious */ + if (seen) obvious = TRUE; - tmp = m_ptr->stunned + (do_stun / 2); - } - else - { -#ifdef JP - note = "¤Ï¤â¤¦¤í¤¦¤È¤·¤¿¡£"; -#else - note = " is dazed."; -#endif + if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1; - tmp = do_stun; + if (do_time) + { + note = _("は弱くなったようだ。", " seems weakened."); + m_ptr->maxhp -= do_time; + if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp; + } + get_angry = TRUE; } - /* Apply stun */ - m_ptr->stunned = (tmp < 200) ? tmp : 200; + /* Mega-Hack -- Handle "polymorph" -- monsters get a saving throw */ + if (do_poly && (randint1(90) > r_ptr->level)) + { + if (polymorph_monster(y, x)) + { + /* Obvious */ + if (seen) obvious = TRUE; - /* Get angry */ - get_angry = TRUE; - } + /* Monster polymorphs */ + note = _("が変身した!", " changes!"); - /* Confusion and Chaos resisters (and sleepers) never confuse */ - else if (do_conf && - !(r_ptr->flags3 & RF3_NO_CONF) && - !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK)) - { - /* Obvious */ - if (seen) obvious = TRUE; + /* Turn off the damage */ + dam = 0; + } + else + { + /* No polymorph */ + note = _("には効果がなかった。", " is unaffected."); + } - /* Already partially confused */ - if (m_ptr->confused) - { -#ifdef JP - note = "¤Ï¤µ¤é¤Ëº®Í𤷤¿¤è¤¦¤À¡£"; -#else - note = " looks more confused."; -#endif + /* Hack -- Get new monster */ + m_ptr = &m_list[c_ptr->m_idx]; - tmp = m_ptr->confused + (do_conf / 2); + /* Hack -- Get new race */ + r_ptr = &r_info[m_ptr->r_idx]; } - /* Was not confused */ - else + /* Handle "teleport" */ + if (do_dist) { -#ifdef JP - note = "¤Ïº®Í𤷤¿¤è¤¦¤À¡£"; -#else - note = " looks confused."; -#endif - - tmp = do_conf; - } + /* Obvious */ + if (seen) obvious = TRUE; - /* Apply confusion */ - m_ptr->confused = (tmp < 200) ? tmp : 200; + /* Message */ + note = _("が消え去った!", " disappears!"); - /* Get angry */ - get_angry = TRUE; - } + if (!who) chg_virtue(V_VALOUR, -1); - else if (do_time) - { - /* Obvious */ - if (seen) obvious = TRUE; + /* Teleport */ + teleport_away(c_ptr->m_idx, do_dist, + (!who ? TELEPORT_DEC_VALOUR : 0L) | TELEPORT_PASSIVE); - if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1; + /* Hack -- get new location */ + y = m_ptr->fy; + x = m_ptr->fx; - if (do_time) - { -#ifdef JP - note = "¤Ï¼å¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£"; -#else - note = " seems weakened."; -#endif - m_ptr->maxhp -= do_time; - if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp; + /* Hack -- get new grid */ + c_ptr = &cave[y][x]; } - get_angry = TRUE; - } + /* Fear */ + if (do_fear) + { + /* Set fear */ + (void)set_monster_monfear(c_ptr->m_idx, MON_MONFEAR(m_ptr) + do_fear); - /* Fear */ - if (do_fear) - { - /* Increase fear */ - tmp = m_ptr->monfear + do_fear; - - /* Set fear */ - m_ptr->monfear = (tmp < 200) ? tmp : 200; - - /* Get angry */ - get_angry = TRUE; + /* Get angry */ + get_angry = TRUE; + } } - if (typ == GF_DRAIN_MANA) { /* Drain mana does nothing */ @@ -6061,9 +4864,7 @@ note = " if (p_ptr->riding == c_ptr->m_idx) p_ptr->redraw |= (PR_UHEALTH); /* Wake the monster up */ - m_ptr->csleep = 0; - - if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE); + (void)set_monster_csleep(c_ptr->m_idx, 0); /* Hurt the monster */ m_ptr->hp -= dam; @@ -6080,7 +4881,7 @@ note = " if (known && note) { monster_desc(m_name, m_ptr, MD_TRUE_NAME); - if (see_s) + if (see_s_msg) { msg_format("%^s%s", m_name, note); } @@ -6090,7 +4891,7 @@ note = " } } - monster_gain_exp(who, m_ptr->r_idx); + if (who > 0) monster_gain_exp(who, m_ptr->r_idx); /* Generate treasure, etc */ monster_death(c_ptr->m_idx, FALSE); @@ -6100,12 +4901,7 @@ note = " if (sad) { -#ifdef JP -msg_print("¾¯¤·Èᤷ¤¤µ¤Ê¬¤¬¤·¤¿¡£"); -#else - msg_print("You feel sad for a moment."); -#endif - + msg_print(_("少し悲しい気分がした。", "You feel sad for a moment.")); } } @@ -6113,10 +4909,10 @@ msg_print(" else { /* Give detailed messages if visible or destroyed */ - if (note && seen) msg_format("%^s%s", m_name, note); + if (note && seen_msg) msg_format("%^s%s", m_name, note); /* Hack -- Pain message */ - else if (see_s) + else if (see_s_msg) { message_pain(c_ptr->m_idx, dam); } @@ -6126,17 +4922,21 @@ msg_print(" } /* Hack -- handle sleep */ - if (do_sleep) m_ptr->csleep = do_sleep; + if (do_sleep) (void)set_monster_csleep(c_ptr->m_idx, do_sleep); } } else if (heal_leper) { -#ifdef JP -msg_print("ÉÔ·é¤ÊÉ¿ͤÏɵ¤¤¬¼£¤Ã¤¿¡ª"); -#else - msg_print("The Mangy looking leper is healed!"); -#endif + if (seen_msg) msg_print(_("不潔な病人は病気が治った!", "The Mangy looking leper is healed!")); + + if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname) + { + char m2_name[80]; + + monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE); + do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name); + } delete_monster_idx(c_ptr->m_idx); } @@ -6159,13 +4959,8 @@ msg_print(" if (do_sleep) anger_monster(m_ptr); /* Give detailed messages if visible or destroyed */ - if (note && seen) -#ifdef JP -msg_format("%s%s", m_name, note); -#else - msg_format("%^s%s", m_name, note); -#endif - + if (note && seen_msg) + msg_format(_("%s%s", "%^s%s"), m_name, note); /* Hack -- Pain message */ else if (known && (dam || !do_fear)) @@ -6178,22 +4973,17 @@ msg_format("%s%s", m_name, note); anger_monster(m_ptr); /* Take note */ - if ((fear || do_fear) && (m_ptr->ml)) + if ((fear || do_fear) && seen) { /* Sound */ sound(SOUND_FLEE); /* Message */ -#ifdef JP -msg_format("%^s¤Ï¶²Éݤ·¤Æƨ¤²½Ð¤·¤¿¡ª", m_name); -#else - msg_format("%^s flees in terror!", m_name); -#endif - + msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name); } /* Hack -- handle sleep */ - if (do_sleep) m_ptr->csleep = do_sleep; + if (do_sleep) (void)set_monster_csleep(c_ptr->m_idx, do_sleep); } } @@ -6208,48 +4998,30 @@ msg_format("%^s case 1: case 2: if (!count) { -#ifdef JP -msg_print("ÃÏÌ̤¬Íɤ줿..."); -#else - msg_print("The ground trembles..."); -#endif - + msg_print(_("地面が揺れた...", "The ground trembles...")); earthquake(ty, tx, 4 + randint0(4)); if (!one_in_(6)) break; } case 3: case 4: case 5: case 6: if (!count) { - int dam = damroll(10, 10); -#ifdef JP -msg_print("½ã¿è¤ÊËâÎϤμ¡¸µ¤Ø¤ÎÈ⤬³«¤¤¤¿¡ª"); -#else - msg_print("A portal opens to a plane of raw mana!"); -#endif + int extra_dam = damroll(10, 10); + msg_print(_("純粋な魔力の次元への扉が開いた!", "A portal opens to a plane of raw mana!")); - project(0, 8, ty,tx, dam, GF_MANA, curse_flg, -1); + project(0, 8, ty, tx, extra_dam, GF_MANA, curse_flg, -1); if (!one_in_(6)) break; } case 7: case 8: if (!count) { -#ifdef JP -msg_print("¶õ´Ö¤¬ÏĤó¤À¡ª"); -#else - msg_print("Space warps about you!"); -#endif + msg_print(_("空間が歪んだ!", "Space warps about you!")); - if (m_ptr->r_idx) teleport_away(c_ptr->m_idx, damroll(10, 10), FALSE); + if (m_ptr->r_idx) teleport_away(c_ptr->m_idx, damroll(10, 10), TELEPORT_PASSIVE); if (one_in_(13)) count += activate_hi_summon(ty, tx, TRUE); if (!one_in_(6)) break; } case 9: case 10: case 11: -#ifdef JP -msg_print("¥¨¥Í¥ë¥®¡¼¤Î¤¦¤Í¤ê¤ò´¶¤¸¤¿¡ª"); -#else - msg_print("You feel a surge of energy!"); -#endif - + msg_print(_("エネルギーのうねりを感じた!", "You feel a surge of energy!")); project(0, 7, ty, tx, 50, GF_DISINTEGRATE, curse_flg, -1); if (!one_in_(6)) break; case 12: case 13: case 14: case 15: case 16: @@ -6266,18 +5038,14 @@ msg_print(" if (pet) mode |= PM_FORCE_PET; else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY); - count += summon_specific((pet ? -1 : 0), py, px, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode); + count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode); if (!one_in_(6)) break; } case 23: case 24: case 25: - if (p_ptr->hold_life && (randint0(100) < 75)) break; -#ifdef JP -msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª"); -#else - msg_print("You feel your life draining away..."); -#endif + if (p_ptr->hold_exp && (randint0(100) < 75)) break; + msg_print(_("経験値が体から吸い取られた気がする!", "You feel your experience draining away...")); - if (p_ptr->hold_life) lose_exp(p_ptr->exp / 160); + if (p_ptr->hold_exp) lose_exp(p_ptr->exp / 160); else lose_exp(p_ptr->exp / 16); if (!one_in_(6)) break; case 26: case 27: case 28: @@ -6317,14 +5085,14 @@ msg_print(" /* XXX XXX XXX Verify this code */ /* Update the monster */ - update_mon(c_ptr->m_idx, FALSE); + if (m_ptr->r_idx) update_mon(c_ptr->m_idx, FALSE); /* Redraw the monster grid */ lite_spot(y, x); /* Update monster recall window */ - if (p_ptr->monster_race_idx == m_ptr->r_idx) + if ((p_ptr->monster_race_idx == m_ptr->r_idx) && (seen || !m_ptr->r_idx)) { /* Window stuff */ p_ptr->window |= (PW_MONSTER); @@ -6334,14 +5102,14 @@ msg_print(" { if (!who) { - if (!projectable(m_ptr->fy, m_ptr->fx, py, px) && !(flg & PROJECT_NO_HANGEKI)) + if (!(flg & PROJECT_NO_HANGEKI)) { set_target(m_ptr, monster_target_y, monster_target_x); } } - else if (is_pet(&m_list[who]) && !player_bold(m_ptr->target_y, m_ptr->target_x)) + else if ((who > 0) && is_pet(caster_ptr) && !player_bold(m_ptr->target_y, m_ptr->target_x)) { - set_target(m_ptr, m_list[who].fy, m_list[who].fx); + set_target(m_ptr, caster_ptr->fy, caster_ptr->fx); } } @@ -6369,7 +5137,7 @@ msg_print(" q_ptr->ident |= (IDENT_MENTAL); /* Drop it in the dungeon */ - (void)drop_near(q_ptr, -1, py, px); + (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x); } /* Track it */ @@ -6381,27 +5149,31 @@ msg_print(" return (obvious); } - -/* - * Helper function for "project()" below. - * +/*! + * @brief 汎用的なビーム/ボルト/ボール系によるプレイヤーへの効果処理 / Helper function for "project()" below. + * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player") + * @param who_name 効果を起こしたモンスターの名前 + * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball) + * @param y 目標Y座標 / Target y location (or location to travel "towards") + * @param x 目標X座標 / Target x location (or location to travel "towards") + * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player) + * @param typ 効果属性 / Type of damage to apply to monsters (and objects) + * @param flg 効果フラグ + * @param monspell 効果元のモンスター魔法ID + * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE + * @details * Handle a beam/bolt/ball causing damage to the player. - * * This routine takes a "source monster" (by index), a "distance", a default * "damage", and a "damage type". See "project_m()" above. - * * If "rad" is non-zero, then the blast was centered elsewhere, and the damage * is reduced (see "project_m()" above). This can happen if a monster breathes * at the player and hits a wall instead. - * * NOTE (Zangband): 'Bolt' attacks can be reflected back, so we need * to know if this is actually a ball or a bolt spell - * - * * We return "TRUE" if any "obvious" effects were observed. XXX XXX Actually, * we just assume that the effects were obvious, for historical reasons. */ -static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int typ, int flg, int monspell) +static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell) { int k = 0; int rlev = 0; @@ -6435,8 +5207,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && (randint0(55) < (p_ptr->lev*3/5+20)) && who && (who != p_ptr->riding)) { - kawarimi(TRUE); - return FALSE; + if (kawarimi(TRUE)) return FALSE; } /* Player cannot hurt himself */ @@ -6445,37 +5216,43 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int if ((p_ptr->reflect || ((p_ptr->special_defense & KATA_FUUJIN) && !p_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10)) { - byte t_y, t_x; + POSITION t_y, t_x; int max_attempts = 10; -#ifdef JP - if (blind) msg_print("²¿¤«¤¬Ä·¤ÍÊ֤ä¿¡ª"); - else if (p_ptr->special_defense & KATA_FUUJIN) msg_print("É÷¤ÎÇ¡¤¯Éð´ï¤ò¿¶¤ë¤Ã¤ÆÃƤ­ÊÖ¤·¤¿¡ª"); - else msg_print("¹¶·â¤¬Ä·¤ÍÊ֤ä¿¡ª"); -#else - if (blind) msg_print("Something bounces!"); - else msg_print("The attack bounces!"); -#endif + if (blind) + msg_print(_("何かが跳ね返った!", "Something bounces!")); + else if (p_ptr->special_defense & KATA_FUUJIN) + msg_print(_("風の如く武器を振るって弾き返した!", "The attack bounces!")); + else + msg_print(_("攻撃が跳ね返った!", "The attack bounces!")); /* Choose 'new' target */ - do + if (who > 0) { - t_y = m_list[who].fy - 1 + randint1(3); - t_x = m_list[who].fx - 1 + randint1(3); - max_attempts--; - } - while (max_attempts && in_bounds2u(t_y, t_x) && !projectable(py, px, t_y, t_x)); + do + { + t_y = m_list[who].fy - 1 + randint1(3); + t_x = m_list[who].fx - 1 + randint1(3); + max_attempts--; + } + while (max_attempts && in_bounds2u(t_y, t_x) && !projectable(p_ptr->y, p_ptr->x, t_y, t_x)); - if (max_attempts < 1) + if (max_attempts < 1) + { + t_y = m_list[who].fy; + t_x = m_list[who].fx; + } + } + else { - t_y = m_list[who].fy; - t_x = m_list[who].fx; + t_y = p_ptr->y - 1 + randint1(3); + t_x = p_ptr->x - 1 + randint1(3); } project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell); - disturb(1, 0); + disturb(1, 1); return TRUE; } @@ -6501,16 +5278,28 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int /* Get the monster name */ monster_desc(m_name, m_ptr, 0); - /* Get the monster's real name (gotten before polymorph!) */ - strcpy(killer, who_name); - } - else if (who < 0) - { -#ifdef JP - strcpy(killer, "æ«"); -#else - strcpy(killer, "a trap"); -#endif + /* Get the monster's real name (gotten before polymorph!) */ + strcpy(killer, who_name); + } + else + { + switch (who) + { + case PROJECT_WHO_UNCTRL_POWER: + strcpy(killer, _("制御できない力の氾流", "uncontrollable power storm")); + break; + + case PROJECT_WHO_GLASS_SHARDS: + strcpy(killer, _("ガラスの破片", "shards of glass")); + break; + + default: + strcpy(killer, _("ç½ ", "a trap")); + break; + } + + /* Paranoia */ + strcpy(m_name, killer); } /* Analyze the damage */ @@ -6519,52 +5308,32 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int /* Standard damage -- hurts inventory too */ case GF_ACID: { -#ifdef JP -if (fuzzy) msg_print("»À¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by acid!"); -#endif - - get_damage = acid_dam(dam, killer, monspell); + if (fuzzy) msg_print(_("酸で攻撃された!", "You are hit by acid!")); + get_damage = acid_dam(dam, killer, monspell, FALSE); break; } /* Standard damage -- hurts inventory too */ case GF_FIRE: { -#ifdef JP -if (fuzzy) msg_print("²Ð±ê¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by fire!"); -#endif - - get_damage = fire_dam(dam, killer, monspell); + if (fuzzy) msg_print(_("火炎で攻撃された!", "You are hit by fire!")); + get_damage = fire_dam(dam, killer, monspell, FALSE); break; } /* Standard damage -- hurts inventory too */ case GF_COLD: { -#ifdef JP -if (fuzzy) msg_print("Î䵤¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by cold!"); -#endif - - get_damage = cold_dam(dam, killer, monspell); + if (fuzzy) msg_print(_("冷気で攻撃された!", "You are hit by cold!")); + get_damage = cold_dam(dam, killer, monspell, FALSE); break; } /* Standard damage -- hurts inventory too */ case GF_ELEC: { -#ifdef JP -if (fuzzy) msg_print("ÅÅ·â¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by lightning!"); -#endif - - get_damage = elec_dam(dam, killer, monspell); + if (fuzzy) msg_print(_("電撃で攻撃された!", "You are hit by lightning!")); + get_damage = elec_dam(dam, killer, monspell, FALSE); break; } @@ -6572,24 +5341,20 @@ if (fuzzy) msg_print(" case GF_POIS: { bool double_resist = IS_OPPOSE_POIS(); -#ifdef JP -if (fuzzy) msg_print("ÆǤǹ¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by poison!"); -#endif + if (fuzzy) msg_print(_("毒で攻撃された!", "You are hit by poison!")); if (p_ptr->resist_pois) dam = (dam + 2) / 3; if (double_resist) dam = (dam + 2) / 3; if ((!(double_resist || p_ptr->resist_pois)) && - one_in_(HURT_CHANCE)) + one_in_(HURT_CHANCE) && !CHECK_MULTISHADOW()) { do_dec_stat(A_CON); } get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); - if (!(double_resist || p_ptr->resist_pois)) + if (!(double_resist || p_ptr->resist_pois) && !CHECK_MULTISHADOW()) { set_poisoned(p_ptr->poisoned + randint0(dam) + 10); } @@ -6600,27 +5365,18 @@ if (fuzzy) msg_print(" case GF_NUKE: { bool double_resist = IS_OPPOSE_POIS(); -#ifdef JP -if (fuzzy) msg_print("Êü¼Íǽ¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by radiation!"); -#endif + if (fuzzy) msg_print(_("放射能で攻撃された!", "You are hit by radiation!")); if (p_ptr->resist_pois) dam = (2 * dam + 2) / 5; if (double_resist) dam = (2 * dam + 2) / 5; get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); - if (!(double_resist || p_ptr->resist_pois)) + if (!(double_resist || p_ptr->resist_pois) && !CHECK_MULTISHADOW()) { set_poisoned(p_ptr->poisoned + randint0(dam) + 10); if (one_in_(5)) /* 6 */ { -#ifdef JP -msg_print("´ñ·ÁŪ¤ÊÊѿȤò¿ë¤²¤¿¡ª"); -#else - msg_print("You undergo a freakish metamorphosis!"); -#endif - + msg_print(_("奇形的な変身を遂げた!", "You undergo a freakish metamorphosis!")); if (one_in_(4)) /* 4 */ do_poly_self(); else @@ -6638,12 +5394,7 @@ msg_print(" /* Standard damage */ case GF_MISSILE: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something!"); -#endif - + if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!")); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); break; } @@ -6651,12 +5402,7 @@ if (fuzzy) msg_print(" /* Holy Orb -- Player only takes partial damage */ case GF_HOLY_FIRE: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something!"); -#endif - + if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!")); if (p_ptr->align > 10) dam /= 2; else if (p_ptr->align < -10) @@ -6667,12 +5413,7 @@ if (fuzzy) msg_print(" case GF_HELL_FIRE: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something!"); -#endif - + if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!")); if (p_ptr->align > 10) dam *= 2; get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); @@ -6682,19 +5423,13 @@ if (fuzzy) msg_print(" /* Arrow -- XXX no dodging */ case GF_ARROW: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«±Ô¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something sharp!"); -#endif - + if (fuzzy) + { + msg_print(_("何か鋭いもので攻撃された!", "You are hit by something sharp!")); + } else if ((inventory[INVEN_RARM].name1 == ART_ZANTETSU) || (inventory[INVEN_LARM].name1 == ART_ZANTETSU)) { -#ifdef JP - msg_print("Ìð¤ò»Â¤ê¼Î¤Æ¤¿¡ª"); -#else - msg_print("You cut down the arrow!"); -#endif + msg_print(_("矢を斬り捨てた!", "You cut down the arrow!")); break; } get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); @@ -6704,23 +5439,18 @@ if (fuzzy) msg_print(" /* Plasma -- XXX No resist */ case GF_PLASMA: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤È¤Æ¤âÇ®¤¤¤â¤Î¤Ç¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something *HOT*!"); -#endif - + if (fuzzy) msg_print(_("何かとても熱いもので攻撃された!", "You are hit by something *HOT*!")); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); - if (!p_ptr->resist_sound) + if (!p_ptr->resist_sound && !CHECK_MULTISHADOW()) { - int k = (randint1((dam > 40) ? 35 : (dam * 3 / 4 + 5))); - (void)set_stun(p_ptr->stun + k); + int plus_stun = (randint1((dam > 40) ? 35 : (dam * 3 / 4 + 5))); + (void)set_stun(p_ptr->stun + plus_stun); } if (!(p_ptr->resist_fire || - IS_OPPOSE_FIRE() || - p_ptr->immune_fire)) + IS_OPPOSE_FIRE() || + p_ptr->immune_fire)) { inven_damage(set_acid_destroy, 3); } @@ -6731,28 +5461,19 @@ if (fuzzy) msg_print(" /* Nether -- drain experience */ case GF_NETHER: { -#ifdef JP -if (fuzzy) msg_print("ÃϹö¤ÎÎϤǹ¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by nether forces!"); -#endif - - + if (fuzzy) msg_print(_("地獄の力で攻撃された!", "You are hit by nether forces!")); if (p_ptr->resist_neth) { if (!prace_is_(RACE_SPECTRE)) + { dam *= 6; dam /= (randint1(4) + 7); + } } - else drain_exp(200 + (p_ptr->exp / 100), 200 + (p_ptr->exp / 1000), 75); + else if (!CHECK_MULTISHADOW()) drain_exp(200 + (p_ptr->exp / 100), 200 + (p_ptr->exp / 1000), 75); - if (prace_is_(RACE_SPECTRE)) + if (prace_is_(RACE_SPECTRE) && !CHECK_MULTISHADOW()) { -#ifdef JP -msg_print("µ¤Ê¬¤¬¤è¤¯¤Ê¤Ã¤¿¡£"); -#else - msg_print("You feel invigorated!"); -#endif - + msg_print(_("気分がよくなった。", "You feel invigorated!")); hp_player(dam / 4); learn_spell(monspell); } @@ -6767,24 +5488,22 @@ msg_print(" /* Water -- stun/confuse */ case GF_WATER: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¼¾¤Ã¤¿¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something wet!"); -#endif - - if (!p_ptr->resist_sound) - { - set_stun(p_ptr->stun + randint1(40)); - } - if (!p_ptr->resist_conf) + if (fuzzy) msg_print(_("何か湿ったもので攻撃された!", "You are hit by something wet!")); + if (!CHECK_MULTISHADOW()) { - set_confused(p_ptr->confused + randint1(5) + 5); - } + if (!p_ptr->resist_sound) + { + set_stun(p_ptr->stun + randint1(40)); + } + if (!p_ptr->resist_conf) + { + set_confused(p_ptr->confused + randint1(5) + 5); + } - if (one_in_(5)) - { - inven_damage(set_cold_destroy, 3); + if (one_in_(5)) + { + inven_damage(set_cold_destroy, 3); + } } get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); @@ -6794,43 +5513,39 @@ if (fuzzy) msg_print(" /* Chaos -- many effects */ case GF_CHAOS: { -#ifdef JP -if (fuzzy) msg_print("̵Ãá½ø¤ÎÇÈÆ°¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by a wave of anarchy!"); -#endif - + if (fuzzy) msg_print(_("無秩序の波動で攻撃された!", "You are hit by a wave of anarchy!")); if (p_ptr->resist_chaos) { dam *= 6; dam /= (randint1(4) + 7); } - if (!p_ptr->resist_conf) - { - (void)set_confused(p_ptr->confused + randint0(20) + 10); - } - if (!p_ptr->resist_chaos) + + if (!CHECK_MULTISHADOW()) { - (void)set_image(p_ptr->image + randint1(10)); - if (one_in_(3)) + if (!p_ptr->resist_conf) { -#ifdef JP -msg_print("¤¢¤Ê¤¿¤Î¿ÈÂΤϥ«¥ª¥¹¤ÎÎϤÇDZ¤¸¶Ê¤²¤é¤ì¤¿¡ª"); -#else - msg_print("Your body is twisted by chaos!"); -#endif + (void)set_confused(p_ptr->confused + randint0(20) + 10); + } + if (!p_ptr->resist_chaos) + { + (void)set_image(p_ptr->image + randint1(10)); + if (one_in_(3)) + { + msg_print(_("あなたの身体はカオスの力で捻じ曲げられた!", "Your body is twisted by chaos!")); + (void)gain_random_mutation(0); + } + } + if (!p_ptr->resist_neth && !p_ptr->resist_chaos) + { + drain_exp(5000 + (p_ptr->exp / 100), 500 + (p_ptr->exp / 1000), 75); + } - (void)gain_random_mutation(0); + if (!p_ptr->resist_chaos || one_in_(9)) + { + inven_damage(set_elec_destroy, 2); + inven_damage(set_fire_destroy, 2); } } - if (!p_ptr->resist_neth && !p_ptr->resist_chaos) - { - drain_exp(5000 + (p_ptr->exp / 100), 500 + (p_ptr->exp / 1000), 75); - } - if (!p_ptr->resist_chaos || one_in_(9)) - { - inven_damage(set_elec_destroy, 2); - inven_damage(set_fire_destroy, 2); - } + get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); break; } @@ -6838,17 +5553,12 @@ msg_print(" /* Shards -- mostly cutting */ case GF_SHARDS: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«±Ô¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something sharp!"); -#endif - + if (fuzzy) msg_print(_("何か鋭いもので攻撃された!", "You are hit by something sharp!")); if (p_ptr->resist_shard) { dam *= 6; dam /= (randint1(4) + 7); } - else + else if (!CHECK_MULTISHADOW()) { (void)set_cut(p_ptr->cut + dam); } @@ -6865,20 +5575,15 @@ if (fuzzy) msg_print(" /* Sound -- mostly stunning */ case GF_SOUND: { -#ifdef JP -if (fuzzy) msg_print("¹ì²»¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by a loud noise!"); -#endif - + if (fuzzy) msg_print(_("轟音で攻撃された!", "You are hit by a loud noise!")); if (p_ptr->resist_sound) { dam *= 5; dam /= (randint1(4) + 7); } - else + else if (!CHECK_MULTISHADOW()) { - int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5))); - (void)set_stun(p_ptr->stun + k); + int plus_stun = (randint1((dam > 90) ? 35 : (dam / 3 + 5))); + (void)set_stun(p_ptr->stun + plus_stun); } if (!p_ptr->resist_sound || one_in_(13)) @@ -6893,17 +5598,12 @@ if (fuzzy) msg_print(" /* Pure confusion */ case GF_CONFUSION: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«º®Í𤹤ë¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something puzzling!"); -#endif - + if (fuzzy) msg_print(_("何か混乱するもので攻撃された!", "You are hit by something puzzling!")); if (p_ptr->resist_conf) { dam *= 5; dam /= (randint1(4) + 7); } - if (!p_ptr->resist_conf) + else if (!CHECK_MULTISHADOW()) { (void)set_confused(p_ptr->confused + randint1(20) + 10); } @@ -6914,17 +5614,12 @@ if (fuzzy) msg_print(" /* Disenchantment -- see above */ case GF_DISENCHANT: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤µ¤¨¤Ê¤¤¤â¤Î¤Ç¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something static!"); -#endif - + if (fuzzy) msg_print(_("何かさえないもので攻撃された!", "You are hit by something static!")); if (p_ptr->resist_disen) { dam *= 6; dam /= (randint1(4) + 7); } - else + else if (!CHECK_MULTISHADOW()) { (void)apply_disenchant(0); } @@ -6935,17 +5630,12 @@ if (fuzzy) msg_print(" /* Nexus -- see above */ case GF_NEXUS: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«´ñ̯¤Ê¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something strange!"); -#endif - + if (fuzzy) msg_print(_("何か奇妙なもので攻撃された!", "You are hit by something strange!")); if (p_ptr->resist_nexus) { dam *= 6; dam /= (randint1(4) + 7); } - else + else if (!CHECK_MULTISHADOW()) { apply_nexus(m_ptr); } @@ -6956,13 +5646,8 @@ if (fuzzy) msg_print(" /* Force -- mostly stun */ case GF_FORCE: { -#ifdef JP -if (fuzzy) msg_print("±¿Æ°¥¨¥Í¥ë¥®¡¼¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by kinetic force!"); -#endif - - if (!p_ptr->resist_sound) + if (fuzzy) msg_print(_("運動エネルギーで攻撃された!", "You are hit by kinetic force!")); + if (!p_ptr->resist_sound && !CHECK_MULTISHADOW()) { (void)set_stun(p_ptr->stun + randint1(20)); } @@ -6974,26 +5659,22 @@ if (fuzzy) msg_print(" /* Rocket -- stun, cut */ case GF_ROCKET: { -#ifdef JP -if (fuzzy) msg_print("Çúȯ¤¬¤¢¤Ã¤¿¡ª"); -#else - if (fuzzy) msg_print("There is an explosion!"); -#endif - - if (!p_ptr->resist_sound) + if (fuzzy) msg_print(_("爆発があった!", "There is an explosion!")); + if (!p_ptr->resist_sound && !CHECK_MULTISHADOW()) { (void)set_stun(p_ptr->stun + randint1(20)); } + if (p_ptr->resist_shard) { dam /= 2; } - else + else if (!CHECK_MULTISHADOW()) { - (void)set_cut(p_ptr-> cut + ( dam / 2)); + (void)set_cut(p_ptr->cut + (dam / 2)); } - if ((!p_ptr->resist_shard) || one_in_(12)) + if (!p_ptr->resist_shard || one_in_(12)) { inven_damage(set_cold_destroy, 3); } @@ -7003,15 +5684,10 @@ if (fuzzy) msg_print(" } /* Inertia -- slowness */ - case GF_INERTIA: + case GF_INERTIAL: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«ÃÙ¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something slow!"); -#endif - - (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); + if (fuzzy) msg_print(_("何か遅いもので攻撃された!", "You are hit by something slow!")); + if (!CHECK_MULTISHADOW()) (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); break; } @@ -7019,45 +5695,34 @@ if (fuzzy) msg_print(" /* Lite -- blinding */ case GF_LITE: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something!"); -#endif - + if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!")); if (p_ptr->resist_lite) { dam *= 4; dam /= (randint1(4) + 7); } - else if (!blind && !p_ptr->resist_blind) + else if (!blind && !p_ptr->resist_blind && !CHECK_MULTISHADOW()) { (void)set_blind(p_ptr->blind + randint1(5) + 2); } + if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE)) { -#ifdef JP -msg_print("¸÷¤ÇÆùÂΤ¬¾Ç¤¬¤µ¤ì¤¿¡ª"); -#else - msg_print("The light scorches your flesh!"); -#endif - + if (!CHECK_MULTISHADOW()) msg_print(_("光で肉体が焦がされた!", "The light scorches your flesh!")); dam *= 2; } else if (prace_is_(RACE_S_FAIRY)) { dam = dam * 4 / 3; } + if (p_ptr->wraith_form) dam *= 2; get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); - if (p_ptr->wraith_form) + if (p_ptr->wraith_form && !CHECK_MULTISHADOW()) { p_ptr->wraith_form = 0; -#ifdef JP -msg_print("Á®¸÷¤Î¤¿¤áÈóʪ¼ÁŪ¤Ê±Æ¤Î¸ºß¤Ç¤¤¤é¤ì¤Ê¤¯¤Ê¤Ã¤¿¡£"); -#else - msg_print("The light forces you out of your incorporeal shadow form."); -#endif + msg_print(_("閃光のため非物質的な影の存在でいられなくなった。", + "The light forces you out of your incorporeal shadow form.")); p_ptr->redraw |= PR_MAP; /* Update monsters */ @@ -7076,19 +5741,14 @@ msg_print(" /* Dark -- blinding */ case GF_DARK: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something!"); -#endif - + if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!")); if (p_ptr->resist_dark) { dam *= 4; dam /= (randint1(4) + 7); if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE) || p_ptr->wraith_form) dam = 0; } - else if (!blind && !p_ptr->resist_blind) + else if (!blind && !p_ptr->resist_blind && !CHECK_MULTISHADOW()) { (void)set_blind(p_ptr->blind + randint1(5) + 2); } @@ -7099,36 +5759,21 @@ if (fuzzy) msg_print(" /* Time -- bolt fewer effects XXX */ case GF_TIME: { -#ifdef JP -if (fuzzy) msg_print("²áµî¤«¤é¤Î¾×·â¤Ë¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by a blast from the past!"); -#endif - + if (fuzzy) msg_print(_("過去からの衝撃に攻撃された!", "You are hit by a blast from the past!")); if (p_ptr->resist_time) { dam *= 4; dam /= (randint1(4) + 7); -#ifdef JP -msg_print("»þ´Ö¤¬Ä̤ê²á¤®¤Æ¤¤¤¯µ¤¤¬¤¹¤ë¡£"); -#else - msg_print("You feel as if time is passing you by."); -#endif - + msg_print(_("時間が通り過ぎていく気がする。", "You feel as if time is passing you by.")); } - else + else if (!CHECK_MULTISHADOW()) { switch (randint1(10)) { case 1: case 2: case 3: case 4: case 5: { if (p_ptr->prace == RACE_ANDROID) break; -#ifdef JP -msg_print("¿ÍÀ¸¤¬µÕÌá¤ê¤·¤¿µ¤¤¬¤¹¤ë¡£"); -#else - msg_print("You feel life has clocked back."); -#endif - + msg_print(_("人生が逆戻りした気がする。", "You feel life has clocked back.")); lose_exp(100 + (p_ptr->exp / 100) * MON_DRAIN_LIFE); break; } @@ -7137,30 +5782,16 @@ msg_print(" { switch (randint1(6)) { -#ifdef JP -case 1: k = A_STR; act = "¶¯¤¯"; break; -case 2: k = A_INT; act = "ÁïÌÀ¤Ç"; break; -case 3: k = A_WIS; act = "¸­ÌÀ¤Ç"; break; -case 4: k = A_DEX; act = "´ïÍѤÇ"; break; -case 5: k = A_CON; act = "·ò¹¯¤Ç"; break; -case 6: k = A_CHR; act = "Èþ¤·¤¯"; break; -#else - case 1: k = A_STR; act = "strong"; break; - case 2: k = A_INT; act = "bright"; break; - case 3: k = A_WIS; act = "wise"; break; - case 4: k = A_DEX; act = "agile"; break; - case 5: k = A_CON; act = "hale"; break; - case 6: k = A_CHR; act = "beautiful"; break; -#endif - + case 1: k = A_STR; act = _("強く", "strong"); break; + case 2: k = A_INT; act = _("聡明で", "bright"); break; + case 3: k = A_WIS; act = _("賢明で", "wise"); break; + case 4: k = A_DEX; act = _("器用で", "agile"); break; + case 5: k = A_CON; act = _("健康で", "hale"); break; + case 6: k = A_CHR; act = _("美しく", "beautiful"); break; } -#ifdef JP -msg_format("¤¢¤Ê¤¿¤Ï°ÊÁ°¤Û¤É%s¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿...¡£", act); -#else - msg_format("You're not as %s as you used to be...", act); -#endif - + msg_format(_("あなたは以前ほど%sなくなってしまった...。", + "You're not as %s as you used to be..."), act); p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 3) / 4; if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3; @@ -7170,12 +5801,8 @@ msg_format(" case 10: { -#ifdef JP -msg_print("¤¢¤Ê¤¿¤Ï°ÊÁ°¤Û¤ÉÎ϶¯¤¯¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿...¡£"); -#else - msg_print("You're not as powerful as you used to be..."); -#endif - + msg_print(_("あなたは以前ほど力強くなくなってしまった...。", + "You're not as powerful as you used to be...")); for (k = 0; k < 6; k++) { @@ -7195,28 +5822,26 @@ msg_print(" /* Gravity -- stun plus slowness plus teleport */ case GF_GRAVITY: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«½Å¤¤¤â¤Î¤Ç¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -msg_print("¼þÊդνÅÎϤ¬¤æ¤¬¤ó¤À¡£"); -#else - if (fuzzy) msg_print("You are hit by something heavy!"); - msg_print("Gravity warps around you."); -#endif + if (fuzzy) msg_print(_("何か重いもので攻撃された!", "You are hit by something heavy!")); + msg_print(_("周辺の重力がゆがんだ。", "Gravity warps around you.")); - teleport_player(5, TRUE); - if (!p_ptr->ffall) - (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); - if (!(p_ptr->resist_sound || p_ptr->ffall)) + if (!CHECK_MULTISHADOW()) { - int k = (randint1((dam > 90) ? 35 : (dam / 3 + 5))); - (void)set_stun(p_ptr->stun + k); + teleport_player(5, TELEPORT_PASSIVE); + if (!p_ptr->levitation) + (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); + if (!(p_ptr->resist_sound || p_ptr->levitation)) + { + int plus_stun = (randint1((dam > 90) ? 35 : (dam / 3 + 5))); + (void)set_stun(p_ptr->stun + plus_stun); + } } - if (p_ptr->ffall) + if (p_ptr->levitation) { dam = (dam * 2) / 3; } - if (!p_ptr->ffall || one_in_(13)) + if (!p_ptr->levitation || one_in_(13)) { inven_damage(set_cold_destroy, 2); } @@ -7228,11 +5853,7 @@ msg_print(" /* Standard damage */ case GF_DISINTEGRATE: { -#ifdef JP -if (fuzzy) msg_print("½ã¿è¤Ê¥¨¥Í¥ë¥®¡¼¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by pure energy!"); -#endif + if (fuzzy) msg_print(_("純粋なエネルギーで攻撃された!", "You are hit by pure energy!")); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); break; @@ -7240,11 +5861,7 @@ if (fuzzy) msg_print(" case GF_OLD_HEAL: { -#ifdef JP -if (fuzzy) msg_print("²¿¤é¤«¤Î¹¶·â¤Ë¤è¤Ã¤Æµ¤Ê¬¤¬¤è¤¯¤Ê¤Ã¤¿¡£"); -#else - if (fuzzy) msg_print("You are hit by something invigorating!"); -#endif + if (fuzzy) msg_print(_("何らかの攻撃によって気分がよくなった。", "You are hit by something invigorating!")); (void)hp_player(dam); dam = 0; @@ -7253,12 +5870,7 @@ if (fuzzy) msg_print(" case GF_OLD_SPEED: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something!"); -#endif - + if (fuzzy) msg_print(_("何かで攻撃された!", "You are hit by something!")); (void)set_fast(p_ptr->fast + randint1(5), FALSE); dam = 0; break; @@ -7266,12 +5878,7 @@ if (fuzzy) msg_print(" case GF_OLD_SLOW: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«ÃÙ¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something slow!"); -#endif - + if (fuzzy) msg_print(_("何か遅いもので攻撃された!", "You are hit by something slow!")); (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); break; } @@ -7279,30 +5886,13 @@ if (fuzzy) msg_print(" case GF_OLD_SLEEP: { if (p_ptr->free_act) break; -#ifdef JP -if (fuzzy) msg_print("̲¤Ã¤Æ¤·¤Þ¤Ã¤¿¡ª"); -#else - if (fuzzy) msg_print("You fall asleep!"); -#endif - + if (fuzzy) msg_print(_("眠ってしまった!", "You fall asleep!")); if (ironman_nightmare) { -#ifdef JP -msg_print("¶²¤í¤·¤¤¸÷·Ê¤¬Æ¬¤ËÉ⤫¤ó¤Ç¤­¤¿¡£"); -#else - msg_print("A horrible vision enters your mind."); -#endif - - - /* Pick a nightmare */ - get_mon_num_prep(get_nightmare, NULL); - + msg_print(_("恐ろしい光景が頭に浮かんできた。", "A horrible vision enters your mind.")); /* Have some nightmares */ - have_nightmare(get_mon_num(MAX_DEPTH)); - - /* Remove the monster restriction */ - get_mon_num_prep(NULL, NULL); + sanity_blast(NULL, FALSE); } set_paralyzed(p_ptr->paralyzed + dam); @@ -7315,12 +5905,7 @@ msg_print(" case GF_SEEKER: case GF_SUPER_RAY: { -#ifdef JP -if (fuzzy) msg_print("ËâË¡¤Î¥ª¡¼¥é¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by an aura of magic!"); -#endif - + if (fuzzy) msg_print(_("魔法のオーラで攻撃された!", "You are hit by an aura of magic!")); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); break; } @@ -7328,12 +5913,7 @@ if (fuzzy) msg_print(" /* Pure damage */ case GF_PSY_SPEAR: { -#ifdef JP -if (fuzzy) msg_print("¥¨¥Í¥ë¥®¡¼¤Î²ô¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by an energy!"); -#endif - + if (fuzzy) msg_print(_("エネルギーの塊で攻撃された!", "You are hit by an energy!")); get_damage = take_hit(DAMAGE_FORCE, dam, killer, monspell); break; } @@ -7341,11 +5921,7 @@ if (fuzzy) msg_print(" /* Pure damage */ case GF_METEOR: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«¤¬¶õ¤«¤é¤¢¤Ê¤¿¤ÎƬ¾å¤ËÍî¤Á¤Æ¤­¤¿¡ª"); -#else - if (fuzzy) msg_print("Something falls from the sky on you!"); -#endif + if (fuzzy) msg_print(_("何かが空からあなたの頭上に落ちてきた!", "Something falls from the sky on you!")); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); if (!p_ptr->resist_shard || one_in_(13)) @@ -7360,25 +5936,23 @@ if (fuzzy) msg_print(" /* Ice -- cold plus stun plus cuts */ case GF_ICE: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«±Ô¤¯Î䤿¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something sharp and cold!"); -#endif - - cold_dam(dam, killer, monspell); - if (!p_ptr->resist_shard) - { - (void)set_cut(p_ptr->cut + damroll(5, 8)); - } - if (!p_ptr->resist_sound) + if (fuzzy) msg_print(_("何か鋭く冷たいもので攻撃された!", "You are hit by something sharp and cold!")); + get_damage = cold_dam(dam, killer, monspell, FALSE); + if (!CHECK_MULTISHADOW()) { - (void)set_stun(p_ptr->stun + randint1(15)); - } + if (!p_ptr->resist_shard) + { + (void)set_cut(p_ptr->cut + damroll(5, 8)); + } + if (!p_ptr->resist_sound) + { + (void)set_stun(p_ptr->stun + randint1(15)); + } - if ((!(p_ptr->resist_cold || IS_OPPOSE_COLD())) || one_in_(12)) - { - if (!p_ptr->immune_cold) inven_damage(set_cold_destroy, 3); + if ((!(p_ptr->resist_cold || IS_OPPOSE_COLD())) || one_in_(12)) + { + if (!p_ptr->immune_cold) inven_damage(set_cold_destroy, 3); + } } break; @@ -7387,12 +5961,7 @@ if (fuzzy) msg_print(" /* Death Ray */ case GF_DEATH_RAY: { -#ifdef JP -if (fuzzy) msg_print("²¿¤«Èó¾ï¤ËÎ䤿¤¤¤â¤Î¤Ç¹¶·â¤µ¤ì¤¿¡ª"); -#else - if (fuzzy) msg_print("You are hit by something extremely cold!"); -#endif - + if (fuzzy) msg_print(_("何か非常に冷たいもので攻撃された!", "You are hit by something extremely cold!")); if (p_ptr->mimic_form) { @@ -7430,16 +5999,17 @@ if (fuzzy) msg_print(" /* Drain mana */ case GF_DRAIN_MANA: { - if (p_ptr->csp) + if (CHECK_MULTISHADOW()) + { + msg_print(_("攻撃は幻影に命中し、あなたには届かなかった。", "The attack hits Shadow, you are unharmed!")); + } + else if (p_ptr->csp) { /* Basic message */ -#ifdef JP - if (who > 0) msg_format("%^s¤ËÀº¿À¥¨¥Í¥ë¥®¡¼¤òµÛ¤¤¼è¤é¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª", m_name); - else msg_print("Àº¿À¥¨¥Í¥ë¥®¡¼¤òµÛ¤¤¼è¤é¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª"); -#else - if (who > 0) msg_format("%^s draws psychic energy from you!", m_name); - else msg_print("Your psychic energy is drawn!"); -#endif + if (who > 0) + msg_format(_("%^sに精神エネルギーを吸い取られてしまった!", "%^s draws psychic energy from you!"), m_name); + else + msg_print(_("精神エネルギーを吸い取られてしまった!", "Your psychic energy is drawn!")); /* Full drain */ if (dam >= p_ptr->csp) @@ -7470,7 +6040,7 @@ if (fuzzy) msg_print(" if (m_ptr->hp < m_ptr->maxhp) { /* Heal */ - m_ptr->hp += (6 * dam); + m_ptr->hp += dam; if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp; /* Redraw (later) if needed */ @@ -7480,11 +6050,7 @@ if (fuzzy) msg_print(" /* Special message */ if (m_ptr->ml) { -#ifdef JP - msg_format("%^s¤Ïµ¤Ê¬¤¬Îɤµ¤½¤¦¤À¡£", m_name); -#else - msg_format("%^s appears healthier.", m_name); -#endif + msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), m_name); } } } @@ -7497,40 +6063,35 @@ if (fuzzy) msg_print(" /* Mind blast */ case GF_MIND_BLAST: { - if (randint0(100 + rlev/2) < (MAX(5, p_ptr->skill_sav))) + if ((randint0(100 + rlev / 2) < MAX(5, p_ptr->skill_sav)) && !CHECK_MULTISHADOW()) { -#ifdef JP - msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); learn_spell(monspell); } else { -#ifdef JP - msg_print("ÎîŪ¥¨¥Í¥ë¥®¡¼¤ÇÀº¿À¤¬¹¶·â¤µ¤ì¤¿¡£"); -#else - msg_print("Your mind is blasted by psyonic energy."); -#endif - - if (!p_ptr->resist_conf) + if (!CHECK_MULTISHADOW()) { - (void)set_confused(p_ptr->confused + randint0(4) + 4); - } + msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy.")); - if (!p_ptr->resist_chaos && one_in_(3)) - { - (void)set_image(p_ptr->image + randint0(250) + 150); - } + if (!p_ptr->resist_conf) + { + (void)set_confused(p_ptr->confused + randint0(4) + 4); + } - p_ptr->csp -= 50; - if (p_ptr->csp < 0) - { - p_ptr->csp = 0; - p_ptr->csp_frac = 0; + if (!p_ptr->resist_chaos && one_in_(3)) + { + (void)set_image(p_ptr->image + randint0(250) + 150); + } + + p_ptr->csp -= 50; + if (p_ptr->csp < 0) + { + p_ptr->csp = 0; + p_ptr->csp_frac = 0; + } + p_ptr->redraw |= PR_MANA; } - p_ptr->redraw |= PR_MANA; get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); } @@ -7540,54 +6101,52 @@ if (fuzzy) msg_print(" /* Brain smash */ case GF_BRAIN_SMASH: { - if (randint0(100 + rlev/2) < (MAX(5, p_ptr->skill_sav))) - { -#ifdef JP - msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif + if ((randint0(100 + rlev / 2) < MAX(5, p_ptr->skill_sav)) && !CHECK_MULTISHADOW()) + { + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); learn_spell(monspell); } else { -#ifdef JP - msg_print("ÎîŪ¥¨¥Í¥ë¥®¡¼¤ÇÀº¿À¤¬¹¶·â¤µ¤ì¤¿¡£"); -#else - msg_print("Your mind is blasted by psionic energy."); -#endif + if (!CHECK_MULTISHADOW()) + { + msg_print(_("霊的エネルギーで精神が攻撃された。", "Your mind is blasted by psyonic energy.")); - p_ptr->csp -= 100; - if (p_ptr->csp < 0) - { - p_ptr->csp = 0; - p_ptr->csp_frac = 0; + p_ptr->csp -= 100; + if (p_ptr->csp < 0) + { + p_ptr->csp = 0; + p_ptr->csp_frac = 0; + } + p_ptr->redraw |= PR_MANA; } - p_ptr->redraw |= PR_MANA; get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); - if (!p_ptr->resist_blind) - { - (void)set_blind(p_ptr->blind + 8 + randint0(8)); - } - if (!p_ptr->resist_conf) - { - (void)set_confused(p_ptr->confused + randint0(4) + 4); - } - if (!p_ptr->free_act) + if (!CHECK_MULTISHADOW()) { - (void)set_paralyzed(p_ptr->paralyzed + randint0(4) + 4); - } - (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); + if (!p_ptr->resist_blind) + { + (void)set_blind(p_ptr->blind + 8 + randint0(8)); + } + if (!p_ptr->resist_conf) + { + (void)set_confused(p_ptr->confused + randint0(4) + 4); + } + if (!p_ptr->free_act) + { + (void)set_paralyzed(p_ptr->paralyzed + randint0(4) + 4); + } + (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); - while (randint0(100 + rlev/2) > (MAX(5, p_ptr->skill_sav))) - (void)do_dec_stat(A_INT); - while (randint0(100 + rlev/2) > (MAX(5, p_ptr->skill_sav))) - (void)do_dec_stat(A_WIS); + while (randint0(100 + rlev / 2) > (MAX(5, p_ptr->skill_sav))) + (void)do_dec_stat(A_INT); + while (randint0(100 + rlev / 2) > (MAX(5, p_ptr->skill_sav))) + (void)do_dec_stat(A_WIS); - if (!p_ptr->resist_chaos) - { - (void)set_image(p_ptr->image + randint0(250) + 150); + if (!p_ptr->resist_chaos) + { + (void)set_image(p_ptr->image + randint0(250) + 150); + } } } break; @@ -7596,18 +6155,14 @@ if (fuzzy) msg_print(" /* cause 1 */ case GF_CAUSE_1: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) - { -#ifdef JP - msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif + if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW()) + { + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); learn_spell(monspell); } else { - curse_equipment(15, 0); + if (!CHECK_MULTISHADOW()) curse_equipment(15, 0); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); } break; @@ -7616,18 +6171,14 @@ if (fuzzy) msg_print(" /* cause 2 */ case GF_CAUSE_2: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) - { -#ifdef JP - msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif + if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW()) + { + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); learn_spell(monspell); } else { - curse_equipment(25, MIN(rlev/2-15, 5)); + if (!CHECK_MULTISHADOW()) curse_equipment(25, MIN(rlev / 2 - 15, 5)); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); } break; @@ -7636,18 +6187,14 @@ if (fuzzy) msg_print(" /* cause 3 */ case GF_CAUSE_3: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) - { -#ifdef JP - msg_print("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif + if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW()) + { + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); learn_spell(monspell); } else { - curse_equipment(33, MIN(rlev/2-15, 15)); + if (!CHECK_MULTISHADOW()) curse_equipment(33, MIN(rlev / 2 - 15, 15)); get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); } break; @@ -7656,19 +6203,15 @@ if (fuzzy) msg_print(" /* cause 4 */ case GF_CAUSE_4: { - if ((randint0(100 + rlev/2) < p_ptr->skill_sav) && !(m_ptr->r_idx == MON_KENSHIROU)) + if ((randint0(100 + rlev / 2) < p_ptr->skill_sav) && !(m_ptr->r_idx == MON_KENSHIROU) && !CHECK_MULTISHADOW()) { -#ifdef JP - msg_print("¤·¤«¤·È빦¤òÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_print("You resist the effects!"); -#endif + msg_print(_("しかし秘孔を跳ね返した!", "You resist the effects!")); learn_spell(monspell); } else { get_damage = take_hit(DAMAGE_ATTACK, dam, killer, monspell); - (void)set_cut(p_ptr->cut + damroll(10, 10)); + if (!CHECK_MULTISHADOW()) (void)set_cut(p_ptr->cut + damroll(10, 10)); } break; } @@ -7676,27 +6219,22 @@ if (fuzzy) msg_print(" /* Hand of Doom */ case GF_HAND_DOOM: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) - { -#ifdef JP - msg_format("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_format("You resist the effects!"); -#endif + if ((randint0(100 + rlev/2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW()) + { + msg_print(_("しかし効力を跳ね返した!", "You resist the effects!")); learn_spell(monspell); } else { -#ifdef JP - msg_print("¤¢¤Ê¤¿¤ÏÌ¿¤¬Çö¤Þ¤Ã¤Æ¤¤¤¯¤è¤¦¤Ë´¶¤¸¤¿¡ª"); -#else - msg_print("You feel your life fade away!"); -#endif + if (!CHECK_MULTISHADOW()) + { + msg_print(_("あなたは命が薄まっていくように感じた!", "You feel your life fade away!")); + curse_equipment(40, 20); + } get_damage = take_hit(DAMAGE_ATTACK, dam, m_name, monspell); - curse_equipment(40, 20); - if (p_ptr->chp < 1) p_ptr->chp = 1; + if (p_ptr->chp < 1) p_ptr->chp = 1; /* Paranoia */ } break; } @@ -7711,20 +6249,20 @@ if (fuzzy) msg_print(" } } - if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead) + /* Hex - revenge damage stored */ + revenge_store(get_damage); + + if ((p_ptr->tim_eyeeye || hex_spelling(HEX_EYE_FOR_EYE)) + && (get_damage > 0) && !p_ptr->is_dead && (who > 0)) { -#ifdef JP - msg_format("¹¶·â¤¬%s¼«¿È¤ò½ý¤Ä¤±¤¿¡ª", m_name); -#else char m_name_self[80]; /* hisself */ monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE); - msg_format("The attack of %s has wounded %s!", m_name, m_name_self); -#endif + msg_format(_("攻撃が%s自身を傷つけた!", "The attack of %s has wounded %s!"), m_name, m_name_self); project(0, 0, m_ptr->fy, m_ptr->fx, get_damage, GF_MISSILE, PROJECT_KILL, -1); - set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE); + if (p_ptr->tim_eyeeye) set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE); } if (p_ptr->riding && dam > 0) @@ -7734,13 +6272,12 @@ if (fuzzy) msg_print(" /* Disturb */ - disturb(1, 0); + disturb(1, 1); if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding)) { - kawarimi(FALSE); - return obvious; + (void)kawarimi(FALSE); } /* Return "Anything seen?" */ @@ -7781,28 +6318,28 @@ int dist_to_line(int y, int x, int y1, int x1, int y2, int x2) * Modified version of los() for calculation of disintegration balls. * Disintegration effects are stopped by permanent walls. */ -bool in_disintegration_range(int y1, int x1, int y2, int x2) +bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2) { /* Delta */ - int dx, dy; + POSITION dx, dy; /* Absolute */ - int ax, ay; + POSITION ax, ay; /* Signs */ - int sx, sy; + POSITION sx, sy; /* Fractions */ - int qx, qy; + POSITION qx, qy; /* Scanners */ - int tx, ty; + POSITION tx, ty; /* Scale factors */ - int f1, f2; + POSITION f1, f2; /* Slope, or 1/Slope, of LOS */ - int m; + POSITION m; /* Extract the offset */ @@ -8007,10 +6544,10 @@ bool in_disintegration_range(int y1, int x1, int y2, int x2) /* * breath shape */ -void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ) +void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int typ) { - int by = y1; - int bx = x1; + POSITION by = y1; + POSITION bx = x1; int brad = 0; int brev = rad * rad / dist; int bdis = 0; @@ -8094,20 +6631,19 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte } -/* - * Generic "beam"/"bolt"/"ball" projection routine. - * - * Input: - * who: Index of "source" monster (zero for "player") - * rad: Radius of explosion (0 = beam/bolt, 1 to 9 = ball) - * y,x: Target location (or location to travel "towards") - * dam: Base damage roll to apply to affected monsters (or player) - * typ: Type of damage to apply to monsters (and objects) - * flg: Extra bit flags (see PROJECT_xxxx in "defines.h") - * - * Return: - * TRUE if any "effects" of the projection were observed, else FALSE - * +/*! + * @brief 汎用的なビーム/ボルト/ボール系処理のルーチン Generic "beam"/"bolt"/"ball" projection routine. + * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player") + * @param rad 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball) + * @param y 目標Y座標 / Target y location (or location to travel "towards") + * @param x 目標X座標 / Target x location (or location to travel "towards") + * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player) + * @param typ 効果属性 / Type of damage to apply to monsters (and objects) + * @param flg 効果フラグ / Extra bit flags (see PROJECT_xxxx in "defines.h") + * @param monspell 効果元のモンスター魔法ID + * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE + * @details + *
  * Allows a monster (or player) to project a beam/bolt/ball of a given kind
  * towards a given location (optionally passing over the heads of interposing
  * monsters), and have it do a given amount of damage to the monsters (and
@@ -8235,18 +6771,19 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte
  * Note that we must call "handle_stuff()" after affecting terrain features
  * in the blast radius, in case the "illumination" of the grid was changed,
  * and "update_view()" and "update_monsters()" need to be called.
+ * 
*/ -bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int monspell) +bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell) { int i, t, dist; - int y1, x1; - int y2, x2; - int by, bx; + POSITION y1, x1; + POSITION y2, x2; + POSITION by, bx; int dist_hack = 0; - int y_saver, x_saver; /* For reflecting monsters */ + POSITION y_saver, x_saver; /* For reflecting monsters */ int msec = delay_factor * delay_factor * delay_factor; @@ -8277,19 +6814,22 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons int grids = 0; /* Coordinates of the affected grids */ - byte gx[1024], gy[1024]; + POSITION gx[1024], gy[1024]; /* Encoded "radius" info (see above) */ - byte gm[32]; + POSITION gm[32]; /* Actual radius encoded in gm[] */ - int gm_rad = rad; + POSITION gm_rad = rad; bool jump = FALSE; /* Attacker's name (prepared before polymorph)*/ char who_name[80]; + /* Can the player see the source of this effect? */ + bool see_s_msg = TRUE; + /* Initialize by null string */ who_name[0] = '\0'; @@ -8297,8 +6837,8 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons rakubadam_m = 0; /* Default target of monsterspell is player */ - monster_target_y=py; - monster_target_x=px; + monster_target_y=p_ptr->y; + monster_target_x=p_ptr->x; /* Hack -- Jump to target */ if (flg & (PROJECT_JUMP)) @@ -8315,8 +6855,8 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons /* Start at player */ else if (who <= 0) { - x1 = px; - y1 = py; + x1 = p_ptr->x; + y1 = p_ptr->y; } /* Start at monster */ @@ -8484,24 +7024,27 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons monster_target_y=(s16b)y; monster_target_x=(s16b)x; - remove_mirror(y,x); - next_mirror( &oy,&ox,y,x ); + remove_mirror(y, x); + next_mirror(&oy, &ox, y, x); path_n = i+project_path(&(path_g[i+1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg); - for( j = last_i; j <=i ; j++ ) + for(j = last_i; j <= i; j++) { y = GRID_Y(path_g[j]); x = GRID_X(path_g[j]); - if(project_m(0,0,y,x,dam,GF_SEEKER,flg))notice=TRUE; + if(project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice=TRUE; if(!who && (project_m_n==1) && !jump ){ if(cave[project_m_y][project_m_x].m_idx >0 ){ monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx]; - /* Hack -- auto-recall */ - if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx); + if (m_ptr->ml) + { + /* Hack -- auto-recall */ + if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx); - /* Hack - auto-track */ - if (m_ptr->ml) health_track(cave[project_m_y][project_m_x].m_idx); + /* Hack - auto-track */ + health_track(cave[project_m_y][project_m_x].m_idx); + } } } (void)project_f(0,0,y,x,dam,GF_SEEKER); @@ -8509,25 +7052,29 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons last_i = i; } } - for( i = last_i ; i < path_n ; i++ ) + for(i = last_i ; i < path_n ; i++) { - int x,y; - y = GRID_Y(path_g[i]); - x = GRID_X(path_g[i]); - if(project_m(0,0,y,x,dam,GF_SEEKER,flg)) - notice=TRUE; + int py, px; + py = GRID_Y(path_g[i]); + px = GRID_X(path_g[i]); + if(project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE)) + notice = TRUE; if(!who && (project_m_n==1) && !jump ){ - if(cave[project_m_y][project_m_x].m_idx >0 ){ - monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx]; - - /* Hack -- auto-recall */ - if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx); - - /* Hack - auto-track */ - if (m_ptr->ml) health_track(cave[project_m_y][project_m_x].m_idx); - } + if(cave[project_m_y][project_m_x].m_idx > 0) + { + monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx]; + + if (m_ptr->ml) + { + /* Hack -- auto-recall */ + if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx); + + /* Hack - auto-track */ + health_track(cave[project_m_y][project_m_x].m_idx); + } + } } - (void)project_f(0,0,y,x,dam,GF_SEEKER); + (void)project_f(0, 0, py, px, dam, GF_SEEKER); } return notice; } @@ -8609,7 +7156,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons } } if(project_o(0,0,y,x,dam,GF_SUPER_RAY) )notice=TRUE; - if (!have_flag(f_flags_bold(y, x), FF_PROJECT)) + if (!cave_have_flag_bold(y, x, FF_PROJECT)) { if( second_step )continue; break; @@ -8641,22 +7188,25 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons } for( i = 0; i < path_n ; i++ ) { - int x,y; - y = GRID_Y(path_g[i]); - x = GRID_X(path_g[i]); - (void)project_m(0,0,y,x,dam,GF_SUPER_RAY,flg); - if(!who && (project_m_n==1) && !jump ){ - if(cave[project_m_y][project_m_x].m_idx >0 ){ - monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx]; - - /* Hack -- auto-recall */ - if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx); - - /* Hack - auto-track */ - if (m_ptr->ml) health_track(cave[project_m_y][project_m_x].m_idx); - } + int py, px; + py = GRID_Y(path_g[i]); + px = GRID_X(path_g[i]); + (void)project_m(0, 0, py, px, dam, GF_SUPER_RAY, flg, TRUE); + if(!who && (project_m_n == 1) && !jump){ + if(cave[project_m_y][project_m_x].m_idx >0 ){ + monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx]; + + if (m_ptr->ml) + { + /* Hack -- auto-recall */ + if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx); + + /* Hack - auto-track */ + health_track(cave[project_m_y][project_m_x].m_idx); + } + } } - (void)project_f(0,0,y,x,dam,GF_SUPER_RAY); + (void)project_f(0, 0, py, px, dam, GF_SUPER_RAY); } return notice; } @@ -8683,7 +7233,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons else { /* Hack -- Balls explode before reaching walls */ - if (!have_flag(f_flags_bold(ny, nx), FF_PROJECT) && (rad > 0)) break; + if (!cave_have_flag_bold(ny, nx, FF_PROJECT) && (rad > 0)) break; } /* Advance */ @@ -8928,6 +7478,13 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons if (p_ptr->update) update_stuff(); + if (flg & PROJECT_KILL) + { + see_s_msg = (who > 0) ? is_seen(&m_list[who]) : + (!who ? TRUE : (player_can_see_bold(y1, x1) && projectable(p_ptr->y, p_ptr->x, y1, x1))); + } + + /* Check features */ if (flg & (PROJECT_GRID)) { @@ -9025,9 +7582,11 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons monster_type *m_ptr = &m_list[cave[y][x].m_idx]; monster_race *ref_ptr = &r_info[m_ptr->r_idx]; - if ((ref_ptr->flags2 & RF2_REFLECTING) && (flg & PROJECT_REFLECTABLE) && (!who || dist_hack > 1) && !one_in_(10)) + if ((flg & PROJECT_REFLECTABLE) && cave[y][x].m_idx && (ref_ptr->flags2 & RF2_REFLECTING) && + ((cave[y][x].m_idx != p_ptr->riding) || !(flg & PROJECT_PLAYER)) && + (!who || dist_hack > 1) && !one_in_(10)) { - byte t_y, t_x; + POSITION t_y, t_x; int max_attempts = 10; /* Choose 'new' target */ @@ -9045,23 +7604,20 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons t_x = x_saver; } - if (m_ptr->ml) + if (is_seen(m_ptr)) { -#ifdef JP if ((m_ptr->r_idx == MON_KENSHIROU) || (m_ptr->r_idx == MON_RAOU)) - msg_print("¡ÖËÌÅÍ¿À·ý±üµÁ¡¦Æó»Ø¿¿¶õÇÄ¡ª¡×"); - else if (m_ptr->r_idx == MON_DIO) msg_print("¥Ç¥£¥ª¡¦¥Ö¥é¥ó¥É¡¼¤Ï»Ø°ìËܤǹ¶·â¤òÃƤ­ÊÖ¤·¤¿¡ª"); - else msg_print("¹¶·â¤ÏÄ·¤ÍÊ֤ä¿¡ª"); -#else - msg_print("The attack bounces!"); -#endif - - if (is_original_ap(m_ptr)) ref_ptr->r_flags2 |= RF2_REFLECTING; + msg_print(_("「北斗神拳奥義・二指真空把!」", "The attack bounces!")); + else if (m_ptr->r_idx == MON_DIO) + msg_print(_("ディオ・ブランドーは指一本で攻撃を弾き返した!", "The attack bounces!")); + else + msg_print(_("攻撃は跳ね返った!", "The attack bounces!")); } + if (is_original_ap_and_seen(m_ptr)) ref_ptr->r_flags2 |= RF2_REFLECTING; /* Reflected bolts randomly target either one */ - if (one_in_(2)) flg |= PROJECT_PLAYER; - else flg &= ~(PROJECT_PLAYER); + if (player_bold(y, x) || one_in_(2)) flg &= ~(PROJECT_PLAYER); + else flg |= PROJECT_PLAYER; /* The bolt is reflected */ project(cave[y][x].m_idx, 0, t_y, t_x, dam, typ, flg, monspell); @@ -9155,7 +7711,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons } /* Affect the monster in the grid */ - if (project_m(who, effective_dist, y, x, dam, typ,flg)) notice = TRUE; + if (project_m(who, effective_dist, y, x, dam, typ, flg, see_s_msg)) notice = TRUE; } @@ -9171,11 +7727,14 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons { monster_type *m_ptr = &m_list[cave[y][x].m_idx]; - /* Hack -- auto-recall */ - if (m_ptr->ml) monster_race_track(m_ptr->ap_r_idx); + if (m_ptr->ml) + { + /* Hack -- auto-recall */ + if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx); - /* Hack - auto-track */ - if (m_ptr->ml) health_track(cave[y][x].m_idx); + /* Hack - auto-track */ + if (m_ptr->ml) health_track(cave[y][x].m_idx); + } } } } @@ -9266,22 +7825,14 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons { if (rakuba(rakubadam_m, FALSE)) { -#ifdef JP -msg_format("%^s¤Ë¿¶¤êÍî¤È¤µ¤ì¤¿¡ª", m_name); -#else - msg_format("%^s has thrown you off!", m_name); -#endif + msg_format(_("%^sに振り落とされた!", "%^s has thrown you off!"), m_name); } } if (p_ptr->riding && rakubadam_p > 0) { if(rakuba(rakubadam_p, FALSE)) { -#ifdef JP -msg_format("%^s¤«¤éÍî¤Á¤Æ¤·¤Þ¤Ã¤¿¡ª", m_name); -#else - msg_format("You have fallen from %s.", m_name); -#endif + msg_format(_("%^sから落ちてしまった!", "You have fallen from %s."), m_name); } } } @@ -9290,33 +7841,38 @@ msg_format("%^s return (notice); } +/*! + * @brief 鏡魔法「封魔結界」の効果処理 + * @param dam ダメージ量 + * @return 効果があったらTRUEを返す + */ bool binding_field( int dam ) { - int mirror_x[10],mirror_y[10]; /* ¶À¤Ï¤â¤Ã¤È¾¯¤Ê¤¤ */ - int mirror_num=0; /* ¶À¤Î¿ô */ + int mirror_x[10],mirror_y[10]; /* 鏡はもっと少ない */ + int mirror_num=0; /* 鏡の数 */ int x,y; int centersign; int x1,x2,y1,y2; u16b p; int msec= delay_factor*delay_factor*delay_factor; - /* »°³Ñ·Á¤ÎĺÅÀ */ + /* 三角形の頂点 */ int point_x[3]; int point_y[3]; /* Default target of monsterspell is player */ - monster_target_y=py; - monster_target_x=px; + monster_target_y=p_ptr->y; + monster_target_x=p_ptr->x; for( x=0 ; x < cur_wid ; x++ ) { for( y=0 ; y < cur_hgt ; y++ ) { if( is_mirror_grid(&cave[y][x]) && - distance(py,px,y,x) <= MAX_RANGE && - distance(py,px,y,x) != 0 && + distance(p_ptr->y,p_ptr->x,y,x) <= MAX_RANGE && + distance(p_ptr->y,p_ptr->x,y,x) != 0 && player_has_los_bold(y,x) && - projectable(py, px, y, x) + projectable(p_ptr->y, p_ptr->x, y, x) ){ mirror_y[mirror_num]=y; mirror_x[mirror_num]=x; @@ -9337,8 +7893,8 @@ bool binding_field( int dam ) point_x[0]=mirror_x[point_x[0]]; point_y[1]=mirror_y[point_x[1]]; point_x[1]=mirror_x[point_x[1]]; - point_y[2]=py; - point_x[2]=px; + point_y[2]=p_ptr->y; + point_x[2]=p_ptr->x; x=point_x[0]+point_x[1]+point_x[2]; y=point_y[0]+point_y[1]+point_y[2]; @@ -9366,7 +7922,7 @@ bool binding_field( int dam ) centersign*( (point_x[2]-x)*(point_y[0]-y) -(point_y[2]-y)*(point_x[0]-x)) >=0 ) { - if (player_has_los_bold(y, x) && projectable(py, px, y, x)) { + if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) { /* Visual effects */ if(!(p_ptr->blind) && panel_contains(y,x)){ @@ -9389,7 +7945,7 @@ bool binding_field( int dam ) centersign*( (point_x[2]-x)*(point_y[0]-y) -(point_y[2]-y)*(point_x[0]-x)) >=0 ) { - if (player_has_los_bold(y, x) && projectable(py, px, y, x)) { + if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) { (void)project_f(0,0,y,x,dam,GF_MANA); } } @@ -9404,7 +7960,7 @@ bool binding_field( int dam ) centersign*( (point_x[2]-x)*(point_y[0]-y) -(point_y[2]-y)*(point_x[0]-x)) >=0 ) { - if (player_has_los_bold(y, x) && projectable(py, px, y, x)) { + if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) { (void)project_o(0,0,y,x,dam,GF_MANA); } } @@ -9419,25 +7975,26 @@ bool binding_field( int dam ) centersign*( (point_x[2]-x)*(point_y[0]-y) -(point_y[2]-y)*(point_x[0]-x)) >=0 ) { - if (player_has_los_bold(y, x) && projectable(py, px, y, x)) { + if (player_has_los_bold(y, x) && projectable(p_ptr->y, p_ptr->x, y, x)) { (void)project_m(0,0,y,x,dam,GF_MANA, - (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP)); + (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE); } } } } if( one_in_(7) ){ -#ifdef JP - msg_print("¶À¤¬·ë³¦¤ËÂѤ¨¤­¤ì¤º¡¢²õ¤ì¤Æ¤·¤Þ¤Ã¤¿¡£"); -#else - msg_print("The field broke a mirror"); -#endif + msg_print(_("鏡が結界に耐えきれず、壊れてしまった。", "The field broke a mirror")); remove_mirror(point_y[0],point_x[0]); } return TRUE; } +/*! + * @brief 鏡魔法「鏡の封印」の効果処理 + * @param dam ダメージ量 + * @return 効果があったらTRUEを返す + */ void seal_of_mirror( int dam ) { int x,y; @@ -9449,7 +8006,7 @@ void seal_of_mirror( int dam ) if( is_mirror_grid(&cave[y][x])) { if(project_m(0,0,y,x,dam,GF_GENOCIDE, - (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP))) + (PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP),TRUE)) { if( !cave[y][x].m_idx ) {