OSDN Git Service

[Refactor] #37353 コメント整理 / Refactor comments.
[hengband/hengband.git] / src / melee1.c
index d911517..d1ba640 100644 (file)
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "cmd-pet.h"
+#include "player-damage.h"
 
 
 
@@ -244,7 +245,7 @@ static cptr desc_moan[] =
 * @return なし
 */
 static void touch_zap_player_aux(monster_type *m_ptr, bool immune, int flags_offset, int r_flags_offset, u32b aura_flag,
-       int(*dam_func)(HIT_POINT dam, cptr kb_str, int monspell, bool aura), cptr message)
+       HIT_POINT(*dam_func)(HIT_POINT dam, cptr kb_str, int monspell, bool aura), cptr message)
 {
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
@@ -1544,7 +1545,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
        bool explode = FALSE;
        bool do_silly_attack = (one_in_(2) && p_ptr->image);
        HIT_POINT get_damage = 0;
-       int abbreviate = 0;
+       int abbreviate = 0;     // 2回目以降の省略表現フラグ
 
        /* Not allowed to attack */
        if (r_ptr->flags1 & (RF1_NEVER_BLOW)) return (FALSE);
@@ -1638,11 +1639,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL;
 
 #ifdef JP
-                               if (abbreviate)
-                                   msg_format("撃退した。");
-                               else
-                                   msg_format("%^sは撃退された。", m_name);
-                               abbreviate = 1;/*2回目以降は省略 */
+                               if (abbreviate) msg_format("撃退した。");
+                               else msg_format("%^sは撃退された。", m_name);
+                               abbreviate = 1; /*2回目以降は省略 */
 #else
                                msg_format("%^s is repelled.", m_name);
 #endif
@@ -1908,15 +1907,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        else
                                        {
                                                if (one_in_(3))
-#ifdef JP
-                                                       act = "は♪僕らは楽しい家族♪と歌っている。";
+                                                       act = _("は♪僕らは楽しい家族♪と歌っている。", "sings 'We are a happy family.'");
                                                else
-                                                       act = "は♪アイ ラブ ユー、ユー ラブ ミー♪と歌っている。";
-#else
-                                                       act = "sings 'We are a happy family.'";
-                                               else
-                                                       act = "sings 'I love you, you love me.'";
-#endif
+                                                       act = _("は♪アイ ラブ ユー、ユー ラブ ミー♪と歌っている。", "sings 'I love you, you love me.'");
                                        }
 
                                        sound(SOUND_SHOW);
@@ -1935,11 +1928,11 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
 #ifdef JP
                                if (abbreviate == 0)
-                                   msg_format("%^sに%s", m_name, act);
+                                       msg_format("%^sに%s", m_name, act);
                                else if (abbreviate == 1)
-                                   msg_format("%s", act);
+                                       msg_format("%s", act);
                                else /* if (abbreviate == -1) */
-                                   msg_format("%^s%s", m_name, act);
+                                       msg_format("%^s%s", m_name, act);
                                abbreviate = 1;/*2回目以降は省略 */
 #else
                                msg_format("%^s %s%s", m_name, act, do_silly_attack ? " you." : "");
@@ -1956,23 +1949,18 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                         * Skip the effect when exploding, since the explosion
                         * already causes the effect.
                         */
-                       if (explode)
-                               damage = 0;
+                       if(explode) damage = 0;
                        /* Apply appropriate damage */
                        switch (effect)
                        {
                                case 0:
                                {
-                                       /* Hack -- Assume obvious */
                                        obvious = TRUE;
-
-                                       /* Hack -- No damage */
                                        damage = 0;
-
                                        break;
                                }
 
-                               case RBE_SUPERHURT:
+                               case RBE_SUPERHURT:     /* AC軽減あり / Player armor reduces total damage */
                                {
                                        if (((randint1(rlev*2+300) > (ac+200)) || one_in_(13)) && !CHECK_MULTISHADOW())
                                        {
@@ -1980,22 +1968,15 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                msg_print(_("痛恨の一撃!", "It was a critical hit!"));
                                                tmp_damage = MAX(damage, tmp_damage*2);
 
-                                               /* Take damage */
                                                get_damage += take_hit(DAMAGE_ATTACK, tmp_damage, ddesc, -1);
                                                break;
                                        }
                                }
-                               case RBE_HURT:
+                               case RBE_HURT: /* AC軽減あり / Player armor reduces total damage */
                                {
-                                       /* Obvious */
                                        obvious = TRUE;
-
-                                       /* Hack -- Player armor reduces total damage */
                                        damage -= (damage * ((ac < 150) ? ac : 150) / 250);
-
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
-
                                        break;
                                }
 
@@ -2012,7 +1993,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                }
                                        }
 
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        /* Learn about the player */
@@ -2037,7 +2017,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                }
                                        }
 
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        /* Learn about the player */
@@ -2048,7 +2027,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_UN_POWER:
                                {
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2080,7 +2058,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                                        msg_print(_("ザックからエネルギーが吸い取られた!", "Energy drains from your pack!"));
 
-                                                       /* Obvious */
                                                        obvious = TRUE;
 
                                                        /* Heal the monster */
@@ -2107,7 +2084,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_EAT_GOLD:
                                {
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        /* Confused monsters cannot steal successfully. -LM-*/
@@ -2115,7 +2091,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        /* Saving throw (unless paralyzed) based on dex and level */
@@ -2169,7 +2144,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_EAT_ITEM:
                                {
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        /* Confused monsters cannot steal successfully. -LM-*/
@@ -2188,7 +2162,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Occasional "blink" anyway */
                                                blinked = TRUE;
 
-                                               /* Obvious */
                                                obvious = TRUE;
 
                                                break;
@@ -2211,17 +2184,12 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Skip artifacts */
                                                if (object_is_artifact(o_ptr)) continue;
 
-                                               /* Get a description */
                                                object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
 
 #ifdef JP
-                                               msg_format("%s(%c)を%s盗まれた!",
-                                                          o_name, index_to_label(i),
-                                                          ((o_ptr->number > 1) ? "一つ" : ""));
+                                               msg_format("%s(%c)を%s盗まれた!", o_name, index_to_label(i), ((o_ptr->number > 1) ? "一つ" : ""));
 #else
-                                               msg_format("%sour %s (%c) was stolen!",
-                                                          ((o_ptr->number > 1) ? "One of y" : "Y"),
-                                                          o_name, index_to_label(i));
+                                               msg_format("%sour %s (%c) was stolen!", ((o_ptr->number > 1) ? "One of y" : "Y"), o_name, index_to_label(i));
 #endif
 
                                                chg_virtue(V_SACRIFICE, 1);
@@ -2271,7 +2239,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                inven_item_increase(i, -1);
                                                inven_item_optimize(i);
 
-                                               /* Obvious */
                                                obvious = TRUE;
 
                                                /* Blink away */
@@ -2285,7 +2252,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_EAT_FOOD:
                                {
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2296,7 +2262,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Pick an item from the pack */
                                                i = (INVENTORY_IDX)randint0(INVEN_PACK);
 
-                                               /* Get the item */
                                                o_ptr = &inventory[i];
 
                                                /* Skip non-objects */
@@ -2305,25 +2270,18 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Skip non-food objects */
                                                if ((o_ptr->tval != TV_FOOD) && !((o_ptr->tval == TV_CORPSE) && (o_ptr->sval))) continue;
 
-                                               /* Get a description */
                                                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
 #ifdef JP
-                                               msg_format("%s(%c)を%s食べられてしまった!",
-                                                         o_name, index_to_label(i),
-                                                         ((o_ptr->number > 1) ? "一つ" : ""));
+                                               msg_format("%s(%c)を%s食べられてしまった!", o_name, index_to_label(i), ((o_ptr->number > 1) ? "一つ" : ""));
 #else
-                                               msg_format("%sour %s (%c) was eaten!",
-                                                          ((o_ptr->number > 1) ? "One of y" : "Y"),
-                                                          o_name, index_to_label(i));
+                                               msg_format("%sour %s (%c) was eaten!", ((o_ptr->number > 1) ? "One of y" : "Y"), o_name, index_to_label(i));
 #endif
 
-
                                                /* Steal the items */
                                                inven_item_increase(i, -1);
                                                inven_item_optimize(i);
 
-                                               /* Obvious */
                                                obvious = TRUE;
 
                                                break;
@@ -2336,8 +2294,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        /* Access the lite */
                                        o_ptr = &inventory[INVEN_LITE];
-
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2364,7 +2320,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_ACID:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("酸を浴びせられた!", "You are covered in acid!"));
@@ -2384,7 +2339,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_ELEC:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("電撃を浴びせられた!", "You are struck by electricity!"));
@@ -2401,7 +2355,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_FIRE:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("全身が炎に包まれた!", "You are enveloped in flames!"));
@@ -2418,7 +2371,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_COLD:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("全身が冷気で覆われた!", "You are covered with frost!"));
@@ -2434,7 +2386,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_BLIND:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2462,7 +2413,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_CONFUSE:
                                {
                                        if (explode) break;
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2484,7 +2434,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_TERRIFY:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2520,7 +2469,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_PARALYZE:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2559,12 +2507,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_STR:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_STR)) obvious = TRUE;
 
                                        break;
