fiddlerwoaroof/crawl - Change OA5LKRBWU6B5OT45MV4L6AQJBOD7M3YXBFP3AWZJI24YHASOJQTAC

* Add a few exceptions to the new armour acquirement for Xom.

Tweak book acquirement: if more than 25% of your skills are magic you will never get manuals. If you get a manual, use increased weights for Fighting, Armour, Spellcasting, Invocations, Evocations (arbitrarily chosen).

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

Created by j-p-e-g on August 8, 2009

OA5LKRBWU6B5OT45MV4L6AQJBOD7M3YXBFP3AWZJI24YHASOJQTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2101 [7.804403]

B:BD[5.242] → [6.5962:6025]

                    _inc_gift_timeout(20 + random2avg(15, 2));

[5.242]

[8.175849]

                    _inc_gift_timeout(25 + random2avg(15, 2));

Replacement in crawl-ref/source/effects.cc at line 954 [7.3382105]

B:BD[7.3396810] → [9.3442:3503]

static armour_type _acquirement_armour_subtype(bool okawaru)

[7.3396810]

[9.3503]

static armour_type _acquirement_armour_subtype(bool divine)

Replacement in crawl-ref/source/effects.cc at line 963 [7.3382105]
B:BD[9.3772] → [9.3772:3789]
```
    if (okawaru)
```
[9.3772]
[9.3789]
```
    if (divine)
```
Replacement in crawl-ref/source/effects.cc at line 1011 [7.3382105]
B:BD[7.3397012] → [4.2824:2849]
```
            if (okawaru)
```
[7.3397012]
[4.2849]
```
            if (divine)
```

Replacement in crawl-ref/source/effects.cc at line 1445 [7.3382105]

B:BD[9.6620] → [9.6620:6741]

            const bool okawaru = (agent == GOD_OKAWARU);
            type_wanted = _acquirement_armour_subtype(okawaru);

[9.6620]

[9.6741]

            const bool divine = (agent == GOD_OKAWARU || agent == GOD_XOM);
            type_wanted = _acquirement_armour_subtype(divine);

Replacement in crawl-ref/source/effects.cc at line 1580 [7.3382105]

B:BD[10.6357] → [11.9854:9915]

        // Count magic skills double to bias against manuals

[10.6357]

[11.9915]

        // If someone has 25% or more magic skills, never give manuals.
        // Otherwise, count magic skills double to bias against manuals

Replacement in crawl-ref/source/effects.cc at line 1583 [7.3382105]

∅:D[11.9943] → [12.3130:3205]

B:BD[10.6357] → [12.3130:3205]

        if (x_chance_in_y(other_weights, 2*magic_weights + other_weights))

[11.9943]

[10.6430]

        if (magic_weights * 3 < other_weights
            && x_chance_in_y(other_weights, 2*magic_weights + other_weights))

Insertion in crawl-ref/source/effects.cc at line 1667 [7.3382105]

[2.3004]

[10.7516]


            if (skill == 27)
            {
                weights[i] = 0;
                continue;
            }

Insertion in crawl-ref/source/effects.cc at line 1676 [7.3382105]

[13.5401]

[14.3622]


            // Give a bonus for some highly sought after skills.
            if (i == SK_FIGHTING || i == SK_ARMOUR || i == SK_SPELLCASTING
                || i == SK_INVOCATIONS || i == SK_EVOCATIONS)
            {
                w += 5;
            }

Replacement in crawl-ref/source/effects.cc at line 1827 [7.3382105]

B:BD[3.4209] → [3.4209:4245]

                if (!mundane_check)

[3.4209]

[3.4245]

                if (!mundane_check && agent != GOD_XOM)

Insertion in crawl-ref/source/effects.cc at line 1851 [7.3382105]

[3.5231]

                        else if (agent == GOD_XOM && doodad.plus > 0)
                            doodad.plus *= -1;

Replacement in crawl-ref/source/effects.cc at line 1854 [7.3382105]

B:BD[3.5253] → [3.5253:5324]

                    else if (eq != EQ_BODY_ARMOUR && one_chance_in(5))

[3.5253]

[3.5324]

                    else if (eq != EQ_BODY_ARMOUR && agent != GOD_XOM
                             && one_chance_in(5))