fiddlerwoaroof/crawl - Change V3GWLMX6JL3YOYB427VLHPOTGHGWZK64HI6LLUU4X6CFMD2MEQMQC

Fixed player_AC so that Armour skill bonuses are not lost to integer math.

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

Created by dshaligram on July 27, 2007

V3GWLMX6JL3YOYB427VLHPOTGHGWZK64HI6LLUU4X6CFMD2MEQMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 1540 [3.962854]
B:BD[3.989879] → [3.989879:989915]
```
        AC += you.inv[ item ].plus;
```
[3.989879]
[3.989915]
```
        AC += you.inv[ item ].plus * 100;
```

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

B:BD[3.990721] → [3.990721:990788]

        const int ac_value = property( you.inv[ item ], PARM_AC );

[3.990721]

[3.990788]

        const int ac_value = property( you.inv[ item ], PARM_AC ) * 100;

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

B:BD[3.991717] → [3.991717:991775]

    AC += player_equip( EQ_RINGS_PLUS, RING_PROTECTION );

[3.991717]

[3.991775]

    AC += player_equip( EQ_RINGS_PLUS, RING_PROTECTION ) * 100;

Replacement in crawl-ref/source/player.cc at line 1603 [3.962854]
B:BD[3.991838] → [3.991838:991855]
```
        AC += 5;
```
[3.991838]
[3.991855]
```
        AC += 500;
```
Replacement in crawl-ref/source/player.cc at line 1606 [3.962854]
B:BD[3.991918] → [3.991918:991935]
```
        AC += 3;
```
[3.991918]
[3.991935]
```
        AC += 300;
```
Replacement in crawl-ref/source/player.cc at line 1608 [3.962854]
B:BD[3.991936] → [3.991936:991969]
```
    AC += scan_randarts(RAP_AC);
```
[3.991936]
[3.991969]
```
    AC += scan_randarts(RAP_AC) * 100;
```

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

B:BD[3.992008] → [3.992008:992074]

        AC += 4 + you.skills[SK_ICE_MAGIC] / 3;         // max 13

[3.992008]

[3.992074]

        AC += 400 + 100 * you.skills[SK_ICE_MAGIC] / 3;         // max 13

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

B:BD[3.992112] → [3.992112:992178]

        AC += 5 + you.skills[SK_EARTH_MAGIC] / 2;       // max 18

[3.992112]

[3.992178]

        AC += 500 + 100 * you.skills[SK_EARTH_MAGIC] / 2;       // max 18

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

B:BD[3.992216] → [3.992216:992281]

        AC += 2 + you.skills[SK_EARTH_MAGIC] / 5;       // max 7

[3.992216]

[3.992281]

        AC += 200 + 100 * you.skills[SK_EARTH_MAGIC] / 5;       // max 7

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

B:BD[3.992766] → [3.992766:992839]

            AC += (3 + you.skills[SK_NECROMANCY] / 6);          // max 7

[3.992766]

[3.992839]

            AC += (300 + 100 * you.skills[SK_NECROMANCY] / 6);   // max 7

Replacement in crawl-ref/source/player.cc at line 1634 [3.962854]
B:BD[3.992961] → [3.992961:992986]
```
                AC += 2;
```
[3.992961]
[3.992986]
```
                AC += 200;
```

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

B:BD[3.993041] → [3.993041:993115]

                AC += 1 + (you.experience_level - 4) / 2;       // max 12

[3.993041]

[3.993115]

                AC += 100 + 100 * (you.experience_level - 4) / 2;  // max 12

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

B:BD[3.993132] → [3.993132:993205]

                AC += 1 + (you.experience_level / 4);           // max 7

[3.993132]

[3.993205]

                AC += 100 + (100 * you.experience_level / 4);      // max 7

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

B:BD[3.993311] → [3.993311:993384]

                AC += you.experience_level / 3;                 // max 9

[3.993311]

[3.993384]

                AC += 100 * you.experience_level / 3;              // max 9

Replacement in crawl-ref/source/player.cc at line 1649 [3.962854]
B:BD[3.993434] → [3.993434:993456]
```
                AC++;
```
[3.993434]
[3.993456]
```
                AC += 100;
```
Replacement in crawl-ref/source/player.cc at line 1654 [3.962854]
B:BD[3.993536] → [3.993536:993561]
```
                AC += 3;
```
[3.993536]
[3.993561]
```
                AC += 300;
```

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

