fiddlerwoaroof/crawl - Change 2JEJP4VO4NUN5X63WT54RWIXPJLHB6NJ7LVGQCU2QHO7CRBIPT2AC

Fix inconsistencies with resistance displays in the "%" screen,

including a fix for [2822291]. (For the record, there still seem to be some inconsistencies with how many levels some resistances have; do acid resistance and clarity have 3 levels or 1?)

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

Created by dolorous on July 16, 2009

2JEJP4VO4NUN5X63WT54RWIXPJLHB6NJ7LVGQCU2QHO7CRBIPT2AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/player.h at line 206 [5.945993]
B:BD[4.336398] → [4.336398:336448]
```
bool player_res_corrosion(bool calc_unid = true);
```

Replacement in crawl-ref/source/player.cc at line 1548 [5.962854]

B:BD[4.345270] → [3.6147:6213]

∅:D[3.6213] → [4.345344:345359]

B:BD[4.345344] → [4.345344:345359]

    if (items && wearing_amulet(AMU_RESIST_CORROSION, calc_unid))
        res++;

[4.345270]

[4.345359]

    if (items)
    {
        if (wearing_amulet(AMU_RESIST_CORROSION, calc_unid))
            res++;
        if (player_equip_ego_type(EQ_CLOAK, SPARM_PRESERVATION))
            res++;
    }

Deletion in crawl-ref/source/player.cc at line 4390 [5.962854]

B:BD[4.352683] → [4.352683:352868]

bool player_res_corrosion(bool calc_unid)
{
    return (player_equip(EQ_AMULET, AMU_RESIST_CORROSION, calc_unid)
            || player_equip_ego_type(EQ_CLOAK, SPARM_PRESERVATION));
}

Replacement in crawl-ref/source/player.cc at line 6706 [5.962854]

B:BD[6.3069] → [6.3069:3125]

        const int wardpiety = piety > 160? 160 : piety;

[6.3069]

[6.3125]

        const int wardpiety = piety > 160 ? 160 : piety;

Deletion in crawl-ref/source/output.cc at line 2089 [5.1088282]
∅:D[7.2697] → [8.9352:9353]
∅:D[9.8039] → [8.9352:9353]
∅:D[10.12110] → [8.9352:9353]
B:BD[8.9352] → [8.9352:9353]

Replacement in crawl-ref/source/output.cc at line 2135 [5.1088282]

∅:D[2.3365] → [11.58689:58889]

B:BD[11.58689] → [11.58689:58889]

    const int rcons = wearing_amulet(AMU_CONSERVATION, calc_unid);
    const int rcorr = wearing_amulet(AMU_RESIST_CORROSION, calc_unid);
    const int rclar = wearing_amulet(AMU_CLARITY, calc_unid);

[2.3365]

[11.58889]

    const int rcons = player_item_conserve(calc_unid);
    const int rcorr = player_res_acid(calc_unid);
    const int rclar = player_mental_clarity(calc_unid);

Insertion in crawl-ref/source/delay.cc at line 1360 [5.3963459]
[12.15800]
[13.7684]