OSDN Git Service

Suppress gcc warning
[hengband/hengband.git] / src / artifact.c
index 85fb5fc..ad5a8bd 100644 (file)
@@ -12,6 +12,7 @@
 
 
 /* Chance of using syllables to form the name instead of the "template" files */
+#define SINDARIN_NAME   10
 #define TABLE_NAME      20
 #define A_CURSED        13
 #define WEIRD_LUCK      12
@@ -128,18 +129,19 @@ void one_dragon_ele_resistance(object_type *o_ptr)
  */
 void one_low_esp(object_type *o_ptr)
 {
-        switch (randint1(9))
-        {
-        case 1: add_flag(o_ptr->art_flags, TR_ESP_ANIMAL);   break;
-        case 2: add_flag(o_ptr->art_flags, TR_ESP_UNDEAD);   break;
-        case 3: add_flag(o_ptr->art_flags, TR_ESP_DEMON);   break;
-        case 4: add_flag(o_ptr->art_flags, TR_ESP_ORC);   break;
-        case 5: add_flag(o_ptr->art_flags, TR_ESP_TROLL);   break;
-        case 6: add_flag(o_ptr->art_flags, TR_ESP_GIANT);   break;
-        case 7: add_flag(o_ptr->art_flags, TR_ESP_DRAGON);   break;
-        case 8: add_flag(o_ptr->art_flags, TR_ESP_HUMAN);   break;
-        case 9: add_flag(o_ptr->art_flags, TR_ESP_GOOD);   break;
-        }
+       switch (randint1(10))
+       {
+       case 1:  add_flag(o_ptr->art_flags, TR_ESP_ANIMAL);   break;
+       case 2:  add_flag(o_ptr->art_flags, TR_ESP_UNDEAD);   break;
+       case 3:  add_flag(o_ptr->art_flags, TR_ESP_DEMON);   break;
+       case 4:  add_flag(o_ptr->art_flags, TR_ESP_ORC);   break;
+       case 5:  add_flag(o_ptr->art_flags, TR_ESP_TROLL);   break;
+       case 6:  add_flag(o_ptr->art_flags, TR_ESP_GIANT);   break;
+       case 7:  add_flag(o_ptr->art_flags, TR_ESP_DRAGON);   break;
+       case 8:  add_flag(o_ptr->art_flags, TR_ESP_HUMAN);   break;
+       case 9:  add_flag(o_ptr->art_flags, TR_ESP_GOOD);   break;
+       case 10: add_flag(o_ptr->art_flags, TR_ESP_UNIQUE);   break;
+       }
 }
 
 
@@ -167,7 +169,7 @@ void one_ability(object_type *o_ptr)
 {
        switch (randint0(10))
        {
-       case 0: add_flag(o_ptr->art_flags, TR_FEATHER);     break;
+       case 0: add_flag(o_ptr->art_flags, TR_LEVITATION);     break;
        case 1: add_flag(o_ptr->art_flags, TR_LITE);        break;
        case 2: add_flag(o_ptr->art_flags, TR_SEE_INVIS);   break;
        case 3: add_flag(o_ptr->art_flags, TR_WARNING);     break;
@@ -177,11 +179,127 @@ void one_ability(object_type *o_ptr)
        case 7: add_flag(o_ptr->art_flags, TR_HOLD_LIFE);   break;
        case 8:
        case 9:
-                one_low_esp(o_ptr);
+               one_low_esp(o_ptr);
                break;
        }
 }
 
+/*
+ * Choose one random activation
+ */
+void one_activation(object_type *o_ptr)
+{
+       int type = 0;
+       int chance = 0;
+
+       while (randint1(100) >= chance)
+       {
+               type = randint1(255);
+               switch (type)
+               {
+                       case ACT_SUNLIGHT:
+                       case ACT_BO_MISS_1:
+                       case ACT_BA_POIS_1:
+                       case ACT_BO_ELEC_1:
+                       case ACT_BO_ACID_1:
+                       case ACT_BO_COLD_1:
+                       case ACT_BO_FIRE_1:
+                       case ACT_CONFUSE:
+                       case ACT_SLEEP:
+                       case ACT_QUAKE:
+                       case ACT_CURE_LW:
+                       case ACT_CURE_MW:
+                       case ACT_CURE_POISON:
+                       case ACT_BERSERK:
+                       case ACT_LIGHT:
+                       case ACT_MAP_LIGHT:
+                       case ACT_DEST_DOOR:
+                       case ACT_STONE_MUD:
+                       case ACT_TELEPORT:
+                               chance = 101;
+                               break;
+                       case ACT_BA_COLD_1:
+                       case ACT_BA_FIRE_1:
+                       case ACT_DRAIN_1:
+                       case ACT_TELE_AWAY:
+                       case ACT_ESP:
+                       case ACT_RESIST_ALL:
+                       case ACT_DETECT_ALL:
+                       case ACT_RECALL:
+                       case ACT_SATIATE:
+                       case ACT_RECHARGE:
+                               chance = 85;
+                               break;
+                       case ACT_TERROR:
+                       case ACT_PROT_EVIL:
+                       case ACT_ID_PLAIN:
+                               chance = 75;
+                               break;
+                       case ACT_DRAIN_2:
+                       case ACT_VAMPIRE_1:
+                       case ACT_BO_MISS_2:
+                       case ACT_BA_FIRE_2:
+                       case ACT_REST_LIFE:
+                               chance = 66;
+                               break;
+                       case ACT_BA_FIRE_3:
+                       case ACT_BA_COLD_3:
+                       case ACT_BA_ELEC_3:
+                       case ACT_WHIRLWIND:
+                       case ACT_VAMPIRE_2:
+                       case ACT_CHARM_ANIMAL:
+                               chance = 50;
+                               break;
+                       case ACT_SUMMON_ANIMAL:
+                               chance = 40;
+                               break;
+                       case ACT_DISP_EVIL:
+                       case ACT_BA_MISS_3:
+                       case ACT_DISP_GOOD:
+                       case ACT_BANISH_EVIL:
+                       case ACT_GENOCIDE:
+                       case ACT_MASS_GENO:
+                       case ACT_CHARM_UNDEAD:
+                       case ACT_CHARM_OTHER:
+                       case ACT_SUMMON_PHANTOM:
+                       case ACT_REST_ALL:
+                       case ACT_RUNE_EXPLO:
+                               chance = 33;
+                               break;
+                       case ACT_CALL_CHAOS:
+                       case ACT_ROCKET:
+                       case ACT_CHARM_ANIMALS:
+                       case ACT_CHARM_OTHERS:
+                       case ACT_SUMMON_ELEMENTAL:
+                       case ACT_CURE_700:
+                       case ACT_SPEED:
+                       case ACT_ID_FULL:
+                       case ACT_RUNE_PROT:
+                               chance = 25;
+                               break;
+                       case ACT_CURE_1000:
+                       case ACT_XTRA_SPEED:
+                       case ACT_DETECT_XTRA:
+                       case ACT_DIM_DOOR:
+                               chance = 10;
+                               break;
+                       case ACT_SUMMON_UNDEAD:
+                       case ACT_SUMMON_DEMON:
+                       case ACT_WRAITH:
+                       case ACT_INVULN:
+                       case ACT_ALCHEMY:
+                               chance = 5;
+                               break;
+                       default:
+                               chance = 0;
+               }
+       }
+
+       /* A type was chosen... */
+       o_ptr->xtra2 = type;
+       add_flag(o_ptr->art_flags, TR_ACTIVATE);
+       o_ptr->timeout = 0;
+}
 
 static void curse_artifact(object_type * o_ptr)
 {
@@ -197,6 +315,8 @@ static void curse_artifact(object_type * o_ptr)
        if (one_in_(3)) add_flag(o_ptr->art_flags, TR_TY_CURSE);
        if (one_in_(2)) add_flag(o_ptr->art_flags, TR_AGGRAVATE);
        if (one_in_(3)) add_flag(o_ptr->art_flags, TR_DRAIN_EXP);
+       if (one_in_(6)) add_flag(o_ptr->art_flags, TR_ADD_L_CURSE);
+       if (one_in_(9)) add_flag(o_ptr->art_flags, TR_ADD_H_CURSE);
        if (one_in_(2)) add_flag(o_ptr->art_flags, TR_TELEPORT);
        else if (one_in_(3)) add_flag(o_ptr->art_flags, TR_NO_TELE);
 
@@ -207,7 +327,7 @@ static void curse_artifact(object_type * o_ptr)
 
 static void random_plus(object_type * o_ptr)
 {
-       int this_type = (o_ptr->tval < TV_BOOTS ? 23 : 19);
+       int this_type = (object_is_weapon_ammo(o_ptr) ? 23 : 19);
 
        switch (artifact_bias)
        {
@@ -871,7 +991,7 @@ static void random_misc(object_type * o_ptr)
                        break;
                case 12:
                case 13:
-                       add_flag(o_ptr->art_flags, TR_FEATHER);
+                       add_flag(o_ptr->art_flags, TR_LEVITATION);
                        break;
                case 15:
                case 16:
@@ -892,7 +1012,7 @@ static void random_misc(object_type * o_ptr)
                case 24:
                case 25:
                case 26:
-                       if (o_ptr->tval >= TV_BOOTS && o_ptr->tval <= TV_DRAG_ARMOR)
+                       if (object_is_armour(o_ptr))
                                random_misc(o_ptr);
                        else
                        {
@@ -997,6 +1117,11 @@ static void random_misc(object_type * o_ptr)
                                if (!artifact_bias && one_in_(3))
                                        artifact_bias = BIAS_LAW;
                                break;
+                       case 9:
+                               add_flag(o_ptr->art_flags, TR_ESP_UNIQUE);
+                               if (!artifact_bias && one_in_(3))
+                                       artifact_bias = BIAS_LAW;
+                               break;
                        }
                        break;
                }
@@ -1426,106 +1551,10 @@ static void give_activation_power(object_type *o_ptr)
                        break;
        }
 
-       while (!type || (randint1(100) >= chance))
+       if (!type || (randint1(100) >= chance))
        {
-               type = randint1(255);
-               switch (type)
-               {
-                       case ACT_SUNLIGHT:
-                       case ACT_BO_MISS_1:
-                       case ACT_BA_POIS_1:
-                       case ACT_BO_ELEC_1:
-                       case ACT_BO_ACID_1:
-                       case ACT_BO_COLD_1:
-                       case ACT_BO_FIRE_1:
-                       case ACT_CONFUSE:
-                       case ACT_SLEEP:
-                       case ACT_QUAKE:
-                       case ACT_CURE_LW:
-                       case ACT_CURE_MW:
-                       case ACT_CURE_POISON:
-                       case ACT_BERSERK:
-                       case ACT_LIGHT:
-                       case ACT_MAP_LIGHT:
-                       case ACT_DEST_DOOR:
-                       case ACT_STONE_MUD:
-                       case ACT_TELEPORT:
-                               chance = 101;
-                               break;
-                       case ACT_BA_COLD_1:
-                       case ACT_BA_FIRE_1:
-                       case ACT_DRAIN_1:
-                       case ACT_TELE_AWAY:
-                       case ACT_ESP:
-                       case ACT_RESIST_ALL:
-                       case ACT_DETECT_ALL:
-                       case ACT_RECALL:
-                       case ACT_SATIATE:
-                       case ACT_RECHARGE:
-                               chance = 85;
-                               break;
-                       case ACT_TERROR:
-                       case ACT_PROT_EVIL:
-                       case ACT_ID_PLAIN:
-                               chance = 75;
-                               break;
-                       case ACT_DRAIN_2:
-                       case ACT_VAMPIRE_1:
-                       case ACT_BO_MISS_2:
-                       case ACT_BA_FIRE_2:
-                       case ACT_REST_LIFE:
-                               chance = 66;
-                               break;
-                       case ACT_BA_COLD_3:
-                       case ACT_BA_ELEC_3:
-                       case ACT_WHIRLWIND:
-                       case ACT_VAMPIRE_2:
-                       case ACT_CHARM_ANIMAL:
-                               chance = 50;
-                               break;
-                       case ACT_SUMMON_ANIMAL:
-                               chance = 40;
-                               break;
-                       case ACT_DISP_EVIL:
-                       case ACT_BA_MISS_3:
-                       case ACT_DISP_GOOD:
-                       case ACT_BANISH_EVIL:
-                       case ACT_GENOCIDE:
-                       case ACT_MASS_GENO:
-                       case ACT_CHARM_UNDEAD:
-                       case ACT_CHARM_OTHER:
-                       case ACT_SUMMON_PHANTOM:
-                       case ACT_REST_ALL:
-                       case ACT_RUNE_EXPLO:
-                               chance = 33;
-                               break;
-                       case ACT_CALL_CHAOS:
-                       case ACT_ROCKET:
-                       case ACT_CHARM_ANIMALS:
-                       case ACT_CHARM_OTHERS:
-                       case ACT_SUMMON_ELEMENTAL:
-                       case ACT_CURE_700:
-                       case ACT_SPEED:
-                       case ACT_ID_FULL:
-                       case ACT_RUNE_PROT:
-                               chance = 25;
-                               break;
-                       case ACT_CURE_1000:
-                       case ACT_XTRA_SPEED:
-                       case ACT_DETECT_XTRA:
-                       case ACT_DIM_DOOR:
-                               chance = 10;
-                               break;
-                       case ACT_SUMMON_UNDEAD:
-                       case ACT_SUMMON_DEMON:
-                       case ACT_WRAITH:
-                       case ACT_INVULN:
-                       case ACT_ALCHEMY:
-                               chance = 5;
-                               break;
-                       default:
-                               chance = 0;
-               }
+               one_activation(o_ptr);
+               return;
        }
 
        /* A type was chosen... */
@@ -1537,7 +1566,13 @@ static void give_activation_power(object_type *o_ptr)
 
 static void get_random_name(char *return_name, bool armour, int power)
 {
-       if (randint1(100) <= TABLE_NAME)
+       int prob = randint1(100);
+
+       if (prob <= SINDARIN_NAME)
+       {
+               get_table_sindarin(return_name);
+       }
+       else if (prob <= TABLE_NAME)
        {
                get_table_name(return_name);
        }
@@ -1552,35 +1587,31 @@ static void get_random_name(char *return_name, bool armour, int power)
                                {
                                        case 0:
 #ifdef JP
-filename = "a_cursed_j.txt";
+                                               filename = "a_cursed_j.txt";
 #else
                                                filename = "a_cursed.txt";
 #endif
-
                                                break;
                                        case 1:
 #ifdef JP
-filename = "a_low_j.txt";
+                                               filename = "a_low_j.txt";
 #else
                                                filename = "a_low.txt";
 #endif
-
                                                break;
                                        case 2:
 #ifdef JP
-filename = "a_med_j.txt";
+                                               filename = "a_med_j.txt";
 #else
                                                filename = "a_med.txt";
 #endif
-
                                                break;
                                        default:
 #ifdef JP
-filename = "a_high_j.txt";
+                                               filename = "a_high_j.txt";
 #else
                                                filename = "a_high.txt";
 #endif
-
                                }
                                break;
                        default:
@@ -1588,41 +1619,37 @@ filename = "a_high_j.txt";
                                {
                                        case 0:
 #ifdef JP
-filename = "w_cursed_j.txt";
+                                               filename = "w_cursed_j.txt";
 #else
                                                filename = "w_cursed.txt";
 #endif
-
                                                break;
                                        case 1:
 #ifdef JP
-filename = "w_low_j.txt";
+                                               filename = "w_low_j.txt";
 #else
                                                filename = "w_low.txt";
 #endif
-
                                                break;
                                        case 2:
 #ifdef JP
-filename = "w_med_j.txt";
+                                               filename = "w_med_j.txt";
 #else
                                                filename = "w_med.txt";
 #endif
-
                                                break;
                                        default:
 #ifdef JP
-filename = "w_high_j.txt";
+                                               filename = "w_high_j.txt";
 #else
                                                filename = "w_high.txt";
 #endif
-
                                }
                }
 
                (void)get_rnd_line(filename, artifact_bias, return_name);
 #ifdef JP
if(return_name[0]==0)get_table_name(return_name);
               if (return_name[0] == 0) get_table_name(return_name);
 #endif
        }
 }
