fiddlerwoaroof/crawl - Change 3WZEOSDQM4HMTE3RJWUOGJX3UWEP4JBFNCC63Z4P7HGMXFXSESVQC

Another armour acquirement tweak:

Seeing how animal skins never get an ego property, lower the chance of acquirement handing out animal skins.
For armour-restricted species slightly increase the chance of getting one of the simpler hide armours (troll, steam, swamp, dragon).
Remove the chance to reroll for items with egos you already have, but increase the chance to reroll for mundane items if all secondary slots are already filled.
Make Oki's armour acquirements a bit more expensive.

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

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

3WZEOSDQM4HMTE3RJWUOGJX3UWEP4JBFNCC63Z4P7HGMXFXSESVQC

Dependencies

In channels

main

Change contents

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

B:BD[3.242] → [2.2647:2710]

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

[3.242]

[5.175849]

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

Replacement in crawl-ref/source/effects.cc at line 1008 [4.3382105]

B:BD[6.6350] → [6.6350:6412]

            result = coinflip() ? ARM_ROBE : ARM_ANIMAL_SKIN;

[6.6350]

[7.4271]

        {
            // Animal skins don't get egos, so make them less likely.
            result = (one_chance_in(4) ? ARM_ANIMAL_SKIN : ARM_ROBE);
            // Armour-restricted species get a bonus chance at troll/dragon
            // armour. (In total, the chance is almost 10%.)
            if (one_chance_in(20))
            {
                result = static_cast<armour_type>(
                    random_choose_weighted(3, ARM_TROLL_LEATHER_ARMOUR,
                                           3, ARM_STEAM_DRAGON_ARMOUR,
                                           1, ARM_SWAMP_DRAGON_ARMOUR,
                                           1, ARM_DRAGON_ARMOUR,
                                           0));
            }
        }

Replacement in crawl-ref/source/effects.cc at line 1038 [4.3382105]
B:BD[4.3397361] → [8.3386:3425]
```
                if (one_chance_in(10))
```
[4.3397361]
[8.3425]
```
                if (one_chance_in(12))
```

Replacement in crawl-ref/source/effects.cc at line 1881 [4.3382105]

B:BD[9.3759] → [9.3759:3821]

                bool mundane_check = (sparm == SPARM_NORMAL);

[9.3759]

[9.3821]

                bool is_mundane   = (sparm == SPARM_NORMAL);
                bool is_redundant = false;

Replacement in crawl-ref/source/effects.cc at line 1889 [4.3382105]

B:BD[9.4209] → [2.3732:3788]

                if (!mundane_check && agent != GOD_XOM)

[9.4209]

[9.4245]

                if (!is_mundane && agent != GOD_XOM)

Replacement in crawl-ref/source/effects.cc at line 1898 [4.3382105]

B:BD[9.4666] → [9.4666:4712]

                        mundane_check = true;

[9.4666]

[9.4712]

                        is_redundant = true;

Replacement in crawl-ref/source/effects.cc at line 1902 [4.3382105]

B:BD[9.4753] → [9.4753:4788]

                if (mundane_check)

[9.4753]

[9.4788]

                if (is_mundane || is_redundant)

Replacement in crawl-ref/source/effects.cc at line 1916 [4.3382105]

B:BD[9.5253] → [2.3907:4027]

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

[9.5253]

[9.5324]

                    else if (is_mundane && agent != GOD_XOM && one_chance_in(3))

Replacement in crawl-ref/source/effects.cc at line 1918 [4.3382105]

B:BD[9.5346] → [9.5346:5493]

                        // If there weren't any unfilled slots, there's a 20%
                        // chance for non-body armour to roll again.

[9.5346]

[9.5493]

                        // If the item is mundane and there aren't any
                        // unfilled slots, we might want to roll again.