New Magic-Eater's class power, 'Powerful Activation' is added

Some magic items are not affected by this power yet

diff --git a/src/artifact.c b/src/artifact.c
index 3595542..07c800d 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2048,7 +2048,7 @@ bool activate_random_artifact(object_type *o_ptr)
 #else
                        msg_print("A line of sunlight appears.");
 #endif
-                       (void)lite_line(dir);
+                       (void)lite_line(dir, damroll(6, 8));
                        break;
                }
 
@@ -3319,7 +3319,7 @@ bool activate_random_artifact(object_type *o_ptr)
                        msg_print("It pulsates...");
 #endif
                        if (!get_aim_dir(&dir)) return FALSE;
-                       wall_to_mud(dir);
+                       wall_to_mud(dir, 20 + randint1(30));
                        break;
                }
 

diff --git a/src/cmd6.c b/src/cmd6.c
index 68a2272..9e9c7a8 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -2306,10 +2306,12 @@ void do_cmd_read_scroll(void)
 }
 
 
-static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
+static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, bool known)
 {
        int k;
        int ident = FALSE;
+       int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
+       int detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT;
 
        /* Analyze the staff */
        switch (sval)
@@ -2320,7 +2322,7 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
                        {
                                if (set_blind(p_ptr->blind + 3 + randint1(5))) ident = TRUE;
                        }
-                       if (unlite_area(10, 3)) ident = TRUE;
+                       if (unlite_area(10, (powerful ? 6 : 3))) ident = TRUE;
                        break;
                }
 