@@ -1633,7 +1660,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
        char    new_name[1024];
        int     has_pval = 0;
        int     powers = randint1(5) + 1;
-       int     max_type = (o_ptr->tval < TV_BOOTS ? 7 : 5);
+       int     max_type = (object_is_weapon_ammo(o_ptr) ? 7 : 5);
        int     power_level;
        s32b    total_flags;
        bool    a_cursed = FALSE;
@@ -1680,6 +1707,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
                                warrior_artifact_bias = 25;
                                break;
                        case CLASS_RANGER:
+                       case CLASS_SNIPER:
                                artifact_bias = BIAS_RANGER;
                                warrior_artifact_bias = 30;
                                break;
@@ -1734,7 +1762,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
 
        if (!a_scroll && one_in_(A_CURSED))
                a_cursed = TRUE;
-       if (((o_ptr->tval == TV_AMULET) || (o_ptr->tval == TV_RING)) && cursed_p(o_ptr))
+       if (((o_ptr->tval == TV_AMULET) || (o_ptr->tval == TV_RING)) && object_is_cursed(o_ptr))
                a_cursed = TRUE;
 
        while (one_in_(powers) || one_in_(7) || one_in_(10))
@@ -1755,7 +1783,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
                                has_pval = TRUE;
                                break;
                        case 3: case 4:
-                               if (one_in_(2) && (o_ptr->tval < TV_BOOTS) && (o_ptr->tval != TV_BOW))
+                               if (one_in_(2) && object_is_weapon_ammo(o_ptr) && (o_ptr->tval != TV_BOW))
                                {
                                        if (a_cursed && !one_in_(13)) break;
                                        if (one_in_(13))
@@ -1812,9 +1840,9 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
        }
 
        /* give it some plusses... */
-       if (o_ptr->tval >= TV_BOOTS && o_ptr->tval <= TV_DRAG_ARMOR)
+       if (object_is_armour(o_ptr))
                o_ptr->to_a += randint1(o_ptr->to_a > 19 ? 1 : 20 - o_ptr->to_a);
-       else if (o_ptr->tval <= TV_SWORD)
+       else if (object_is_weapon_ammo(o_ptr))
        {
                o_ptr->to_h += randint1(o_ptr->to_h > 19 ? 1 : 20 - o_ptr->to_h);
                o_ptr->to_d += randint1(o_ptr->to_d > 19 ? 1 : 20 - o_ptr->to_d);
@@ -1833,14 +1861,13 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
        if (a_cursed) curse_artifact(o_ptr);
 
        if (!a_cursed &&
-           (randint1((o_ptr->tval >= TV_BOOTS)
-           ? ACTIVATION_CHANCE * 2 : ACTIVATION_CHANCE) == 1))
+           one_in_(object_is_armour(o_ptr) ? ACTIVATION_CHANCE * 2 : ACTIVATION_CHANCE))
        {
                o_ptr->xtra2 = 0;
                give_activation_power(o_ptr);
        }
 
-       if ((o_ptr->tval >= TV_BOOTS) && (o_ptr->tval <= TV_DRAG_ARMOR))
+       if (object_is_armour(o_ptr))
        {
                while ((o_ptr->to_d+o_ptr->to_h) > 20)
                {
@@ -1882,25 +1909,33 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
                remove_flag(o_ptr->art_flags, TR_BRAND_COLD);
        }
 
-       if (o_ptr->tval >= TV_BOOTS)
+       if (!object_is_weapon_ammo(o_ptr))
        {
+               /* For armors */
                if (a_cursed) power_level = 0;
                else if (total_flags < 15000) power_level = 1;
-               else if (total_flags < 25000) power_level = 2;
+               else if (total_flags < 35000) power_level = 2;
                else power_level = 3;
        }
 
        else
        {
+               /* For weapons */
                if (a_cursed) power_level = 0;
                else if (total_flags < 20000) power_level = 1;
-               else if (total_flags < 35000) power_level = 2;
+               else if (total_flags < 45000) power_level = 2;
                else power_level = 3;
        }
 
        if (a_scroll)
        {
-               char dummy_name[80];
+               char dummy_name[80] = "";
+#ifdef JP
+               cptr ask_msg = "¤³¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò²¿¤È̾ÉÕ¤±¤Þ¤¹¤«¡©";
+#else
+               cptr ask_msg = "What do you want to call the artifact? ";
+#endif
+
                /* Identify it fully */
                object_aware(o_ptr);
                object_known(o_ptr);
@@ -1908,60 +1943,48 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
                /* Mark the item as fully known */
                o_ptr->ident |= (IDENT_MENTAL);
 
-               strcpy(dummy_name, "");
-               (void)identify_fully_aux(o_ptr);
+               /* For being treated as random artifact in screen_object() */
+               o_ptr->art_name = quark_add("");
 
-#ifdef JP
-               if (!(get_string("¤³¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò²¿¤È̾ÉÕ¤±¤Þ¤¹¤«¡©", dummy_name, 80)))
-#else
-               if (!(get_string("What do you want to call the artifact? ", dummy_name, 80)))
-#endif
+               (void)screen_object(o_ptr, 0L);
 
+               if (!get_string(ask_msg, dummy_name, sizeof dummy_name)
+                   || !dummy_name[0])
                {
-                       get_random_name(new_name, (bool)(o_ptr->tval >= TV_BOOTS), power_level);
+                       /* Cancelled */
+                       if (one_in_(2))
+                       {
+                               get_table_sindarin_aux(dummy_name);
+                       }
+                       else
+                       {
+                               get_table_name_aux(dummy_name);
+                       }
                }
-               else
-               {
-#ifdef JP
-                       strcpy(new_name, "¡Ô");
-#else
-                       strcpy(new_name, "'");
-#endif
 
-                       strcat(new_name, dummy_name);
 #ifdef JP
-                       strcat(new_name, "¡Õ¤È¤¤¤¦Ì¾¤Î");
+               sprintf(new_name, "¡Ô%s¡Õ", dummy_name);
 #else
-                       strcat(new_name, "'");
+               sprintf(new_name, "'%s'", dummy_name);
 #endif
 
-               }
-
                chg_virtue(V_INDIVIDUALISM, 2);
                chg_virtue(V_ENCHANT, 5);
-
        }
        else
        {
-               get_random_name(new_name, (bool)(o_ptr->tval >= TV_BOOTS), power_level);
+               get_random_name(new_name, object_is_armour(o_ptr), power_level);
        }
 
        if (cheat_xtra)
        {
-               if (artifact_bias)
-#ifdef JP
-msg_format("±¿¤ÎÊФä¿¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È: %d¡£", artifact_bias);
-#else
-                       msg_format("Biased artifact: %d.", artifact_bias);
-#endif
-
-               else
 #ifdef JP
-msg_print("¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ë±¿¤ÎÊФê¤Ê¤·¡£");
+               if (artifact_bias) msg_format("±¿¤ÎÊФä¿¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È: %d¡£", artifact_bias);
+               else msg_print("¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ë±¿¤ÎÊФê¤Ê¤·¡£");
 #else
-                       msg_print("No bias in artifact.");
+               if (artifact_bias) msg_format("Biased artifact: %d.", artifact_bias);
+               else msg_print("No bias in artifact.");
 #endif
-
        }
 
        /* Save the inscription */
@@ -1974,15 +1997,115 @@ msg_print("
 }
 
 
-bool activate_random_artifact(object_type * o_ptr)
+int activation_index(object_type *o_ptr)
 {
-       int plev = p_ptr->lev;
-       int k, dir, dummy = 0;
-
-       if (!o_ptr->art_name) return FALSE; /* oops? */
+       /* Give priority to weaponsmith's essential activations */
+       if (object_is_smith(o_ptr))
+       {
+               switch (o_ptr->xtra3-1)
+               {
+               case ESSENCE_TMP_RES_ACID: return ACT_RESIST_ACID;
+               case ESSENCE_TMP_RES_ELEC: return ACT_RESIST_ELEC;
+               case ESSENCE_TMP_RES_FIRE: return ACT_RESIST_FIRE;
+               case ESSENCE_TMP_RES_COLD: return ACT_RESIST_COLD;
+               case TR_IMPACT: return ACT_QUAKE;
+               }
+       }
+
+       if (object_is_fixed_artifact(o_ptr))
+       {
+               if (have_flag(a_info[o_ptr->name1].flags, TR_ACTIVATE))
+               {
+                       return a_info[o_ptr->name1].act_idx;
+               }
+       }
+       if (object_is_ego(o_ptr))
+       {
+               if (have_flag(e_info[o_ptr->name2].flags, TR_ACTIVATE))
+               {
+                       return e_info[o_ptr->name2].act_idx;
+               }
+       }
+       if (!object_is_random_artifact(o_ptr))
+       {
+               if (have_flag(k_info[o_ptr->k_idx].flags, TR_ACTIVATE))
+               {
+                       return k_info[o_ptr->k_idx].act_idx;
+               }
+       }
+
+       return o_ptr->xtra2;
+}
+
+const activation_type* find_activation_info(object_type *o_ptr)
+{
+       const int index = activation_index(o_ptr);
+       const activation_type* p;
+
+       for (p = activation_info; p->flag != NULL; ++ p) {
+               if (p->index == index)
+               {
+                       return p;
+               }
+       }
+
+       return NULL;
+}
+
+
+/* Dragon breath activation */
+static bool activate_dragon_breath(object_type *o_ptr)
+{
+       u32b flgs[4]; /* for resistance flags */
+       int type[20];
+       cptr name[20];
+       int i, dir, t, n = 0;
+
+       if (!get_aim_dir(&dir)) return FALSE;
+
+       object_flags(o_ptr, flgs);
+
+       for (i = 0; dragonbreath_info[i].flag != 0; i++)
+       {
+               if (have_flag(flgs, dragonbreath_info[i].flag))
+               {
+                       type[n] = dragonbreath_info[i].type;
+                       name[n] = dragonbreath_info[i].name;
+                       n++;
+               }
+       }
+
+       /* Paranoia */
+       if (n == 0) return FALSE;
+
+       /* Stop speaking */
+       if (music_singing_any()) stop_singing();
+       if (hex_spelling_any()) stop_hex_spell_all();
+
+       t = randint0(n);
+       msg_format(_("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", "You breathe %s."), name[t]);
+       fire_ball(type[t], dir, 250, -4);
+
+       return TRUE;
+}
+
+
+bool activate_random_artifact(object_type *o_ptr)
+{
+       int plev = p_ptr->lev;
+       int k, dir, dummy = 0;
+       cptr name = k_name + k_info[o_ptr->k_idx].name;
+       const activation_type* const act_ptr = find_activation_info(o_ptr);
+
+       /* Paranoia */
+       if (!act_ptr) {
+               /* Maybe forgot adding information to activation_info table ? */
+               msg_print("Activation information is not found.");
+               return FALSE;
+       }
 
        /* Activate for attack */
-       switch (o_ptr->xtra2)
+       switch (act_ptr->index)
        {
                case ACT_SUNLIGHT:
                {
@@ -1992,9 +2115,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("A line of sunlight appears.");
 #endif
-
-                       (void)lite_line(dir);
-                       o_ptr->timeout = 10;
+                       (void)lite_line(dir, damroll(6, 8));
                        break;
                }
 
@@ -2005,10 +2126,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows extremely brightly...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_bolt(GF_MISSILE, dir, damroll(2, 6));
-                       o_ptr->timeout = 2;
                        break;
                }
 
@@ -2019,10 +2138,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It throbs deep green...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_ball(GF_POIS, dir, 12, 3);
-                       o_ptr->timeout = randint0(4) + 4;
                        break;
                }
 
@@ -2033,10 +2150,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It is covered in sparks...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_bolt(GF_ELEC, dir, damroll(4, 8));
-                       o_ptr->timeout = randint0(5) + 5;
                        break;
                }
 
@@ -2047,10 +2162,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It is covered in acid...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_bolt(GF_ACID, dir, damroll(5, 8));
-                       o_ptr->timeout = randint0(6) + 6;
                        break;
                }
 
@@ -2061,10 +2174,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It is covered in frost...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_bolt(GF_COLD, dir, damroll(6, 8));
-                       o_ptr->timeout = randint0(7) + 7;
                        break;
                }
 
@@ -2075,10 +2186,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It is covered in fire...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_bolt(GF_FIRE, dir, damroll(9, 8));
-                       o_ptr->timeout = randint0(8) + 8;
                        break;
                }
 
@@ -2089,10 +2198,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It is covered in frost...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_ball(GF_COLD, dir, 48, 2);
-                       o_ptr->timeout = 400;
                        break;
                }
 
@@ -2103,24 +2210,20 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows an intense red...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_ball(GF_FIRE, dir, 72, 2);
-                       o_ptr->timeout = 400;
                        break;
                }
 
                case ACT_DRAIN_1:
                {
 #ifdef JP
-                       msg_print("¤½¤ì¤Ï¹õ¤¯µ±¤¤¤¿...");
+                       msg_format("¤¢¤Ê¤¿¤Ï%s¤ËŨ¤òÄù¤á»¦¤¹¤è¤¦Ì¿¤¸¤¿¡£", name);
 #else
-                       msg_print("It glows black...");
+                       msg_format("You order the %s to strangle your opponent.", name);
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        if (drain_life(dir, 100))
-                       o_ptr->timeout = randint0(100) + 100;
                        break;
                }
 
@@ -2131,10 +2234,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows an intense blue...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_ball(GF_COLD, dir, 100, 2);
-                       o_ptr->timeout = 300;
                        break;
                }
 
@@ -2145,10 +2246,20 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It crackles with electricity...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_ball(GF_ELEC, dir, 100, 3);
-                       o_ptr->timeout = 500;
+                       break;
+               }
+
+               case ACT_BA_FIRE_2:
+               {
+#ifdef JP
+                       msg_format("%s¤«¤é±ê¤¬¿á¤­½Ð¤·¤¿...", name);
+#else
+                       msg_format("The %s rages in fire...", name);
+#endif
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_ball(GF_FIRE, dir, 120, 3);
                        break;
                }
 
@@ -2159,10 +2270,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows black...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        drain_life(dir, 120);
-                       o_ptr->timeout = 400;
                        break;
                }
 
@@ -2174,7 +2283,6 @@ bool activate_random_artifact(object_type * o_ptr)
                                if (drain_life(dir, 50))
                                hp_player(50);
                        }
-                       o_ptr->timeout = 400;
                        break;
                }
 
@@ -2185,24 +2293,20 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It grows magical spikes...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        fire_bolt(GF_ARROW, dir, 150);
-                       o_ptr->timeout = randint0(90) + 90;
                        break;
                }
 
-               case ACT_BA_FIRE_2:
+               case ACT_BA_FIRE_3:
                {
 #ifdef JP
                        msg_print("¿¼ÀÖ¿§¤Ëµ±¤¤¤Æ¤¤¤ë...");
 #else
                        msg_print("It glows deep red...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
-                       fire_ball(GF_FIRE, dir, 120, 3);
-                       o_ptr->timeout = randint0(225) + 225;
+                       fire_ball(GF_FIRE, dir, 300, 3);
                        break;
                }
 
@@ -2213,10 +2317,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows bright white...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
-                       fire_ball(GF_COLD, dir, 200, 3);
-                       o_ptr->timeout = randint0(325) + 325;
+                       fire_ball(GF_COLD, dir, 400, 3);
                        break;
                }
 
@@ -2227,10 +2329,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows deep blue...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
-                       fire_ball(GF_ELEC, dir, 250, 3);
-                       o_ptr->timeout = randint0(425) + 425;
+                       fire_ball(GF_ELEC, dir, 500, 3);
                        break;
                }
 
@@ -2251,11 +2351,10 @@ bool activate_random_artifact(object_type * o_ptr)
                                        m_ptr = &m_list[c_ptr->m_idx];
 
                                        /* Hack -- attack monsters */
-                                       if (c_ptr->m_idx && (m_ptr->ml || cave_floor_bold(y, x)))
+                                       if (c_ptr->m_idx && (m_ptr->ml || cave_have_flag_bold(y, x, FF_PROJECT)))
                                                py_attack(y, x, 0);
                                }
                        }
-                       o_ptr->timeout = 250;
                        break;
                }
 
@@ -2267,8 +2366,6 @@ bool activate_random_artifact(object_type * o_ptr)
                                if (drain_life(dir, 100))
                                hp_player(100);
                        }
-
-                       o_ptr->timeout = 400;
                        break;
                }
 
@@ -2280,9 +2377,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows in scintillating colours...");
 #endif
-
                        call_chaos();
-                       o_ptr->timeout = 350;
                        break;
                }
 
@@ -2294,9 +2389,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("You launch a rocket!");
 #endif
-
                        fire_ball(GF_ROCKET, dir, 250 + plev*3, 2);
-                       o_ptr->timeout = 400;
                        break;
                }
 
