fiddlerwoaroof/crawl - Change V53DXVC5T3N6J47H2CNG4MMPRR4PHW4AIS66QNVTKJNNYTTTQL4AC

Removed DISRUPTION brand and added DRAGON_SLAYING.

The old disruption code should probably be moved over to holy wrath but I'm unsure whether I should replace the current one. I'm talking about the "You are blasted by holy energy!" bit in the commit below. For now, I've simply removed it.

All dragon slaying currently does is what orc slaying does, only against dragons. So no additional effects, resistances or otherwise. Both slaying brands are still randomly created (though dragon only for polearms), I haven't changed anything about that.

Also removed DISTORTION effect upon wielding such a weapon. Xom is still pleased about seeing you in this conundrum, but not as much as when you were blasted right away. Changed distortion description to explicitly mentioning its effects.

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

Created by j-p-e-g on January 7, 2008

V53DXVC5T3N6J47H2CNG4MMPRR4PHW4AIS66QNVTKJNNYTTTQL4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/unrand.h at line 1026 [6.114533]
B:BD[6.140021] → [6.140021:140062]
```
        SPWPN_DISRUPTION, 0, 0, 0, 0, 0,
```
[6.140021]
[6.140062]
```
        SPWPN_HOLY_WRATH, 0, 0, 0, 0, 0,
```
Deletion in crawl-ref/source/shopping.cc at line 670 [6.759950]
B:BD[6.776453] → [6.776453:776488]
```
            case SPWPN_DISRUPTION:
```
Insertion in crawl-ref/source/shopping.cc at line 690 [6.759950]
[6.777006]
[6.777006]
```
            case SPWPN_DRAGON_SLAYING:
```

Replacement in crawl-ref/source/randart.cc at line 1171 [6.893152]

B:BD[7.738] → [7.738:802]

            proprt[RAP_BRAND] = SPWPN_ORC_SLAYING + random2(4);

[7.738]

[6.910332]

            proprt[RAP_BRAND] = SPWPN_ORC_SLAYING + random2(5);
        if (proprt[RAP_BRAND] == SPWPN_DRAGON_SLAYING
            && weapon_skill(item) != SK_POLEARMS)
        {
            proprt[RAP_BRAND] = 0;      /* missile wpns */
        }

Deletion in crawl-ref/source/randart.cc at line 1191 [6.893152]

B:BD[6.910695] → [6.910695:910915]

        if (proprt[RAP_BRAND] == SPWPN_DISRUPTION
            && !(atype == WPN_MACE || atype == WPN_GREAT_MACE
                || atype == WPN_HAMMER))
        {
            proprt[RAP_BRAND] = SPWPN_NORMAL;
        }

Deletion in crawl-ref/source/mon-util.cc at line 2759 [6.1699344]

B:BD[8.6710] → [8.6710:6803]

        case SPWPN_DISRUPTION:
            mpr("You sense a holy aura.");
            break;

Deletion in crawl-ref/source/mon-util.cc at line 3112 [6.1699344]
B:BD[8.13083] → [8.13083:13163]
```
    if (brand == SPWPN_DISRUPTION && holy == MH_UNDEAD)
        return (false);
```

Deletion in crawl-ref/source/makeitem.cc at line 1198 [9.927]

B:BD[4.9411] → [4.9411:9527]

∅:D[4.9527] → [9.38780:38794]

B:BD[9.38780] → [9.38780:38794]

B:BD[9.38794] → [4.9528:9636]

            if ((item.sub_type == WPN_MACE || item.sub_type == WPN_GREAT_MACE)
                && one_chance_in(4))
            {
                rc = SPWPN_DISRUPTION;
            }
            // **** intentional fall through here ****

Insertion in crawl-ref/source/makeitem.cc at line 1411 [9.927]

[4.15542]

[9.49424]

                
            if (one_chance_in(5))
                rc = SPWPN_DRAGON_SLAYING;

Replacement in crawl-ref/source/makeitem.cc at line 2852 [9.927]