@@ -2338,7 +2340,8 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
 
                case SV_STAFF_SUMMONING:
                {
-                       for (k = 0; k < randint1(4); k++)
+                       const int times = randint1(powerful ? 8 : 4);
+                       for (k = 0; k < times; k++)
                        {
                                if (summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
                                {
@@ -2350,21 +2353,26 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
 
                case SV_STAFF_TELEPORTATION:
                {
-                       teleport_player(100, 0L);
+                       teleport_player((powerful ? 150 : 100), 0L);
                        ident = TRUE;
                        break;
                }
 
                case SV_STAFF_IDENTIFY:
                {
-                       if (!ident_spell(FALSE)) *use_charge = FALSE;
+                       if (powerful) {
+                               if (!identify_fully(FALSE)) *use_charge = FALSE;
+                       } else {
+                               if (!ident_spell(FALSE)) *use_charge = FALSE;
+                       }
                        ident = TRUE;
                        break;
                }
 
                case SV_STAFF_REMOVE_CURSE:
                {
-                       if (remove_curse())
+                       bool result = powerful ? remove_all_curse() : remove_curse();
+                       if (result)
                        {
                                if (magic)
                                {
@@ -2416,7 +2424,7 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
                                        if (!player_bold(y, x)) break;
                                }
 
-                               project(0, 0, y, x, damroll(6 + p_ptr->lev / 8, 10), GF_LITE_WEAK,
+                               project(0, 0, y, x, damroll(6 + lev / 8, 10), GF_LITE_WEAK,
                                                  (PROJECT_BEAM | PROJECT_THRU | PROJECT_GRID | PROJECT_KILL), -1);
                        }
                        ident = TRUE;
@@ -2425,58 +2433,63 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
 
                case SV_STAFF_LITE:
                {
-                       if (lite_area(damroll(2, 8), 2)) ident = TRUE;
+                       if (lite_area(damroll(2, 8), (powerful ? 4 : 2))) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_MAPPING:
                {
-                       map_area(DETECT_RAD_MAP);
+                       map_area(powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP);
                        ident = TRUE;
                        break;
                }
 
                case SV_STAFF_DETECT_GOLD:
                {
-                       if (detect_treasure(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_objects_gold(DETECT_RAD_DEFAULT)) ident = TRUE;
+                       if (detect_treasure(detect_rad)) ident = TRUE;
+                       if (detect_objects_gold(detect_rad)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_DETECT_ITEM:
                {
-                       if (detect_objects_normal(DETECT_RAD_DEFAULT)) ident = TRUE;
+                       if (detect_objects_normal(detect_rad)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_DETECT_TRAP:
                {
-                       if (detect_traps(DETECT_RAD_DEFAULT, known)) ident = TRUE;
+                       if (detect_traps(detect_rad, known)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_DETECT_DOOR:
                {
-                       if (detect_doors(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_stairs(DETECT_RAD_DEFAULT)) ident = TRUE;
+                       if (detect_doors(detect_rad)) ident = TRUE;
+                       if (detect_stairs(detect_rad)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_DETECT_INVIS:
                {
-                       if (detect_monsters_invis(DETECT_RAD_DEFAULT)) ident = TRUE;
+                       if (detect_monsters_invis(detect_rad)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_DETECT_EVIL:
                {
-                       if (detect_monsters_evil(DETECT_RAD_DEFAULT)) ident = TRUE;
+                       if (detect_monsters_evil(detect_rad)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_CURE_LIGHT:
                {
-                       if (hp_player(damroll(2, 8))) ident = TRUE;
+                       if (hp_player(damroll((powerful ? 4 : 2), 8))) ident = TRUE;
+                       if (powerful) {
+                               if (set_blind(0)) ident = TRUE;
+                               if (set_poisoned(0)) ident = TRUE;
+                               if (set_cut(p_ptr->cut - 10)) ident = TRUE;
+                       }
                        if (set_shero(0,TRUE)) ident = TRUE;
                        break;
                }
@@ -2495,7 +2508,7 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
 
                case SV_STAFF_HEALING:
                {
-                       if (hp_player(300)) ident = TRUE;
+                       if (hp_player(powerful ? 500 : 300)) ident = TRUE;
                        if (set_stun(0)) ident = TRUE;
                        if (set_cut(0)) ident = TRUE;
                        if (set_shero(0,TRUE)) ident = TRUE;
@@ -2526,19 +2539,19 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
 
                case SV_STAFF_SLEEP_MONSTERS:
                {
-                       if (sleep_monsters()) ident = TRUE;
+                       if (sleep_monsters(lev)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_SLOW_MONSTERS:
                {
-                       if (slow_monsters()) ident = TRUE;
+                       if (slow_monsters(lev)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_SPEED:
                {
-                       if (set_fast(randint1(30) + 15, FALSE)) ident = TRUE;
+                       if (set_fast(randint1(30) + (powerful ? 30 : 15), FALSE)) ident = TRUE;
                        break;
                }
 
@@ -2551,20 +2564,20 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
 
                case SV_STAFF_DISPEL_EVIL:
                {
-                       if (dispel_evil(80)) ident = TRUE;
+                       if (dispel_evil(powerful ? 120 : 80)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_POWER:
                {
-                       if (dispel_monsters(150)) ident = TRUE;
+                       if (dispel_monsters(powerful ? 225 : 150)) ident = TRUE;
                        break;
                }
 
                case SV_STAFF_HOLINESS:
                {
-                       if (dispel_evil(150)) ident = TRUE;
-                       k = 3 * p_ptr->lev;
+                       if (dispel_evil(powerful ? 225 : 150)) ident = TRUE;
+                       k = 3 * lev;
                        if (set_protevil((magic ? 0 : p_ptr->protevil) + randint1(25) + k, FALSE)) ident = TRUE;
                        if (set_poisoned(0)) ident = TRUE;
                        if (set_afraid(0)) ident = TRUE;
@@ -2576,14 +2589,14 @@ static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
 
                case SV_STAFF_GENOCIDE:
                {
-                       (void)symbol_genocide((magic ? p_ptr->lev + 50 : 200), TRUE);
+                       (void)symbol_genocide((magic ? lev + 50 : 200), TRUE);
                        ident = TRUE;
                        break;
                }
 
                case SV_STAFF_EARTHQUAKES:
                {
-                       if (earthquake(py, px, 10))
+                       if (earthquake(py, px, (powerful ? 15 : 10)))
                                ident = TRUE;
                        else
 #ifdef JP
@@ -2598,7 +2611,7 @@ msg_print("
 
                case SV_STAFF_DESTRUCTION:
                {
-                       if (destroy_area(py, px, 13 + randint0(5), FALSE))
+                       if (destroy_area(py, px, (powerful ? 18 : 13) + randint0(5), FALSE))
                                ident = TRUE;
 
                        break;
@@ -2619,8 +2632,8 @@ msg_print("
 #else
                        msg_print("Mighty magics rend your enemies!");
 #endif
-                       project(0, 5, py, px,
-                               (randint1(200) + 300) * 2, GF_MANA, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID, -1);
+                       project(0, (powerful ? 7 : 5), py, px,
+                               (randint1(200) + (powerful ? 500 : 300)) * 2, GF_MANA, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID, -1);
                        if ((p_ptr->pclass != CLASS_MAGE) && (p_ptr->pclass != CLASS_HIGH_MAGE) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_MAGIC_EATER) && (p_ptr->pclass != CLASS_BLUE_MAGE))
                        {
 #ifdef JP
@@ -2769,7 +2782,7 @@ static void do_cmd_use_staff_aux(int item)
        /* Sound */
        sound(SOUND_ZAP);
 
-       ident = staff_effect(o_ptr->sval, &use_charge, FALSE, object_is_aware(o_ptr));
+       ident = staff_effect(o_ptr->sval, &use_charge, FALSE, FALSE, object_is_aware(o_ptr));
 
        if (!(object_is_aware(o_ptr)))
        {
@@ -2876,9 +2889,11 @@ void do_cmd_use_staff(void)
 }
 
 
-static int wand_effect(int sval, int dir, bool magic)
+static int wand_effect(int sval, int dir, bool powerful, bool magic)
 {
        int ident = FALSE;
+       int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
+       int rad = powerful ? 3 : 2;
 
        /* XXX Hack -- Wand of wonder can do anything before it */
        if (sval == SV_WAND_WONDER)
@@ -2908,13 +2923,14 @@ static int wand_effect(int sval, int dir, bool magic)
        {
                case SV_WAND_HEAL_MONSTER:
                {
-                       if (heal_monster(dir, damroll(10, 10))) ident = TRUE;
+                       int dam = damroll((powerful ? 20 : 10), 10);
+                       if (heal_monster(dir, dam)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_HASTE_MONSTER:
                {
-                       if (speed_monster(dir)) ident = TRUE;
+                       if (speed_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
@@ -2926,143 +2942,148 @@ static int wand_effect(int sval, int dir, bool magic)
 
                case SV_WAND_TELEPORT_AWAY:
                {
-                       if (teleport_monster(dir)) ident = TRUE;
+                       int distance = MAX_SIGHT * (powerful ? 8 : 5);
+                       if (teleport_monster(dir, distance)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_DISARMING:
                {
                        if (disarm_trap(dir)) ident = TRUE;
+                       if (powerful && disarm_traps_touch()) ident = TRUE;
                        break;
                }
 
                case SV_WAND_TRAP_DOOR_DEST:
                {
                        if (destroy_door(dir)) ident = TRUE;
+                       if (powerful && destroy_doors_touch()) ident = TRUE;
                        break;
                }
 
                case SV_WAND_STONE_TO_MUD:
                {
-                       if (wall_to_mud(dir)) ident = TRUE;
+                       int dam = powerful ? 40 + randint1(60) : 20 + randint1(30);
+                       if (wall_to_mud(dir, dam)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_LITE:
                {
+                       int dam = damroll((powerful ? 12 : 6), 8);
 #ifdef JP
                        msg_print("ÀĤ¯µ±¤¯¸÷Àþ¤¬Êü¤¿¤ì¤¿¡£");
 #else
                        msg_print("A line of blue shimmering light appears.");
 #endif
 
-                       (void)lite_line(dir);
+                       (void)lite_line(dir, dam);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_SLEEP_MONSTER:
                {
-                       if (sleep_monster(dir)) ident = TRUE;
+                       if (sleep_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_SLOW_MONSTER:
                {
-                       if (slow_monster(dir)) ident = TRUE;
+                       if (slow_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_CONFUSE_MONSTER:
                {
-                       if (confuse_monster(dir, p_ptr->lev)) ident = TRUE;
+                       if (confuse_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_FEAR_MONSTER:
                {
-                       if (fear_monster(dir, p_ptr->lev)) ident = TRUE;
+                       if (fear_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_DRAIN_LIFE:
                {
-                       if (drain_life(dir, 80 + p_ptr->lev)) ident = TRUE;
+                       if (drain_life(dir, 80 + lev)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_POLYMORPH:
                {
-                       if (poly_monster(dir)) ident = TRUE;
+                       if (poly_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_WAND_STINKING_CLOUD:
                {
-                       fire_ball(GF_POIS, dir, 12 + p_ptr->lev / 4, 2);
+                       fire_ball(GF_POIS, dir, 12 + lev / 4, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_MAGIC_MISSILE:
                {
-                       fire_bolt_or_beam(20, GF_MISSILE, dir, damroll(2 + p_ptr->lev / 10, 6));
+                       fire_bolt_or_beam(20, GF_MISSILE, dir, damroll(2 + lev / 10, 6));
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_ACID_BOLT:
                {
-                       fire_bolt_or_beam(20, GF_ACID, dir, damroll(6 + p_ptr->lev / 7, 8));
+                       fire_bolt_or_beam(20, GF_ACID, dir, damroll(6 + lev / 7, 8));
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_CHARM_MONSTER:
                {
-                       if (charm_monster(dir, MAX(20, p_ptr->lev)))
+                       if (charm_monster(dir, MAX(20, lev)))
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_FIRE_BOLT:
                {
-                       fire_bolt_or_beam(20, GF_FIRE, dir, damroll(7 + p_ptr->lev / 6, 8));
+                       fire_bolt_or_beam(20, GF_FIRE, dir, damroll(7 + lev / 6, 8));
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_COLD_BOLT:
                {
-                       fire_bolt_or_beam(20, GF_COLD, dir, damroll(5 + p_ptr->lev / 8, 8));
+                       fire_bolt_or_beam(20, GF_COLD, dir, damroll(5 + lev / 8, 8));
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_ACID_BALL:
                {
-                       fire_ball(GF_ACID, dir, 60 + 3 * p_ptr->lev / 4, 2);
+                       fire_ball(GF_ACID, dir, 60 + 3 * lev / 4, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_ELEC_BALL:
                {
-                       fire_ball(GF_ELEC, dir, 40 + 3 * p_ptr->lev / 4, 2);
+                       fire_ball(GF_ELEC, dir, 40 + 3 * lev / 4, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_FIRE_BALL:
                {
-                       fire_ball(GF_FIRE, dir, 70 + 3 * p_ptr->lev / 4, 2);
+                       fire_ball(GF_FIRE, dir, 70 + 3 * lev / 4, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_COLD_BALL:
                {
-                       fire_ball(GF_COLD, dir, 50 + 3 * p_ptr->lev / 4, 2);
+                       fire_ball(GF_COLD, dir, 50 + 3 * lev / 4, rad);
                        ident = TRUE;
                        break;
                }
@@ -3080,60 +3101,58 @@ static int wand_effect(int sval, int dir, bool magic)
 
                case SV_WAND_DRAGON_FIRE:
                {
-                       fire_ball(GF_FIRE, dir, 200, -3);
+                       fire_ball(GF_FIRE, dir, (powerful ? 300 : 200), -3);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_DRAGON_COLD:
                {
-                       fire_ball(GF_COLD, dir, 180, -3);
+                       fire_ball(GF_COLD, dir, (powerful ? 270 : 180), -3);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_DRAGON_BREATH:
                {
+                       int dam;
+                       int typ;
+
                        switch (randint1(5))
                        {
                                case 1:
-                               {
-                                       fire_ball(GF_ACID, dir, 240, -3);
+                                       dam = 240;
+                                       typ = GF_ACID;
                                        break;
-                               }
-
                                case 2:
-                               {
-                                       fire_ball(GF_ELEC, dir, 210, -3);
+                                       dam = 210;
+                                       typ = GF_ELEC;
                                        break;
-                               }
-
                                case 3:
-                               {
-                                       fire_ball(GF_FIRE, dir, 240, -3);
+                                       dam = 240;
+                                       typ = GF_FIRE;
                                        break;
-                               }
-
                                case 4:
-                               {
-                                       fire_ball(GF_COLD, dir, 210, -3);
+                                       dam = 210;
+                                       typ = GF_COLD;
                                        break;
-                               }
-
                                default:
-                               {
-                                       fire_ball(GF_POIS, dir, 180, -3);
+                                       dam = 180;
+                                       typ = GF_POIS;
                                        break;
-                               }
                        }
 
+                       if (powerful) dam = (dam * 3) / 2;
+
+                       fire_ball(typ, dir, dam, -3);
+
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_DISINTEGRATE:
                {
-                       fire_ball(GF_DISINTEGRATE, dir, 200 + randint1(p_ptr->lev * 2), 2);
+                       fire_ball(GF_DISINTEGRATE, dir, 200 + randint1(lev * 2), rad);
                        ident = TRUE;
                        break;
                }
@@ -3146,21 +3165,21 @@ msg_print("
                        msg_print("You launch a rocket!");
 #endif
 
-                       fire_rocket(GF_ROCKET, dir, 250 + p_ptr->lev * 3, 2);
+                       fire_rocket(GF_ROCKET, dir, 250 + lev * 3, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_STRIKING:
                {
-                       fire_bolt(GF_METEOR, dir, damroll(15 + p_ptr->lev / 3, 13));
+                       fire_bolt(GF_METEOR, dir, damroll(15 + lev / 3, 13));
                        ident = TRUE;
                        break;
                }
 
                case SV_WAND_GENOCIDE:
                {
-                       fire_ball_hide(GF_GENOCIDE, dir, magic ? p_ptr->lev + 50 : 250, 0);
+                       fire_ball_hide(GF_GENOCIDE, dir, magic ? lev + 50 : 250, 0);
                        ident = TRUE;
                        break;
                }
@@ -3302,7 +3321,7 @@ static void do_cmd_aim_wand_aux(int item)
        /* Sound */
        sound(SOUND_ZAP);
 
-       ident = wand_effect(o_ptr->sval, dir, FALSE);
+       ident = wand_effect(o_ptr->sval, dir, FALSE, FALSE);
 
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
@@ -3374,9 +3393,12 @@ void do_cmd_aim_wand(void)
 }
 
 
-static int rod_effect(int sval, int dir, bool *use_charge, bool magic)
+static int rod_effect(int sval, int dir, bool *use_charge, bool powerful, bool magic)
 {
        int ident = FALSE;
+       int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
+       int detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT;
+       int rad = powerful ? 3 : 2;
 
        /* Unused */
        (void)magic;
@@ -3386,20 +3408,24 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool magic)
        {
                case SV_ROD_DETECT_TRAP:
                {
-                       if (detect_traps(DETECT_RAD_DEFAULT, (bool)(dir ? FALSE : TRUE))) ident = TRUE;
+                       if (detect_traps(detect_rad, (bool)(dir ? FALSE : TRUE))) ident = TRUE;
                        break;
                }
 
                case SV_ROD_DETECT_DOOR:
                {
-                       if (detect_doors(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_stairs(DETECT_RAD_DEFAULT)) ident = TRUE;
+                       if (detect_doors(detect_rad)) ident = TRUE;
+                       if (detect_stairs(detect_rad)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_IDENTIFY:
                {
-                       if (!ident_spell(FALSE)) *use_charge = FALSE;
+                       if (powerful) {
+                               if (!identify_fully(FALSE)) *use_charge = FALSE;
+                       } else {
+                               if (!ident_spell(FALSE)) *use_charge = FALSE;
+                       }
                        ident = TRUE;
                        break;
                }
@@ -3413,20 +3439,20 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool magic)
 
                case SV_ROD_ILLUMINATION:
                {
-                       if (lite_area(damroll(2, 8), 2)) ident = TRUE;
+                       if (lite_area(damroll(2, 8), (powerful ? 4 : 2))) ident = TRUE;
                        break;
                }
 
                case SV_ROD_MAPPING:
                {
-                       map_area(DETECT_RAD_MAP);
+                       map_area(powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP);
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_DETECTION:
                {
-                       detect_all(DETECT_RAD_DEFAULT);
+                       detect_all(detect_rad);
                        ident = TRUE;
                        break;
                }
@@ -3452,7 +3478,7 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool magic)
 
                case SV_ROD_HEALING:
                {
-                       if (hp_player(500)) ident = TRUE;
+                       if (hp_player(powerful ? 750 : 500)) ident = TRUE;
                        if (set_stun(0)) ident = TRUE;
                        if (set_cut(0)) ident = TRUE;
                        if (set_shero(0,TRUE)) ident = TRUE;
@@ -3473,117 +3499,120 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool magic)
 
                case SV_ROD_SPEED:
                {
-                       if (set_fast(randint1(30) + 15, FALSE)) ident = TRUE;
+                       if (set_fast(randint1(30) + (powerful ? 30 : 15), FALSE)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_PESTICIDE:
                {
-                       if (dispel_monsters(4)) ident = TRUE;
+                       if (dispel_monsters(powerful ? 8 : 4)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_TELEPORT_AWAY:
                {
-                       if (teleport_monster(dir)) ident = TRUE;
+                       int distance = MAX_SIGHT * (powerful ? 8 : 5);
+                       if (teleport_monster(dir, distance)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_DISARMING:
                {
                        if (disarm_trap(dir)) ident = TRUE;
+                       if (powerful && disarm_traps_touch()) ident = TRUE;
                        break;
                }
 
                case SV_ROD_LITE:
                {
+                       int dam = damroll((powerful ? 12 : 6), 8);
 #ifdef JP
                        msg_print("ÀĤ¯µ±¤¯¸÷Àþ¤¬Êü¤¿¤ì¤¿¡£");
 #else
                        msg_print("A line of blue shimmering light appears.");
 #endif
 
-                       (void)lite_line(dir);
+                       (void)lite_line(dir, dam);
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_SLEEP_MONSTER:
                {
-                       if (sleep_monster(dir)) ident = TRUE;
+                       if (sleep_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_SLOW_MONSTER:
                {
-                       if (slow_monster(dir)) ident = TRUE;
+                       if (slow_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_DRAIN_LIFE:
                {
-                       if (drain_life(dir, 70 + 3 * p_ptr->lev / 2)) ident = TRUE;
+                       if (drain_life(dir, 70 + 3 * lev / 2)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_POLYMORPH:
                {
-                       if (poly_monster(dir)) ident = TRUE;
+                       if (poly_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
                case SV_ROD_ACID_BOLT:
                {
-                       fire_bolt_or_beam(10, GF_ACID, dir, damroll(6 + p_ptr->lev / 7, 8));
+                       fire_bolt_or_beam(10, GF_ACID, dir, damroll(6 + lev / 7, 8));
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_ELEC_BOLT:
                {
-                       fire_bolt_or_beam(10, GF_ELEC, dir, damroll(4 + p_ptr->lev / 9, 8));
+                       fire_bolt_or_beam(10, GF_ELEC, dir, damroll(4 + lev / 9, 8));
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_FIRE_BOLT:
                {
-                       fire_bolt_or_beam(10, GF_FIRE, dir, damroll(7 + p_ptr->lev / 6, 8));
+                       fire_bolt_or_beam(10, GF_FIRE, dir, damroll(7 + lev / 6, 8));
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_COLD_BOLT:
                {
-                       fire_bolt_or_beam(10, GF_COLD, dir, damroll(5 + p_ptr->lev / 8, 8));
+                       fire_bolt_or_beam(10, GF_COLD, dir, damroll(5 + lev / 8, 8));
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_ACID_BALL:
                {
-                       fire_ball(GF_ACID, dir, 60 + p_ptr->lev, 2);
+                       fire_ball(GF_ACID, dir, 60 + lev, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_ELEC_BALL:
                {
-                       fire_ball(GF_ELEC, dir, 40 + p_ptr->lev, 2);
+                       fire_ball(GF_ELEC, dir, 40 + lev, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_FIRE_BALL:
                {
-                       fire_ball(GF_FIRE, dir, 70 + p_ptr->lev, 2);
+                       fire_ball(GF_FIRE, dir, 70 + lev, rad);
                        ident = TRUE;
                        break;
                }
 
                case SV_ROD_COLD_BALL:
                {
-                       fire_ball(GF_COLD, dir, 50 + p_ptr->lev, 2);
+                       fire_ball(GF_COLD, dir, 50 + lev, rad);
                        ident = TRUE;
                        break;
                }
@@ -3597,7 +3626,8 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool magic)
 
                case SV_ROD_STONE_TO_MUD:
                {
-                       if (wall_to_mud(dir)) ident = TRUE;
+                       int dam = powerful ? 40 + randint1(60) : 20 + randint1(30);
+                       if (wall_to_mud(dir, dam)) ident = TRUE;
                        break;
                }
 
@@ -3755,7 +3785,7 @@ msg_print("
        /* Sound */
        sound(SOUND_ZAP);
 
-       ident = rod_effect(o_ptr->sval, dir, &use_charge, FALSE);
+       ident = rod_effect(o_ptr->sval, dir, &use_charge, FALSE, FALSE);
 
        /* Increase the timeout by the rod kind's pval. -LM- */
        if (use_charge) o_ptr->timeout += k_ptr->pval;
@@ -5049,7 +5079,7 @@ static int select_magic_eater(bool only_browse)
 /*
  *  Use eaten rod, wand or staff
  */
-void do_cmd_magic_eater(bool only_browse)
+bool do_cmd_magic_eater(bool only_browse, bool powerful)
 {
        int item, chance, level, k_idx, tval, sval;
        bool use_charge = TRUE;
@@ -5063,14 +5093,14 @@ msg_print("
                msg_print("You are too confused!");
 #endif
 
-               return;
+               return FALSE;
        }
 
        item = select_magic_eater(only_browse);
        if (item == -1)
        {
                energy_use = 0;
-               return;
+               return FALSE;
        }
        if (item >= EATER_EXT*2) {tval = TV_ROD;sval = item - EATER_EXT*2;}
        else if (item >= EATER_EXT) {tval = TV_WAND;sval = item - EATER_EXT;}
@@ -5110,7 +5140,7 @@ msg_print("
                        chg_virtue(V_CHANCE,-1);
                energy_use = 100;
 
-               return;
+               return TRUE;
        }
        else
        {
@@ -5119,19 +5149,19 @@ msg_print("
                if (tval == TV_ROD)
                {
                        if ((sval >= SV_ROD_MIN_DIRECTION) && (sval != SV_ROD_HAVOC) && (sval != SV_ROD_AGGRAVATE) && (sval != SV_ROD_PESTICIDE))
-                               if (!get_aim_dir(&dir)) return;
-                       rod_effect(sval, dir, &use_charge, TRUE);
-                       if (!use_charge) return;
+                               if (!get_aim_dir(&dir)) return FALSE;
+                       rod_effect(sval, dir, &use_charge, powerful, TRUE);
+                       if (!use_charge) return FALSE;
                }
                else if (tval == TV_WAND)
                {
-                       if (!get_aim_dir(&dir)) return;
-                       wand_effect(sval, dir, TRUE);
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       wand_effect(sval, dir, powerful, TRUE);
                }
                else
                {
-                       staff_effect(sval, &use_charge, TRUE, TRUE);
-                       if (!use_charge) return;
+                       staff_effect(sval, &use_charge, powerful, TRUE, TRUE);
+                       if (!use_charge) return FALSE;
                }
                if (randint1(100) < chance)
                        chg_virtue(V_CHANCE,1);
@@ -5139,4 +5169,6 @@ msg_print("
        energy_use = 100;
        if (tval == TV_ROD) p_ptr->magic_num1[item] += k_info[k_idx].pval * EATER_ROD_CHARGE;
        else p_ptr->magic_num1[item] -= EATER_CHARGE;
+
+        return TRUE;
 }

diff --git a/src/do-spell.c b/src/do-spell.c
index 261eff3..44945e6 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -277,15 +277,15 @@ static void cast_wonder(int dir)
        }
 
        if (die < 8) clone_monster(dir);
-       else if (die < 14) speed_monster(dir);
+       else if (die < 14) speed_monster(dir, plev);
        else if (die < 26) heal_monster(dir, damroll(4, 6));
-       else if (die < 31) poly_monster(dir);
+       else if (die < 31) poly_monster(dir, plev);
        else if (die < 36)
                fire_bolt_or_beam(beam_chance() - 10, GF_MISSILE, dir,
                                  damroll(3 + ((plev - 1) / 5), 4));
        else if (die < 41) confuse_monster(dir, plev);
        else if (die < 46) fire_ball(GF_POIS, dir, 20 + (plev / 2), 3);
-       else if (die < 51) (void)lite_line(dir);
+       else if (die < 51) (void)lite_line(dir, damroll(6, 8));
        else if (die < 56)
                fire_bolt_or_beam(beam_chance() - 10, GF_ELEC, dir,
                                  damroll(3 + ((plev - 5) / 4), 8));
@@ -320,8 +320,8 @@ static void cast_wonder(int dir)
        else /* RARE */
        {
                dispel_monsters(150);
-               slow_monsters();
-               sleep_monsters();
+               slow_monsters(plev);
+               sleep_monsters(plev);
                hp_player(300);
        }
 }
@@ -396,7 +396,7 @@ static void cast_invoke_spirits(int dir)
        }
        else if (die < 31)
        {
-               poly_monster(dir);
+               poly_monster(dir, plev);
        }
        else if (die < 36)
        {
@@ -413,7 +413,7 @@ static void cast_invoke_spirits(int dir)
        }
        else if (die < 51)
        {
-               (void)lite_line(dir);
+               (void)lite_line(dir, damroll(6, 8));
        }
        else if (die < 56)
        {
@@ -478,8 +478,8 @@ static void cast_invoke_spirits(int dir)
        else
        { /* RARE */
                dispel_monsters(150);
-               slow_monsters();
-               sleep_monsters();
+               slow_monsters(plev);
+               sleep_monsters(plev);
                hp_player(300);
        }
 
@@ -2046,7 +2046,7 @@ static cptr do_sorcery_spell(int spell, int mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               sleep_monster(dir);
+                               sleep_monster(dir, plev);
                        }
                }
                break;
@@ -2128,7 +2128,7 @@ static cptr do_sorcery_spell(int spell, int mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               slow_monster(dir);
+                               slow_monster(dir, plev);
                        }
                }
                break;
@@ -2149,7 +2149,7 @@ static cptr do_sorcery_spell(int spell, int mode)
 
                        if (cast)
                        {
-                               sleep_monsters();
+                               sleep_monsters(plev);
                        }
                }
                break;
@@ -2836,7 +2836,7 @@ static cptr do_nature_spell(int spell, int mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               wall_to_mud(dir);
+                               wall_to_mud(dir, 20 + randint1(30));
                        }
                }
                break;
@@ -2937,7 +2937,7 @@ static cptr do_nature_spell(int spell, int mode)
                                msg_print("A line of sunlight appears.");
 #endif
 
-                               lite_line(dir);
+                               lite_line(dir, damroll(6, 8));
                        }
                }
                break;
@@ -2958,7 +2958,7 @@ static cptr do_nature_spell(int spell, int mode)
 
                        if (cast)
                        {
-                               slow_monsters();
+                               slow_monsters(plev);
                        }
                }
                break;
@@ -3810,7 +3810,7 @@ static cptr do_chaos_spell(int spell, int mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               poly_monster(dir);
+                               poly_monster(dir, plev);
                        }
                }
                break;
@@ -4333,7 +4333,7 @@ static cptr do_death_spell(int spell, int mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               sleep_monster(dir);
+                               sleep_monster(dir, plev);
                        }
                }
                break;
@@ -5354,7 +5354,7 @@ static cptr do_trump_spell(int spell, int mode)
 
                                if (!result) return NULL;
 
-                               speed_monster(dir);
+                               speed_monster(dir, plev);
                        }
                }
                break;
@@ -6412,7 +6412,7 @@ static cptr do_arcane_spell(int spell, int mode)
                        {
                                if (!get_aim_dir(&dir)) return NULL;
 
-                               wall_to_mud(dir);
+                               wall_to_mud(dir, 20 + randint1(30));
                        }
                }
                break;
@@ -6442,7 +6442,7 @@ static cptr do_arcane_spell(int spell, int mode)
                                msg_print("A line of light appears.");
 #endif
 
-                               lite_line(dir);
+                               lite_line(dir, damroll(6, 8));
                        }
                }
                break;
@@ -8888,7 +8888,7 @@ static cptr do_crusade_spell(int spell, int mode)
                        {
                                project(0, 1, py, px, b_dam, GF_HOLY_FIRE, PROJECT_KILL, -1);
                                dispel_monsters(d_dam);
-                               slow_monsters();
+                               slow_monsters(plev);
                                stun_monsters(power);
                                confuse_monsters(power);
                                turn_monsters(power);
@@ -8995,7 +8995,7 @@ static cptr do_music_spell(int spell, int mode)
 
                        if (cont)
                        {
-                               slow_monsters();
+                               slow_monsters(plev);
                        }
                }
                break;
@@ -9801,8 +9801,8 @@ static cptr do_music_spell(int spell, int mode)
 
                        if (cont)
                        {
-                               slow_monsters();
-                               sleep_monsters();
+                               slow_monsters(plev);
+                               sleep_monsters(plev);
                        }
                }
 

diff --git a/src/dungeon.c b/src/dungeon.c
index 0616cec..1aa5836 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4825,7 +4825,7 @@ msg_print("
                        else if (p_ptr->pclass == CLASS_SMITH)
                                do_cmd_kaji(TRUE);
                        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
-                               do_cmd_magic_eater(TRUE);
+                               do_cmd_magic_eater(TRUE, FALSE);
                        else if (p_ptr->pclass == CLASS_SNIPER)
                                do_cmd_snipe_browse();
                        else do_cmd_browse();
@@ -4927,7 +4927,7 @@ msg_print("
                                        else if (p_ptr->pclass == CLASS_IMITATOR)
                                                do_cmd_mane(FALSE);
                                        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
-                                               do_cmd_magic_eater(FALSE);
+                                               do_cmd_magic_eater(FALSE, FALSE);
                                        else if (p_ptr->pclass == CLASS_SAMURAI)
                                                do_cmd_hissatsu();
                                        else if (p_ptr->pclass == CLASS_BLUE_MAGE)

diff --git a/src/externs.h b/src/externs.h
index 89b2c25..dc46928 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -814,7 +814,7 @@ extern void do_cmd_rerate_aux(void);
 extern void do_cmd_rerate(bool display);
 extern void ring_of_power(int dir);
 extern void do_cmd_use(void);
-extern void do_cmd_magic_eater(bool only_browse);
+extern bool do_cmd_magic_eater(bool only_browse, bool powerful);
 
 /* do-spell.c */
 extern void stop_singing(void);
@@ -1113,8 +1113,8 @@ extern bool detect_monsters_mind(int range);
 extern bool detect_all(int range);
 extern bool wall_stone(void);
 extern bool speed_monsters(void);
-extern bool slow_monsters(void);
-extern bool sleep_monsters(void);
+extern bool slow_monsters(int power);
+extern bool sleep_monsters(int power);
 extern void aggravate_monsters(int who);
 extern bool genocide_aux(int m_idx, int power, bool player_cast, int dam_side, cptr spell_name);
 extern bool symbol_genocide(int power, bool player_cast);
@@ -1146,30 +1146,31 @@ extern bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev);
 extern void call_chaos(void);
 extern bool fire_beam(int typ, int dir, int dam);
 extern bool fire_bolt_or_beam(int prob, int typ, int dir, int dam);
-extern bool lite_line(int dir);
+extern bool lite_line(int dir, int dam);
 extern bool drain_life(int dir, int dam);
 extern bool death_ray(int dir, int plev);
-extern bool wall_to_mud(int dir);
+extern bool wall_to_mud(int dir, int dam);
 extern bool destroy_door(int dir);
 extern bool disarm_trap(int dir);
 extern bool wizard_lock(int dir);
 extern bool heal_monster(int dir, int dam);
-extern bool speed_monster(int dir);
-extern bool slow_monster(int dir);
-extern bool sleep_monster(int dir);
+extern bool speed_monster(int dir, int power);
+extern bool slow_monster(int dir, int power);
+extern bool sleep_monster(int dir, int power);
 extern bool stasis_monster(int dir);    /* Like sleep, affects undead as well */
 extern bool stasis_evil(int dir);    /* Like sleep, affects undead as well */
 extern bool confuse_monster(int dir, int plev);
 extern bool stun_monster(int dir, int plev);
 extern bool fear_monster(int dir, int plev);
-extern bool poly_monster(int dir);
+extern bool poly_monster(int dir, int power);
 extern bool clone_monster(int dir);
-extern bool teleport_monster(int dir);
+extern bool teleport_monster(int dir, int distance);
 extern bool door_creation(void);
 extern bool trap_creation(int y, int x);
 extern bool tree_creation(void);
 extern bool glyph_creation(void);
 extern bool destroy_doors_touch(void);
+extern bool disarm_traps_touch(void);
 extern bool animate_dead(int who, int y, int x);
 extern bool sleep_monsters_touch(void);
 extern bool activate_ty_curse(bool stop_ty, int *count);

diff --git a/src/mane.c b/src/mane.c
index a9c80f6..a79bb02 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -840,11 +840,11 @@ else msg_print("Ͷ
                break;
        case MS_SLOW:
                if (!get_aim_dir(&dir)) return FALSE;
-               slow_monster(dir);
+               slow_monster(dir, plev);
                break;
        case MS_SLEEP:
                if (!get_aim_dir(&dir)) return FALSE;
-               sleep_monster(dir);
+               sleep_monster(dir, plev);
                break;
        case MS_SPEED:
                (void)set_fast(randint1(20 + plev) + plev, FALSE);

diff --git a/src/mind.c b/src/mind.c
index 33e9921..3a5026e 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1349,7 +1349,7 @@ msg_format("There are too many mirrors to control!");
        /* illusion light */
        case 14:
          tmp = is_mirror_grid(&cave[py][px]) ? 4 : 3;
-         slow_monsters();
+         slow_monsters(plev);
          stun_monsters(plev*tmp);
          confuse_monsters(plev*tmp);
          turn_monsters(plev*tmp);

diff --git a/src/mspells3.c b/src/mspells3.c
index 2efe100..8c64a1b 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1276,11 +1276,11 @@ else msg_print("Ͷ
                break;
        case MS_SLOW:
                if (!get_aim_dir(&dir)) return FALSE;
-               slow_monster(dir);
+               slow_monster(dir, plev);
                break;
        case MS_SLEEP:
                if (!get_aim_dir(&dir)) return FALSE;
-               sleep_monster(dir);
+               sleep_monster(dir, plev);
                break;
        case MS_SPEED:
                (void)set_fast(randint1(20 + plev) + plev, FALSE);

diff --git a/src/racial.c b/src/racial.c
index 4145154..65eb5a6 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -1054,7 +1054,7 @@ static bool cmd_racial_power_aux(s32b command)
 #else
                        msg_print("You glare nearby monsters...");
 #endif
-                       slow_monsters();
+                       slow_monsters(p_ptr->lev);
                        stun_monsters(p_ptr->lev * 4);
                        confuse_monsters(p_ptr->lev * 4);
                        turn_monsters(p_ptr->lev * 4);
@@ -1194,7 +1194,11 @@ static bool cmd_racial_power_aux(s32b command)
                }
                case CLASS_MAGIC_EATER:
                {
-                       if (!gain_magic()) return FALSE;
+                       if (command == -3) {
+                               if (!gain_magic()) return FALSE;
+                       } else if (command == -4) {
+                               if (!do_cmd_magic_eater(FALSE, TRUE)) return FALSE;
+                       }
                        break;
                }
                case CLASS_BARD:
@@ -1659,7 +1663,7 @@ static bool cmd_racial_power_aux(s32b command)
 
                case RACE_HALF_GIANT:
                        if (!get_aim_dir(&dir)) return FALSE;
-                       (void)wall_to_mud(dir);
+                       (void)wall_to_mud(dir, 20 + randint1(30));
                        break;
 
                case RACE_HALF_TITAN:
@@ -2092,7 +2096,7 @@ static bool cmd_racial_power_aux(s32b command)
 #endif
 
                        if (plev < 25) sleep_monsters_touch();
-                       else (void)sleep_monsters();
+                       else (void)sleep_monsters(plev);
                        break;
 
                case RACE_DEMON:
@@ -2540,6 +2544,13 @@ strcpy(power_desc[num].name, "
                power_desc[num].stat = A_INT;
                power_desc[num].fail = 0;
                power_desc[num++].number = -3;
+
+               strcpy(power_desc[num].name, _("¶¯ÎÏȯư", "Powerful Activation"));
+               power_desc[num].level = 10;
+               power_desc[num].cost = 10 + (lvl - 10) / 2;
+               power_desc[num].stat = A_INT;
+               power_desc[num].fail = 0;
+               power_desc[num++].number = -4;
                break;
        }
        case CLASS_BARD:

diff --git a/src/spells2.c b/src/spells2.c
index 1bc6fe0..ae68634 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4485,17 +4485,17 @@ bool speed_monsters(void)
 /*
  * Slow monsters
  */
-bool slow_monsters(void)
+bool slow_monsters(int power)
 {
-       return (project_hack(GF_OLD_SLOW, p_ptr->lev));
+       return (project_hack(GF_OLD_SLOW, power));
 }
 
 /*
  * Sleep monsters
  */
-bool sleep_monsters(void)
+bool sleep_monsters(int power)
 {
-       return (project_hack(GF_OLD_SLEEP, p_ptr->lev));
+       return (project_hack(GF_OLD_SLEEP, power));
 }
 
 
@@ -6719,10 +6719,10 @@ bool fire_bolt_or_beam(int prob, int typ, int dir, int dam)
 /*
  * Some of the old functions
  */
-bool lite_line(int dir)
+bool lite_line(int dir, int dam)
 {
        int flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_KILL;
-       return (project_hook(GF_LITE_WEAK, dir, damroll(6, 8), flg));
+       return (project_hook(GF_LITE_WEAK, dir, dam, flg));
 }
 
 
@@ -6733,10 +6733,10 @@ bool drain_life(int dir, int dam)
 }
 
 
-bool wall_to_mud(int dir)
+bool wall_to_mud(int dir, int dam)
 {
        int flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
-       return (project_hook(GF_KILL_WALL, dir, 20 + randint1(30), flg));
+       return (project_hook(GF_KILL_WALL, dir, dam, flg));
 }
 
 
@@ -6768,24 +6768,24 @@ bool heal_monster(int dir, int dam)
 }
 
 
-bool speed_monster(int dir)
+bool speed_monster(int dir, int power)
 {
        int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
-       return (project_hook(GF_OLD_SPEED, dir, p_ptr->lev, flg));
+       return (project_hook(GF_OLD_SPEED, dir, power, flg));
 }
 
 
-bool slow_monster(int dir)
+bool slow_monster(int dir, int power)
 {
        int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
-       return (project_hook(GF_OLD_SLOW, dir, p_ptr->lev, flg));
+       return (project_hook(GF_OLD_SLOW, dir, power, flg));
 }
 
 
-bool sleep_monster(int dir)
+bool sleep_monster(int dir, int power)
 {
        int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
-       return (project_hook(GF_OLD_SLEEP, dir, p_ptr->lev, flg));
+       return (project_hook(GF_OLD_SLEEP, dir, power, flg));
 }
 
 
@@ -6815,10 +6815,10 @@ bool stun_monster(int dir, int plev)
 }
 
 
-bool poly_monster(int dir)
+bool poly_monster(int dir, int power)
 {
        int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
-       bool tester = (project_hook(GF_OLD_POLY, dir, p_ptr->lev, flg));
+       bool tester = (project_hook(GF_OLD_POLY, dir, power, flg));
        if (tester)
                chg_virtue(V_CHANCE, 1);
        return(tester);
@@ -6846,10 +6846,10 @@ bool death_ray(int dir, int plev)
 }
 
 
-bool teleport_monster(int dir)
+bool teleport_monster(int dir, int distance)
 {
        int flg = PROJECT_BEAM | PROJECT_KILL;
-       return (project_hook(GF_AWAY_ALL, dir, MAX_SIGHT * 5, flg));
+       return (project_hook(GF_AWAY_ALL, dir, distance, flg));
 }
 
 /*
@@ -6905,6 +6905,11 @@ bool destroy_doors_touch(void)
        return (project(0, 1, py, px, 0, GF_KILL_DOOR, flg, -1));
 }
 
+bool disarm_traps_touch(void)
+{
+       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
+       return (project(0, 1, py, px, 0, GF_KILL_TRAP, flg, -1));
+}
 
 bool sleep_monsters_touch(void)
 {

diff --git a/src/store.c b/src/store.c
index 570e941..5cac2ea 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -4548,7 +4548,7 @@ static void store_process_command(void)
                        else if (p_ptr->pclass == CLASS_SMITH)
                                do_cmd_kaji(TRUE);
                        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
-                               do_cmd_magic_eater(TRUE);
+                               do_cmd_magic_eater(TRUE, FALSE);
                        else if (p_ptr->pclass == CLASS_SNIPER)
                                do_cmd_snipe_browse();
                        else do_cmd_browse();