fiddlerwoaroof/crawl - Change 2G7MZ653N3JUHJ4DA5Q7VRO3S5T27DLPKDCJEKB6DGYSTXULUVWAC

After discussion with dpeg, added a Scroll of Antimagic,

taking probability (equal to ?oHolyWord) from the ?oPaper.

Effects apply to all creatures within LOS, including you, with no magic resistance check:

Remove all magical enchantments (e.g. Haste, but not Poison)
Cut magic resistance in half for 40 turns. (This does not affect magic-immunes.)

Balance testing, etc., needed.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7211 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on October 11, 2008

2G7MZ653N3JUHJ4DA5Q7VRO3S5T27DLPKDCJEKB6DGYSTXULUVWAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 1164 [5.962854]

[5.977231]


    // Enchantment effect
    if (you.duration[DUR_LOWERED_MR])
        rm /= 2;

Replacement in crawl-ref/source/output.cc at line 599 [5.1088282]

B:BD[6.10021] → [7.8711:8848]

        int color = _dur_colour( LIGHTGREY, (you.duration[DUR_REPEL_UNDEAD] <= 4) );
        out.push_back(status_light(color, "Holy"));

[6.10021]

[5.1093425]

        int colour = _dur_colour(LIGHTGREY,
                                 (you.duration[DUR_REPEL_UNDEAD] <= 4));
        out.push_back(status_light(colour, "Holy"));

Insertion in crawl-ref/source/output.cc at line 691 [5.1088282]

[8.3265]

[6.12955]

    if (you.duration[DUR_LOWERED_MR])
    {
        out.push_back(status_light(RED, "-MR"));
    }

Insertion in crawl-ref/source/output.cc at line 2127 [5.1088282]

[9.4250]

// MR output already says so
//    if (you.duration[DUR_LOWERED_MR])
//        text += "vulnerable to magic, ";

Insertion in crawl-ref/source/mon-util.cc at line 938 [5.1699344]
[5.1708494]
[5.1708494]
```
    if (mon->has_ench(ENCH_LOWERED_MR))
        u /= 2;
```
Insertion in crawl-ref/source/mon-util.cc at line 5903 [5.1699344]
[10.2750]
[11.2817]
```
        case ENCH_LOWERED_MR:
```
Insertion in crawl-ref/source/mon-util.cc at line 6036 [5.1699344]
[11.4938]
[11.4938]
```
    case ENCH_LOWERED_MR:
```

Replacement in crawl-ref/source/mon-util.cc at line 7012 [5.1699344]

∅:D[4.2543] → [12.6829:6891]

B:BD[13.265] → [12.6829:6891]

    "blood-lust", "neutral", "petrifying", "petrified", "bug"

[4.2543]

[14.27853]

    "blood-lust", "neutral", "petrifying", "petrified", "magic-vulnerable",
    "bug"

Replacement in crawl-ref/source/misc.cc at line 2391 [5.1933596]
B:BD[15.3610] → [16.2581:2621]
```
    // Sweep every square within range.
```
[15.3610]
[17.5081]
```
    // Sweep every visible square within range.
```

Replacement in crawl-ref/source/misc.cc at line 2397 [5.1933596]

B:BD[18.6755] → [16.2786:2817]

            if (see_grid(*ri))

[18.6755]

[18.6788]

            monsters *mon = &menv[targ_monst];
            if (mon->alive()
                && (!require_visible || player_monster_visible(mon))
                && !mons_is_submerged(mon)
                && (!mons_is_mimic(mon->type) || mons_is_known_mimic(mon))
                && (!dangerous_only || !mons_is_safe(mon, want_move)))

Replacement in crawl-ref/source/misc.cc at line 2404 [5.1933596]

B:BD[18.6802] → [3.3783:3834]

∅:D[3.3834] → [19.2689:2722]

B:BD[16.2873] → [19.2689:2722]

B:BD[19.2722] → [3.3835:3908]

∅:D[19.2773] → [16.2921:3122]

∅:D[3.3908] → [16.2921:3122]

B:BD[16.2921] → [16.2921:3122]

∅:D[16.3122] → [18.7006:7024]

∅:D[20.3667] → [18.7006:7024]

∅:D[15.4012] → [18.7006:7024]

∅:D[21.8014] → [18.7006:7024]

∅:D[22.9092] → [18.7006:7024]

∅:D[7.14143] → [18.7006:7024]

B:BD[18.7006] → [18.7006:7024]

