fiddlerwoaroof/crawl - Change XGHM5AJS3XIA4TI2OES3ZRDAY42BBK5JTCTEMTQK3A3FBYM2MIOQC

Some updates to the chaos brand based on discussions:

Remove behavior/logic which wouldn't be evident to the player.
Xom only gives chaos branded missiles and launchers to hostile monsters, never as a gift to the player.
The frequency of a branded Xom gift being switched to the chaos brand has decreased from 33% to 20%.

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

Created by zelgadis on December 14, 2008

XGHM5AJS3XIA4TI2OES3ZRDAY42BBK5JTCTEMTQK3A3FBYM2MIOQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 255 [5.3]

B:BD[4.5] → [4.5:78]

    if (item.base_type != OBJ_WEAPONS && item.base_type != OBJ_MISSILES)

[4.5]

[4.78]

    // Only apply to melee weapons for the player.
    if (item.base_type != OBJ_WEAPONS || is_range_weapon(item))

Replacement in crawl-ref/source/xom.cc at line 263 [5.3]
B:BD[3.1796] → [3.1796:1822]
```
    if (one_chance_in(3))
```
[3.1796]
[6.300]
```
    if (one_chance_in(5))
```
Deletion in crawl-ref/source/fight.cc at line 2212 [7.3140790]
B:BD[6.25955] → [6.25955:26012]
```
    const bool is_chaotic = mon && mons_is_chaotic(def);
```

Deletion in crawl-ref/source/fight.cc at line 2224 [7.3140790]

∅:D[8.2819] → [6.26393:26606]

∅:D[2.7678] → [6.26393:26606]

B:BD[6.26393] → [6.26393:26606]


    if (is_chaotic)
    {
        // Polymorphing might reduce amount of chaos in the world.
        poly_chance    = 0;
        poly_up_chance = 0;
        // Chaos wants more chaos.
        clone_chance *= 2;

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

B:BD[6.26607] → [6.26607:26740]

        // Chaos loves shifters.
        if (is_shifter)
        {
            clone_chance   *= 2;
            poly_up_chance  = 4;

[6.26607]

[6.26740]

    if (is_shifter)
        // Already a shifter
        shifter_chance = 0;

Deletion in crawl-ref/source/fight.cc at line 2229 [7.3140790]

B:BD[6.26741] → [6.26741:26823]

            // Already a shifter
            shifter_chance = 0;
        }
    }

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

[2.7987]


        // Inform player that something is up.
        if (see_grid(defender->pos()))
        {
            if (defender->atype() == ACT_PLAYER)
                mpr("You give off a flash of multi-coloured light!");
            else if (you.can_see(defender))
                simple_monster_message(def, " gives off a flash of "
                                       "multi-coloured light!");
            else
                mpr("There is a flash of multi-coloured light!");
        }