fiddlerwoaroof/crawl - Change MIMVAKQXKJMHYLKXKY2TJEBL4HCOHKLDQYX6J5H4MWCI442NWEHAC

Added a message when Condensation Shield is extended

(inspired by BR 1763077) and removed double levitation extension if flying. Also, rods don't give the surge message anymore as spell enhancers are ignored anyway. Added message to show when a weapon of reaching is being used. (FR 1781922)

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

Created by j-p-e-g on September 5, 2007

MIMVAKQXKJMHYLKXKY2TJEBL4HCOHKLDQYX6J5H4MWCI442NWEHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 883 [5.293070]

B:BD[4.6921] → [4.6921:6926]

[4.6921]

[6.129613]


    // enhancers only matter for calc_spell_power() and spell_fail()
    // not sure about this: is it flavour or misleading?
    if (powc == 0 || allow_fail)
        surge_power(spell);

Deletion in crawl-ref/source/spl-cast.cc at line 892 [5.293070]
∅:D[3.2130] → [6.129748:129749]
B:BD[6.129748] → [6.129748:129749]
B:BD[6.129749] → [3.2131:2155]
```
    surge_power(spell);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1191 [5.293070]

B:BD[5.323704] → [5.323704:323783]

    case SPELL_ABJURATION_I:    //jmf: why not group with SPELL_ABJURATION_II?

[5.323704]

[5.323783]

    case SPELL_ABJURATION_I:
    case SPELL_ABJURATION_II:

Deletion in crawl-ref/source/spl-cast.cc at line 1378 [5.293070]
B:BD[5.329449] → [5.329449:329521]
```
        break;
    case SPELL_ABJURATION_II:
        abjuration(powc);
```

Insertion in crawl-ref/source/spells4.cc at line 3053 [5.436250]

[5.523195]

        {
            mpr("The disc of vapour around you crackles some more.");

Insertion in crawl-ref/source/spells4.cc at line 3056 [5.436250]
[5.523269]
[5.523269]
```
        }
```

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

B:BD[5.633681] → [2.2599:2637]

    if (you.duration[DUR_LEVITATION])

[5.633681]

[5.633705]

    if (you.duration[DUR_LEVITATION] && !you.duration[DUR_CONTROLLED_FLIGHT])

Replacement in crawl-ref/source/fight.cc at line 2821 [5.3140790]

B:BD[7.443] → [8.27228:27295]

        return std::string(" with ") + weapon->name(DESC_NOCAP_A);

[7.443]

[5.3228809]

    {
        std::string result = "";
        const item_def wpn = *weapon;
        if (get_weapon_brand(wpn) == SPWPN_REACHING)
        {
            int dx = abs(attacker->pos().x - defender->pos().x);
            int dy = abs(attacker->pos().y - defender->pos().y);
            if ((dx == 2 && dy <= 2) || (dy == 2 && dx <= 2))
                result += " from afar";
        }
        result += " with ";
        result += weapon->name(DESC_NOCAP_A);
        return result;
    }