B:BD[18.7024] → [16.3123:3226]

B:BD[16.3226] → [3.3909:3946]

∅:D[16.3258] → [18.7065:7083]

∅:D[3.3946] → [18.7065:7083]

∅:D[15.4642] → [18.7065:7083]

B:BD[18.7065] → [18.7065:7083]

                monsters *mon = &menv[targ_monst];
                if (mon->alive()
                    && (!require_visible || player_monster_visible(mon))
                    && !mons_is_submerged(mon)
                    && (!mons_is_mimic(mon->type) || mons_is_known_mimic(mon))
                    && (!dangerous_only || !mons_is_safe(mon, want_move)))
                {
                    mons.push_back(mon);
                    if (just_check) // stop once you find one
                        return mons;
                }

[18.6802]

[18.7083]

                mons.push_back(mon);
                if (just_check) // stop once you find one
                    return mons;

Deletion in crawl-ref/source/makeitem.cc at line 2377 [24.927]
B:BD[23.43606] → [23.43606:43650]
```
        // only used in certain cases {dlb}
```
Deletion in crawl-ref/source/makeitem.cc at line 2378 [24.927]
B:BD[23.43705] → [25.2746:2790]
```
        const int temp_rand = random2(935);
```

Replacement in crawl-ref/source/makeitem.cc at line 2379 [24.927]

∅:D[26.5379] → [23.43758:43782]

B:BD[23.43758] → [23.43758:43782]

B:BD[23.43782] → [25.2791:3930]

        item.sub_type =
            ((temp_rand > 766) ? SCR_IDENTIFY :          // 17.97%
             (temp_rand > 644) ? SCR_REMOVE_CURSE :      // 13.05%
             (temp_rand > 569) ? SCR_TELEPORTATION :     //  8.02%
             (temp_rand > 509) ? SCR_DETECT_CURSE :      //  6.42%
             (temp_rand > 479) ? SCR_FEAR :              //  3.21%
             (temp_rand > 449) ? SCR_NOISE :             //  3.21%
             (temp_rand > 419) ? SCR_MAGIC_MAPPING :     //  3.21%
             (temp_rand > 389) ? SCR_FOG :               //  3.21%
             (temp_rand > 359) ? SCR_RANDOM_USELESSNESS ://  3.21%
             (temp_rand > 329) ? SCR_CURSE_WEAPON :      //  3.21%
             (temp_rand > 299) ? SCR_CURSE_ARMOUR :      //  3.21%
             (temp_rand > 269) ? SCR_RECHARGING :        //  3.21%
             (temp_rand > 239) ? SCR_BLINKING :          //  3.21%
             (temp_rand > 209) ? SCR_PAPER :             //  3.21%
             (temp_rand > 179) ? SCR_ENCHANT_ARMOUR :    //  3.21%
             (temp_rand > 149) ? SCR_ENCHANT_WEAPON_I :  //  3.21%
             (temp_rand > 119) ? SCR_ENCHANT_WEAPON_II : //  3.21%

[26.5379]

[24.84696]

        // total weight: 10000
        item.sub_type = random_choose_weighted(
            1797, SCR_IDENTIFY,
            1305, SCR_REMOVE_CURSE,
            802, SCR_TELEPORTATION,
            642, SCR_DETECT_CURSE,
            321, SCR_FEAR,
            321, SCR_NOISE,
            321, SCR_MAGIC_MAPPING,
            321, SCR_FOG,
            321, SCR_RANDOM_USELESSNESS,
            321, SCR_CURSE_WEAPON,
            321, SCR_CURSE_ARMOUR,
            321, SCR_RECHARGING,
            321, SCR_BLINKING,
            161, SCR_PAPER,
            321, SCR_ENCHANT_ARMOUR,
            321, SCR_ENCHANT_WEAPON_I,
            321, SCR_ENCHANT_WEAPON_II,
            // Don't create ?oImmolation at low levels (encourage read-ID)
            321, (item_level < 4 ? SCR_TELEPORTATION : SCR_IMMOLATION),
            // Medium-level scrolls
            160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ACQUIREMENT),
            160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ENCHANT_WEAPON_III),
            160, (depth_mod < 4 ? SCR_DETECT_CURSE  : SCR_SUMMONING),
            160, (depth_mod < 4 ? SCR_PAPER :         SCR_ANTIMAGIC),

Replacement in crawl-ref/source/makeitem.cc at line 2408 [24.927]

B:BD[24.84697] → [23.44922:45160]

