fiddlerwoaroof/crawl - Change WYNGGL55XFKKEY6NQBH7EKVIZZATLZ2MVPAMNM4Q3SVISGT3UEDAC

Move the routine to calculate the racial armor bonus into its own

function. Also, use it to properly apply racial bonuses to shields, so that racial shields mean something. (Note that the bonus for shields is 2/3 the bonus for armor, as the upper limit for shields is 20, as opposed to armor's 30.)

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

Created by dolorous on March 11, 2008

WYNGGL55XFKKEY6NQBH7EKVIZZATLZ2MVPAMNM4Q3SVISGT3UEDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 1818 [3.962854]
B:BD[3.989215] → [3.989215:989235]
```
int player_AC(void)
```
[3.989215]
[3.989235]
```
static int player_armour_racial_bonus(const item_def& item)
```

Replacement in crawl-ref/source/player.cc at line 1820 [3.962854]

B:BD[3.989237] → [3.989237:989302]

    int AC = 0;
    int i;                      // loop variable

[3.989237]

[3.989302]

    if (item.base_type != OBJ_ARMOUR)
        return 0;
    int racial_bonus = 0;
    const unsigned long armour_race = get_equip_race(item);

Replacement in crawl-ref/source/player.cc at line 1827 [3.962854]
B:BD[3.989378] → [3.989378:989415]
```
    const unsigned long racial_type 
```
[3.989378]
[3.989415]
```
    const unsigned long racial_type
```

Insertion in crawl-ref/source/player.cc at line 1832 [3.962854]

[3.989717]


    // Dwarven armour is universally good -- bwr
    if (armour_race == ISFLAG_DWARVEN)
        racial_bonus += 4;
    if (racial_type && armour_race == racial_type)
    {
        // Elven armour is light, but still gives one level to elves.
        // Orcish and Dwarven armour are worth +2 to the correct
        // species, plus the plus that anyone gets with dwarven armour.
        // -- bwr
        if (racial_type == ISFLAG_ELVEN)
            racial_bonus += 2;
        else
            racial_bonus += 4;

Insertion in crawl-ref/source/player.cc at line 1848 [3.962854]

[3.989718]

        // an additional bonus for Beogh worshippers
        if (you.religion == GOD_BEOGH && !you.penance[GOD_BEOGH])
        {
            if (you.piety >= 185)
                racial_bonus += racial_bonus * 9 / 4;
            else if (you.piety >= 160)
                racial_bonus += racial_bonus * 2;
            else if (you.piety >= 120)
                racial_bonus += racial_bonus * 7 / 4;
            else if (you.piety >= 80)
                racial_bonus += racial_bonus * 5 / 4;
            else if (you.piety >= 40)
                racial_bonus += racial_bonus * 3 / 4;
            else
                racial_bonus += racial_bonus / 4;
        }
    }
    return racial_bonus;
}
int player_AC(void)
{
    int AC = 0;
    int i;                      // loop variable

Deletion in crawl-ref/source/player.cc at line 1883 [3.962854]
∅:D[4.212] → [3.989915:989916]
∅:D[2.615] → [3.989915:989916]
B:BD[3.989915] → [3.989915:989916]
B:BD[3.989916] → [2.616:647]
∅:D[2.647] → [3.990378:990379]
B:BD[3.990378] → [3.990378:990379]
B:BD[3.990379] → [5.170:253]
B:BD[5.253] → [2.648:712]
```
        AC += item.plus * 100;
        // additional *half*-levels of armour skill.
        int racial_bonus = 0;
        const unsigned long armour_race = get_equip_race(item);
```

Replacement in crawl-ref/source/player.cc at line 1884 [3.962854]

∅:D[4.286] → [3.990788:990885]

∅:D[2.773] → [3.990788:990885]

B:BD[3.990788] → [3.990788:990885]

B:BD[3.990885] → [5.254:285]

∅:D[5.285] → [3.990916:991271]

B:BD[3.990916] → [3.990916:991271]

B:BD[3.991271] → [5.286:321]

∅:D[5.321] → [3.991303:991320]

B:BD[3.991303] → [3.991303:991320]

B:BD[3.991320] → [5.322:357]

∅:D[5.357] → [6.386:387]

B:BD[3.991355] → [6.386:387]

∅:D[6.387] → [7.17610:17751]

B:BD[7.17610] → [7.17610:17751]

B:BD[7.17751] → [6.388:426]

B:BD[6.426] → [5.358:416]

∅:D[5.416] → [6.480:523]

B:BD[6.480] → [6.480:523]

B:BD[6.523] → [5.417:471]

∅:D[5.471] → [6.581:624]

B:BD[6.581] → [6.581:624]

B:BD[6.624] → [5.472:530]

∅:D[5.530] → [6.678:720]

B:BD[6.678] → [6.678:720]

B:BD[6.720] → [5.531:589]

∅:D[5.589] → [6.778:820]

B:BD[6.778] → [6.778:820]

B:BD[6.820] → [5.590:648]

∅:D[5.648] → [8.887:908]

∅:D[6.870] → [8.887:908]

B:BD[7.18153] → [8.887:908]

B:BD[8.908] → [5.649:703]

∅:D[5.703] → [7.18153:18167]

∅:D[6.925] → [7.18153:18167]

∅:D[8.947] → [7.18153:18167]

B:BD[7.18153] → [7.18153:18167]

∅:D[7.18167] → [3.991355:991365]

B:BD[3.991355] → [3.991355:991365]


        // Dwarven armour is universally good -- bwr
        if (armour_race == ISFLAG_DWARVEN)
            racial_bonus += 4;
        if (racial_type && armour_race == racial_type)
        {
            // Elven armour is light, but still gives one level 
            // to elves.  Orcish and Dwarven armour are worth +2
            // to the correct species, plus the plus that anyone
            // gets with dwarven armour. -- bwr
            if (racial_type == ISFLAG_ELVEN)
                racial_bonus += 2;
            else
                racial_bonus += 4;
            // an additional bonus for Beogh worshippers
            if (you.religion == GOD_BEOGH && !you.penance[GOD_BEOGH])
            {
                if (you.piety >= 185)
                    racial_bonus += racial_bonus * 9 / 4;
                else if (you.piety >= 160)
                    racial_bonus += racial_bonus * 2;
                else if (you.piety >= 120)
                    racial_bonus += racial_bonus * 7 / 4;
                else if (you.piety >= 80)
                    racial_bonus += racial_bonus * 5 / 4;
                else if (you.piety >= 40)
                    racial_bonus += racial_bonus * 3 / 4;
                else
                    racial_bonus += racial_bonus / 4;
            }
        }

[2.773]

[3.991365]

        int racial_bonus = player_armour_racial_bonus(item);

Replacement in crawl-ref/source/player.cc at line 1888 [3.962854]

B:BD[3.991442] → [9.277:387]

        /* The deformed don't fit into body armour very well
           (this includes nagas and centaurs) */

[3.991442]

[9.387]

        AC += item.plus * 100;
        // The deformed don't fit into body armour very well
        // (this includes nagas and centaurs)

Replacement in crawl-ref/source/player.cc at line 2416 [3.962854]

B:BD[3.1001940] → [3.1001940:1001984]

        switch (you.inv[ shield ].sub_type)

[3.1001940]

[3.1001984]

        const item_def& item = you.inv[shield];
        switch (item.sub_type)

Insertion in crawl-ref/source/player.cc at line 2431 [3.962854]
[3.1002341]
[3.1002341]
```
        int racial_bonus = player_armour_racial_bonus(item) * 2 / 3;
```

Replacement in crawl-ref/source/player.cc at line 2434 [3.962854]

B:BD[3.1002402] → [3.1002402:1002456]

        base_shield *= (20 + you.skills[SK_SHIELDS]);

[3.1002402]

[3.1002456]

        base_shield *= (20 + you.skills[SK_SHIELDS] + racial_bonus);

Replacement in crawl-ref/source/player.cc at line 2437 [3.962854]
B:BD[3.1002484] → [3.1002484:1002531]
```
        base_shield += you.inv[ shield ].plus;
```
[3.1002484]
[3.1002531]
```
        base_shield += item.plus;
```

Move the routine to calculate the racial armor bonus into its own

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 1818 [3.962854]

Replacement in crawl-ref/source/player.cc at line 1820 [3.962854]

Replacement in crawl-ref/source/player.cc at line 1827 [3.962854]

Insertion in crawl-ref/source/player.cc at line 1832 [3.962854]

Insertion in crawl-ref/source/player.cc at line 1848 [3.962854]

Deletion in crawl-ref/source/player.cc at line 1883 [3.962854]

Replacement in crawl-ref/source/player.cc at line 1884 [3.962854]

Replacement in crawl-ref/source/player.cc at line 1888 [3.962854]

Replacement in crawl-ref/source/player.cc at line 2416 [3.962854]

Insertion in crawl-ref/source/player.cc at line 2431 [3.962854]

Replacement in crawl-ref/source/player.cc at line 2434 [3.962854]

Replacement in crawl-ref/source/player.cc at line 2437 [3.962854]