B:BD[3.993846] → [3.993846:994130]

        AC += you.mutation[MUT_TOUGH_SKIN];
        AC += you.mutation[MUT_GREY_SCALES];
        AC += you.mutation[MUT_SPECKLED_SCALES];
        AC += you.mutation[MUT_IRIDESCENT_SCALES];
        AC += you.mutation[MUT_PATTERNED_SCALES];
        AC += you.mutation[MUT_BLUE_SCALES];

[3.993846]

[3.994130]

        AC += 100 * you.mutation[MUT_TOUGH_SKIN];
        AC += 100 * you.mutation[MUT_GREY_SCALES];
        AC += 100 * you.mutation[MUT_SPECKLED_SCALES];
        AC += 100 * you.mutation[MUT_IRIDESCENT_SCALES];
        AC += 100 * you.mutation[MUT_PATTERNED_SCALES];
        AC += 100 * you.mutation[MUT_BLUE_SCALES];

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

B:BD[3.994214] → [3.994214:994274]

            AC += (you.mutation[MUT_GREEN_SCALES] * 2) - 1;

[3.994214]

[3.994274]

            AC += (you.mutation[MUT_GREEN_SCALES] * 200) - 100;

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

B:BD[3.994325] → [3.994325:994388]

            AC += (you.mutation[MUT_NACREOUS_SCALES] * 2) - 1;

[3.994325]

[3.994388]

            AC += (you.mutation[MUT_NACREOUS_SCALES] * 200) - 100;

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

B:BD[3.994437] → [3.994437:994498]

            AC += (you.mutation[MUT_BLACK2_SCALES] * 2) - 1;

[3.994437]

[3.994498]

            AC += (you.mutation[MUT_BLACK2_SCALES] * 200) - 100;

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

B:BD[3.994546] → [3.994546:994606]

            AC += (you.mutation[MUT_WHITE_SCALES] * 2) - 1;

[3.994546]

[3.994606]

            AC += (you.mutation[MUT_WHITE_SCALES] * 200) - 100;

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

B:BD[3.994641] → [3.994641:994793]

        AC += you.mutation[MUT_GREY2_SCALES] * 2;
        AC += you.mutation[MUT_YELLOW_SCALES] * 2;
        AC += you.mutation[MUT_PURPLE_SCALES] * 2;

[3.994641]

[3.994793]

        AC += you.mutation[MUT_GREY2_SCALES] * 200;
        AC += you.mutation[MUT_YELLOW_SCALES] * 200;
        AC += you.mutation[MUT_PURPLE_SCALES] * 200;

Replacement in crawl-ref/source/player.cc at line 1690 [3.962854]
B:BD[3.994829] → [3.994829:994879]
```
        AC += you.mutation[MUT_BLACK_SCALES] * 3;
```
[3.994829]
[3.994879]
```
        AC += you.mutation[MUT_BLACK_SCALES] * 300;
```

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

B:BD[3.994969] → [3.994969:995023]

            AC += you.mutation[MUT_BONEY_PLATES] + 1;

[3.994969]

[3.995023]

            AC += 100 * (you.mutation[MUT_BONEY_PLATES] + 1);

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

B:BD[3.995056] → [3.995056:995166]

        AC += you.mutation[MUT_RED_SCALES]
                            + (you.mutation[MUT_RED_SCALES] == 3);

[3.995056]

[3.995166]

        AC += 100 * (you.mutation[MUT_RED_SCALES]
                     + (you.mutation[MUT_RED_SCALES] == 3));

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

B:BD[3.995262] → [3.995262:995386]

            AC += 1 + you.mutation[MUT_INDIGO_SCALES]
                            + (you.mutation[MUT_INDIGO_SCALES] == 3);

[3.995262]

[3.995386]

            AC += 100 * (1 + you.mutation[MUT_INDIGO_SCALES]
                         + (you.mutation[MUT_INDIGO_SCALES] == 3));

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

B:BD[3.995432] → [3.995432:995483]