B:BD[23.45160] → [25.3931:3963]

B:BD[25.3963] → [27.9577:9694]

∅:D[27.9694] → [25.4011:4043]

B:BD[25.4011] → [25.4011:4043]

B:BD[25.4043] → [27.9695:9811]

∅:D[27.9811] → [25.4091:4123]

B:BD[25.4091] → [25.4091:4123]

B:BD[25.4123] → [27.9812:9927]

∅:D[25.4219] → [23.45419:45451]

∅:D[27.9927] → [23.45419:45451]

B:BD[23.45419] → [23.45419:45451]

B:BD[23.45451] → [27.9928:10052]

∅:D[27.10052] → [25.4284:4316]

B:BD[23.45684] → [25.4284:4316]

B:BD[25.4316] → [27.10053:10168]

∅:D[25.4412] → [23.45684:45716]

∅:D[27.10168] → [23.45684:45716]

B:BD[23.45684] → [23.45684:45716]

B:BD[23.45716] → [27.10169:10284]

∅:D[25.4460] → [23.45812:45837]

∅:D[27.10284] → [23.45812:45837]

B:BD[23.45812] → [23.45812:45837]

B:BD[23.45837] → [27.10285:10407]

             // Crawl is kind to newbie adventurers {dlb}:
             // yes -- these five are messy {dlb}:
             // yes they are a hellish mess of tri-ops and long lines,
             // this formating is somewhat better -- bwr
             (temp_rand > 89) ?
              ((item_level < 4) ? SCR_TELEPORTATION
                                : SCR_IMMOLATION) :    //  3.21%
             (temp_rand > 74) ?
              ((depth_mod < 4) ? SCR_TELEPORTATION
                               : SCR_ACQUIREMENT) :    //  1.60%
             (temp_rand > 59) ?
              ((depth_mod < 4) ? SCR_DETECT_CURSE
                               : SCR_SUMMONING) :      //  1.60%
             (temp_rand > 44) ?
              ((depth_mod < 4) ? SCR_TELEPORTATION     //  1.60%
                               : SCR_ENCHANT_WEAPON_III) :
             (temp_rand > 29) ?
              ((depth_mod < 7) ? SCR_DETECT_CURSE
                               : SCR_TORMENT) :        //  1.60%
             (temp_rand > 14) ?
              ((depth_mod < 7) ? SCR_DETECT_CURSE
                               : SCR_HOLY_WORD) :      //  1.60%
             // default:
              ((depth_mod < 7) ? SCR_TELEPORTATION     //  1.60%
                               : SCR_VORPALISE_WEAPON));

[24.84697]

[23.45944]

            // High-level scrolls
            160, (depth_mod < 7 ? SCR_TELEPORTATION : SCR_VORPALISE_WEAPON),
            160, (depth_mod < 7 ? SCR_DETECT_CURSE  : SCR_TORMENT),
            160, (depth_mod < 7 ? SCR_DETECT_CURSE  : SCR_HOLY_WORD),
            0);

Replacement in crawl-ref/source/makeitem.cc at line 2416 [24.927]

B:BD[23.45977] → [27.10408:10638]

    if ( item.sub_type == SCR_VORPALISE_WEAPON
         || item.sub_type == SCR_ENCHANT_WEAPON_III
         || item.sub_type == SCR_ACQUIREMENT
         || item.sub_type == SCR_TORMENT
         || item.sub_type == SCR_HOLY_WORD )

[23.45977]

[27.10638]

    if (item.sub_type == SCR_VORPALISE_WEAPON
        || item.sub_type == SCR_ENCHANT_WEAPON_III
        || item.sub_type == SCR_ACQUIREMENT
        || item.sub_type == SCR_TORMENT
        || item.sub_type == SCR_HOLY_WORD)

Replacement in crawl-ref/source/makeitem.cc at line 2426 [24.927]

B:BD[23.46206] → [23.46206:46358]

        const int tmp = random2(48);
        if ( tmp == 1 )
            item.quantity = 2;
        else if ( tmp == 0 )
            item.quantity = 3;

[23.46206]

[23.46358]

        if (one_chance_in(24))
            item.quantity = (coinflip() ? 2 : 3);

