fiddlerwoaroof/crawl - Change TPSCOEB3X6LNZ7F5UBMHDZ4IUE4H3RLX6IGNW65VSJBDMNNZ3FMAC

Implemented 1617200: Changed armour skill training. Once the original EV

penalty is gone (i.e., at an armour skill of 3 * EV penalty), passive training will train stealth instead of armour (as if the player were wearing light armour); also, getting hit in this situation can train both dodging and armour.

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

Created by haranp on December 25, 2006

TPSCOEB3X6LNZ7F5UBMHDZ4IUE4H3RLX6IGNW65VSJBDMNNZ3FMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.h at line 42 [3.945993]
B:BD[3.946968] → [3.946968:947000]
```
bool player_light_armour(void);
```
[3.946968]
[3.947000]
```
bool player_light_armour(bool with_skill = false);
```
Replacement in crawl-ref/source/player.cc at line 1725 [3.962854]
B:BD[3.998018] → [3.998018:998049]
```
bool player_light_armour(void)
```
[3.998018]
[3.998049]
```
bool player_light_armour(bool with_skill)
```
Replacement in crawl-ref/source/player.cc at line 1727 [3.962854]
B:BD[3.998051] → [3.998051:998092]
```
    if (you.equip[EQ_BODY_ARMOUR] == -1)
```
[3.998051]
[3.998092]
```
    const int arm = you.equip[EQ_BODY_ARMOUR];
    if (arm == -1)
```

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

B:BD[3.998114] → [3.998114:998182]

    return (is_light_armour( you.inv[you.equip[EQ_BODY_ARMOUR]] ));

[3.998114]

[3.998182]

    if (with_skill &&
        property(you.inv[arm], PARM_EVASION) + you.skills[SK_ARMOUR]/3 >= 0)
        return true;
    return (is_light_armour(you.inv[arm]));

Replacement in crawl-ref/source/misc.cc at line 1205 [3.1933596]
B:BD[3.1967649] → [3.1967649:1967694]
```
    if (player_light_armour() && coinflip())
```
[3.1967649]
[3.1967694]
```
    if (player_light_armour(true) && coinflip())
```
Replacement in crawl-ref/source/items.cc at line 2841 [3.2584728]
B:BD[3.2656529] → [3.2656529:2656561]
```
    if (!player_light_armour())
```
[3.2656529]
[3.2656561]
```
    if (!player_light_armour(true))
```
Deletion in crawl-ref/source/items.cc at line 2844 [3.2584728]
∅:D[2.640448] → [3.2656645:2656655]
B:BD[3.2656645] → [3.2656645:2656655]
```
        {
```
Deletion in crawl-ref/source/items.cc at line 2845 [3.2584728]
B:BD[3.2656675] → [3.2656675:2656685]
```
        }
```

Replacement in crawl-ref/source/fight.cc at line 2192 [3.3140790]

B:BD[3.3205373] → [3.3205373:3205433]

        else if (player_light_armour() && one_chance_in(3))

[3.3205373]

[3.3205433]

        else if (player_light_armour(true) && one_chance_in(3))

Replacement in crawl-ref/source/fight.cc at line 2325 [3.3140790]

B:BD[3.3209585] → [3.3209585:3209646]

                    if (!player_light_armour() && coinflip()

[3.3209585]

[3.3209646]

                    // Being generous here...this can train both Armour
                    // and Dodging.
                    if (!player_light_armour(false) && coinflip()

Replacement in crawl-ref/source/beam.cc at line 3036 [3.4128068]
B:BD[3.4224080] → [3.4224080:4224122]
```
                if (player_light_armour()
```
[3.4224080]
[2.1242919]
```
                if (player_light_armour(true)
```

Replacement in crawl-ref/source/beam.cc at line 3089 [3.4128068]

B:BD[3.4226037] → [2.1243811:1243876]

                if (player_light_armour() && !beam.aimed_at_feet

[3.4226037]

[3.4226100]

                if (player_light_armour(true) && !beam.aimed_at_feet

Replacement in crawl-ref/source/beam.cc at line 3284 [3.4128068]

B:BD[3.4231636] → [3.4231636:4231691]

        if (!player_light_armour() && one_chance_in(4)

[3.4231636]

[2.1245045]

        if (!player_light_armour(false) && one_chance_in(4)

Implemented 1617200: Changed armour skill training. Once the original EV

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.h at line 42 [3.945993]

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

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

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

Replacement in crawl-ref/source/misc.cc at line 1205 [3.1933596]

Replacement in crawl-ref/source/items.cc at line 2841 [3.2584728]

Deletion in crawl-ref/source/items.cc at line 2844 [3.2584728]

Deletion in crawl-ref/source/items.cc at line 2845 [3.2584728]

Replacement in crawl-ref/source/fight.cc at line 2192 [3.3140790]

Replacement in crawl-ref/source/fight.cc at line 2325 [3.3140790]

Replacement in crawl-ref/source/beam.cc at line 3036 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 3089 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 3284 [3.4128068]