B:BD[3.995483] → [2.172:241]

        AC += (you.mutation[MUT_BROWN_SCALES] * 2)
                            - (you.mutation[MUT_BROWN_SCALES] == 3);

[3.995432]

[3.995555]

        AC += 100 * ((you.mutation[MUT_BROWN_SCALES] * 2)
                     - (you.mutation[MUT_BROWN_SCALES] == 3));

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

B:BD[3.995592] → [3.995592:995707]

        AC += you.mutation[MUT_ORANGE_SCALES]
                            + (you.mutation[MUT_ORANGE_SCALES] > 1);

[3.995592]

[3.995707]

        AC += 100 * (you.mutation[MUT_ORANGE_SCALES]
                     + (you.mutation[MUT_ORANGE_SCALES] > 1));

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

B:BD[3.995749] → [3.995749:995866]

        AC += (you.mutation[MUT_RED2_SCALES] * 2)
                            + (you.mutation[MUT_RED2_SCALES] > 1);

[3.995749]

[3.995866]

        AC += 100 * ((you.mutation[MUT_RED2_SCALES] * 2)
                     + (you.mutation[MUT_RED2_SCALES] > 1));

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

B:BD[3.995905] → [3.995905:996028]

        AC += you.mutation[MUT_METALLIC_SCALES] * 3
                            + (you.mutation[MUT_METALLIC_SCALES] > 1);

[3.995905]

[3.996028]

        AC += 100 * (you.mutation[MUT_METALLIC_SCALES] * 3
                     + (you.mutation[MUT_METALLIC_SCALES] > 1));

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

B:BD[3.996352] → [3.996352:996425]

            AC += (2 + you.skills[SK_POISON_MAGIC] / 6);        // max 6

[3.996352]

[3.996425]

            AC += (200 + 100 * you.skills[SK_POISON_MAGIC] / 6); // max 6

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

B:BD[3.996474] → [3.996474:996548]

            AC += (5 + (you.skills[SK_ICE_MAGIC] + 1) / 4);     // max 12

[3.996474]

[3.996548]

            AC += (500 + 100 * (you.skills[SK_ICE_MAGIC] + 1) / 4); // max 12

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

B:BD[3.996595] → [3.996595:996670]

                AC += (1 + you.skills[SK_ICE_MAGIC] / 4);       // max +7

[3.996595]

[3.996670]

                AC += (100 + 100 * you.skills[SK_ICE_MAGIC] / 4);   // max +7

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

B:BD[3.996716] → [3.996716:996790]

            AC += (7 + you.skills[SK_FIRE_MAGIC] / 3);          // max 16

[3.996716]

[3.996790]

            AC += (700 + 100 * you.skills[SK_FIRE_MAGIC] / 3);      // max 16

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

B:BD[3.996875] → [3.996875:996949]

            AC += (17 + you.skills[SK_EARTH_MAGIC] / 2);        // max 30

[3.996875]

[3.996949]

            AC += (1700 + 100 * you.skills[SK_EARTH_MAGIC] / 2);    // max 30

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

B:BD[3.997026] → [3.997026:997100]

                AC += (1 + you.skills[SK_EARTH_MAGIC] / 4);     // max +7

[3.997026]

[3.997100]

                AC += (100 + 100 * you.skills[SK_EARTH_MAGIC] / 4); // max +7

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

B:BD[3.997155] → [3.997155:997229]

            AC += (10 + you.skills[SK_FIRE_MAGIC] / 3);         // max 19

[3.997155]

[3.997229]

            AC += (1000 + 100 * you.skills[SK_FIRE_MAGIC] / 3);     // max 19

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

B:BD[3.997324] → [3.997324:997398]

            AC = (you.skills[SK_AIR_MAGIC] * 3) / 2;            // max 40

[3.997324]

[3.997398]

            AC = (you.skills[SK_AIR_MAGIC] * 300) / 2;            // max 40

Replacement in crawl-ref/source/player.cc at line 1769 [3.962854]
B:BD[3.997471] → [3.997471:997486]
```
    return AC;
```
[3.997471]
[3.997486]
```
    return (AC / 100);
```

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

B:BD[3.997849] → [3.997849:997948]

    //case ARM_TROLL_HIDE: //jmf: these are knobbly and stiff
    //case ARM_TROLL_LEATHER_ARMOUR: