• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision51b8f2e27c1a362b46f71edda77d400a8375f940 (tree)
Time2019-02-13 13:12:07
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 メッセージ整理。 / Refactor messages.

Change Summary

Incremental Difference

--- a/src/melee1.c
+++ b/src/melee1.c
@@ -2920,17 +2920,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
29202920 /* Modify the damage */
29212921 dam = mon_damage_mod(m_ptr, dam, FALSE);
29222922
2923-#ifdef JP
2924- msg_format("%^sは突然熱くなった!", m_name);
2925- if (mon_take_hit(m_idx, dam, &fear,
2926- "は灰の山になった。"))
2927-#else
2928- msg_format("%^s is suddenly very hot!", m_name);
2929-
2930- if (mon_take_hit(m_idx, dam, &fear,
2931- " turns into a pile of ash."))
2932-#endif
2923+ msg_format(_("%^sは突然熱くなった!", "%^s is suddenly very hot!"), m_name);
29332924
2925+ if (mon_take_hit(m_idx, dam, &fear, _("は灰の山になった。", " turns into a pile of ash.")))
29342926 {
29352927 blinked = FALSE;
29362928 alive = FALSE;
@@ -2952,17 +2944,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
29522944 /* Modify the damage */
29532945 dam = mon_damage_mod(m_ptr, dam, FALSE);
29542946
2955-#ifdef JP
2956- msg_format("%^sは電撃をくらった!", m_name);
2957- if (mon_take_hit(m_idx, dam, &fear,
2958- "は燃え殻の山になった。"))
2959-#else
2960- msg_format("%^s gets zapped!", m_name);
2961-
2962- if (mon_take_hit(m_idx, dam, &fear,
2963- " turns into a pile of cinder."))
2964-#endif
2965-
2947+ msg_format(_("%^sは電撃をくらった!", "%^s gets zapped!"), m_name);
2948+ if (mon_take_hit(m_idx, dam, &fear, _("は燃え殻の山になった。", " turns into a pile of cinder.")))
29662949 {
29672950 blinked = FALSE;
29682951 alive = FALSE;
@@ -2984,17 +2967,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
29842967 /* Modify the damage */
29852968 dam = mon_damage_mod(m_ptr, dam, FALSE);
29862969
2987-#ifdef JP
2988- msg_format("%^sは冷気をくらった!", m_name);
2989- if (mon_take_hit(m_idx, dam, &fear,
2990- "は凍りついた。"))
2991-#else
2992- msg_format("%^s is very cold!", m_name);
2993-
2994- if (mon_take_hit(m_idx, dam, &fear,
2995- " was frozen."))
2996-#endif
2997-
2970+ msg_format(_("%^sは冷気をくらった!", "%^s is very cold!"), m_name);
2971+ if (mon_take_hit(m_idx, dam, &fear, _("は凍りついた。", " was frozen.")))
29982972 {
29992973 blinked = FALSE;
30002974 alive = FALSE;
@@ -3017,16 +2991,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
30172991 /* Modify the damage */
30182992 dam = mon_damage_mod(m_ptr, dam, FALSE);
30192993
3020-#ifdef JP
3021- msg_format("%^sは鏡の破片をくらった!", m_name);
3022- if (mon_take_hit(m_idx, dam, &fear,
3023- "はズタズタになった。"))
3024-#else
3025- msg_format("%^s gets zapped!", m_name);
3026-
3027- if (mon_take_hit(m_idx, dam, &fear,
3028- " had torn to pieces."))
3029-#endif
2994+ msg_format(_("%^sは鏡の破片をくらった!", "%^s gets zapped!"), m_name);
2995+ if (mon_take_hit(m_idx, dam, &fear, _("はズタズタになった。", " had torn to pieces.")))
30302996 {
30312997 blinked = FALSE;
30322998 alive = FALSE;
@@ -3055,16 +3021,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
30553021 /* Modify the damage */
30563022 dam = mon_damage_mod(m_ptr, dam, FALSE);
30573023
3058-#ifdef JP
3059- msg_format("%^sは聖なるオーラで傷ついた!", m_name);
3060- if (mon_take_hit(m_idx, dam, &fear,
3061- "は倒れた。"))
3062-#else
3063- msg_format("%^s is injured by holy power!", m_name);
3064-
3065- if (mon_take_hit(m_idx, dam, &fear,
3066- " is destroyed."))
3067-#endif
3024+ msg_format(_("%^sは聖なるオーラで傷ついた!", "%^s is injured by holy power!"), m_name);
3025+ if (mon_take_hit(m_idx, dam, &fear, _("は倒れた。", " is destroyed.")))
30683026 {
30693027 blinked = FALSE;
30703028 alive = FALSE;
@@ -3089,17 +3047,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
30893047 /* Modify the damage */
30903048 dam = mon_damage_mod(m_ptr, dam, FALSE);
30913049
3092-#ifdef JP
3093- msg_format("%^sが鋭い闘気のオーラで傷ついた!", m_name);
3094- if (mon_take_hit(m_idx, dam, &fear,
3095- "は倒れた。"))
3096-#else
3097- msg_format("%^s is injured by the Force", m_name);
3098-
3099- if (mon_take_hit(m_idx, dam, &fear,
3100- " is destroyed."))
3101-#endif
3102-
3050+ msg_format(_("%^sが鋭い闘気のオーラで傷ついた!", "%^s is injured by the Force"), m_name);
3051+ if (mon_take_hit(m_idx, dam, &fear, _("は倒れた。", " is destroyed.")))
31033052 {
31043053 blinked = FALSE;
31053054 alive = FALSE;
@@ -3132,14 +3081,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
31323081 /* Modify the damage */
31333082 dam = mon_damage_mod(m_ptr, dam, FALSE);
31343083
3135-#ifdef JP
3136- msg_format("影のオーラが%^sに反撃した!", m_name);
3137- if (mon_take_hit(m_idx, dam, &fear, "は倒れた。"))
3138-#else
3139- msg_format("Enveloped shadows attack %^s.", m_name);
3140-
3141- if (mon_take_hit(m_idx, dam, &fear, " is destroyed."))
3142-#endif
3084+ msg_format(_("影のオーラが%^sに反撃した!", "Enveloped shadows attack %^s."), m_name);
3085+ if (mon_take_hit(m_idx, dam, &fear, _("は倒れた。", " is destroyed.")))
31433086 {
31443087 blinked = FALSE;
31453088 alive = FALSE;
Show on old repository browser