[modify] #37914 (2.2.1.3) ブレス処理をfire_ball()からfire_breath()に分離。 / Separate fire_breath...

diff --git a/src/artifact.c b/src/artifact.c
index 5b3ca9b..54b6c7a 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2193,7 +2193,7 @@ static bool activate_dragon_breath(object_type *o_ptr)
 
        t = randint0(n);
        msg_format(_("あなたは%sのブレスを吐いた。", "You breathe %s."), name[t]);
-       fire_ball(type[t], dir, 250, -4);
+       fire_breath(type[t], dir, 250, 4);
 
        return TRUE;
 }
@@ -2464,7 +2464,7 @@ bool activate_random_artifact(object_type *o_ptr)
                {
                        if (!get_aim_dir(&dir)) return FALSE;
                        msg_print(_("あなたはエレメントのブレスを吐いた。", "You breathe the elements."));
-                       fire_ball(GF_MISSILE, dir, 300, -4);
+                       fire_breath(GF_MISSILE, dir, 300, 4);
                        break;
                }
 
@@ -2560,7 +2560,7 @@ bool activate_random_artifact(object_type *o_ptr)
                {
                        if (!get_aim_dir(&dir)) return FALSE;
                        msg_print(_("あなたはエレメントのブレスを吐いた。", "You breathe the elements."));
-                       fire_ball(GF_MISSILE, dir, 300, -4);
+                       fire_breath(GF_MISSILE, dir, 300, 4);
                        msg_print(_("鎧が様々な色に輝いた...", "Your armor glows many colours..."));
                        (void)set_afraid(0);
                        (void)set_hero(randint1(50) + 50, FALSE);
@@ -2577,7 +2577,7 @@ bool activate_random_artifact(object_type *o_ptr)
                case ACT_BR_FIRE:
                {
                        if (!get_aim_dir(&dir)) return FALSE;
-                       fire_ball(GF_FIRE, dir, 200, -2);
+                       fire_breath(GF_FIRE, dir, 200, 2);
                        if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES))
                        {
                                (void)set_oppose_fire(randint1(20) + 20, FALSE);
@@ -2587,7 +2587,7 @@ bool activate_random_artifact(object_type *o_ptr)
                case ACT_BR_COLD:
                {
                        if (!get_aim_dir(&dir)) return FALSE;
-                       fire_ball(GF_COLD, dir, 200, -2);
+                       fire_breath(GF_COLD, dir, 200, 2);
                        if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE))
                        {
                                (void)set_oppose_cold(randint1(20) + 20, FALSE);

diff --git a/src/cmd6.c b/src/cmd6.c
index 1be1d7e..ecd16c9 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -2765,14 +2765,14 @@ static int wand_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool powerful, bool m
 
                case SV_WAND_DRAGON_FIRE:
                {
-                       fire_ball(GF_FIRE, dir, (powerful ? 300 : 200), -3);
+                       fire_breath(GF_FIRE, dir, (powerful ? 300 : 200), 3);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_DRAGON_COLD:
                {
-                       fire_ball(GF_COLD, dir, (powerful ? 270 : 180), -3);
+                       fire_breath(GF_COLD, dir, (powerful ? 270 : 180), 3);
                        ident = TRUE;
                        break;
                }

diff --git a/src/defines.h b/src/defines.h
index fb900e2..e55457f 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -53,7 +53,7 @@
 #define FAKE_VER_MAJOR 12 /*!< ゲームのバージョン番号定義(メジャー番号 + 10) */
 #define FAKE_VER_MINOR 2 /*!< ゲームのバージョン番号定義(マイナー番号) */
 #define FAKE_VER_PATCH 1 /*!< ゲームのバージョン番号定義(パッチ番号) */
-#define FAKE_VER_EXTRA 2 /*!< ゲームのバージョン番号定義(エクストラ番号) */
+#define FAKE_VER_EXTRA 3 /*!< ゲームのバージョン番号定義(エクストラ番号) */
 
 
  /*!

diff --git a/src/externs.h b/src/externs.h
index aee3202..c0131b7 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1146,6 +1146,7 @@ extern void unlite_room(int y1, int x1);
 extern bool lite_area(HIT_POINT dam, int rad);
 extern bool unlite_area(HIT_POINT dam, int rad);
 extern bool fire_ball(int typ, int dir, HIT_POINT dam, int rad);
+extern bool fire_breath(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_rocket(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION x, POSITION y, HIT_POINT dam, POSITION rad);

diff --git a/src/mane.c b/src/mane.c
index 1214abf..b73ee34 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -327,121 +327,121 @@ static bool use_mane(int spell)
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("酸のブレスを吐いた。", "You breathe acid."));
                
-                       fire_ball(GF_ACID, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_ACID, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_ELEC:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("稲妻のブレスを吐いた。", "You breathe lightning."));
                
-                       fire_ball(GF_ELEC, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_ELEC, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_FIRE:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("火炎のブレスを吐いた。", "You breathe fire."));
                
-                       fire_ball(GF_FIRE, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_FIRE, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_COLD:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("冷気のブレスを吐いた。", "You breathe frost."));
                
-                       fire_ball(GF_COLD, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_COLD, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_POIS:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("ガスのブレスを吐いた。", "You breathe gas."));
                
-                       fire_ball(GF_POIS, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_POIS, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_NETHER:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("地獄のブレスを吐いた。", "You breathe nether."));
                
-                       fire_ball(GF_NETHER, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_NETHER, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_LITE:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("閃光のブレスを吐いた。", "You breathe light."));
                
-                       fire_ball(GF_LITE, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_LITE, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_DARK:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("暗黒のブレスを吐いた。", "You breathe darkness."));
                
-                       fire_ball(GF_DARK, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_DARK, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_CONF:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("混乱のブレスを吐いた。", "You breathe confusion."));
                
-                       fire_ball(GF_CONFUSION, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_CONFUSION, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_SOUND:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("轟音のブレスを吐いた。", "You breathe sound."));
                
-                       fire_ball(GF_SOUND, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_SOUND, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_CHAOS:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("カオスのブレスを吐いた。", "You breathe chaos."));
                
-                       fire_ball(GF_CHAOS, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_CHAOS, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_DISEN:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("劣化のブレスを吐いた。", "You breathe disenchantment."));
                
-                       fire_ball(GF_DISENCHANT, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_DISENCHANT, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_NEXUS:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus."));
                
-                       fire_ball(GF_NEXUS, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_NEXUS, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_TIME:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("時間逆転のブレスを吐いた。", "You breathe time."));
                
-                       fire_ball(GF_TIME, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_TIME, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_INERTIA:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
                
-                       fire_ball(GF_INERTIAL, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_INERTIAL, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_GRAVITY:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));
                
-                       fire_ball(GF_GRAVITY, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_GRAVITY, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_SHARDS:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("破片のブレスを吐いた。", "You breathe shards."));
                
-                       fire_ball(GF_SHARDS, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_SHARDS, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_PLASMA:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma."));
                
-                       fire_ball(GF_PLASMA, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_PLASMA, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_FORCE:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("フォースのブレスを吐いた。", "You breathe force."));
                
-                       fire_ball(GF_FORCE, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_FORCE, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BR_MANA:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("魔力のブレスを吐いた。", "You breathe mana."));
                
-                       fire_ball(GF_MANA, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_MANA, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BALL_NUKE:
                if (!get_aim_dir(&dir)) return FALSE;
@@ -453,7 +453,7 @@ static bool use_mane(int spell)
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("放射性廃棄物のブレスを吐いた。", "You breathe toxic waste."));
                
-                       fire_ball(GF_NUKE, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_NUKE, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BALL_CHAOS:
                if (!get_aim_dir(&dir)) return FALSE;
@@ -465,7 +465,7 @@ static bool use_mane(int spell)
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("分解のブレスを吐いた。", "You breathe disintegration."));
                
-                       fire_ball(GF_DISINTEGRATE, dir, damage, (plev > 35 ? -3 : -2));
+               fire_breath(GF_DISINTEGRATE, dir, damage, (plev > 35 ? 3 : 2));
                break;
        case MS_BALL_ACID:
                if (!get_aim_dir(&dir)) return FALSE;

diff --git a/src/mspells3.c b/src/mspells3.c
index a2bc371..865b402 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -676,21 +676,21 @@ static bool cast_learned_spell(int spell, bool success)
 
         msg_print(_("酸のブレスを吐いた。", "You breathe acid."));
         damage = monspell_bluemage_damage((MS_BR_ACID), plev, DAM_ROLL);
-               fire_ball(GF_ACID, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_ACID, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_ELEC:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("稲妻のブレスを吐いた。", "You breathe lightning."));
         damage = monspell_bluemage_damage((MS_BR_ELEC), plev, DAM_ROLL);
-               fire_ball(GF_ELEC, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_ELEC, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_FIRE:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("火炎のブレスを吐いた。", "You breathe fire."));
         damage = monspell_bluemage_damage((MS_BR_FIRE), plev, DAM_ROLL);
-               fire_ball(GF_FIRE, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_FIRE, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_COLD:
         if (!get_aim_dir(&dir)) return FALSE;
@@ -704,112 +704,112 @@ static bool cast_learned_spell(int spell, bool success)
 
         msg_print(_("ガスのブレスを吐いた。", "You breathe gas."));
         damage = monspell_bluemage_damage((MS_BR_POIS), plev, DAM_ROLL);
-               fire_ball(GF_POIS, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_POIS, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_NETHER:
         if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("地獄のブレスを吐いた。", "You breathe nether."));
         damage = monspell_bluemage_damage((MS_BR_NETHER), plev, DAM_ROLL);
-               fire_ball(GF_NETHER, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_NETHER, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_LITE:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("閃光のブレスを吐いた。", "You breathe light."));
         damage = monspell_bluemage_damage((MS_BR_LITE), plev, DAM_ROLL);
-               fire_ball(GF_LITE, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_LITE, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_DARK:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("暗黒のブレスを吐いた。", "You breathe darkness."));
         damage = monspell_bluemage_damage((MS_BR_DARK), plev, DAM_ROLL);
-               fire_ball(GF_DARK, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_DARK, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_CONF:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("混乱のブレスを吐いた。", "You breathe confusion."));
         damage = monspell_bluemage_damage((MS_BR_CONF), plev, DAM_ROLL);
-               fire_ball(GF_CONFUSION, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_CONFUSION, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_SOUND:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("轟音のブレスを吐いた。", "You breathe sound."));
         damage = monspell_bluemage_damage((MS_BR_SOUND), plev, DAM_ROLL);
-               fire_ball(GF_SOUND, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_SOUND, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_CHAOS:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("カオスのブレスを吐いた。", "You breathe chaos."));
         damage = monspell_bluemage_damage((MS_BR_CHAOS), plev, DAM_ROLL);
-               fire_ball(GF_CHAOS, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_CHAOS, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_DISEN:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("劣化のブレスを吐いた。", "You breathe disenchantment."));
         damage = monspell_bluemage_damage((MS_BR_DISEN), plev, DAM_ROLL);
-               fire_ball(GF_DISENCHANT, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_DISENCHANT, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_NEXUS:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus."));
         damage = monspell_bluemage_damage((MS_BR_NEXUS), plev, DAM_ROLL);
-               fire_ball(GF_NEXUS, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_NEXUS, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_TIME:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("時間逆転のブレスを吐いた。", "You breathe time."));
         damage = monspell_bluemage_damage((MS_BR_TIME), plev, DAM_ROLL);
-               fire_ball(GF_TIME, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_TIME, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_INERTIA:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
         damage = monspell_bluemage_damage((MS_BR_INERTIA), plev, DAM_ROLL);
-               fire_ball(GF_INERTIAL, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_INERTIAL, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_GRAVITY:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));
         damage = monspell_bluemage_damage((MS_BR_GRAVITY), plev, DAM_ROLL);
-               fire_ball(GF_GRAVITY, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_GRAVITY, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_SHARDS:
         if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("破片のブレスを吐いた。", "You breathe shards."));
         damage = monspell_bluemage_damage((MS_BR_SHARDS), plev, DAM_ROLL);
-               fire_ball(GF_SHARDS, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_SHARDS, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_PLASMA:
         if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma."));
         damage = monspell_bluemage_damage((MS_BR_PLASMA), plev, DAM_ROLL);
-               fire_ball(GF_PLASMA, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_PLASMA, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_FORCE:
         if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("フォースのブレスを吐いた。", "You breathe force."));
         damage = monspell_bluemage_damage((MS_BR_FORCE), plev, DAM_ROLL);
-               fire_ball(GF_FORCE, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_FORCE, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_MANA:
                if (!get_aim_dir(&dir)) return FALSE;
 
         msg_print(_("魔力のブレスを吐いた。", "You breathe mana."));
         damage = monspell_bluemage_damage((MS_BR_MANA), plev, DAM_ROLL);
-               fire_ball(GF_MANA, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_MANA, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BALL_NUKE:
                if (!get_aim_dir(&dir)) return FALSE;
@@ -823,7 +823,7 @@ static bool cast_learned_spell(int spell, bool success)
 
         msg_print(_("放射性廃棄物のブレスを吐いた。", "You breathe toxic waste."));
         damage = monspell_bluemage_damage((MS_BR_NUKE), plev, DAM_ROLL);
-               fire_ball(GF_NUKE, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_NUKE, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BALL_CHAOS:
                if (!get_aim_dir(&dir)) return FALSE;
@@ -837,7 +837,7 @@ static bool cast_learned_spell(int spell, bool success)
 
         msg_print(_("分解のブレスを吐いた。", "You breathe disintegration."));
         damage = monspell_bluemage_damage((MS_BR_DISI), plev, DAM_ROLL);
-               fire_ball(GF_DISINTEGRATE, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_DISINTEGRATE, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BALL_ACID:
                if (!get_aim_dir(&dir)) return FALSE;

diff --git a/src/mutation.c b/src/mutation.c
index d0aa073..98d8348 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -2119,7 +2119,7 @@ bool mutation_power_aux(u32b power)
                        mutation_stop_mouth();
                        msg_print(_("あなたは火炎のブレスを吐いた...", "You breathe fire..."));
 
-                       fire_ball(GF_FIRE, dir, lvl * 2, -1 - (lvl / 20));
+                       fire_breath(GF_FIRE, dir, lvl * 2, 1 + (lvl / 20));
                        break;
 
                case MUT1_HYPN_GAZE:

diff --git a/src/racial.c b/src/racial.c
index af76946..347f65c 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -1233,7 +1233,7 @@ static bool cmd_racial_power_aux(s32b command)
                        msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
 #endif
 
-                       fire_ball(type, dir, plev * 3, -(plev / 15) - 1);
+                       fire_breath(type, dir, plev * 3, (plev / 15) + 1);
                        break;
                }
                case MIMIC_VAMPIRE:
@@ -1662,7 +1662,7 @@ static bool cmd_racial_power_aux(s32b command)
                                msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
 #endif
 
-                               fire_ball(type, dir, plev * 3, -(plev / 15) - 1);
+                               fire_breath(type, dir, plev * 3, (plev / 15) + 1);
                        }
                        break;
 

diff --git a/src/spells2.c b/src/spells2.c
index 1b1c78b..20d7d46 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4685,6 +4685,24 @@ bool fire_ball(int typ, int dir, HIT_POINT dam, int rad)
        return (project(0, rad, ty, tx, dam, typ, flg, -1));
 }
 
+/*!
+* @brief ブレス系スペルの発動 / Cast a breath spell
+* @param typ 効果属性
+* @param dir 方向(5ならばグローバル変数 target_col/target_row の座標を目標にする)
+* @param dam 威力
+* @param rad 半径
+* @return 作用が実際にあった場合TRUEを返す
+* @details
+* <pre>
+* Stop if we hit a monster, act as a "ball"
+* Allow "target" mode to pass over monsters
+* Affect grids, objects, and monsters
+* </pre>
+*/
+bool fire_breath(int typ, int dir, HIT_POINT dam, int rad)
+{
+       fire_ball(typ, dir, dam, -rad);
+}
 
 
 /*!