B:BD[9.101337] → [8.18303:18387]

    if (get_weapon_brand(mthing) == SPWPN_DISRUPTION
        && mholy == MH_UNDEAD)

[9.101337]

[9.101510]

    if (get_weapon_brand(mthing) == SPWPN_HOLY_WRATH
        && (mholy == MH_UNDEAD || mholy == MH_DEMONIC))

Deletion in crawl-ref/source/makeitem.cc at line 2857 [9.927]

B:BD[9.101586] → [9.101586:101781]

    else if (get_weapon_brand(mthing) == SPWPN_HOLY_WRATH
             && (mholy == MH_UNDEAD || mholy == MH_DEMONIC))
    {
        set_item_ego_type( mthing, OBJ_WEAPONS, SPWPN_NORMAL );
    }

Insertion in crawl-ref/source/itemprop.h at line 87 [11.641567]
[10.75812]
[10.75812]
```
    SPWPN_DRAGON_SLAYING,
```

Replacement in crawl-ref/source/itemprop.h at line 91 [11.641567]

B:BD[10.75871] → [10.75871:75935]

    SPWPN_SPEED,
    SPWPN_VORPAL,                      //   10

[10.75871]

[10.75935]

    SPWPN_SPEED,                       //   10
    SPWPN_VORPAL,

Deletion in crawl-ref/source/itemprop.h at line 96 [11.641567]
B:BD[10.75992] → [10.75992:76014]
```
    SPWPN_DISRUPTION,
```

Replacement in crawl-ref/source/itemprop.cc at line 1735 [11.646661]

B:BD[11.695542] → [11.695542:695626]

            || brand == SPWPN_HOLY_WRATH 
            || brand == SPWPN_DISRUPTION)

[11.695542]

[11.695626]

            || brand == SPWPN_HOLY_WRATH)

Insertion in crawl-ref/source/itemname.cc at line 321 [6.2667494]

[12.2179]

    case SPWPN_DRAGON_SLAYING: return ((terse) ? " (slay drac)":" of dragon slaying");

Deletion in crawl-ref/source/itemname.cc at line 326 [6.2667494]
B:BD[12.2465] → [12.2465:2544]
```
    case SPWPN_DISRUPTION: return ((terse) ? " (disrupt)" : " of disruption");
```
Deletion in crawl-ref/source/item_use.cc at line 167 [6.2781507]
B:BD[13.364214] → [11.731059:731113]
```
                    || weap_brand == SPWPN_DISRUPTION
```

Insertion in crawl-ref/source/item_use.cc at line 515 [6.2781507]

[6.2791707]

                case SPWPN_DRAGON_SLAYING:
                    mpr(player_genus(GENPC_DRACONIAN)
                            ? "You feel a sudden desire to commit suicide."
                            : "You feel a sudden desire to slay dragons!");
                    break;

Deletion in crawl-ref/source/item_use.cc at line 550 [6.2781507]

B:BD[6.2792624] → [6.2792624:2792742]

                    break;
                case SPWPN_DISRUPTION:
                    mpr("You sense a holy aura.");

Replacement in crawl-ref/source/item_use.cc at line 620 [6.2781507]

B:BD[14.14771] → [14.14771:14945]

B:BD[14.14945] → [2.360:435]

                    xom_is_stimulated(128);
                miscast_effect( SPTYP_TRANSLOCATION, 9, 90, 100,
                                was_known ? "distortion wield" :
                                            "unknowing distortion wield");

[14.14771]

[6.2794861]

                    xom_is_stimulated(32);

Insertion in crawl-ref/source/ghost.cc at line 164 [15.9890]

[3.404]

[15.13709]

                 || (values[ GVAL_BRAND ] == SPWPN_DRAGON_SLAYING
                     && you.mons_species() != MONS_DRACONIAN)

Replacement in crawl-ref/source/ghost.cc at line 168 [15.9890]

B:BD[15.13828] → [15.13828:13885]