@@ -2307,9 +2400,19 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It floods the area with goodness...");
 #endif
-
                        dispel_evil(p_ptr->lev * 5);
-                       o_ptr->timeout = randint0(300) + 300;
+                       break;
+               }
+
+               case ACT_BA_MISS_3:
+               {
+                       if (!get_aim_dir(&dir)) return FALSE;
+#ifdef JP
+                       msg_print("¤¢¤Ê¤¿¤Ï¥¨¥ì¥á¥ó¥È¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£");
+#else
+                       msg_print("You breathe the elements.");
+#endif
+                       fire_ball(GF_MISSILE, dir, 300, -4);
                        break;
                }
 
@@ -2320,13 +2423,124 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It floods the area with evil...");
 #endif
-
                        dispel_good(p_ptr->lev * 5);
-                       o_ptr->timeout = randint0(300) + 300;
                        break;
                }
 
-               case ACT_BA_MISS_3:
+               case ACT_BO_MANA:
+               {
+#ifdef JP
+                       msg_format("%s¤ËËâË¡¤Î¥È¥²¤¬¸½¤ì¤¿...", name);
+#else
+                       msg_format("The %s grows magical spikes...", name);
+#endif
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_bolt(GF_ARROW, dir, 150);
+                       break;
+               }
+
+               case ACT_BA_WATER:
+               {
+#ifdef JP
+                       msg_format("%s¤¬¿¼¤¤ÀÄ¿§¤Ë¸ÝÆ°¤·¤Æ¤¤¤ë...", name);
+#else
+                       msg_format("The %s throbs deep blue...", name);
+#endif
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_ball(GF_WATER, dir, 200, 3);
+                       break;
+               }
+
+               case ACT_BA_DARK:
+               {
+#ifdef JP
+                       msg_format("%s¤¬¿¼¤¤°Ç¤Ëʤ¤ï¤ì¤¿...", name);
+#else
+                       msg_format("The %s is coverd in pitch-darkness...", name);
+#endif
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_ball(GF_DARK, dir, 250, 4);
+                       break;
+               }
+
+               case ACT_BA_MANA:
+               {
+#ifdef JP
+                       msg_format("%s¤¬ÀÄÇò¤¯¸÷¤Ã¤¿¡¥¡¥¡¥", name);
+#else
+                       msg_format("The %s glows pale...", name);
+#endif
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_ball(GF_MANA, dir, 250, 4);
+                       break;
+               }
+
+               case ACT_PESTICIDE:
+               {
+#ifdef JP
+                       msg_print("¤¢¤Ê¤¿¤Ï³²Ãî¤ò°ìÁݤ·¤¿¡£");
+#else
+                       msg_print("You exterminate small life.");
+#endif
+                       (void)dispel_monsters(4);
+                       break;
+               }
+
+               case ACT_BLINDING_LIGHT:
+               {
+#ifdef JP
+                       msg_format("%s¤¬âÁ¤·¤¤¸÷¤Çµ±¤¤¤¿...", name);
+#else
+                       msg_format("The %s gleams with blinding light...", name);
+#endif
+                       fire_ball(GF_LITE, 0, 300, 6);
+                       confuse_monsters(3 * p_ptr->lev / 2);
+                       break;
+               }
+
+               case ACT_BIZARRE:
+               {
+#ifdef JP
+                       msg_format("%s¤Ï¼¿¹õ¤Ëµ±¤¤¤¿...", name);
+#else
+                       msg_format("The %s glows intensely black...", name);
+#endif
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       ring_of_power(dir);
+                       break;
+               }
+
+               case ACT_CAST_BA_STAR:
+               {
+                       int num = damroll(5, 3);
+                       int y, x;
+                       int attempts;
+#ifdef JP
+                       msg_format("%s¤¬°ðºÊ¤Çʤ¤ï¤ì¤¿...", name);
+#else
+                       msg_format("The %s is surrounded by lightning...", name);
+#endif
+                       for (k = 0; k < num; k++)
+                       {
+                               attempts = 1000;
+
+                               while (attempts--)
+                               {
+                                       scatter(&y, &x, py, px, 4, 0);
+
+                                       if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue;
+
+                                       if (!player_bold(y, x)) break;
+                               }
+
+                               project(0, 3, y, x, 150, GF_ELEC,
+                                                       (PROJECT_THRU | PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL), -1);
+                       }
+
+                       break;
+               }
+
+               case ACT_BLADETURNER:
                {
                        if (!get_aim_dir(&dir)) return FALSE;
 #ifdef JP
@@ -2334,9 +2548,53 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("You breathe the elements.");
 #endif
+                       fire_ball(GF_MISSILE, dir, 300, -4);
+#ifdef JP
+                       msg_print("³»¤¬ÍÍ¡¹¤Ê¿§¤Ëµ±¤¤¤¿...");
+#else
+                       msg_print("Your armor glows many colours...");
+#endif
+                       (void)set_afraid(0);
+                       (void)set_hero(randint1(50) + 50, FALSE);
+                       (void)hp_player(10);
+                       (void)set_blessed(randint1(50) + 50, FALSE);
+                       (void)set_oppose_acid(randint1(50) + 50, FALSE);
+                       (void)set_oppose_elec(randint1(50) + 50, FALSE);
+                       (void)set_oppose_fire(randint1(50) + 50, FALSE);
+                       (void)set_oppose_cold(randint1(50) + 50, FALSE);
+                       (void)set_oppose_pois(randint1(50) + 50, FALSE);
+                       break;
+               }
+               case ACT_BA_ACID_1:
+               {
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_ball(GF_ACID, dir, 100, 2);
+                       break;
+               }
 
-                       fire_ball(GF_MISSILE, dir, 300, 4);
-                       o_ptr->timeout = 500;
+               case ACT_BR_FIRE:
+               {
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_ball(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);
+                       }
+                       break;
+               }
+               case ACT_BR_COLD:
+               {
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       fire_ball(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);
+                       }
+                       break;
+               }
+               case ACT_BR_DRAGON:
+               {
+                       if (!activate_dragon_breath(o_ptr)) return FALSE;
                        break;
                }
 
@@ -2349,10 +2607,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows in scintillating colours...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
                        confuse_monster(dir, 20);
-                       o_ptr->timeout = 15;
                        break;
                }
 
@@ -2363,23 +2619,19 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows deep blue...");
 #endif
-
                        sleep_monsters_touch();
-                       o_ptr->timeout = 55;
                        break;
                }
 
                case ACT_QUAKE:
                {
-                       earthquake(py, px, 10);
-                       o_ptr->timeout = 50;
+                       earthquake(py, px, 5);
                        break;
                }
 
                case ACT_TERROR:
                {
                        turn_monsters(40 + p_ptr->lev);
-                       o_ptr->timeout = 3 * (p_ptr->lev + 10);
                        break;
                }
 
@@ -2387,7 +2639,6 @@ bool activate_random_artifact(object_type * o_ptr)
                {
                        if (!get_aim_dir(&dir)) return FALSE;
                        (void)fire_beam(GF_AWAY_ALL, dir, plev);
-                       o_ptr->timeout = 200;
                        break;
                }
 
@@ -2396,13 +2647,11 @@ bool activate_random_artifact(object_type * o_ptr)
                        if (banish_evil(100))
                        {
 #ifdef JP
-                               msg_print("¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÎϤ¬¼Ù°­¤òÂǤÁÅݤ·¤¿¡ª");
+                               msg_print("¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÎϤ¬¼Ù°­¤òÂǤÁʧ¤Ã¤¿¡ª");
 #else
                                msg_print("The power of the artifact banishes evil!");
 #endif
-
                        }
-                       o_ptr->timeout = 250 + randint1(250);
                        break;
                }
 
@@ -2413,9 +2662,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows deep blue...");
 #endif
-
                        (void)symbol_genocide(200, TRUE);
-                       o_ptr->timeout = 500;
                        break;
                }
 
@@ -2426,9 +2673,42 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It lets out a long, shrill note...");
 #endif
-
                        (void)mass_genocide(200, TRUE);
-                       o_ptr->timeout = 1000;
+                       break;
+               }
+
+               case ACT_SCARE_AREA:
+               {
+                       if (music_singing_any()) stop_singing();
+                       if (hex_spelling_any()) stop_hex_spell_all();
+#ifdef JP
+                       msg_print("¤¢¤Ê¤¿¤ÏÎ϶¯¤¤ÆÍÉ÷¤ò¿á¤­ÌĤ餷¤¿¡£¼þ°Ï¤ÎŨ¤¬¿Ì¤¨¾å¤Ã¤Æ¤¤¤ë!");
+#else
+                       msg_print("You wind a mighty blast; your enemies tremble!");
+#endif
+                       (void)turn_monsters((3 * p_ptr->lev / 2) + 10);
+                       break;
+               }
+
+               case ACT_AGGRAVATE:
+               {
+                       if (o_ptr->name1 == ART_HYOUSIGI)
+                       {
+#ifdef JP
+                               msg_print("Çï»ÒÌÚ¤òÂǤä¿¡£");
+#else
+                               msg_print("You beat Your wooden clappers.");
+#endif
+                       }
+                       else
+                       {
+#ifdef JP
+                               msg_format("%s¤ÏÉÔ²÷¤Êʪ²»¤òΩ¤Æ¤¿¡£", name);
+#else
+                               msg_format("The %s sounds an unpleasant noise.", name);
+#endif
+                       }
+                       aggravate_monsters(0);
                        break;
                }
 
@@ -2437,45 +2717,39 @@ bool activate_random_artifact(object_type * o_ptr)
                case ACT_CHARM_ANIMAL:
                {
                        if (!get_aim_dir(&dir)) return FALSE;
-                       (void)charm_animal(dir, plev);
-                       o_ptr->timeout = 300;
+                       (void)charm_animal(dir, plev * 2);
                        break;
                }
 
                case ACT_CHARM_UNDEAD:
                {
                        if (!get_aim_dir(&dir)) return FALSE;
-                       (void)control_one_undead(dir, plev);
-                       o_ptr->timeout = 333;
+                       (void)control_one_undead(dir, plev * 2);
                        break;
                }
 
                case ACT_CHARM_OTHER:
                {
                        if (!get_aim_dir(&dir)) return FALSE;
-                       (void)charm_monster(dir, plev);
-                       o_ptr->timeout = 400;
+                       (void)charm_monster(dir, plev * 2);
                        break;
                }
 
                case ACT_CHARM_ANIMALS:
                {
                        (void)charm_animals(plev * 2);
-                       o_ptr->timeout = 500;
                        break;
                }
 
                case ACT_CHARM_OTHERS:
                {
                        charm_monsters(plev * 2);
-                       o_ptr->timeout = 750;
                        break;
                }
 
                case ACT_SUMMON_ANIMAL:
                {
                        (void)summon_specific(-1, py, px, plev, SUMMON_ANIMAL_RANGER, (PM_ALLOW_GROUP | PM_FORCE_PET));
-                       o_ptr->timeout = 200 + randint1(300);
                        break;
                }
 
@@ -2486,9 +2760,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("You summon a phantasmal servant.");
 #endif
