fiddlerwoaroof/crawl - Change 2SU35FKBXMKAYJY76OXAC55R6JWTSHQSHBNBR3ICWUQREJME2ZSAC

Finally include Ely piety gain from Destroy Weapon depending on

both current piety and item value. (Only in 0.3 up to now. Whoops.) And make "evil" weapons (demonic, vampiric, pain, draining) always give piety when destroyed. (FR1832851)

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

Created by j-p-e-g on November 21, 2007

2SU35FKBXMKAYJY76OXAC55R6JWTSHQSHBNBR3ICWUQREJME2ZSAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 1853 [4.804403]

[3.750]


static bool is_evil_weapon(item_def weap)
{
    if (weap.base_type != OBJ_WEAPONS)
        return false;

Insertion in crawl-ref/source/religion.cc at line 1859 [4.804403]

[3.751]

[2.191]

    return (is_demonic(weap)
            || weap.special == SPWPN_VAMPIRICISM
            || weap.special == SPWPN_PAIN
            || weap.special == SPWPN_DRAINING);
}

Deletion in crawl-ref/source/religion.cc at line 1886 [4.804403]

B:BD[3.1420] → [2.242:528]

∅:D[2.528] → [3.1447:1448]

B:BD[3.1447] → [3.1447:1448]

        std::ostream& strm = msg::streams(MSGCH_GOD);
        strm << mitm[i].name(DESC_CAP_THE);
        if ( mitm[i].quantity == 1 )
            strm << " shimmers and breaks into pieces." << std::endl;
        else
            strm << " shimmer and break into pieces." << std::endl;

Replacement in crawl-ref/source/religion.cc at line 1891 [4.804403]

B:BD[3.1606] → [3.1606:1648]

        if (random2(value) >= random2(50)

[3.1606]

[3.1648]

        bool pgain = false;
        if (is_evil_weapon(mitm[i])
            || random2(value) >= random2(250) // artefacts (incl. most randarts)
            || random2(value) >= random2(100) && one_chance_in(1 + you.piety/50)

Insertion in crawl-ref/source/religion.cc at line 1898 [4.804403]
[3.1771]
[2.529]
```
            pgain = true;
```

Replacement in crawl-ref/source/religion.cc at line 1901 [4.804403]

B:BD[3.1812] → [3.1812:1821]

[3.1812]

[3.1821]


        std::ostream& strm = msg::streams(MSGCH_GOD);
        strm << mitm[i].name(DESC_CAP_THE);
        if (!pgain)
            strm << " barely";
        if ( mitm[i].quantity == 1 )
            strm << " shimmers and breaks into pieces." << std::endl;
        else
            strm << " shimmer and break into pieces." << std::endl;