fiddlerwoaroof/crawl - Change 6VNXS26SKWXBVS5B3UCWS3OIIPIM2MDHBPUXBVLT5EXXZEEOFVMQC

Make sure that Xom and chaos weapons can only turn monsters with natural

holiness into shapeshifters.

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

Created by dolorous on July 27, 2009

6VNXS26SKWXBVS5B3UCWS3OIIPIM2MDHBPUXBVLT5EXXZEEOFVMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 1306 [4.3]

∅:D[2.1221] → [3.1645:1709]

∅:D[5.3824] → [3.1645:1709]

B:BD[3.1645] → [3.1645:1709]

            if (one_chance_in(8) && !mons_is_shapeshifter(mon))

[2.1221]

[3.1709]

            if (one_chance_in(8) && !mons_is_shapeshifter(mon)
                && mons_holiness(mon) == MH_NATURAL)

Insertion in crawl-ref/source/fight.cc at line 2267 [7.3140790]

[6.9520]

    const bool is_natural = mon && mons_holiness(defender_as_monster())
                                       == MH_NATURAL;

Replacement in crawl-ref/source/fight.cc at line 2276 [7.3140790]

B:BD[8.26217] → [9.7389:7649]

    int clone_chance   = can_clone        ?  1 : 0;
    int poly_chance    = can_poly         ?  1 : 0;
    int poly_up_chance = can_poly  && mon ?  1 : 0;
    int shifter_chance = can_poly  && mon ?  1 : 0;
    int rage_chance    = can_rage         ? 10 : 0;

[8.26217]

[9.7649]

    int clone_chance   = can_clone                      ?  1 : 0;
    int poly_chance    = can_poly                       ?  1 : 0;
    int poly_up_chance = can_poly                && mon ?  1 : 0;
    int shifter_chance = can_poly  && is_natural && mon ?  1 : 0;
    int rage_chance    = can_rage                       ? 10 : 0;