-
                        (void)summon_specific(-1, py, px, dun_level, SUMMON_PHANTOM, (PM_ALLOW_GROUP | PM_FORCE_PET));
-                       o_ptr->timeout = 200 + randint1(200);
                        break;
                }
 
@@ -2508,25 +2780,20 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                                msg_print("An elemental materializes...");
 #endif
-
-
                                if (pet)
 #ifdef JP
                                        msg_print("¤¢¤Ê¤¿¤ËÉþ½¾¤·¤Æ¤¤¤ë¤è¤¦¤À¡£");
 #else
                                        msg_print("It seems obedient to you.");
 #endif
-
                                else
 #ifdef JP
                                        msg_print("¤½¤ì¤ò¥³¥ó¥È¥í¡¼¥ë¤Ç¤­¤Ê¤«¤Ã¤¿¡ª");
 #else
                                        msg_print("You fail to control it!");
 #endif
-
                        }
 
-                       o_ptr->timeout = 750;
                        break;
                }
 
@@ -2546,24 +2813,20 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                                msg_print("The area fills with a stench of sulphur and brimstone.");
 #endif
-
                                if (pet)
 #ifdef JP
                                        msg_print("¡Ö¤´ÍѤǤ´¤¶¤¤¤Þ¤¹¤«¡¢¤´¼ç¿ÍÍÍ¡×");
 #else
                                        msg_print("'What is thy bidding... Master?'");
 #endif
-
                                else
 #ifdef JP
                                        msg_print("¡ÖNON SERVIAM! Wretch! ¤ªÁ°¤Îº²¤òĺ¤¯¤¾¡ª¡×");
 #else
                                        msg_print("'NON SERVIAM! Wretch! I shall feast on thy mortal soul!'");
 #endif
-
                        }
 
-                       o_ptr->timeout = 666 + randint1(333);
                        break;
                }
 
@@ -2586,48 +2849,124 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                                msg_print("Cold winds begin to blow around you, carrying with them the stench of decay...");
 #endif
-
                                if (pet)
 #ifdef JP
                                        msg_print("¸Å¤¨¤Î»à¤»¤ë¼Ô¶¦¤¬¤¢¤Ê¤¿¤Ë»Å¤¨¤ë¤¿¤áÅÚ¤«¤éᴤä¿¡ª");
 #else
                                        msg_print("Ancient, long-dead forms arise from the ground to serve you!");
 #endif
-
                                else
 #ifdef JP
                                        msg_print("»à¼Ô¤¬á´¤Ã¤¿¡£Ì²¤ê¤ò˸¤²¤ë¤¢¤Ê¤¿¤òȳ¤¹¤ë¤¿¤á¤Ë¡ª");
 #else
                                        msg_print("'The dead arise... to punish you for disturbing them!'");
 #endif
-
                        }
 
-                       o_ptr->timeout = 666 + randint1(333);
                        break;
                }
 
-               /* Activate for healing */
-
-               case ACT_CURE_LW:
+               case ACT_SUMMON_HOUND:
                {
-                       (void)set_afraid(0);
-                       (void)hp_player(30);
-                       o_ptr->timeout = 10;
-                       break;
-               }
+                       u32b mode = PM_ALLOW_GROUP;
+                       bool pet = !one_in_(5);
+                       if (pet) mode |= PM_FORCE_PET;
+                       else mode |= PM_NO_PET;
 
-               case ACT_CURE_MW:
-               {
+                       if (summon_specific((pet ? -1 : 0), py, px, ((p_ptr->lev * 3) / 2), SUMMON_HOUND, mode))
+                       {
+
+                               if (pet)
 #ifdef JP
-                       msg_print("¿¼»ç¿§¤Î¸÷¤òȯ¤·¤Æ¤¤¤ë...");
+                                       msg_print("¥Ï¥¦¥ó¥É¤¬¤¢¤Ê¤¿¤Î²¼ËͤȤ·¤Æ½Ð¸½¤·¤¿¡£");
 #else
-                       msg_print("It radiates deep purple...");
+                               msg_print("A group of hounds appear as your servant.");
 #endif
 
-                       hp_player(damroll(4, 8));
-                       (void)set_cut((p_ptr->cut / 2) - 50);
-                       o_ptr->timeout = randint0(3) + 3;
+                               else
+#ifdef JP
+                                       msg_print("¥Ï¥¦¥ó¥É¤Ï¤¢¤Ê¤¿¤Ë²ç¤ò¸þ¤±¤Æ¤¤¤ë¡ª");
+#else
+                                       msg_print("A group of hounds appear as your enemy!");
+#endif
+
+                       }
+
+                       break;
+               }
+
+               case ACT_SUMMON_DAWN:
+               {
+#ifdef JP
+                       msg_print("¶Ç¤Î»ÕÃĤò¾¤´­¤·¤¿¡£");
+#else
+                       msg_print("You summon the Legion of the Dawn.");
+#endif
+                       (void)summon_specific(-1, py, px, dun_level, SUMMON_DAWN, (PM_ALLOW_GROUP | PM_FORCE_PET));
+                       break;
+               }
+
+               case ACT_SUMMON_OCTOPUS:
+               {
+                       u32b mode = PM_ALLOW_GROUP;
+                       bool pet = !one_in_(5);
+                       if (pet) mode |= PM_FORCE_PET;
+
+                       if (summon_named_creature(0, py, px, MON_JIZOTAKO, mode))
+                       {
+                               if (pet)
+#ifdef JP
+                                       msg_print("Âý¤¬¤¢¤Ê¤¿¤Î²¼ËͤȤ·¤Æ½Ð¸½¤·¤¿¡£");
+#else
+                                       msg_print("A group of octopuses appear as your servant.");
+#endif
+                               else
+#ifdef JP
+                                       msg_print("Âý¤Ï¤¢¤Ê¤¿¤òâˤó¤Ç¤¤¤ë¡ª");
+#else
+                                       msg_print("A group of octopuses appear as your enemy!");
+#endif
+                       }
+
+                       break;
+               }
+
+               /* Activate for healing */
+
+               case ACT_CHOIR_SINGS:
+               {
+#ifdef JP
+                       msg_print("Å·¹ñ¤Î²Î¤¬Ê¹¤³¤¨¤ë...");
+#else
+                       msg_print("A heavenly choir sings...");
+#endif
+                       (void)set_poisoned(0);
+                       (void)set_cut(0);
+                       (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);
+                       break;
+               }
+
+               case ACT_CURE_LW:
+               {
+                       (void)set_afraid(0);
+                       (void)hp_player(30);
+                       break;
+               }
+
+               case ACT_CURE_MW:
+               {
+#ifdef JP
+                       msg_print("¿¼»ç¿§¤Î¸÷¤òȯ¤·¤Æ¤¤¤ë...");
+#else
+                       msg_print("It radiates deep purple...");
+#endif
+                       hp_player(damroll(4, 8));
+                       (void)set_cut((p_ptr->cut / 2) - 50);
                        break;
                }
 
@@ -2638,10 +2977,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows deep blue...");
 #endif
-
                        (void)set_afraid(0);
                        (void)set_poisoned(0);
-                       o_ptr->timeout = 5;
                        break;
                }
 
@@ -2652,9 +2989,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows a deep red...");
 #endif
-
                        restore_level();
-                       o_ptr->timeout = 450;
                        break;
                }
 
@@ -2665,7 +3000,6 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows a deep green...");
 #endif
-
                        (void)do_res_stat(A_STR);
                        (void)do_res_stat(A_INT);
                        (void)do_res_stat(A_WIS);
@@ -2673,7 +3007,6 @@ bool activate_random_artifact(object_type * o_ptr)
                        (void)do_res_stat(A_CON);
                        (void)do_res_stat(A_CHR);
                        (void)restore_level();
-                       o_ptr->timeout = 750;
                        break;
                }
 
@@ -2681,19 +3014,13 @@ bool activate_random_artifact(object_type * o_ptr)
                {
 #ifdef JP
                        msg_print("¿¼ÀÄ¿§¤Ëµ±¤¤¤Æ¤¤¤ë...");
-#else
-                       msg_print("It glows deep blue...");
-#endif
-
-#ifdef JP
                        msg_print("ÂÎÆâ¤ËÃȤ«¤¤¸ÝÆ°¤¬´¶¤¸¤é¤ì¤ë...");
 #else
+                       msg_print("It glows deep blue...");
                        msg_print("You feel a warm tingling inside...");
 #endif
-
                        (void)hp_player(700);
                        (void)set_cut(0);
-                       o_ptr->timeout = 250;
                        break;
                }
 
@@ -2701,19 +3028,74 @@ bool activate_random_artifact(object_type * o_ptr)
                {
 #ifdef JP
                        msg_print("Çò¤¯ÌÀ¤ë¤¯µ±¤¤¤Æ¤¤¤ë...");
+                       msg_print("¤Ò¤¸¤ç¤¦¤Ëµ¤Ê¬¤¬¤è¤¤...");
 #else
                        msg_print("It glows a bright white...");
+                       msg_print("You feel much better...");
 #endif
+                       (void)hp_player(1000);
+                       (void)set_cut(0);
+                       break;
+               }
 
+               case ACT_CURING:
+               {
 #ifdef JP
-                       msg_print("¤Ò¤¸¤ç¤¦¤Ëµ¤Ê¬¤¬¤è¤¤...");
+                       msg_format("%s¤ÎÍ¥¤·¤µ¤ËÌþ¤µ¤ì¤ë...", name);
 #else
-                       msg_print("You feel much better...");
+                       msg_format("the %s cures you affectionately ...", name);
 #endif
-
-                       (void)hp_player(1000);
+                       (void)set_poisoned(0);
+                       (void)set_confused(0);
+                       (void)set_blind(0);
+                       (void)set_stun(0);
                        (void)set_cut(0);
-                       o_ptr->timeout = 888;
+                       (void)set_image(0);
+
+                       break;
+               }
+
+               case ACT_CURE_MANA_FULL:
+               {
+#ifdef JP
+                       msg_format("%s¤¬ÀÄÇò¤¯¸÷¤Ã¤¿¡¥¡¥¡¥", name);
+#else
+                       msg_format("The %s glows pale...", name);
+#endif
+                       if (p_ptr->pclass == CLASS_MAGIC_EATER)
+                       {
+                               int i;
+                               for (i = 0; i < EATER_EXT*2; i++)
+                               {
+                                       p_ptr->magic_num1[i] += (p_ptr->magic_num2[i] < 10) ? EATER_CHARGE * 3 : p_ptr->magic_num2[i]*EATER_CHARGE/3;
+                                       if (p_ptr->magic_num1[i] > p_ptr->magic_num2[i]*EATER_CHARGE) p_ptr->magic_num1[i] = p_ptr->magic_num2[i]*EATER_CHARGE;
+                               }
+                               for (; i < EATER_EXT*3; i++)
+                               {
+                                       int k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2);
+                                       p_ptr->magic_num1[i] -= ((p_ptr->magic_num2[i] < 10) ? EATER_ROD_CHARGE*3 : p_ptr->magic_num2[i]*EATER_ROD_CHARGE/3)*k_info[k_idx].pval;
+                                       if (p_ptr->magic_num1[i] < 0) p_ptr->magic_num1[i] = 0;
+                               }
+#ifdef JP
+                               msg_print("Ƭ¤¬¥Ï¥Ã¥­¥ê¤È¤·¤¿¡£");
+#else
+                               msg_print("You feel your head clear.");
+#endif
+                               p_ptr->window |= (PW_PLAYER);
+                       }
+                       else if (p_ptr->csp < p_ptr->msp)
+                       {
+                               p_ptr->csp = p_ptr->msp;
+                               p_ptr->csp_frac = 0;
+#ifdef JP
+                               msg_print("Ƭ¤¬¥Ï¥Ã¥­¥ê¤È¤·¤¿¡£");
+#else
+                               msg_print("You feel your head clear.");
+#endif
+                               p_ptr->redraw |= (PR_MANA);
+                               p_ptr->window |= (PW_PLAYER);
+                               p_ptr->window |= (PW_SPELL);
+                       }
                        break;
                }
 