Insertion in crawl-ref/source/itemprop.h at line 321 [29.641567]
[25.4670]
[28.81843]
```
    SCR_ANTIMAGIC,
```
Insertion in crawl-ref/source/itemname.cc at line 554 [5.2667494]
[25.4727]
[30.12197]
```
    case SCR_ANTIMAGIC:          return "antimagic";
```
Replacement in crawl-ref/source/item_use.cc at line 4274 [5.2781507]
∅:D[31.7754] → [32.5848964:5848993]
B:BD[5.2858295] → [32.5848964:5848993]
```
void read_scroll( int slot )
```
[31.7754]
[5.2858318]
```
static void _antimagic_scroll()
```

Replacement in crawl-ref/source/item_use.cc at line 4276 [5.2781507]

B:BD[5.2858320] → [5.2858320:2858406]

    int affected = 0;
    int i;
    int count;
    int nthing;
    struct bolt beam;

[5.2858320]

[5.2858442]

    // First cast antimagic on yourself.
    antimagic();
    const enchant_type lost_enchantments[] = {
        ENCH_SLOW,
        ENCH_HASTE,
        ENCH_FEAR,
        ENCH_CONFUSION,
        ENCH_INVIS,
        ENCH_BACKLIGHT,
        ENCH_CHARM,
        ENCH_PARALYSIS,
        ENCH_PETRIFYING,
        ENCH_PETRIFIED
    };
    mon_enchant lowered_mr(ENCH_LOWERED_MR, 1, KC_YOU, 40);
    // All nearby creatures lose all magical enchantments, and halve
    // their MR halved (if they're not magic-immune.)
    for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri)
    {
        const unsigned short targ_monst = env.mgrid(*ri);
        if (targ_monst != NON_MONSTER)
        {
            monsters& mon = menv[targ_monst];
            for (unsigned int i = 0; i < ARRAYSZ(lost_enchantments); ++i)
                mon.del_ench(lost_enchantments[i], true, true);
            
            mon.add_ench(lowered_mr);
            
            // Annoying but not enough to turn friendlies against you.
            behaviour_event(&mon, ME_ANNOY, MHITYOU);
        }
    }

Replacement in crawl-ref/source/item_use.cc at line 4312 [5.2781507]

B:BD[5.2858443] → [5.2858443:2858491]

B:BD[5.2858491] → [29.762037:762065]

    // added: scroll effects are never tracers.
    beam.is_tracer = false;

[5.2858443]

[5.2858518]

    you.duration[DUR_LOWERED_MR] = 40;
    mpr("Magic dampens around you!");
}

Insertion in crawl-ref/source/item_use.cc at line 4316 [5.2781507]
[5.2858519]
[33.11928]
```
void read_scroll(int slot)
{
```
Insertion in crawl-ref/source/item_use.cc at line 4497 [5.2781507]
[5.2862742]
[5.2862742]
```
    {
```

Replacement in crawl-ref/source/item_use.cc at line 4503 [5.2781507]

B:BD[5.2862866] → [5.2862866:2862931]

B:BD[5.2862931] → [34.16287:16326]

        // unsure about this    // BEAM_EXPLOSION instead? {dlb}
        beam.flavour      = BEAM_FIRE;

[5.2862794]

[34.16326]

        bolt beam;
        beam.is_tracer = false;

Insertion in crawl-ref/source/item_use.cc at line 4507 [5.2781507]

[34.16327]

        // unsure about this: BEAM_EXPLOSION instead? {dlb}
        beam.flavour      = BEAM_FIRE;

Replacement in crawl-ref/source/item_use.cc at line 4510 [5.2781507]
B:BD[34.16387] → [34.16387:16434]
```
        beam.damage       = dice_def( 3, 10 );
```
[34.16387]
[2.65066]
```
        beam.damage       = dice_def(3, 10);
```
Insertion in crawl-ref/source/item_use.cc at line 4525 [5.2781507]
[5.2863588]
[5.2863588]
```
    }
```

Replacement in crawl-ref/source/item_use.cc at line 4528 [5.2781507]

B:BD[5.2863616] → [5.2863616:2863784]

        nthing = you.equip[EQ_WEAPON];
        if (nthing == -1
            || you.inv[nthing].base_type != OBJ_WEAPONS
            || item_cursed( you.inv[nthing] ))

[5.2863616]

[5.2863784]

        if (!you.weapon()
            || you.weapon()->base_type != OBJ_WEAPONS
            || item_cursed(*you.weapon()))

