X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fspells1.c;h=e35cf966030802c383578bd101e21aefb3cc9792;hb=863a51065492ae85f4678f6494d4415aacd5c405;hp=793793eeaa8d36f79b63e39dc77af1167e0e207d;hpb=6599307eda98e10beaae211323166bad3a4664ab;p=hengband%2Fhengband.git diff --git a/src/spells1.c b/src/spells1.c index 793793eea..e35cf9660 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1,62 +1,144 @@ -/* 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 +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 ã¢ã³ã¹ã¿ã¼é äºç¨ã»ã¼ãã³ã°ã¹ãã¼å ±éé¨(æ±ç¨ç³») + * @param pow é äºãã¯ã¼ + * @param m_ptr 対象ã¢ã³ã¹ã¿ã¼ + * @return é äºã«æµæãããTRUE + */ +static bool_hack common_saving_throw_charm(player_type *player_ptr, HIT_POINT pow, monster_type *m_ptr) +{ + monster_race *r_ptr = &r_info[m_ptr->r_idx]; + + if(p_ptr->inside_arena) return TRUE; + + /* Memorize a flag */ + if (r_ptr->flagsr & RFR_RES_ALL) + { + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + return TRUE; + } + + if (r_ptr->flags3 & RF3_NO_CONF) + { + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); + return TRUE; + } + + if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2 & MFLAG2_NOPET) return TRUE; + + pow += (adj_chr_chm[player_ptr->stat_ind[A_CHR]] - 1); + if((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3; + return (r_ptr->level > randint1((pow - 10) < 1 ? 1 : (pow - 10)) + 5); +} + +/*! + * @brief ã¢ã³ã¹ã¿ã¼æå¾ç¨ã»ã¼ãã³ã°ã¹ãã¼å ±éé¨(é¨æä¾åç³») + * @param pow æå¾ãã¯ã¼ + * @param m_ptr 対象ã¢ã³ã¹ã¿ã¼ + * @return æå¾ã«æµæãããTRUE + */ +static bool_hack common_saving_throw_control(player_type *player_ptr, HIT_POINT pow, monster_type *m_ptr) +{ + monster_race *r_ptr = &r_info[m_ptr->r_idx]; + + if (p_ptr->inside_arena) return TRUE; + + /* Memorize a flag */ + if (r_ptr->flagsr & RFR_RES_ALL) + { + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); + return TRUE; + } + + if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2 & MFLAG2_NOPET) return TRUE; + + pow += adj_chr_chm[player_ptr->stat_ind[A_CHR]] - 1; + if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3; + return (r_ptr->level > randint1((pow - 10) < 1 ? 1 : (pow - 10)) + 5); +} + +/*! +* @brief ä¸é¨ãã«ãéæ³ã®ãã¼ã å確çãç®åºãã / Prepare standard probability to become beam for fire_bolt_or_beam() +* @return ãã¼ã å確ç(%) +* @details +* ãã¼ãã³ã¼ãã£ã³ã°ã«ããå®è£ ãè¡ããã¦ããã +* ã¡ã¤ã¸ã¯(ã¬ãã«)%ããã¤ã¡ã¤ã¸ãã¹ãã«ãã¹ã¿ã¼ã¯(ã¬ãã«)%ããã以å¤ã®è·æ¥ã¯(ã¬ãã«/2)% +*/ +int beam_chance(void) +{ + if (p_ptr->pclass == CLASS_MAGE) + return p_ptr->lev; + if (p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER) + return p_ptr->lev + 10; + + return p_ptr->lev / 2; +} + + +/*! + * @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) +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 x,y; + int mirror_x[10], mirror_y[10]; /* é¡ã¯ãã£ã¨å°ãªã */ + int mirror_num = 0; /* é¡ã®æ° */ + int x, y; int num; - for( x=0 ; x < cur_wid ; x++ ) + for (x = 0; x < cur_wid; x++) { - for( y=0 ; y < cur_hgt ; y++ ) + for (y = 0; y < cur_hgt; y++) { - if( is_mirror_grid(&cave[y][x])){ - mirror_y[mirror_num]=y; - mirror_x[mirror_num]=x; + if (is_mirror_grid(&cave[y][x])) { + mirror_y[mirror_num] = y; + mirror_x[mirror_num] = x; mirror_num++; } } } - if( mirror_num ) + if (mirror_num) { - num=randint0(mirror_num); - *next_y=mirror_y[num]; - *next_x=mirror_x[num]; + num = randint0(mirror_num); + *next_y = mirror_y[num]; + *next_x = mirror_x[num]; return; } - *next_y=cury+randint0(5)-2; - *next_x=curx+randint0(5)-2; + *next_y = cury + randint0(5) - 2; + *next_x = curx + randint0(5) - 2; return; } -/* +/*! + * @brief ä¸è²è¡¨ç¾ç¨ã«ã©ã³ãã ãªè²ãé¸æããé¢æ° / * Get a legal "multi-hued" color for drawing "spells" + * @param max è²IDã®æå¤§å¤ + * @return é¸æããè²ID */ static byte mh_attr(int max) { @@ -83,55 +165,58 @@ 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) { - case GF_PSY_SPEAR: return (0x06); - case GF_MISSILE: return (0x0F); - case GF_ACID: return (0x04); - case GF_ELEC: return (0x02); - case GF_FIRE: return (0x00); - case GF_COLD: return (0x01); - case GF_POIS: return (0x03); - case GF_HOLY_FIRE: return (0x00); - case GF_HELL_FIRE: return (0x00); - case GF_MANA: return (0x0E); + case GF_PSY_SPEAR: return (0x06); + case GF_MISSILE: return (0x0F); + case GF_ACID: return (0x04); + case GF_ELEC: return (0x02); + case GF_FIRE: return (0x00); + case GF_COLD: return (0x01); + case GF_POIS: return (0x03); + case GF_HOLY_FIRE: return (0x00); + case GF_HELL_FIRE: return (0x00); + case GF_MANA: return (0x0E); /* by henkma */ - case GF_SEEKER: return (0x0E); - case GF_SUPER_RAY: return (0x0E); - - case GF_ARROW: return (0x0F); - case GF_WATER: return (0x04); - case GF_NETHER: return (0x07); - case GF_CHAOS: return (mh_attr(15)); - case GF_DISENCHANT: return (0x05); - case GF_NEXUS: return (0x0C); - case GF_CONFUSION: return (mh_attr(4)); - case GF_SOUND: return (0x09); - case GF_SHARDS: return (0x08); - case GF_FORCE: return (0x09); - case GF_INERTIA: return (0x09); - case GF_GRAVITY: return (0x09); - case GF_TIME: return (0x09); - case GF_LITE_WEAK: return (0x06); - case GF_LITE: return (0x06); - case GF_DARK_WEAK: return (0x07); - case GF_DARK: return (0x07); - case GF_PLASMA: return (0x0B); - case GF_METEOR: return (0x00); - case GF_ICE: return (0x01); - case GF_ROCKET: return (0x0F); - case GF_DEATH_RAY: return (0x07); - case GF_NUKE: return (mh_attr(2)); - case GF_DISINTEGRATE: return (0x05); + case GF_SEEKER: return (0x0E); + case GF_SUPER_RAY: return (0x0E); + + case GF_ARROW: return (0x0F); + case GF_WATER: return (0x04); + case GF_NETHER: return (0x07); + case GF_CHAOS: return (mh_attr(15)); + case GF_DISENCHANT: return (0x05); + case GF_NEXUS: return (0x0C); + case GF_CONFUSION: return (mh_attr(4)); + case GF_SOUND: return (0x09); + case GF_SHARDS: return (0x08); + case GF_FORCE: return (0x09); + case GF_INERTIAL: return (0x09); + case GF_GRAVITY: return (0x09); + case GF_TIME: return (0x09); + case GF_LITE_WEAK: return (0x06); + case GF_LITE: return (0x06); + case GF_DARK_WEAK: return (0x07); + case GF_DARK: return (0x07); + case GF_PLASMA: return (0x0B); + case GF_METEOR: return (0x00); + case GF_ICE: return (0x01); + case GF_ROCKET: return (0x0F); + case GF_DEATH_RAY: return (0x07); + case GF_NUKE: return (mh_attr(2)); + case GF_DISINTEGRATE: return (0x05); case GF_PSI: case GF_PSI_DRAIN: case GF_TELEKINESIS: @@ -139,16 +224,16 @@ static byte spell_color(int type) case GF_DRAIN_MANA: case GF_MIND_BLAST: case GF_BRAIN_SMASH: - return (0x09); + return (0x09); case GF_CAUSE_1: case GF_CAUSE_2: case GF_CAUSE_3: - case GF_CAUSE_4: return (0x0E); - case GF_HAND_DOOM: return (0x07); - case GF_CAPTURE : return (0x0E); - case GF_IDENTIFY: return (0x01); - case GF_ATTACK: return (0x0F); - case GF_PHOTO : return (0x06); + case GF_CAUSE_4: return (0x0E); + case GF_HAND_DOOM: return (0x07); + case GF_CAPTURE : return (0x0E); + case GF_IDENTIFY: return (0x01); + case GF_ATTACK: return (0x0F); + case GF_PHOTO : return (0x06); } } /* Normal tiles or ASCII */ @@ -182,14 +267,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 +321,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 +370,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, BIT_FLAGS flg) { int y, x; @@ -382,7 +486,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) if (flg & (PROJECT_STOP)) { if ((n > 0) && - (player_bold(y, x) || cave[y][x].m_idx != 0)) + (player_bold(y, x) || cave[y][x].m_idx != 0)) break; } @@ -471,7 +575,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) if (flg & (PROJECT_STOP)) { if ((n > 0) && - (player_bold(y, x) || cave[y][x].m_idx != 0)) + (player_bold(y, x) || cave[y][x].m_idx != 0)) break; } @@ -542,7 +646,7 @@ sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg) if (flg & (PROJECT_STOP)) { if ((n > 0) && - (player_bold(y, x) || cave[y][x].m_idx != 0)) + (player_bold(y, x) || cave[y][x].m_idx != 0)) break; } @@ -565,17 +669,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,11 +700,12 @@ 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) +static bool project_f(int who, int r, int y, int x, HIT_POINT dam, int typ) { - cave_type *c_ptr = &cave[y][x]; - feature_type *f_ptr = &f_info[c_ptr->feat]; + cave_type *c_ptr = &cave[y][x]; + feature_type *f_ptr = &f_info[c_ptr->feat]; bool obvious = FALSE; bool known = player_has_los_bold(y, x); @@ -613,38 +726,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,22 +749,14 @@ 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; @@ -738,12 +823,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; } @@ -762,12 +842,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; } } @@ -796,12 +871,7 @@ 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; } @@ -844,12 +914,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; } } @@ -864,12 +929,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; } @@ -893,7 +953,7 @@ 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; @@ -920,7 +980,7 @@ 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; @@ -936,7 +996,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); @@ -956,7 +1016,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); + cave_set_feat(y, x, feat_granite); break; } @@ -974,13 +1034,13 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) 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) { /* Place a deep lava */ - cave_set_feat(y, x, FEAT_DEEP_LAVA); + cave_set_feat(y, x, feat_deep_lava); } break; } @@ -997,13 +1057,13 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) if (!have_flag(f_ptr->flags, FF_FLOOR)) break; /* Place a shallow water */ - cave_set_feat(y, x, FEAT_SHAL_WATER); + cave_set_feat(y, x, feat_shallow_water); } /* Deep Water */ else if (dam) { /* Place a deep water */ - cave_set_feat(y, x, FEAT_DEEP_WATER); + cave_set_feat(y, x, feat_deep_water); } break; } @@ -1051,24 +1111,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()) { - int by = y + ddy_ddd[j]; - int bx = x + ddx_ddd[j]; - - if (in_bounds2(by, bx)) + for (j = 0; j < 9; j++) { - cave_type *cc_ptr = &cave[by][bx]; + int by = y + ddy_ddd[j]; + int bx = x + ddx_ddd[j]; - if (have_flag(f_info[get_feat_mimic(cc_ptr)].flags, FF_GLOW)) + if (in_bounds2(by, bx)) { - do_dark = FALSE; - break; + 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); @@ -1104,35 +1167,63 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ) { 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 */ @@ -1154,7 +1245,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. @@ -1169,21 +1270,22 @@ 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); - u32b flgs[TR_FLAG_SIZE]; + BIT_FLAGS flgs[TR_FLAG_SIZE]; char o_name[MAX_NLEN]; - int k_idx = 0; + KIND_OBJECT_IDX k_idx = 0; bool is_potion = FALSE; @@ -1229,12 +1331,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; @@ -1246,12 +1343,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; @@ -1263,12 +1355,7 @@ 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; } break; @@ -1279,12 +1366,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; } @@ -1297,24 +1379,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; @@ -1326,24 +1398,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_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; @@ -1357,12 +1419,7 @@ note_kill = " { 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; @@ -1374,36 +1431,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; @@ -1416,12 +1458,7 @@ note_kill = " if (object_is_cursed(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!")); } break; } @@ -1454,12 +1491,7 @@ note_kill = " /* Notice */ if (known && (o_ptr->marked & OM_FOUND)) { -#ifdef JP -msg_print("¥«¥Á¥Ã¤È²»¤¬¤·¤¿¡ª"); -#else - msg_print("Click!"); -#endif - + msg_print(_("ã«ããã¨é³ãããï¼", "Click!")); obvious = TRUE; } } @@ -1472,7 +1504,7 @@ msg_print(" if (o_ptr->tval == TV_CORPSE) { int i; - u32b mode = 0L; + BIT_FLAGS mode = 0L; if (!who || is_pet(&m_list[who])) mode |= PM_FORCE_PET; @@ -1480,33 +1512,21 @@ msg_print(" for (i = 0; i < o_ptr->number ; i++) { if (((o_ptr->sval == SV_CORPSE) && (randint1(100) > 80)) || - ((o_ptr->sval == SV_SKELETON) && (randint1(100) > 60))) + ((o_ptr->sval == SV_SKELETON) && (randint1(100) > 60))) { 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; @@ -1533,14 +1553,8 @@ note_kill = " /* Observe the resist */ if (known && (o_ptr->marked & OM_FOUND)) { -#ifdef JP -msg_format("%s¤Ï±Æ¶Á¤ò¼õ¤±¤Ê¤¤¡ª", - o_name); -#else - msg_format("The %s %s unaffected!", - o_name, (plural ? "are" : "is")); -#endif - + msg_format(_("%sã¯å½±é¿ãåããªãï¼", + (plural ? "The %s are unaffected!" : "The %s is unaffected!")), o_name); } } @@ -1550,12 +1564,7 @@ msg_format("%s /* Describe if needed */ 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; @@ -1582,11 +1591,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 @@ -1594,49 +1611,55 @@ 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 + * gives avg damage of .655, ranging from .858 to .500 * Note that "dam = dam * 5 / (randint1(6) + 6);" - * gives avg damage of .544, ranging from .714 to .417 + * gives avg damage of .544, ranging from .714 to .417 * Note that "dam = dam * 4 / (randint1(6) + 6);" - * gives avg damage of .444, ranging from .556 to .333 + * gives avg damage of .444, ranging from .556 to .333 * Note that "dam = dam * 3 / (randint1(6) + 6);" - * gives avg damage of .327, ranging from .427 to .250 + * gives avg damage of .327, ranging from .427 to .250 * Note that "dam = dam * 2 / (randint1(6) + 6);" - * gives something simple. - * + * 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, BIT_FLAGS flg, bool see_s_msg) { int tmp; @@ -1653,7 +1676,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) 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; @@ -1661,9 +1684,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_msg = ((who <= 0) || is_seen(caster_ptr)); - /* Were the effects "irrelevant"? */ bool skipped = FALSE; @@ -1695,12 +1715,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; @@ -1732,13 +1749,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) @@ -1750,11 +1764,7 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -1769,23 +1779,14 @@ 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 (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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID); } @@ -1799,23 +1800,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 - + note = _("ã«ã¯ããªãèæ§ãããï¼", " resists a lot."); dam /= 9; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC); } @@ -1829,34 +1821,20 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE); } @@ -1870,34 +1848,20 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); } @@ -1911,23 +1875,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); } @@ -1941,23 +1896,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); } @@ -1972,24 +1918,15 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); } break; @@ -2002,45 +1939,26 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (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 - + 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; @@ -2053,11 +1971,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2072,23 +1986,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS); } @@ -2102,11 +2007,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2115,36 +2016,21 @@ note = " { if (r_ptr->flags3 & RF3_UNDEAD) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡£"; -#else - note = " is immune."; -#endif - + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); } break; @@ -2157,11 +2043,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2170,22 +2052,12 @@ note = " { 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE); @@ -2200,34 +2072,20 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); } @@ -2246,23 +2104,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 - + note = _("ã«ã¯èæ§ãããã", " resists."); dam *= 3; dam /= randint1(6) + 6; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); } @@ -2276,23 +2125,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); } @@ -2307,23 +2147,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 - + note = _("ã«ã¯èæ§ãããã", " resists."); dam *= 2; dam /= randint1(6) + 6; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN); } @@ -2338,23 +2169,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 - + note = _("ã«ã¯èæ§ãããã", " resists."); dam *= 3; dam /= randint1(6) + 6; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } @@ -2369,23 +2191,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 - + note = _("ã«ã¯èæ§ãããã", " resists."); dam *= 3; dam /= randint1(6) + 6; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE); } @@ -2399,23 +2212,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU); } @@ -2429,23 +2233,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL); } @@ -2454,29 +2249,20 @@ note = " } /* 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 (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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER); } @@ -2484,24 +2270,17 @@ note = " { /* Powerful monsters can resist */ if ((r_ptr->flags1 & (RF1_UNIQUE)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { 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); } } break; @@ -2514,23 +2293,14 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME); } @@ -2547,11 +2317,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2561,23 +2327,13 @@ note = " if (r_ptr->flags1 & (RF1_UNIQUE)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected!"); resist_tele = TRUE; } else if (r_ptr->level > randint1(100)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + note = _("ã«ã¯èæ§ãããï¼", " resists!"); resist_tele = TRUE; } } @@ -2588,12 +2344,7 @@ note = " 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV); @@ -2603,24 +2354,17 @@ note = " /* 1. slowness */ /* Powerful monsters can resist */ if ((r_ptr->flags1 & (RF1_UNIQUE)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { 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); } /* 2. stun */ @@ -2628,17 +2372,12 @@ note = " /* Attempt a saving throw */ if ((r_ptr->flags1 & (RF1_UNIQUE)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* Resist */ do_stun = 0; /* No obvious effect */ -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected!"); obvious = FALSE; } } @@ -2654,11 +2393,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2674,11 +2409,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2686,14 +2417,8 @@ note = " if (r_ptr->flags3 & RF3_HURT_ROCK) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); -#ifdef JP -note = "¤ÎÈéÉ椬¤¿¤À¤ì¤¿¡ª"; -note_dies = "¤Ï¾øȯ¤·¤¿¡ª"; -#else - note = " loses some skin!"; - note_dies = " evaporates!"; -#endif - + note = _("ã®ç®èããã ããï¼", " loses some skin!"); + note_dies = _("ã¯è¸çºããï¼", " evaporates!"); dam *= 2; } break; @@ -2704,24 +2429,17 @@ 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) msg_format("%s¤Ï¤¢¤Ê¤¿¤¬¸«¤¨¤Ê¤¤¤Î¤Ç±Æ¶Á¤µ¤ì¤Ê¤¤¡ª", m_name); -#else - if (seen_msg) 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2729,58 +2447,41 @@ note_dies = " if (r_ptr->flags2 & RF2_EMPTY_MIND) { dam = 0; -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif + 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))) + (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 * attacks back on them */ if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) && - (r_ptr->level > p_ptr->lev / 2) && - one_in_(2)) + (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 + 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)) { @@ -2793,12 +2494,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; @@ -2828,23 +2524,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; } @@ -2854,11 +2540,7 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2866,65 +2548,44 @@ note_dies = " if (r_ptr->flags2 & RF2_EMPTY_MIND) { dam = 0; -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif - + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); } else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) || - (r_ptr->flags3 & RF3_ANIMAL) || - (r_ptr->level > randint1(3 * dam))) + (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 * attacks back on them */ if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) && - (r_ptr->level > p_ptr->lev / 2) && - (one_in_(2))) + (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 - + 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; @@ -2933,25 +2594,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; } @@ -2961,11 +2615,7 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -2981,7 +2631,7 @@ note_dies = " /* Attempt a saving throw */ if ((r_ptr->flags1 & RF1_UNIQUE) || - (r_ptr->level > 5 + randint1(dam))) + (r_ptr->level > 5 + randint1(dam))) { /* Resist */ do_stun = 0; @@ -2998,11 +2648,7 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -3017,11 +2663,7 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -3037,19 +2679,15 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãï¼", " is immune."); dam = 0; 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 | RF1_QUESTOR)) || - (r_ptr->flags3 & RF3_NO_CONF) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->flags3 & RF3_NO_CONF) || + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* Memorize a flag */ if (r_ptr->flags3 & RF3_NO_CONF) @@ -3065,26 +2703,18 @@ note_dies = " * attacks back on them */ if ((r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) && - (r_ptr->level > p_ptr->lev / 2) && - (one_in_(2))) + (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 + 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 { @@ -3100,12 +2730,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); } @@ -3115,25 +2740,15 @@ note_dies = " else { /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); obvious = FALSE; } } else { - if ((dam > 29) && (randint1(100) < dam)) + if (!common_saving_throw_charm(p_ptr, dam, m_ptr)) { -#ifdef JP -note = "¤¬¤¢¤Ê¤¿¤ËÎì°¤·¤¿¡£"; -#else - note = " is in your thrall!"; -#endif - + note = _("ãããªãã«é·å±ããã", " is in your thrall!"); set_pet(m_ptr); } else @@ -3166,11 +2781,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -3178,23 +2789,13 @@ note = " 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 (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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); } @@ -3203,17 +2804,13 @@ note = " /* Drain Life */ - case GF_OLD_DRAIN: + case GF_HYPODYNAMIA: { 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -3226,13 +2823,7 @@ note = " 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; } @@ -3248,11 +2839,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -3265,13 +2852,7 @@ note = " 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; } @@ -3280,12 +2861,7 @@ note = " (((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; } @@ -3300,11 +2876,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -3314,15 +2886,10 @@ note = " /* Powerful monsters can resist */ if ((r_ptr->flags1 & RF1_UNIQUE) || - (r_ptr->flags1 & RF1_QUESTOR) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (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; } @@ -3339,13 +2906,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))) + if ((p_ptr->inside_arena) || 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 + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); } else { @@ -3355,12 +2918,7 @@ note = " /* Attempt to clone. */ if (multiply_monster(c_ptr->m_idx, TRUE, 0L)) { -#ifdef JP -note = "¤¬Ê¬Îö¤·¤¿¡ª"; -#else - note = " spawns!"; -#endif - + note = _("ãåè£ããï¼", " spawns!"); } } @@ -3377,17 +2935,11 @@ 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 - if (seen_msg) msg_format("%^s¤Î¶¯¤µ¤¬Ìá¤Ã¤¿¡£", m_name); -#else - if (seen_msg) 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; } @@ -3406,36 +2958,21 @@ 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); - - if (m_ptr->stunned) + (void)set_monster_csleep(c_ptr->m_idx, 0); + if (MON_STUNNED(m_ptr)) { -#ifdef JP - if (seen_msg) msg_format("%^s¤ÏÛ¯Û°¾õÂÖ¤«¤éΩ¤Áľ¤Ã¤¿¡£", m_name); -#else - if (seen_msg) 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 - if (seen_msg) msg_format("%^s¤Ïº®Í𤫤éΩ¤Áľ¤Ã¤¿¡£", m_name); -#else - if (seen_msg) 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 - if (seen_msg) msg_format("%^s¤Ïͦµ¤¤ò¼è¤êÌᤷ¤¿¡£", m_name); -#else - if (seen_msg) 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 */ @@ -3476,11 +3013,7 @@ note = " 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; @@ -3494,18 +3027,10 @@ 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 (!who) { @@ -3528,43 +3053,26 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; 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)) + (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 */ @@ -3580,44 +3088,29 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; 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_NO_SLEEP) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->flags3 & RF3_NO_SLEEP) || + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* Memorize a flag */ if (r_ptr->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 +3127,23 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãï¼", " is immune."); dam = 0; 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)) + !(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; } @@ -3680,36 +3159,22 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; 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)) + (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; } @@ -3722,7 +3187,6 @@ note = " case GF_CHARM: { int vir; - dam += (adj_con_fix[p_ptr->stat_ind[A_CHR]] - 1); vir = virtue_number(V_HARMONY); if (vir) { @@ -3737,63 +3201,25 @@ note = " if (seen) obvious = TRUE; - if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif - dam = 0; - if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); - break; - } - - if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) - dam = dam * 2 / 3; - /* Attempt a saving throw */ - if ((r_ptr->flags1 & RF1_QUESTOR) || - (r_ptr->flags3 & RF3_NO_CONF) || - (m_ptr->mflag2 & MFLAG2_NOPET) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 5)) + if (common_saving_throw_charm(p_ptr, dam, m_ptr)) { - /* Memorize a flag */ - if (r_ptr->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); @@ -3824,55 +3250,23 @@ note = " dam -= p_ptr->virtues[vir-1]/20; } - if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif - dam = 0; - if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); - break; - } - - if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) - dam = dam * 2 / 3; - /* Attempt a saving throw */ - if ((r_ptr->flags1 & RF1_QUESTOR) || - (!(r_ptr->flags3 & RF3_UNDEAD)) || - (m_ptr->mflag2 & MFLAG2_NOPET) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + if (common_saving_throw_control(p_ptr, dam, m_ptr) || + !(r_ptr->flags3 & RF3_UNDEAD)) { /* 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); } @@ -3899,55 +3293,23 @@ note = " dam -= p_ptr->virtues[vir-1]/20; } - if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif - dam = 0; - if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); - break; - } - - if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) - dam = dam * 2 / 3; - /* Attempt a saving throw */ - if ((r_ptr->flags1 & RF1_QUESTOR) || - (!(r_ptr->flags3 & RF3_DEMON)) || - (m_ptr->mflag2 & MFLAG2_NOPET) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + if (common_saving_throw_control(p_ptr, dam, m_ptr) || + !(r_ptr->flags3 & RF3_DEMON)) { /* 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); } @@ -3960,7 +3322,6 @@ note = " case GF_CONTROL_ANIMAL: { int vir; - if (seen) obvious = TRUE; vir = virtue_number(V_NATURE); @@ -3975,65 +3336,25 @@ note = " dam -= p_ptr->virtues[vir-1]/20; } - if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif - dam = 0; - if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); - break; - } - - if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) - dam = dam * 2 / 3; - /* Attempt a saving throw */ - if ((r_ptr->flags1 & (RF1_QUESTOR)) || - (!(r_ptr->flags3 & (RF3_ANIMAL))) || - (m_ptr->mflag2 & MFLAG2_NOPET) || - (r_ptr->flags3 & (RF3_NO_CONF)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + if (common_saving_throw_control(p_ptr, dam, m_ptr) || + !(r_ptr->flags3 & RF3_ANIMAL)) { - /* Memorize a flag */ - if (r_ptr->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) chg_virtue(V_NATURE, 1); } @@ -4044,14 +3365,13 @@ note = " } /* Tame animal */ - case GF_CONTROL_LIVING: + case GF_CHARM_LIVING: { int vir; vir = virtue_number(V_UNLIFE); if (seen) obvious = TRUE; - dam += (adj_chr_chm[p_ptr->stat_ind[A_CHR]]); vir = virtue_number(V_UNLIFE); if (vir) { @@ -4064,65 +3384,27 @@ note = " dam -= p_ptr->virtues[vir-1]/20; } - 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 - if ((r_ptr->flagsr & RFR_RES_ALL) || p_ptr->inside_arena) - { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif - dam = 0; - if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); - break; - } - - if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) - dam = dam * 2 / 3; + msg_format(_("%sãè¦ã¤ããã", "You stare into %s."), m_name); /* Attempt a saving throw */ - if ((r_ptr->flags1 & (RF1_QUESTOR)) || - (m_ptr->mflag2 & MFLAG2_NOPET) || - !monster_living(r_ptr) || - ((r_ptr->level+10) > randint1(dam))) + if (common_saving_throw_charm(p_ptr, dam, m_ptr) || + !monster_living(r_ptr)) { /* 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) chg_virtue(V_NATURE, 1); } @@ -4139,11 +3421,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -4153,8 +3431,8 @@ note = " /* Attempt a saving throw */ if ((r_ptr->flags1 & (RF1_UNIQUE)) || - (r_ptr->flags3 & (RF3_NO_CONF)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->flags3 & (RF3_NO_CONF)) || + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* Memorize a flag */ if (r_ptr->flags3 & (RF3_NO_CONF)) @@ -4166,12 +3444,7 @@ note = " do_conf = 0; /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); obvious = FALSE; } @@ -4186,11 +3459,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -4199,18 +3468,13 @@ note = " /* Attempt a saving throw */ if ((r_ptr->flags1 & (RF1_UNIQUE)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* Resist */ do_stun = 0; /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); obvious = FALSE; } @@ -4245,14 +3509,8 @@ note = " 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 */ @@ -4274,37 +3532,22 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE); } else if (r_ptr->flags3 & (RF3_HURT_LITE)) { if (is_original_ap_and_seen(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 - + note = _("ã¯å ã«èº«ãããããï¼", " cringes from the light!"); + note_dies = _("ã¯å ãåãã¦ãã¼ãã§ãã¾ã£ãï¼", " shrivels away in the light!"); dam *= 2; } break; @@ -4318,23 +3561,14 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK); } @@ -4360,14 +3594,8 @@ note_dies = " 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 */ @@ -4394,23 +3622,13 @@ note_dies = " if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); resists_tele = TRUE; } else if (r_ptr->level > randint1(100)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + note = _("ã«ã¯èæ§ãããï¼", " resists!"); resists_tele = TRUE; } } @@ -4449,23 +3667,13 @@ note = " if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); resists_tele = TRUE; } else if (r_ptr->level > randint1(100)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP -note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + note = _("ã«ã¯èæ§ãããï¼", " resists!"); resists_tele = TRUE; } } @@ -4500,23 +3708,13 @@ note = " if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); resists_tele = TRUE; } else if (r_ptr->level > randint1(100)) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; -#ifdef JP - note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " resists!"; -#endif - + note = _("ã«ã¯èæ§ãããï¼", " resists!"); resists_tele = TRUE; } } @@ -4560,12 +3758,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; } @@ -4608,12 +3801,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; } @@ -4648,16 +3836,11 @@ note = " /* Attempt a saving throw */ if ((r_ptr->flags1 & (RF1_UNIQUE)) || - (r_ptr->flags3 & (RF3_NO_FEAR)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->flags3 & (RF3_NO_FEAR)) || + (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; } @@ -4687,13 +3870,8 @@ note = " 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 */ @@ -4729,13 +3907,8 @@ note = " 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 */ @@ -4770,13 +3943,8 @@ note = " 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 */ @@ -4808,14 +3976,8 @@ note = " if (seen) obvious = TRUE; /* Message */ -#ifdef JP -note = "¤Ï¿È¿Ì¤¤¤·¤¿¡£"; -note_dies = "¤Ï¥É¥í¥É¥í¤ËÍϤ±¤¿¡ª"; -#else - note = " shudders."; - note_dies = " dissolves!"; -#endif - + note = _("ã¯èº«éãããã", " shudders."); + note_dies = _("ã¯ããããã«æº¶ããï¼", " dissolves!"); } /* Others ignore */ @@ -4850,13 +4012,8 @@ note_dies = " 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 */ @@ -4885,15 +4042,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; } @@ -4904,17 +4054,13 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); skipped = TRUE; 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) { @@ -4922,7 +4068,7 @@ note_dies = " 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 */ @@ -4934,33 +4080,20 @@ note_dies = " { /* 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 - if (see_s_msg) msg_format("%s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name); -#else - if (see_s_msg) msg_format("%s is unaffected.", m_name); -#endif + if (see_s_msg) msg_format(_("%sã«ã¯å¹æããªãã£ãã", "%s is unaffected."), m_name); } dam = 0; break; @@ -4971,19 +4104,11 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -4999,42 +4124,25 @@ note_dies = " { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; } else if (r_ptr->flags2 & RF2_EMPTY_MIND) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; } else if (r_ptr->flags2 & RF2_WEIRD_MIND) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); -#ifdef JP - note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif + 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; @@ -5047,19 +4155,11 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5075,42 +4175,25 @@ note_dies = " { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); } -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; } else if (r_ptr->flags2 & RF2_EMPTY_MIND) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune!"; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; } else if (r_ptr->flags2 & RF2_WEIRD_MIND) { if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); -#ifdef JP - note = "¤Ë¤ÏÂÑÀ¤¬¤¢¤ë¡£"; -#else - note = " resists."; -#endif + 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) { @@ -5122,9 +4205,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; } @@ -5134,19 +4215,11 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5155,11 +4228,7 @@ note_dies = " /* 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; @@ -5170,19 +4239,11 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5191,11 +4252,7 @@ note_dies = " /* 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,19 +4263,11 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5227,11 +4276,7 @@ note_dies = " /* 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,19 +4287,13 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5263,11 +4302,7 @@ note_dies = " /* Attempt a saving throw */ if ((randint0(100 + (caster_lev / 2)) < (r_ptr->level + 35)) && ((who <= 0) || (caster_ptr->r_idx != MON_KENSHIROU))) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£"; -#else - note = "is unaffected!"; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; } break; @@ -5280,11 +4315,7 @@ note_dies = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); skipped = TRUE; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5292,11 +4323,7 @@ note_dies = " if (r_ptr->flags1 & RF1_UNIQUE) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = "is unaffected!"; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; } else @@ -5310,11 +4337,7 @@ note_dies = " } else { -#ifdef JP - note = "¤ÏÂÑÀ¤ò»ý¤Ã¤Æ¤¤¤ë¡ª"; -#else - note = "resists!"; -#endif + note = _("ã¯èæ§ãæã£ã¦ããï¼", "resists!"); dam = 0; } } @@ -5326,18 +4349,14 @@ 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) + (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 @@ -5345,38 +4364,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); } } @@ -5386,11 +4390,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; @@ -5413,34 +4413,22 @@ msg_format(" if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); break; } - if (m_ptr->csleep) + if (MON_CSLEEP(m_ptr)) { -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune!"; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); dam = 0; skipped = TRUE; break; @@ -5455,32 +4443,19 @@ note = " { /* Powerful monsters can resist */ if ((r_ptr->flags1 & RF1_UNIQUE) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (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); } } @@ -5490,18 +4465,13 @@ note = " /* Attempt a saving throw */ if ((r_ptr->flags1 & (RF1_UNIQUE)) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* Resist */ do_stun = 0; /* No obvious effect */ -#ifdef JP -note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif - + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); obvious = FALSE; } } @@ -5510,8 +4480,8 @@ note = " { /* Attempt a saving throw */ if ((r_ptr->flags1 & RF1_UNIQUE) || - (r_ptr->flags3 & RF3_NO_SLEEP) || - (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) + (r_ptr->flags3 & RF3_NO_SLEEP) || + (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)) { /* Memorize a flag */ if (r_ptr->flags3 & RF3_NO_SLEEP) @@ -5520,34 +4490,20 @@ note = " } /* 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 */ @@ -5562,27 +4518,15 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); skipped = TRUE; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; } -#ifdef JP - if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, "¥â¥ó¥¹¥¿¡¼¾ÃÌÇ")) -#else - if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, "Genocide One")) -#endif + if (genocide_aux(c_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("ã¢ã³ã¹ã¿ã¼æ¶æ» ", "Genocide One"))) { -#ifdef JP - if (seen_msg) msg_format("%s¤Ï¾ÃÌǤ·¤¿¡ª", m_name); -#else - if (seen_msg) msg_format("%^s disappered!", m_name); -#endif + if (seen_msg) msg_format(_("%sã¯æ¶æ» ããï¼", "%^s disappered!"), m_name); chg_virtue(V_VITALITY, -1); return TRUE; } @@ -5593,11 +4537,7 @@ note = " 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)) { @@ -5608,13 +4548,8 @@ note = " 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 */ @@ -5637,11 +4572,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); dam = 0; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5662,21 +4593,16 @@ 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; } /* Attempt a saving throw */ else if ((r_ptr->flags1 & (RF1_QUESTOR)) || - (r_ptr->flags1 & (RF1_UNIQUE)) || - (m_ptr->mflag2 & MFLAG2_NOPET) || - (p_ptr->cursed & TRC_AGGRAVATE) || + (r_ptr->flags1 & (RF1_UNIQUE)) || + (m_ptr->mflag2 & MFLAG2_NOPET) || + (p_ptr->cursed & TRC_AGGRAVATE) || ((r_ptr->level+10) > randint1(dam))) { /* Resist */ @@ -5684,14 +4610,9 @@ 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 (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); @@ -5719,11 +4640,7 @@ note = " if (r_ptr->flagsr & RFR_RES_ALL) { -#ifdef JP - note = "¤Ë¤Ï´°Á´¤ÊÂÑÀ¤¬¤¢¤ë¡ª"; -#else - note = " is immune."; -#endif + note = _("ã«ã¯å®å ¨ãªèæ§ãããï¼", " is immune."); skipped = TRUE; if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); break; @@ -5732,12 +4649,7 @@ note = " /* 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; @@ -5783,11 +4695,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) @@ -5799,36 +4707,26 @@ note = " { /* Sound and Impact resisters never stun */ if (do_stun && - !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) && - !(r_ptr->flags3 & RF3_NO_STUN)) + !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) && + !(r_ptr->flags3 & RF3_NO_STUN)) { /* Obvious */ if (seen) obvious = TRUE; /* Get stunned */ - if (m_ptr->stunned) + if (MON_STUNNED(m_ptr)) { -#ifdef JP - note = "¤Ï¤Ò¤É¤¯¤â¤¦¤í¤¦¤È¤·¤¿¡£"; -#else - note = " is more dazed."; -#endif - - tmp = m_ptr->stunned + (do_stun / 2); + note = _("ã¯ã²ã©ãããããã¨ããã", " is more dazed."); + tmp = MON_STUNNED(m_ptr) + (do_stun / 2); } else { -#ifdef JP - note = "¤Ï¤â¤¦¤í¤¦¤È¤·¤¿¡£"; -#else - note = " is dazed."; -#endif - + note = _("ã¯ããããã¨ããã", " is dazed."); tmp = do_stun; } /* Apply stun */ - m_ptr->stunned = (tmp < 200) ? tmp : 200; + (void)set_monster_stunned(c_ptr->m_idx, tmp); /* Get angry */ get_angry = TRUE; @@ -5843,31 +4741,21 @@ note = " if (seen) obvious = TRUE; /* Already partially confused */ - if (m_ptr->confused) + if (MON_CONFUSED(m_ptr)) { -#ifdef JP - note = "¤Ï¤µ¤é¤Ëº®Í𤷤¿¤è¤¦¤À¡£"; -#else - note = " looks more confused."; -#endif - - tmp = m_ptr->confused + (do_conf / 2); + note = _("ã¯ããã«æ··ä¹±ããããã ã", " looks more confused."); + tmp = MON_CONFUSED(m_ptr) + (do_conf / 2); } /* Was not confused */ else { -#ifdef JP - note = "¤Ïº®Í𤷤¿¤è¤¦¤À¡£"; -#else - note = " looks confused."; -#endif - + note = _("ã¯æ··ä¹±ããããã ã", " looks confused."); tmp = do_conf; } /* Apply confusion */ - m_ptr->confused = (tmp < 200) ? tmp : 200; + (void)set_monster_confused(c_ptr->m_idx, tmp); /* Get angry */ get_angry = TRUE; @@ -5882,11 +4770,7 @@ note = " if (do_time) { -#ifdef JP - note = "¤Ï¼å¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£"; -#else - note = " seems weakened."; -#endif + note = _("ã¯å¼±ããªã£ãããã ã", " seems weakened."); m_ptr->maxhp -= do_time; if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp; } @@ -5902,30 +4786,22 @@ note = " if (seen) obvious = TRUE; /* Monster polymorphs */ -#ifdef JP - note = "¤¬ÊѿȤ·¤¿¡ª"; -#else - note = " changes!"; -#endif + note = _("ãå¤èº«ããï¼", " changes!"); /* Turn off the damage */ dam = 0; - - /* Hack -- Get new monster */ - m_ptr = &m_list[c_ptr->m_idx]; - - /* Hack -- Get new race */ - r_ptr = &r_info[m_ptr->r_idx]; } else { /* No polymorph */ -#ifdef JP - note = "¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª"; -#else - note = " is unaffected!"; -#endif + note = _("ã«ã¯å¹æããªãã£ãã", " is unaffected."); } + + /* Hack -- Get new monster */ + m_ptr = &m_list[c_ptr->m_idx]; + + /* Hack -- Get new race */ + r_ptr = &r_info[m_ptr->r_idx]; } /* Handle "teleport" */ @@ -5935,16 +4811,13 @@ note = " if (seen) obvious = TRUE; /* Message */ -#ifdef JP - note = "¤¬¾Ã¤¨µî¤Ã¤¿¡ª"; -#else - note = " disappears!"; -#endif + note = _("ãæ¶ãå»ã£ãï¼", " disappears!"); if (!who) chg_virtue(V_VALOUR, -1); /* Teleport */ - teleport_away(c_ptr->m_idx, do_dist, (bool)(!who), TRUE); + teleport_away(c_ptr->m_idx, do_dist, + (!who ? TELEPORT_DEC_VALOUR : 0L) | TELEPORT_PASSIVE); /* Hack -- get new location */ y = m_ptr->fy; @@ -5957,11 +4830,8 @@ note = " /* Fear */ if (do_fear) { - /* Increase fear */ - tmp = m_ptr->monfear + do_fear; - /* Set fear */ - m_ptr->monfear = (tmp < 200) ? tmp : 200; + (void)set_monster_monfear(c_ptr->m_idx, MON_MONFEAR(m_ptr) + do_fear); /* Get angry */ get_angry = TRUE; @@ -5981,9 +4851,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; @@ -6010,7 +4878,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); @@ -6020,12 +4888,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.")); } } @@ -6046,17 +4909,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 - if (seen_msg) msg_print("ÉÔ·é¤ÊÉ¿ͤÏɵ¤¤¬¼£¤Ã¤¿¡ª"); -#else - if (seen_msg) 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); } @@ -6080,12 +4947,7 @@ msg_print(" /* Give detailed messages if visible or destroyed */ if (note && seen_msg) -#ifdef JP - msg_format("%s%s", m_name, note); -#else - msg_format("%^s%s", m_name, note); -#endif - + msg_format(_("%s%s", "%^s%s"), m_name, note); /* Hack -- Pain message */ else if (known && (dam || !do_fear)) @@ -6104,15 +4966,11 @@ msg_print(" 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); } } @@ -6127,48 +4985,30 @@ msg_print(" 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, TRUE); + 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: @@ -6180,23 +5020,19 @@ msg_print(" case 19: case 20: case 21: case 22: { bool pet = !one_in_(3); - u32b mode = PM_ALLOW_GROUP; + BIT_FLAGS mode = PM_ALLOW_GROUP; 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: @@ -6236,14 +5072,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); @@ -6253,7 +5089,7 @@ 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); } @@ -6288,7 +5124,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 */ @@ -6300,27 +5136,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, BIT_FLAGS flg, int monspell) { int k = 0; int rlev = 0; @@ -6354,8 +5194,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 */ @@ -6364,37 +5203,44 @@ 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; + sound(SOUND_REFLECT); -#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; } @@ -6423,13 +5269,25 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int /* Get the monster's real name (gotten before polymorph!) */ strcpy(killer, who_name); } - else if (who < 0) + else { -#ifdef JP - strcpy(killer, "æ«"); -#else - strcpy(killer, "a trap"); -#endif + 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 */ @@ -6438,52 +5296,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; } @@ -6491,24 +5329,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); } @@ -6519,27 +5353,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 @@ -6557,12 +5382,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; } @@ -6570,12 +5390,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) @@ -6586,12 +5401,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); @@ -6601,19 +5411,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); @@ -6623,23 +5427,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); } @@ -6650,28 +5449,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); } @@ -6686,24 +5476,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); @@ -6713,43 +5501,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; } @@ -6757,17 +5541,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); } @@ -6784,20 +5563,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)) @@ -6812,17 +5586,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); } @@ -6833,17 +5602,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); } @@ -6854,17 +5618,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); } @@ -6875,13 +5634,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)); } @@ -6893,26 +5647,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); } @@ -6922,15 +5672,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; } @@ -6938,45 +5683,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 */ @@ -6995,19 +5729,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); } @@ -7018,36 +5747,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; } @@ -7056,30 +5770,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; @@ -7089,12 +5789,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++) { @@ -7114,21 +5810,19 @@ 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->levitation) - (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE); - if (!(p_ptr->resist_sound || p_ptr->levitation)) + 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->levitation) { @@ -7147,11 +5841,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; @@ -7159,11 +5849,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; @@ -7172,12 +5858,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; @@ -7185,12 +5866,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; } @@ -7198,30 +5874,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); @@ -7234,12 +5893,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; } @@ -7247,12 +5901,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; } @@ -7260,11 +5909,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)) @@ -7279,25 +5924,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; @@ -7306,12 +5949,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) { @@ -7349,16 +5987,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) @@ -7389,7 +6028,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 */ @@ -7399,11 +6038,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); } } } @@ -7416,40 +6051,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); } @@ -7459,54 +6089,52 @@ if (fuzzy) msg_print(" /* Brain smash */ case GF_BRAIN_SMASH: { - 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 psionic energy."); -#endif - - p_ptr->csp -= 100; - if (p_ptr->csp < 0) + if (!CHECK_MULTISHADOW()) { - p_ptr->csp = 0; - p_ptr->csp_frac = 0; + 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->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) + if (!CHECK_MULTISHADOW()) { - (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); + 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; @@ -7515,18 +6143,14 @@ if (fuzzy) msg_print(" /* cause 1 */ case GF_CAUSE_1: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) + if ((randint0(100 + rlev / 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!")); 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; @@ -7535,18 +6159,14 @@ if (fuzzy) msg_print(" /* cause 2 */ case GF_CAUSE_2: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) + if ((randint0(100 + rlev / 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!")); 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; @@ -7555,18 +6175,14 @@ if (fuzzy) msg_print(" /* cause 3 */ case GF_CAUSE_3: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) + if ((randint0(100 + rlev / 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!")); 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; @@ -7575,19 +6191,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; } @@ -7595,27 +6207,22 @@ if (fuzzy) msg_print(" /* Hand of Doom */ case GF_HAND_DOOM: { - if (randint0(100 + rlev/2) < p_ptr->skill_sav) + if ((randint0(100 + rlev/2) < p_ptr->skill_sav) && !CHECK_MULTISHADOW()) { -#ifdef JP - msg_format("¤·¤«¤·¸úÎϤòÄ·¤ÍÊÖ¤·¤¿¡ª"); -#else - msg_format("You resist the effects!"); -#endif + 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; } @@ -7630,20 +6237,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) @@ -7653,13 +6260,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?" */ @@ -7670,27 +6276,27 @@ if (fuzzy) msg_print(" /* * Find the distance from (x, y) to a line. */ -int dist_to_line(int y, int x, int y1, int x1, int y2, int x2) +POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2) { /* Vector from (x, y) to (x1, y1) */ - int py = y1 - y; - int px = x1 - x; + POSITION py = y1 - y; + POSITION px = x1 - x; /* Normal vector */ - int ny = x2 - x1; - int nx = y1 - y2; + POSITION ny = x2 - x1; + POSITION nx = y1 - y2; - /* Length of N */ - int pd = distance(y1, x1, y, x); - int nd = distance(y1, x1, y2, x2); + /* Length of N */ + POSITION pd = distance(y1, x1, y, x); + POSITION nd = distance(y1, x1, y2, x2); if (pd > nd) return distance(y, x, y2, x2); /* Component of P on N */ nd = ((nd) ? ((py * ny + px * nx) / nd) : 0); - /* Absolute value */ - return((nd >= 0) ? nd : 0 - nd); + /* Absolute value */ + return((nd >= 0) ? nd : 0 - nd); } @@ -7700,28 +6306,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 */ @@ -7926,10 +6532,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, POSITION *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; @@ -8013,20 +6619,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 @@ -8154,18 +6759,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, BIT_FLAGS 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; @@ -8196,19 +6802,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'; @@ -8216,8 +6825,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)) @@ -8234,8 +6843,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 */ @@ -8403,24 +7012,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]; + 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); @@ -8428,25 +7040,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); - } - } - (void)project_f(0,0,y,x,dam,GF_SEEKER); + 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, py, px, dam, GF_SEEKER); } return notice; } @@ -8560,22 +7176,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); - } - } - (void)project_f(0,0,y,x,dam,GF_SUPER_RAY); + 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, py, px, dam, GF_SUPER_RAY); } return notice; } @@ -8706,11 +7325,11 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons /* * Create a conical breath attack * - * *** - * ******** + * *** + * ******** * D********@** - * ******** - * *** + * ******** + * *** */ if (breath) @@ -8847,6 +7466,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)) { @@ -8944,9 +7570,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 */ @@ -8964,22 +7592,21 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons t_x = x_saver; } + sound(SOUND_REFLECT); 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 + 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); @@ -9073,7 +7700,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; } @@ -9089,11 +7716,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); + } } } } @@ -9184,22 +7814,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); } } } @@ -9208,34 +7830,39 @@ msg_format("%^s return (notice); } -bool binding_field( int dam ) +/*! + * @brief é¡éæ³ãå°éçµçãã®å¹æå¦ç + * @param dam ãã¡ã¼ã¸é + * @return å¹æããã£ããTRUEãè¿ã + */ +bool binding_field( HIT_POINT 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 && - player_has_los_bold(y,x) && - projectable(py, px, y, x) - ){ + 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(p_ptr->y, p_ptr->x, y, x) + ){ mirror_y[mirror_num]=y; mirror_x[mirror_num]=x; mirror_num++; @@ -9255,8 +7882,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]; @@ -9264,7 +7891,7 @@ bool binding_field( int dam ) centersign = (point_x[0]*3-x)*(point_y[1]*3-y) - (point_y[0]*3-y)*(point_x[1]*3-x); if( centersign == 0 )return FALSE; - + x1 = point_x[0] < point_x[1] ? point_x[0] : point_x[1]; x1 = x1 < point_x[2] ? x1 : point_x[2]; y1 = point_y[0] < point_y[1] ? point_y[0] : point_y[1]; @@ -9279,12 +7906,12 @@ bool binding_field( int dam ) for( x=x1 ; x <=x2 ; x++ ){ if( centersign*( (point_x[0]-x)*(point_y[1]-y) -(point_y[0]-y)*(point_x[1]-x)) >=0 && - centersign*( (point_x[1]-x)*(point_y[2]-y) + centersign*( (point_x[1]-x)*(point_y[2]-y) -(point_y[1]-y)*(point_x[2]-x)) >=0 && - centersign*( (point_x[2]-x)*(point_y[0]-y) + 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)){ @@ -9302,12 +7929,12 @@ bool binding_field( int dam ) for( x=x1 ; x <=x2 ; x++ ){ if( centersign*( (point_x[0]-x)*(point_y[1]-y) -(point_y[0]-y)*(point_x[1]-x)) >=0 && - centersign*( (point_x[1]-x)*(point_y[2]-y) + centersign*( (point_x[1]-x)*(point_y[2]-y) -(point_y[1]-y)*(point_x[2]-x)) >=0 && - centersign*( (point_x[2]-x)*(point_y[0]-y) + 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); } } @@ -9317,12 +7944,12 @@ bool binding_field( int dam ) for( x=x1 ; x <=x2 ; x++ ){ if( centersign*( (point_x[0]-x)*(point_y[1]-y) -(point_y[0]-y)*(point_x[1]-x)) >=0 && - centersign*( (point_x[1]-x)*(point_y[2]-y) + centersign*( (point_x[1]-x)*(point_y[2]-y) -(point_y[1]-y)*(point_x[2]-x)) >=0 && - centersign*( (point_x[2]-x)*(point_y[0]-y) + 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); } } @@ -9332,31 +7959,32 @@ bool binding_field( int dam ) for( x=x1 ; x <=x2 ; x++ ){ if( centersign*( (point_x[0]-x)*(point_y[1]-y) -(point_y[0]-y)*(point_x[1]-x)) >=0 && - centersign*( (point_x[1]-x)*(point_y[2]-y) + centersign*( (point_x[1]-x)*(point_y[2]-y) -(point_y[1]-y)*(point_x[2]-x)) >=0 && - centersign*( (point_x[2]-x)*(point_y[0]-y) + 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; } -void seal_of_mirror( int dam ) +/*! + * @brief é¡éæ³ãé¡ã®å°å°ãã®å¹æå¦ç + * @param dam ãã¡ã¼ã¸é + * @return å¹æããã£ããTRUEãè¿ã + */ +void seal_of_mirror( HIT_POINT dam ) { int x,y; @@ -9367,7 +7995,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 ) { @@ -9379,4 +8007,4 @@ void seal_of_mirror( int dam ) } return; } - +