@@ -2722,29 +3104,29 @@ bool activate_random_artifact(object_type * o_ptr)
                case ACT_ESP:
                {
                        (void)set_tim_esp(randint1(30) + 25, FALSE);
-                       o_ptr->timeout = 200;
                        break;
                }
 
                case ACT_BERSERK:
                {
+                       (void)set_afraid(0);
+                       (void)set_shero(randint1(25) + 25, FALSE);
+                       /* (void)set_afraid(0);
                        (void)set_hero(randint1(50) + 50, FALSE);
                        (void)set_blessed(randint1(50) + 50, FALSE);
-                       o_ptr->timeout = 100 + randint1(100);
+                       o_ptr->timeout = 100 + randint1(100); */
                        break;
                }
 
                case ACT_PROT_EVIL:
                {
 #ifdef JP
-                       msg_print("±Ô¤¤²»¤¬Î®¤ì½Ð¤¿...");
+                       msg_format("%s¤«¤é±Ô¤¤²»¤¬Î®¤ì½Ð¤¿...", name);
 #else
-                       msg_print("It lets out a shrill wail...");
+                       msg_format("The %s lets out a shrill wail...", name);
 #endif
-
                        k = 3 * p_ptr->lev;
                        (void)set_protevil(randint1(25) + k, FALSE);
-                       o_ptr->timeout = randint0(225) + 225;
                        break;
                }
 
@@ -2755,13 +3137,11 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows many colours...");
 #endif
-
                        (void)set_oppose_acid(randint1(40) + 40, FALSE);
                        (void)set_oppose_elec(randint1(40) + 40, FALSE);
                        (void)set_oppose_fire(randint1(40) + 40, FALSE);
                        (void)set_oppose_cold(randint1(40) + 40, FALSE);
                        (void)set_oppose_pois(randint1(40) + 40, FALSE);
-                       o_ptr->timeout = 200;
                        break;
                }
 
@@ -2772,9 +3152,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows bright green...");
 #endif
-
                        (void)set_fast(randint1(20) + 20, FALSE);
-                       o_ptr->timeout = 250;
                        break;
                }
 
@@ -2785,23 +3163,111 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows brightly...");
 #endif
-
                        (void)set_fast(randint1(75) + 75, FALSE);
-                       o_ptr->timeout = randint0(200) + 200;
                        break;
                }
 
                case ACT_WRAITH:
                {
                        set_wraith_form(randint1(plev / 2) + (plev / 2), FALSE);
-                       o_ptr->timeout = 1000;
                        break;
                }
 
                case ACT_INVULN:
                {
                        (void)set_invuln(randint1(8) + 8, FALSE);
-                       o_ptr->timeout = 1000;
+                       break;
+               }
+
+               case ACT_HELO:
+               {
+                       (void)set_afraid(0);
+                       set_hero(randint1(25)+25, FALSE);
+                       hp_player(10);
+                       break;
+               }
+
+               case ACT_HELO_SPEED:
+               {
+                       (void)set_fast(randint1(50) + 50, FALSE);
+                       hp_player(10);
+                       set_afraid(0);
+                       set_hero(randint1(50) + 50, FALSE);
+                       break;
+               }
+
+               case ACT_RESIST_ACID:
+               {
+#ifdef JP
+                       msg_format("%s¤¬¹õ¤¯µ±¤¤¤¿...", name);
+#else
+                       msg_format("The %s grows black.", name);
+#endif
+                       if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ACID))
+                       {
+                               if (!get_aim_dir(&dir)) return FALSE;
+                               fire_ball(GF_ACID, dir, 100, 2);
+                       }
+                       (void)set_oppose_acid(randint1(20) + 20, FALSE);
+                       break;
+               }
+
+               case ACT_RESIST_FIRE:
+               {
+#ifdef JP
+                       msg_format("%s¤¬ÀÖ¤¯µ±¤¤¤¿...", name);
+#else
+                       msg_format("The %s grows red.", name);
+#endif
+                       if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES))
+                       {
+                               if (!get_aim_dir(&dir)) return FALSE;
+                               fire_ball(GF_FIRE, dir, 100, 2);
+                       }
+                       (void)set_oppose_fire(randint1(20) + 20, FALSE);
+                       break;
+               }
+
+               case ACT_RESIST_COLD:
+               {
+#ifdef JP
+                       msg_format("%s¤¬Çò¤¯µ±¤¤¤¿...", name);
+#else
+                       msg_format("The %s grows white.", name);
+#endif
+                       if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE))
+                       {
+                               if (!get_aim_dir(&dir)) return FALSE;
+                               fire_ball(GF_COLD, dir, 100, 2);
+                       }
+                       (void)set_oppose_cold(randint1(20) + 20, FALSE);
+                       break;
+               }
+
+               case ACT_RESIST_ELEC:
+               {
+#ifdef JP
+                       msg_format("%s¤¬ÀĤ¯µ±¤¤¤¿...", name);
+#else
+                       msg_format("The %s grows blue.", name);
+#endif
+                       if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ELEC))
+                       {
+                               if (!get_aim_dir(&dir)) return FALSE;
+                               fire_ball(GF_ELEC, dir, 100, 2);
+                       }
+                       (void)set_oppose_elec(randint1(20) + 20, FALSE);
+                       break;
+               }
+
+               case ACT_RESIST_POIS:
+               {
+#ifdef JP
+                       msg_format("%s¤¬ÎФ˵±¤¤¤¿...", name);
+#else
+                       msg_format("The %s grows green.", name);
+#endif
+                       (void)set_oppose_pois(randint1(20) + 20, FALSE);
                        break;
                }
 
@@ -2810,13 +3276,11 @@ bool activate_random_artifact(object_type * o_ptr)
                case ACT_LIGHT:
                {
 #ifdef JP
-                       msg_print("À¡¤ó¤À¸÷¤¬¤¢¤Õ¤ì½Ð¤¿...");
+                       msg_format("%s¤«¤éÀ¡¤ó¤À¸÷¤¬¤¢¤Õ¤ì½Ð¤¿...", name);
 #else
-                       msg_print("It wells with clear light...");
+                       msg_format("The %s wells with clear light...", name);
 #endif
-
                        lite_area(damroll(2, 15), 3);
-                       o_ptr->timeout = randint0(10) + 10;
                        break;
                }
 
@@ -2827,10 +3291,8 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It shines brightly...");
 #endif
-
                        map_area(DETECT_RAD_MAP);
                        lite_area(damroll(2, 15), 3);
-                       o_ptr->timeout = randint0(50) + 50;
                        break;
                }
 
@@ -2838,18 +3300,12 @@ bool activate_random_artifact(object_type * o_ptr)
                {
 #ifdef JP
                        msg_print("Çò¤¯ÌÀ¤ë¤¯µ±¤¤¤Æ¤¤¤ë...");
-#else
-                       msg_print("It glows bright white...");
-#endif
-
-#ifdef JP
                        msg_print("¿´¤Ë¥¤¥á¡¼¥¸¤¬É⤫¤ó¤Ç¤­¤¿...");
 #else
+                       msg_print("It glows bright white...");
                        msg_print("An image forms in your mind...");
 #endif
-
                        detect_all(DETECT_RAD_DEFAULT);
-                       o_ptr->timeout = randint0(55) + 55;
                        break;
                }
 
@@ -2860,11 +3316,9 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows brightly...");
 #endif
-
                        detect_all(DETECT_RAD_DEFAULT);
                        probing();
-                       identify_fully(FALSE, FALSE);
-                       o_ptr->timeout = 1000;
+                       identify_fully(FALSE);
                        break;
                }
 
@@ -2875,16 +3329,13 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows yellow...");
 #endif
-
-                       identify_fully(FALSE, FALSE);
-                       o_ptr->timeout = 750;
+                       identify_fully(FALSE);
                        break;
                }
 
                case ACT_ID_PLAIN:
                {
-                       if (!ident_spell(FALSE, FALSE)) return FALSE;
-                       o_ptr->timeout = 10;
+                       if (!ident_spell(FALSE)) return FALSE;
                        break;
                }
 
@@ -2895,9 +3346,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows bright red...");
 #endif
-
                        explosive_rune();
-                       o_ptr->timeout = 200;
                        break;
                }
 
@@ -2908,16 +3357,13 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows light blue...");
 #endif
-
                        warding_glyph();
-                       o_ptr->timeout = 400;
                        break;
                }
 
                case ACT_SATIATE:
                {
                        (void)set_food(PY_FOOD_MAX - 1);
-                       o_ptr->timeout = 200;
                        break;
                }
 
@@ -2928,9 +3374,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows bright red...");
 #endif
-
                        destroy_doors_touch();
-                       o_ptr->timeout = 10;
                        break;
                }
 
@@ -2941,17 +3385,14 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It pulsates...");
 #endif
-
                        if (!get_aim_dir(&dir)) return FALSE;
-                       wall_to_mud(dir);
-                       o_ptr->timeout = 5;
+                       wall_to_mud(dir, 20 + randint1(30));
                        break;
                }
 
                case ACT_RECHARGE:
                {
                        recharge(130);
-                       o_ptr->timeout = 70;
                        break;
                }
 
@@ -2962,9 +3403,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It glows bright yellow...");
 #endif
-
                        (void)alchemy();
-                       o_ptr->timeout = 500;
                        break;
                }
 
@@ -2975,9 +3414,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("You open a dimensional gate. Choose a destination.");
 #endif
-
                        if (!dimension_door()) return FALSE;
-                       o_ptr->timeout = 100;
                        break;
                }
 
@@ -2989,9 +3426,7 @@ bool activate_random_artifact(object_type * o_ptr)
 #else
                        msg_print("It twists space around you...");
 #endif
-
-                       teleport_player(100);
-                       o_ptr->timeout = 45;
+                       teleport_player(100, 0L);
                        break;
                }
 
@@ -3003,18 +3438,532 @@ bool activate_random_artifact(object_type * o_ptr)
                        msg_print("It glows soft white...");
 #endif
                        if (!word_of_recall()) return FALSE;