@@ -2572,12 +2517,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_INT:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_INT)) obvious = TRUE;
 
                                        break;
@@ -2585,12 +2527,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_WIS:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_WIS)) obvious = TRUE;
 
                                        break;
@@ -2598,12 +2537,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_DEX:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_DEX)) obvious = TRUE;
 
                                        break;
@@ -2611,12 +2547,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_CON:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_CON)) obvious = TRUE;
 
                                        break;
@@ -2624,12 +2557,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_CHR:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_CHR)) obvious = TRUE;
 
                                        break;
@@ -2637,7 +2567,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_ALL:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2655,13 +2584,11 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_SHATTER:
                                {
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        /* Hack -- Reduce damage based on the player armor class */
                                        damage -= (damage * ((ac < 150) ? ac : 150) / 250);
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        /* Radius 8 earthquake centered at the monster */
@@ -2677,10 +2604,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(10, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2693,10 +2618,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(20, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2709,10 +2632,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(40, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2725,10 +2646,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(80, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2739,7 +2658,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_DISEASE:
                                {
-                                       /* Take some damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2836,10 +2754,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        s32b d = damroll(60, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
                                        bool resist_drain;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2893,7 +2809,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                                case RBE_DR_MANA:
                                {
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        if (CHECK_MULTISHADOW())
@@ -2904,7 +2819,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        {
                                                do_cut = 0;
 
-                                               /* Take damage */
                                                p_ptr->csp -= damage;
                                                if (p_ptr->csp < 0)
                                                {
@@ -2922,7 +2836,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                                case RBE_INERTIA:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2944,7 +2857,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                                case RBE_STUN:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;