fiddlerwoaroof/crawl - Change 2HNLFROSOZ6ROLX3Q3W5E7I4Y4ELIWSJ7EX5GDGZZOMRPTK6TBSAC

Helm card can now have a shield effect. (Well, sort of.)

Antimagic shouldn't cancel kenku permaflight.

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

Created by haranp on June 24, 2007

2HNLFROSOZ6ROLX3Q3W5E7I4Y4ELIWSJ7EX5GDGZZOMRPTK6TBSAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 694 [5.616635]

B:BD[3.2141] → [4.2240:2341]

∅:D[4.2341] → [3.2141:2524]

B:BD[3.2141] → [3.2141:2524]

        DUR_HASTE, DUR_SLOW, DUR_PARALYSIS, DUR_CONF,
        DUR_MIGHT, DUR_INVIS, DUR_FIRE_SHIELD,
        DUR_WEAPON_BRAND, DUR_ICY_ARMOUR, DUR_REPEL_MISSILES, DUR_REGENERATION,
        DUR_DEFLECT_MISSILES, DUR_SWIFTNESS, DUR_INSULATION, DUR_STONEMAIL,
        DUR_CONTROLLED_FLIGHT, DUR_CONTROL_TELEPORT, DUR_RESIST_POISON,
        DUR_RESIST_FIRE, DUR_RESIST_COLD, DUR_TRANSFORMATION, DUR_STONESKIN,
        DUR_FORESCRY, DUR_SEE_INVISIBLE, DUR_SILENCE, DUR_CONDENSATION_SHIELD

[3.2141]

[3.2524]

        DUR_INVIS, DUR_CONF, DUR_PARALYSIS, DUR_SLOW, DUR_HASTE,
        DUR_MIGHT, DUR_FIRE_SHIELD, DUR_ICY_ARMOUR, DUR_REPEL_MISSILES,
        DUR_REGENERATION, DUR_SWIFTNESS, DUR_STONEMAIL, DUR_CONTROL_TELEPORT,
        DUR_TRANSFORMATION, DUR_DEATH_CHANNEL, DUR_DEFLECT_MISSILES,
        DUR_FORESCRY, DUR_SEE_INVISIBLE, DUR_WEAPON_BRAND, DUR_SILENCE,
        DUR_CONDENSATION_SHIELD, DUR_STONESKIN, DUR_BARGAIN,
        DUR_INSULATION, DUR_RESIST_POISON, DUR_RESIST_FIRE, DUR_RESIST_COLD,
        DUR_SLAYING, DUR_STEALTH, DUR_MAGIC_SHIELD

Replacement in crawl-ref/source/spells1.cc at line 704 [5.616635]

B:BD[3.2540] → [4.2342:2384]

    if (you.duration[DUR_LEVITATION] > 2)

[3.2540]

[4.2384]

    if (you.duration[DUR_LEVITATION] > 2 && you.duration[DUR_LEVITATION] < 100)

Insertion in crawl-ref/source/spells1.cc at line 707 [5.616635]

[5.631958]

[3.2678]

    if (you.duration[DUR_CONTROLLED_FLIGHT] < 100 &&
        you.duration[DUR_CONTROLLED_FLIGHT] > 1) // don't mess with permaflight
        you.duration[DUR_CONTROLLED_FLIGHT] = 1;

Replacement in crawl-ref/source/player.cc at line 2030 [5.962854]

B:BD[5.1001739] → [4.4533:4618]

∅:D[4.4618] → [5.1001810:1001919]

B:BD[5.1001810] → [5.1001810:1001919]

        if (!you.duration[DUR_FIRE_SHIELD] && you.duration[DUR_CONDENSATION_SHIELD])
            base_shield = 2 + (you.skills[SK_ICE_MAGIC] / 6);  // max 6
        else
            return (0);

[5.1001739]

[5.1001919]

        if (you.duration[DUR_MAGIC_SHIELD])
            base_shield = 2 + you.skills[SK_EVOCATIONS] / 6;
        if (!you.duration[DUR_FIRE_SHIELD] &&
            you.duration[DUR_CONDENSATION_SHIELD])
            base_shield += 2 + (you.skills[SK_ICE_MAGIC] / 6);  // max 6

Insertion in crawl-ref/source/enum.h at line 1195 [5.3287960]
[2.2967]
[4.15103]
```
    DUR_MAGIC_SHIELD,
```

Replacement in crawl-ref/source/decks.cc at line 765 [5.3987460]

B:BD[5.4000774] → [3.6854:6892]

    // XXX XXX FIXME handle do_shield

[5.4000774]

[6.22929]

    if ( do_shield )
    {
        if ( you.duration[DUR_MAGIC_SHIELD] == 0 )
            mpr("A magical shield forms in front of you.");
        you.duration[DUR_MAGIC_SHIELD] += random2(power/6) + 1;
    }

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

[5.4448324]

    if (you.duration[DUR_MAGIC_SHIELD] > 1)
        you.duration[DUR_MAGIC_SHIELD]--;
    else if (you.duration[DUR_MAGIC_SHIELD] == 1)
    {
        you.duration[DUR_MAGIC_SHIELD] = 0;
        mpr("Your magical shield disappears.", MSGCH_DURATION);
        you.redraw_armour_class = 1;
    }