-                       o_ptr->timeout = 200;
+                       break;
+               }
+
+               case ACT_JUDGE:
+               {
+#ifdef JP
+                       msg_format("%s¤ÏÀÖ¤¯ÌÀ¤ë¤¯¸÷¤Ã¤¿¡ª", name);
+#else
+                       msg_format("The %s flashes bright red!", name);
+#endif
+                       chg_virtue(V_KNOWLEDGE, 1);
+                       chg_virtue(V_ENLIGHTEN, 1);
+                       wiz_lite(FALSE);
+#ifdef JP
+                       msg_format("%s¤Ï¤¢¤Ê¤¿¤ÎÂÎÎϤòÃ¥¤Ã¤¿...", name);
+                       take_hit(DAMAGE_LOSELIFE, damroll(3,8), "¿³È½¤ÎÊõÀÐ", -1);
+#else
+                       msg_format("The %s drains your vitality...", name);
+                       take_hit(DAMAGE_LOSELIFE, damroll(3, 8), "the Jewel of Judgement", -1);
+#endif
+                       (void)detect_traps(DETECT_RAD_DEFAULT, TRUE);
+                       (void)detect_doors(DETECT_RAD_DEFAULT);
+                       (void)detect_stairs(DETECT_RAD_DEFAULT);
+#ifdef JP
+                       if (get_check("µ¢´Ô¤ÎÎϤò»È¤¤¤Þ¤¹¤«¡©"))
+#else
+                       if (get_check("Activate recall? "))
+#endif
+                       {
+                               (void)word_of_recall();
+                       }
+
+                       break;
+               }
+
+               case ACT_TELEKINESIS:
+               {
+                       if (!get_aim_dir(&dir)) return FALSE;
+#ifdef JP
+                       msg_format("%s¤ò¿­¤Ð¤·¤¿¡£", name);
+#else
+                       msg_format("You stretched your %s.", name);
+#endif
+                       fetch(dir, 500, TRUE);
+                       break;
+               }
+
+               case ACT_DETECT_UNIQUE:
+               {
+                       int i;
+                       monster_type *m_ptr;
+                       monster_race *r_ptr;
+#ifdef JP
+                       msg_print("´ñ̯¤Ê¾ì½ê¤¬Æ¬¤ÎÃæ¤ËÉ⤫¤ó¤À¡¥¡¥¡¥");
+#else
+                       msg_print("Some strange places show up in your mind. And you see ...");
+#endif
+                       /* Process the monsters (backwards) */
+                       for (i = m_max - 1; i >= 1; i--)
+                       {
+                               /* Access the monster */
+                               m_ptr = &m_list[i];
+
+                               /* Ignore "dead" monsters */
+                               if (!m_ptr->r_idx) continue;
+
+                               r_ptr = &r_info[m_ptr->r_idx];
+
+                               if(r_ptr->flags1 & RF1_UNIQUE)
+                               {
+#ifdef JP
+                                       msg_format("%s¡¥ ",r_name + r_ptr->name);
+#else
+                                       msg_format("%s. ",r_name + r_ptr->name);
+#endif
+                               }
+                       }
+                       break;
+               }
+
+               case ACT_ESCAPE:
+               {
+                       switch (randint1(13))
+                       {
+                       case 1: case 2: case 3: case 4: case 5:
+                               teleport_player(10, 0L);
+                               break;
+                       case 6: case 7: case 8: case 9: case 10:
+                               teleport_player(222, 0L);
+                               break;
+                       case 11: case 12:
+                               (void)stair_creation();
+                               break;
+                       default:
+#ifdef JP
+                               if (get_check("¤³¤Î³¬¤òµî¤ê¤Þ¤¹¤«¡©"))
+#else
+                               if (get_check("Leave this level? "))
+#endif
+                               {
+                                       if (autosave_l) do_cmd_save_game(TRUE);
+
+                                       /* Leaving */
+                                       p_ptr->leaving = TRUE;
+                               }
+                       }
+                       break;
+               }
+
+               case ACT_DISP_CURSE_XTRA:
+               {
+#ifdef JP
+                       msg_format("%s¤¬¿¿¼Â¤ò¾È¤é¤·½Ð¤¹...", name);
+#else
+                       msg_format("The %s exhibits the truth...", name);
+#endif
+                       if (remove_all_curse())
+                       {
+#ifdef JP
+                               msg_print("狼¤Ë¸«¼é¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£");
+#else
+                               msg_print("You feel as if someone is watching over you.");
+#endif
+                       }
+                       (void)probing();
+                       break;
+               }
+
+               case ACT_BRAND_FIRE_BOLTS:
+               {
+#ifdef JP
+                       msg_format("%s¤¬¿¼¹È¤Ëµ±¤¤¤¿...", name);
+#else
+                       msg_format("Your %s glows deep red...", name);
+#endif
+                       (void)brand_bolts();
+                       break;
+               }
+
+               case ACT_RECHARGE_XTRA:
+               {
+#ifdef JP
+                       msg_format("%s¤¬Çò¤¯µ±¤¤¤¿¡¥¡¥¡¥", name);
+#else
+                       msg_format("The %s gleams with blinding light...", name);
+#endif
+                       if (!recharge(1000)) return FALSE;
+                       break;
+               }
+
+               case ACT_LORE:
+               {
+#ifdef JP
+                       msg_print("ÀФ¬±£¤µ¤ì¤¿ÈëÌ©¤ò¼Ì¤·½Ð¤·¤¿¡¥¡¥¡¥");
+#else
+                       msg_print("The stone reveals hidden mysteries...");
+#endif
+                       if (!ident_spell(FALSE)) return FALSE;
+
+                       if (mp_ptr->spell_book)
+                       {
+                               /* Sufficient mana */
+                               if (20 <= p_ptr->csp)
+                               {
+                                       /* Use some mana */
+                                       p_ptr->csp -= 20;
+                               }
+
+                               /* Over-exert the player */
+                               else
+                               {
+                                       int oops = 20 - p_ptr->csp;
+
+                                       /* No mana left */
+                                       p_ptr->csp = 0;
+                                       p_ptr->csp_frac = 0;
+
+                                       /* Message */
+#ifdef JP
+                                       msg_print("ÀФòÀ©¸æ¤Ç¤­¤Ê¤¤¡ª");
+#else
+                                       msg_print("You are too weak to control the stone!");
+#endif
+                                       /* Hack -- Bypass free action */
+                                       (void)set_paralyzed(p_ptr->paralyzed +
+                                               randint1(5 * oops + 1));
+
+                                       /* Confusing. */
+                                       (void)set_confused(p_ptr->confused +
+                                               randint1(5 * oops + 1));
+                               }
+
+                               /* Redraw mana */
+                               p_ptr->redraw |= (PR_MANA);
+                       }
+#ifdef JP
+                       take_hit(DAMAGE_LOSELIFE, damroll(1, 12), "´í¸±¤ÊÈëÌ©", -1);
+#else
+                       take_hit(DAMAGE_LOSELIFE, damroll(1, 12), "perilous secrets", -1);
+#endif
+                       /* Confusing. */
+                       if (one_in_(5)) (void)set_confused(p_ptr->confused +
+                               randint1(10));
+
+                       /* Exercise a little care... */
+                       if (one_in_(20))
+#ifdef JP
+                               take_hit(DAMAGE_LOSELIFE, damroll(4, 10), "´í¸±¤ÊÈëÌ©", -1);
+#else
+                               take_hit(DAMAGE_LOSELIFE, damroll(4, 10), "perilous secrets", -1);
+#endif
+                       break;
+               }
+
+               case ACT_SHIKOFUMI:
+               {
+#ifdef JP
+                       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);
+                       break;
+               }
+
+               case ACT_PHASE_DOOR:
+               {
+                       teleport_player(10, 0L);
+                       break;
+               }
+
+               case ACT_DETECT_ALL_MONS:
+               {
+                       (void)detect_monsters_invis(255);
+                       (void)detect_monsters_normal(255);
+                       break;
+               }
+
+               case ACT_ULTIMATE_RESIST:
+               {
+                       int v = randint1(25)+25;
+                       (void)set_afraid(0);
+                       (void)set_hero(v, FALSE);
+                       (void)hp_player(10);
+                       (void)set_blessed(v, FALSE);
+                       (void)set_oppose_acid(v, FALSE);
+                       (void)set_oppose_elec(v, FALSE);
+                       (void)set_oppose_fire(v, FALSE);
+                       (void)set_oppose_cold(v, FALSE);
+                       (void)set_oppose_pois(v, FALSE);
+                       (void)set_ultimate_res(v, FALSE);
+                       break;
+               }
+
+
+               /* Unique activation */
+               case ACT_CAST_OFF:
+               {
+                       int inv, o_idx, t;
+                       char o_name[MAX_NLEN];
+                       object_type forge;
+
+                       /* Cast off activated item */
+                       for (inv = INVEN_RARM; inv <= INVEN_FEET; inv++)
+                       {
+                               if (o_ptr == &inventory[inv]) break;
+                       }
+
+                       /* Paranoia */
+                       if (inv > INVEN_FEET) return FALSE;
+
+                       object_copy(&forge, o_ptr);
+                       inven_item_increase(inv, (0 - o_ptr->number));
+                       inven_item_optimize(inv);
+                       o_idx = drop_near(&forge, 0, py, px);
+                       o_ptr = &o_list[o_idx];
+
+                       object_desc(o_name, o_ptr, OD_NAME_ONLY);
+                       msg_format(_("%s¤ò椮¼Î¤Æ¤¿¡£", "You cast off %s."), o_name);
+
+                       /* Get effects */
+                       msg_print(_("¡Ödz¤¨¾å¤¬¤ì²¶¤Î¾®±§Ã衪¡×", "You say, 'Burn up my cosmo!"));
+                       t = 20 + randint1(20);
+                       (void)set_blind(p_ptr->blind + t);
+                       (void)set_afraid(0);
+                       (void)set_tim_esp(p_ptr->tim_esp + t, FALSE);
+                       (void)set_tim_regen(p_ptr->tim_regen + t, FALSE);
+                       (void)set_hero(p_ptr->hero + t, FALSE);
+                       (void)set_blessed(p_ptr->blessed + t, FALSE);
+                       (void)set_fast(p_ptr->fast + t, FALSE);
+                       (void)set_shero(p_ptr->shero + t, FALSE);
+                       if (p_ptr->pclass == CLASS_FORCETRAINER)
+                       {
+                               p_ptr->magic_num1[0] = plev * 5 + 190;
+                               msg_print(_("µ¤¤¬ÇúȯÀ£Á°¤Ë¤Ê¤Ã¤¿¡£", "Your force are immediatly before explosion."));
+                       }
+
+                       break;
+               }
+
+               case ACT_FISHING:
+               {
+                       int x, y;
+
+                       if (!get_rep_dir2(&dir)) return FALSE;
+                       y = py+ddy[dir];
+                       x = px+ddx[dir];
+                       tsuri_dir = dir;
+                       if (!cave_have_flag_bold(y, x, FF_WATER))
+                       {
+#ifdef JP
+                               msg_print("¤½¤³¤Ï¿åÊդǤϤʤ¤¡£");
+#else
+                               msg_print("There is no fishing place.");
+#endif
+                               return FALSE;
+                       }
+                       else if (cave[y][x].m_idx)
+                       {
+                               char m_name[80];
+                               monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
+#ifdef JP
+                               msg_format("%s¤¬¼ÙËâ¤À¡ª", m_name);
+#else
+                               msg_format("%^s is stand in your way.", m_name);
+#endif
+                               energy_use = 0;
+                               return FALSE;
+                       }
+                       set_action(ACTION_FISH);
+                       p_ptr->redraw |= (PR_STATE);
+                       break;
+               }
+
+               case ACT_INROU:
+               {
+                       int count = 0, i;
+                       monster_type *m_ptr;
+#ifndef JP
+                       cptr kakusan = "";
+#endif
+                       if (summon_named_creature(0, py, px, MON_SUKE, PM_FORCE_PET))
+                       {
+#ifdef JP
+                               msg_print("¡Ø½õ¤µ¤ó¡Ù¤¬¸½¤ì¤¿¡£");
+#else
+                               msg_print("Suke-san apperars.");
+                               kakusan = "Suke-san";
+#endif
+                               count++;
+                       }
+                       if (summon_named_creature(0, py, px, MON_KAKU, PM_FORCE_PET))
+                       {
+#ifdef JP
+                               msg_print("¡Ø³Ê¤µ¤ó¡Ù¤¬¸½¤ì¤¿¡£");
+#else
+                               msg_print("Kaku-san appears.");
+                               kakusan = "Kaku-san";
+#endif
+                               count++;
+                       }
+                       if (!count)
+                       {
+                               for (i = m_max - 1; i > 0; i--)
+                               {
+                                       m_ptr = &m_list[i];
+                                       if (!m_ptr->r_idx) continue;
+                                       if (!((m_ptr->r_idx == MON_SUKE) || (m_ptr->r_idx == MON_KAKU))) continue;
+                                       if (!los(m_ptr->fy, m_ptr->fx, py, px)) continue;
+                                       if (!projectable(m_ptr->fy, m_ptr->fx, py, px)) continue;
+                                       count++;
+                                       break;
+                               }
+                       }
+
+                       if (count)
+                       {
+#ifdef JP
+                               msg_print("¡Ö¼Ô¤É¤â¡¢¤Ò¤«¤¨¤ª¤í¤¦¡ª¡ª¡ª¤³¤Î¤ªÊý¤ò¤É¤Ê¤¿¤È¤³¤³¤í¤¨¤ë¡£¡×");
+#else
+                               msg_format("%^s says 'WHO do you think this person is! Bow your head, down your knees!'", kakusan);
+#endif
+                               sukekaku = TRUE;
+                               stun_monsters(120);
+                               confuse_monsters(120);
+                               turn_monsters(120);
+                               stasis_monsters(120);
+                               sukekaku = FALSE;
+                       }
+                       else
+                       {
+#ifdef JP
+                               msg_print("¤·¤«¤·¡¢²¿¤âµ¯¤­¤Ê¤«¤Ã¤¿¡£");
+#else
+                               msg_print("Nothing happen.");
+#endif
+                       }
+                       break;
+               }
+
+               case ACT_MURAMASA:
+               {
+                       /* Only for Muramasa */
+                       if (o_ptr->name1 != ART_MURAMASA) return FALSE;
+#ifdef JP
+                       if (get_check("ËÜÅö¤Ë»È¤¤¤Þ¤¹¤«¡©"))
+#else
+                       if (get_check("Are you sure?!"))
+#endif
+                       {
+#ifdef JP
+                               msg_print("¼Àµ¤¬¿Ì¤¨¤¿¡¥¡¥¡¥");
+#else
+                               msg_print("The Muramasa pulsates...");
+#endif
+                               do_inc_stat(A_STR);
+                               if (one_in_(2))
+                               {
+#ifdef JP
+                                       msg_print("¼Àµ¤Ï²õ¤ì¤¿¡ª");
+#else
+                                       msg_print("The Muramasa is destroyed!");
+#endif
+                                       curse_weapon_object(TRUE, o_ptr);
+                               }
+                       }
+                       break;
+               }
+
+               case ACT_BLOODY_MOON:
+               {
+                       /* Only for Bloody Moon */
+                       if (o_ptr->name1 != ART_BLOOD) return FALSE;
+#ifdef JP
+                       msg_print("³ù¤¬ÌÀ¤ë¤¯µ±¤¤¤¿...");
+#else
+                       msg_print("Your scythe glows brightly!");
+#endif
+                       get_bloody_moon_flags(o_ptr);
+                       if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
+                       p_ptr->update |= (PU_BONUS | PU_HP);
+                       break;
+               }
+
+               case ACT_CRIMSON:
+               {
+                       int num = 1;
+                       int i;
+                       int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+                       int tx, ty;
+
+                       /* Only for Crimson */
+                       if (o_ptr->name1 != ART_CRIMSON) return FALSE;
+
+#ifdef JP
+                       msg_print("¤»¤Ã¤«¤¯¤À¤«¤é¡Ø¥¯¥ê¥à¥¾¥ó¡Ù¤ò¤Ö¤Ã¤Ñ¤Ê¤¹¤¼¡ª");
+#else
+                       msg_print("I'll fire CRIMSON! SEKKAKUDAKARA!");
+#endif
+
+                       if (!get_aim_dir(&dir)) return FALSE;
+
+                       /* Use the given direction */
+                       tx = px + 99 * ddx[dir];
+                       ty = py + 99 * ddy[dir];
+
+                       /* Hack -- Use an actual "target" */
+                       if ((dir == 5) && target_okay())
+                       {
+                               tx = target_col;
+                               ty = target_row;
+                       }
+
+                       if (p_ptr->pclass == CLASS_ARCHER)
+                       {
+                               /* Extra shot at level 10 */
+                               if (p_ptr->lev >= 10) num++;
+
+                               /* Extra shot at level 30 */
+                               if (p_ptr->lev >= 30) num++;
+
+                               /* Extra shot at level 45 */
+                               if (p_ptr->lev >= 45) num++;
+                       }
+
+                       for (i = 0; i < num; i++)
+                               project(0, p_ptr->lev/20+1, ty, tx, p_ptr->lev*p_ptr->lev*6/50, GF_ROCKET, flg, -1);
                        break;
                }
 
                default:
                {
 #ifdef JP
-                       msg_format("Unknown activation effect: %d.", o_ptr->xtra2);
+                       msg_format("Unknown activation effect: %d.", act_ptr->index);
 #else
-                       msg_format("Unknown activation effect: %d.", o_ptr->xtra2);
+                       msg_format("Unknown activation effect: %d.", act_ptr->index);
 #endif
+                       return FALSE;
+               }
+       }
 
