Merge branch 'master' of git.sourceforge.jp:/gitroot/hengband/hengband

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

diff --git a/src/cmd6.c b/src/cmd6.c
index cf7b16b..ecd16c9 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -1184,15 +1184,7 @@ static void do_cmd_quaff_potion_aux(int item)
                        do_cmd_rerate(FALSE);
                        get_max_stats();
                        p_ptr->update |= PU_BONUS;
-                       if (p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3)
-                       {
-                               chg_virtue(V_CHANCE, -5);
-                               msg_print(_("全ての突然変異が治った。", "You are cured of all mutations."));
-                               p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0;
-                               p_ptr->update |= PU_BONUS;
-                               handle_stuff();
-                               mutant_regenerate_mod = calc_mutant_regenerate_mod();
-                       }
+                       lose_all_mutations();
                        ident = TRUE;
                        break;
 
@@ -1217,11 +1209,7 @@ static void do_cmd_quaff_potion_aux(int item)
                case SV_POTION_POLYMORPH:
                        if ((p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) && one_in_(23))
                        {
-                               chg_virtue(V_CHANCE, -5);
-                               msg_print(_("全ての突然変異が治った。", "You are cured of all mutations."));
-                               p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0;
-                               p_ptr->update |= PU_BONUS;
-                               handle_stuff();
+                               lose_all_mutations();
                        }
                        else
                        {
@@ -2687,9 +2675,9 @@ static int wand_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool powerful, bool m
                        break;
                }
 
-               case SV_WAND_DRAIN_LIFE:
+               case SV_WAND_HYPODYNAMIA:
                {
-                       if (drain_life(dir, 80 + lev)) ident = TRUE;
+                       if (hypodynamic_bolt(dir, 80 + lev)) ident = TRUE;
                        break;
                }
 
@@ -2777,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;
                }
@@ -3201,9 +3189,9 @@ static int rod_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool *use_charge, bool
                        break;
                }
 
-               case SV_ROD_DRAIN_LIFE:
+               case SV_ROD_HYPODYNAMIA:
                {
-                       if (drain_life(dir, 70 + 3 * lev / 2)) ident = TRUE;
+                       if (hypodynamic_bolt(dir, 70 + 3 * lev / 2)) ident = TRUE;
                        break;
                }