Replacement in crawl-ref/source/item_use.cc at line 4536 [5.2781507]
B:BD[5.2863897] → [5.2863897:2863907]
```
        {
```
[5.2863897]
[35.6594]
```
        {             
```
Replacement in crawl-ref/source/item_use.cc at line 4538 [5.2781507]
∅:D[35.6633] → [36.6923:6976]
B:BD[5.2863907] → [36.6923:6976]
```
            do_curse_item( you.inv[nthing], false );
```
[35.6633]
[37.37103]
```
            do_curse_item( *you.weapon(), false );
```
Insertion in crawl-ref/source/item_use.cc at line 4605 [5.2781507]
[5.2866951]
[5.2866951]
```
    {
```

Replacement in crawl-ref/source/item_use.cc at line 4607 [5.2781507]

B:BD[5.2867005] → [5.2867005:2867107]

        count = 0;
        affected = EQ_WEAPON;
        for (i = EQ_CLOAK; i <= EQ_BODY_ARMOUR; i++)

[5.2867005]

[5.2867107]

        int count = 0;
        int affected = EQ_WEAPON;
        for (int i = EQ_CLOAK; i <= EQ_BODY_ARMOUR; i++)

Replacement in crawl-ref/source/item_use.cc at line 4611 [5.2781507]

B:BD[5.2867117] → [29.762842:762919]

            if (you.equip[i] != -1 && !item_cursed( you.inv[you.equip[i]] ))

[5.2867117]

[5.2867195]

            if (you.equip[i] != -1 && !item_cursed(you.inv[you.equip[i]]))

Replacement in crawl-ref/source/item_use.cc at line 4614 [5.2781507]
B:BD[5.2867234] → [5.2867234:2867278]
```
                if (one_chance_in( count ))
```
[5.2867234]
[5.2867278]
```
                if (one_chance_in(count))
```
Insertion in crawl-ref/source/item_use.cc at line 4630 [5.2781507]
[5.2867777]
[25.4730]
```
    }
```

Insertion in crawl-ref/source/item_use.cc at line 4666 [5.2781507]

[38.3591]

[31.8587]

    case SCR_ANTIMAGIC:
        _antimagic_scroll();
        break;

Replacement in crawl-ref/source/item_use.cc at line 4694 [5.2781507]
∅:D[39.51048] → [5.2868084:2868137]
B:BD[5.2868084] → [5.2868084:2868137]
```
}                               // end read_scroll()
```
[39.51048]
[5.2868137]
```
}
```
Insertion in crawl-ref/source/enum.h at line 1132 [5.3287960]
[12.8385]
[12.8385]
```
    DUR_LOWERED_MR,
```
Insertion in crawl-ref/source/enum.h at line 1170 [5.3287960]
[12.8538]
[40.3400]
```
    ENCH_LOWERED_MR,
```

Insertion in crawl-ref/source/acr.cc at line 2753 [5.4397395]

[41.25366]

[42.17813]

    _decrement_a_duration(DUR_LOWERED_MR, "You feel more resistant to magic.");

After discussion with dpeg, added a Scroll of Antimagic,

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/player.cc at line 1164 [5.962854]

Replacement in crawl-ref/source/output.cc at line 599 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 691 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 2127 [5.1088282]

Insertion in crawl-ref/source/mon-util.cc at line 938 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5903 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 6036 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7012 [5.1699344]

Replacement in crawl-ref/source/misc.cc at line 2391 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 2397 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 2404 [5.1933596]

Deletion in crawl-ref/source/makeitem.cc at line 2377 [24.927]

Deletion in crawl-ref/source/makeitem.cc at line 2378 [24.927]

Replacement in crawl-ref/source/makeitem.cc at line 2379 [24.927]

Replacement in crawl-ref/source/makeitem.cc at line 2408 [24.927]

Replacement in crawl-ref/source/makeitem.cc at line 2416 [24.927]

Replacement in crawl-ref/source/makeitem.cc at line 2426 [24.927]

Insertion in crawl-ref/source/itemprop.h at line 321 [29.641567]

Insertion in crawl-ref/source/itemname.cc at line 554 [5.2667494]

Replacement in crawl-ref/source/item_use.cc at line 4274 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4276 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4312 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4316 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4497 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4503 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4507 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4510 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4525 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4528 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4536 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4538 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4605 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4607 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4611 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4614 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4630 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4666 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4694 [5.2781507]

Insertion in crawl-ref/source/enum.h at line 1132 [5.3287960]

Insertion in crawl-ref/source/enum.h at line 1170 [5.3287960]

Insertion in crawl-ref/source/acr.cc at line 2753 [5.4397395]