+       /* Set activation timeout */
+       if (act_ptr->timeout.constant >= 0) {
+               o_ptr->timeout = act_ptr->timeout.constant;
+               if (act_ptr->timeout.dice > 0) {
+                       o_ptr->timeout += randint1(act_ptr->timeout.dice);
+               }
+       } else {
+               /* Activations that have special timeout */
+               switch (act_ptr->index) {
+               case ACT_BR_FIRE:
+                       o_ptr->timeout = ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) ? 200 : 250;
+                       break;
+               case ACT_BR_COLD:
+                       o_ptr->timeout = ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) ? 200 : 250;
+                       break;
+               case ACT_TERROR:
+                       o_ptr->timeout = 3 * (p_ptr->lev + 10);
+                       break;
+               case ACT_MURAMASA:
+                       /* Nothing to do */
+                       break;
+               default:
+                       msg_format("Special timeout is not implemented: %d.", act_ptr->index);
                        return FALSE;
                }
        }
@@ -3023,6 +3972,35 @@ bool activate_random_artifact(object_type * o_ptr)
 }
 
 
+void get_bloody_moon_flags(object_type *o_ptr)
+{
+       int dummy, i;
+
+       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(26);
+               if (flag >= 20) add_flag(o_ptr->art_flags, TR_KILL_UNDEAD + flag - 20);
+               else if (flag == 19) add_flag(o_ptr->art_flags, TR_KILL_ANIMAL);
+               else 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);
+
+       for (i = 0; i < 2; 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);
+       }
+}
+
+
 void random_artifact_resistance(object_type * o_ptr, artifact_type *a_ptr)
 {
        bool give_resistance = FALSE, give_power = FALSE;
@@ -3044,6 +4022,7 @@ void random_artifact_resistance(object_type * o_ptr, artifact_type *a_ptr)
                        return;
                }
        }
+
        if (o_ptr->name1 == ART_MURAMASA)
        {
                if (p_ptr->pclass != CLASS_SAMURAI)
@@ -3061,23 +4040,14 @@ void random_artifact_resistance(object_type * o_ptr, artifact_type *a_ptr)
 
        if (o_ptr->name1 == ART_BLOOD)
        {
-               int dummy, 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++)
+               get_bloody_moon_flags(o_ptr);
+       }
+
+       if (o_ptr->name1 == ART_HEAVENLY_MAIDEN)
+       {
+               if (p_ptr->psex != SEX_FEMALE)
                {
-                       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);
+                       add_flag(o_ptr->art_flags, TR_AGGRAVATE);
                }
        }
 
@@ -3105,7 +4075,7 @@ void random_artifact_resistance(object_type * o_ptr, artifact_type *a_ptr)
 /*
  * Create the artifact of the specified number
  */
-void create_named_art(int a_idx, int y, int x)
+bool create_named_art(int a_idx, int y, int x)
 {
        object_type forge;
        object_type *q_ptr;
@@ -3117,13 +4087,13 @@ void create_named_art(int a_idx, int y, int x)
        q_ptr = &forge;
 
        /* Ignore "empty" artifacts */
-       if (!a_ptr->name) return;
+       if (!a_ptr->name) return FALSE;
 
        /* Acquire the "kind" index */
        i = lookup_kind(a_ptr->tval, a_ptr->sval);
 
        /* Oops */
-       if (!i) return;
+       if (!i) return FALSE;
 
        /* Create the artifact */
        object_prep(q_ptr, i);
@@ -3151,6 +4121,12 @@ void create_named_art(int a_idx, int y, int x)
 
        random_artifact_resistance(q_ptr, a_ptr);
 
+       /*
+        * drop_near()Æâ¤ÇÉáÄ̤θÇÄꥢ¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬½Å¤Ê¤é¤Ê¤¤À­¼Á¤Ë°Í¸¤¹¤ë.
+        * ²¾¤Ë2¸Ä°Ê¾å¸ºß²Äǽ¤«¤ÄÁõÈ÷Éʰʳ°¤Î¸ÇÄꥢ¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬ºîÀ®¤µ¤ì¤ì¤Ð
+        * ¤³¤Î´Ø¿ô¤ÎÊÖ¤êÃͤϿ®ÍѤǤ­¤Ê¤¯¤Ê¤ë.
+        */
+
        /* Drop the artifact from heaven */
-       (void)drop_near(q_ptr, -1, y, x);
+       return drop_near(q_ptr, -1, y, x) ? TRUE : FALSE;
 }