[Refactor] #37353 コメント整理 / Refactor comments.

[hengband/hengband.git] / src / melee1.c

diff --git a/src/melee1.c b/src/melee1.c
index 64a4b2a..d1ba640 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1545,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;     // ２回目以降の省略表現フラグ
 
        /* Not allowed to attack */
        if (r_ptr->flags1 & (RF1_NEVER_BLOW)) return (FALSE);
@@ -1639,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;/*２回目以降は省略 */
+                               if (abbreviate) msg_format("撃退した。");
+                               else msg_format("%^sは撃退された。", m_name);
+                               abbreviate = 1; /*２回目以降は省略 */
 #else
                                msg_format("%^s is repelled.", m_name);
 #endif
@@ -1909,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);
@@ -1936,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;/*２回目以降は省略 */
 #else
                                msg_format("%^s %s%s", m_name, act, do_silly_attack ? " you." : "");
@@ -1957,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())
                                        {
@@ -1985,15 +1972,11 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                break;
                                        }
                                }
-                               case RBE_HURT:
+                               case RBE_HURT: /* AC軽減あり / Player armor reduces total damage */
                                {
                                        obvious = TRUE;
-
-                                       /* Hack -- Player armor reduces total damage */
                                        damage -= (damage * ((ac < 150) ? ac : 150) / 250);
-
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
-
                                        break;
                                }
 
@@ -2010,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 */
@@ -2035,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 */
@@ -2046,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;
@@ -2104,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-*/
@@ -2165,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-*/
@@ -2206,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);
@@ -2279,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;
@@ -2298,7 +2270,6 @@ 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
@@ -2323,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;
@@ -2689,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;