B:BD[15.13885] → [3.405:522]

                 || values[ GVAL_BRAND ] == SPWPN_FROST 
                 || (values[ GVAL_BRAND ] == SPWPN_DISRUPTION
                     && you.holiness() != MH_UNDEAD));

[15.13828]

[15.13948]

                 || values[ GVAL_BRAND ] == SPWPN_FROST);

Replacement in crawl-ref/source/ghost.cc at line 178 [15.9890]

B:BD[15.14315] → [15.14315:14382]

                                        one_chance_in(5) ? 2 : 1);

[15.14315]

[15.14382]

                                  one_chance_in(5) ? 2 : 1);

Insertion in crawl-ref/source/fight.cc at line 1899 [6.3140790]

[16.2027]

[17.8208]

        {
            special_damage = 1 + random2(damage_done);
            if (defender_visible)
                special_damage_message =
                    make_stringf(
                        "%s %s%s",
                        defender->name(DESC_CAP_THE).c_str(),
                        defender->conj_verb("convulse").c_str(),
                        special_attack_punctuation().c_str());
        }
        break;
    case SPWPN_DRAGON_SLAYING:
        if (mons_genus(defender->mons_species()) == MONS_DRAGON
            || mons_genus(defender->mons_species()) == MONS_DRACONIAN)

Deletion in crawl-ref/source/fight.cc at line 2049 [6.3140790]

B:BD[6.3175220] → [18.60856:60883]

B:BD[18.60883] → [19.62060:62128]

∅:D[19.62128] → [18.60949:60959]

B:BD[18.60949] → [18.60949:60959]

B:BD[18.60959] → [20.3839:4214]

∅:D[20.4214] → [19.62409:62422]

B:BD[19.62409] → [19.62409:62422]

∅:D[19.62422] → [18.61059:61163]

B:BD[18.61059] → [18.61059:61163]

    case SPWPN_DISRUPTION:
        if (defender->holiness() == MH_UNDEAD && !one_chance_in(3))
        {
            if (defender_visible)
                special_damage_message =
                    defender->atype() == ACT_MONSTER?
                    make_stringf("%s %s.",
                                 defender->name(DESC_CAP_THE).c_str(),
                                 defender->conj_verb("shudder").c_str())
                    : ("You are blasted by holy energy!");
            
            special_damage += random2avg((1 + (damage_done * 3)), 3);
        }
        break;

Replacement in crawl-ref/source/effects.cc at line 1514 [6.3382105]

∅:D[11.943273] → [6.3420550:3420659]

B:BD[6.3420550] → [6.3420550:3420659]

                    if (brand == SPWPN_HOLY_WRATH 
                            || brand == SPWPN_DISRUPTION)

[11.943273]

[6.3420659]

                    if (brand == SPWPN_HOLY_WRATH)

Replacement in crawl-ref/source/effects.cc at line 1524 [6.3382105]

∅:D[11.943457] → [6.3421072:3421203]

B:BD[6.3421072] → [6.3421072:3421203]

                            for (; brand == SPWPN_HOLY_WRATH 
                                      || brand == SPWPN_DISRUPTION;

[11.943457]

[11.943458]

                            for (; brand == SPWPN_HOLY_WRATH;

Insertion in crawl-ref/source/describe.cc at line 794 [6.3736416]

[6.3769208]

                break;
            case SPWPN_DRAGON_SLAYING:
                description += "It is especially effective against "
                    "all kinds of dragons. ";

Deletion in crawl-ref/source/describe.cc at line 851 [6.3736416]

B:BD[6.3771085] → [6.3771085:3771323]

            case SPWPN_DISRUPTION:
                description += "It is a weapon blessed by Zin, "
                    "and can inflict up to fourfold damage "
                    "when used against the undead. ";
                break;

Replacement in crawl-ref/source/describe.cc at line 858 [6.3736416]

B:BD[21.491] → [5.734:812]

                    "Merely wielding or unwielding it can be highly risky. ";

[21.491]

[6.3771660]

                    "Unwielding it can cause banishment or high damage. ";