GF_ICE属性の攻撃に対し、目には目を等の反撃ダメージが発動しないバグを修正。

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

diff --git a/src/cmd6.c b/src/cmd6.c
index f441992..059f0ea 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -60,6 +60,7 @@ static void do_cmd_eat_food_aux(int item)
        object_type *o_ptr;
 
        if (music_singing_any()) stop_singing();
+       if (hex_spelling_any()) stop_hex_spell_all();
 
        /* Get the item (in the pack) */
        if (item >= 0)
@@ -729,6 +730,10 @@ static void do_cmd_quaff_potion_aux(int item)
        }
 
        if (music_singing_any()) stop_singing();
+       if (hex_spelling_any())
+       {
+               if (!hex_spelling(HEX_INHAIL)) stop_hex_spell_all();
+       }
 
        /* Get the item (in the pack) */
        if (item >= 0)
@@ -1471,7 +1476,7 @@ msg_print("
                                set_food(p_ptr->food + ((o_ptr->pval) / 20));
                                break;
                        case RACE_ANDROID:
-                               if (o_ptr->tval == TV_FLASK)
+                               if (q_ptr->tval == TV_FLASK)
                                {
 #ifdef JP
                                        msg_print("¥ª¥¤¥ë¤òÊäµë¤·¤¿¡£");
@@ -1616,6 +1621,9 @@ static void do_cmd_read_scroll_aux(int item, bool known)
 
        if (music_singing_any()) stop_singing();
 
+       /* Hex */
+       if (hex_spelling_any() && ((p_ptr->lev < 35) || hex_spell_fully())) stop_hex_spell_all();
+
        /* Not identified yet */
        ident = FALSE;
 
@@ -4197,7 +4205,7 @@ static void do_cmd_activate_aux(int item)
                        case ART_GALADRIEL:
                        {
 #ifdef JP
-                               msg_print("ààÎÜÉÓ¤«¤éÀ¡¤ó¤À¸÷¤¬¤¢¤Õ¤ì½Ð¤¿...");
+                               msg_print("ààÍþÉÓ¤«¤éÀ¡¤ó¤À¸÷¤¬¤¢¤Õ¤ì½Ð¤¿...");
 #else
                                msg_print("The phial wells with clear light...");
 #endif
@@ -4475,6 +4483,7 @@ msg_print("ŷ
                                (void)set_stun(0);
                                (void)set_confused(0);
                                (void)set_blind(0);
+                               (void)set_afraid(0);
                                (void)set_hero(randint1(25) + 25, FALSE);
                                (void)hp_player(777);
                                o_ptr->timeout = 300;
@@ -4618,6 +4627,18 @@ msg_print("ŷ
                                break;
                        }
 
+                       case ART_HEAVENLY_MAIDEN:
+                       {
+#ifdef JP
+                               msg_print("¥¯¥í¡¼¥¯¤¬½À¤é¤«¤¯Çò¤¯µ±¤¤¤¿...");
+#else
+                               msg_print("Your cloak glows soft white...");
+#endif
+                               if (!word_of_recall()) return;
+                               o_ptr->timeout = 200;
+                               break;
+                       }
+
                        case ART_CAMMITHRIM:
                        {
 #ifdef JP
@@ -5126,6 +5147,7 @@ msg_print("
                        }
 
                        case ART_BRAND:
+                       case ART_HELLFIRE:
                        {
 #ifdef JP
                                msg_print("¥¯¥í¥¹¥Ü¥¦¤¬¿¼¹È¤Ëµ±¤¤¤¿...");
@@ -5286,6 +5308,7 @@ msg_print("
                        case ART_BOROMIR:
                        {
                                if (music_singing_any()) stop_singing();
+                               if (hex_spelling_any()) stop_hex_spell_all();
 #ifdef JP
                                msg_print("¤¢¤Ê¤¿¤ÏÎ϶¯¤¤ÆÍÉ÷¤ò¿á¤­ÌĤ餷¤¿¡£¼þ°Ï¤ÎŨ¤¬¿Ì¤¨¾å¤Ã¤Æ¤¤¤ë!");
 #else
@@ -5576,6 +5599,7 @@ msg_print("
                        case ART_MATOI:
                        case ART_AEGISFANG:
                        {
+                               (void)set_afraid(0);
                                set_hero(randint1(25)+25, FALSE);
                                hp_player(10);
                                o_ptr->timeout = randint0(30) + 30;
@@ -5618,32 +5642,12 @@ msg_print("
                        }
                        case ART_BLOOD:
                        {
-                               int dummy, i;
 #ifdef JP
                                msg_print("³ù¤¬ÌÀ¤ë¤¯µ±¤¤¤¿...");
 #else
                                msg_print("Your scythe glows brightly!");
 #endif
-                               for (i = 0; i < TR_FLAG_SIZE; i++)
-                                       o_ptr->art_flags[i] = a_info[ART_BLOOD].flags[i];
-
-                               dummy = randint1(2)+randint1(2);
-                               for (i = 0; i < dummy; i++)
-                               {
-                                       int flag = randint0(19);
-                                       if (flag == 18) add_flag(o_ptr->art_flags, TR_SLAY_HUMAN);
-                                       else add_flag(o_ptr->art_flags, TR_CHAOTIC + flag);
-                               }
-                               dummy = randint1(2);
-                               for (i = 0; i < dummy; i++)
-                                       one_resistance(o_ptr);
-                               dummy = 2;
-                               for (i = 0; i < dummy; i++)
-                               {
-                                       int tmp = randint0(11);
-                                       if (tmp < 6) add_flag(o_ptr->art_flags, TR_STR + tmp);
-                                       else add_flag(o_ptr->art_flags, TR_STEALTH + tmp - 6);
-                               }
+                               get_bloody_moon_flags(o_ptr);
                                o_ptr->timeout = 3333;
                                if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
                                p_ptr->update |= (PU_BONUS | PU_HP);
@@ -5656,6 +5660,7 @@ msg_print("
 #else
                                msg_print("You stamp. (as if you are in a ring.)");
 #endif
+                               (void)set_afraid(0);
                                (void)set_hero(randint1(20) + 20, FALSE);
                                dispel_evil(p_ptr->lev * 3);
                                o_ptr->timeout = 100 + randint1(100);
@@ -5726,6 +5731,25 @@ msg_print("
                                break;
                        }
 
+                       case ART_AESCULAPIUS:
+                       {
+#ifdef JP
+                               msg_print("Ï»¼ÜËÀ¤ÏÇ»Îп§¤Ëµ±¤¤¤Æ¤¤¤ë...");
+#else
+                               msg_print("The jo staff glows a deep green...");
+#endif
+
+                               (void)do_res_stat(A_STR);
+                               (void)do_res_stat(A_INT);
+                               (void)do_res_stat(A_WIS);
+                               (void)do_res_stat(A_DEX);
+                               (void)do_res_stat(A_CON);
+                               (void)do_res_stat(A_CHR);
+                               (void)restore_level();
+                               o_ptr->timeout = 750;
+                               break;
+                       }
+
                        case ART_NIGHT:
                        {
 #ifdef JP
@@ -5927,6 +5951,7 @@ msg_print("
                if (!get_aim_dir(&dir)) return;
 
                if (music_singing_any()) stop_singing();
+               if (hex_spelling_any()) stop_hex_spell_all();
 
                /* Branch on the sub-type */
                switch (o_ptr->sval)
@@ -6178,7 +6203,7 @@ msg_print("
                                break;
                        case EGO_RING_ACID_BOLT:
                                if (!get_aim_dir(&dir)) return;
-                               fire_bolt(GF_FIRE, dir, damroll(5, 8));
+                               fire_bolt(GF_ACID, dir, damroll(5, 8));
                                o_ptr->timeout = randint0(6) + 6;
                                break;
                        case EGO_RING_MANA_BOLT:
@@ -6241,6 +6266,7 @@ msg_print("
                                o_ptr->timeout = 100;
                                break;
                        case EGO_RING_BERSERKER:
+                               (void)set_afraid(0);
                                (void)set_shero(randint1(25) + 25, FALSE);
                                o_ptr->timeout = randint0(75)+75;
                                break;
@@ -6372,6 +6398,7 @@ msg_print("
        else if (o_ptr->tval == TV_WHISTLE)
        {
                if (music_singing_any()) stop_singing();
+               if (hex_spelling_any()) stop_hex_spell_all();
 
 #if 0
                if (object_is_cursed(o_ptr))