[modify](2.2.1.1 #37582) GF_OLD_DRAINをGF_HYPODYNAMIAに改名。使い手のHP回復や滋養度回復を伴わない同魔法効果を...

Rename GF_OLD_DRAIN to GF_HYPODYNAMIA, This magic effect without user's healing and feed is defined as "Hypodynamia".

diff --git a/lib/pref/spell-xx.prf b/lib/pref/spell-xx.prf
index 9159f9c..77053a9 100644 (file)
--- a/lib/pref/spell-xx.prf
+++ b/lib/pref/spell-xx.prf
@@ -50,7 +50,7 @@ Z:GF_OLD_SPEED:B
 Z:GF_OLD_SLOW:u
 Z:GF_OLD_CONF:U
 Z:GF_OLD_SLEEP:DDs
-Z:GF_OLD_DRAIN:G
+Z:GF_HYPODYNAMIA:G
 Z:GF_AWAY_UNDEAD:uug
 Z:GF_AWAY_EVIL:WWw
 Z:GF_AWAY_ALL:wwwwbbBBv

diff --git a/src/defines.h b/src/defines.h
index 41e0d78..0366532 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -3006,7 +3006,7 @@
 #define GF_OLD_SLOW     55
 #define GF_OLD_CONF     56
 #define GF_OLD_SLEEP    57
-#define GF_OLD_DRAIN    58
+#define GF_HYPODYNAMIA  58                     /*!< 魔法効果: 衰弱*/
 #define GF_AWAY_UNDEAD  61
 #define GF_AWAY_EVIL    62
 #define GF_AWAY_ALL     63

diff --git a/src/do-spell.c b/src/do-spell.c
index 03ec074..46dd422 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -3541,7 +3541,7 @@ static cptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               fire_ball(GF_OLD_DRAIN, dir, damroll(dice, sides) + base, rad);
+                               fire_ball(GF_HYPODYNAMIA, dir, damroll(dice, sides) + base, rad);
                        }
                }
                break;
@@ -9137,7 +9137,7 @@ static cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (info) return info_damage(1, power, 0);
                if (cast || cont)
                {
-                       project_hack(GF_OLD_DRAIN, randint1(power));
+                       project_hack(GF_HYPODYNAMIA, randint1(power));
                }
                break;
 

diff --git a/src/files.c b/src/files.c
index 31c045d..8d6f218 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -239,7 +239,7 @@ static named_num gf_desc[] =
        {"GF_OLD_SLOW",                 GF_OLD_SLOW                     },
        {"GF_OLD_CONF",                 GF_OLD_CONF                     },
        {"GF_OLD_SLEEP",                        GF_OLD_SLEEP            },
-       {"GF_OLD_DRAIN",                        GF_OLD_DRAIN            },
+       {"GF_HYPODYNAMIA",                      GF_HYPODYNAMIA          },
        {"GF_AWAY_UNDEAD",              GF_AWAY_UNDEAD          },
        {"GF_AWAY_EVIL",                        GF_AWAY_EVIL            },
        {"GF_AWAY_ALL",                 GF_AWAY_ALL                     },

diff --git a/src/melee2.c b/src/melee2.c
index 0b0fb31..3e22720 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -1839,7 +1839,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, IDX t_idx)
                                break;
 
                        case RBE_DR_LIFE:
-                               pt = GF_OLD_DRAIN;
+                               pt = GF_HYPODYNAMIA;
                                effect_type = BLOW_EFFECT_TYPE_HEAL;
                                break;
 

diff --git a/src/mind.c b/src/mind.c
index 74f510f..b7d5b83 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1839,7 +1839,7 @@ static bool cast_ninja_spell(int spell)
                break;
        case 17:
                fire_ball(GF_POIS, 0, 75+plev*2/3, plev/5+2);
-               fire_ball(GF_OLD_DRAIN, 0, 75+plev*2/3, plev/5+2);
+               fire_ball(GF_HYPODYNAMIA, 0, 75+plev*2/3, plev/5+2);
                fire_ball(GF_CONFUSION, 0, 75+plev*2/3, plev/5+2);
                teleport_player(30, 0L);
                break;

diff --git a/src/spells1.c b/src/spells1.c
index 92dbfcc..6d2da94 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -2730,13 +2730,13 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
 
                /* Drain Life */
-               case GF_OLD_DRAIN:
+               case GF_HYPODYNAMIA:
                {
                        if (seen) obvious = TRUE;
 
                        if (r_ptr->flagsr & RFR_RES_ALL)
-            {
-                note = _("には完全な耐性がある！", " is immune.");
+                       {
+                               note = _("には完全な耐性がある！", " is immune.");
                                dam = 0;
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL);
                                break;
@@ -2749,7 +2749,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                        if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD);
                                        if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING);
                                }
-                note = _("には効果がなかった。", " is unaffected.");
+                               note = _("には効果がなかった。", " is unaffected.");
                                obvious = FALSE;
                                dam = 0;
                        }
@@ -4783,7 +4783,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                        if (do_time)
                        {
-                note = _("は弱くなったようだ。", " seems weakened.");
+                               note = _("は弱くなったようだ。", " seems weakened.");
                                m_ptr->maxhp -= do_time;
                                if ((m_ptr->hp - dam) > m_ptr->maxhp) dam = m_ptr->hp - m_ptr->maxhp;
                        }

diff --git a/src/spells2.c b/src/spells2.c
index fe2b90a..9ba3db2 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -5037,7 +5037,7 @@ bool lite_line(int dir, HIT_POINT dam)
 bool drain_life(int dir, HIT_POINT dam)
 {
        BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
-       return (project_hook(GF_OLD_DRAIN, dir, dam, flg));
+       return (project_hook(GF_HYPODYNAMIA, dir, dam, flg));
 }
 
 /*!