fiddlerwoaroof/crawl - Change 6ARBZEUSCIPVJUQJST5HG6TKQYQZPOHWYIIJO4OD2SUECPYMLVIQC

Added "items" boolean parameter to the player_res_foo() functions, which

when false makes equipped items be ignored when figuring reistance. Used by is_useless_item() to avoid (for example) rings of poison reistance being marked useless if the player equips one. Also mark rings of teleport control as useless if the player has inate teleport control, and never mark artifact jewellery as useless.

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

Created by zelgadis on June 11, 2008

6ARBZEUSCIPVJUQJST5HG6TKQYQZPOHWYIIJO4OD2SUECPYMLVIQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.h at line 164 [4.945993]

B:BD[4.951493] → [5.197100:197144]

B:BD[5.197144] → [6.336255:336316]

int player_res_cold(bool calc_unid = true);
int player_res_acid(bool consider_unidentified_gear = true);

[4.951493]

[6.336316]

int player_res_cold(bool calc_unid = true, bool temp = true,
                    bool items = true);
int player_res_acid(bool calc_unid = true, bool items = true);

Replacement in crawl-ref/source/player.h at line 173 [4.945993]

B:BD[6.336498] → [6.336498:336548]

int player_mental_clarity(bool calc_unid = true);

[6.336498]

[7.400]

int player_mental_clarity(bool calc_unid = true, bool items = true);

Replacement in crawl-ref/source/player.h at line 184 [4.945993]

B:BD[4.951712] → [5.197145:197196]

int player_res_electricity(bool calc_unid = true);

[4.951712]

[4.951746]

int player_res_electricity(bool calc_unid = true, bool temp = true,
                           bool items = true);

Replacement in crawl-ref/source/player.h at line 191 [4.945993]

B:BD[4.951952] → [8.3220:3345]

int player_res_fire(bool calc_unid = true, bool temp = true);
int player_res_steam(bool calc_unid = true, bool temp = true);

[4.951952]

[4.951979]

int player_res_fire(bool calc_unid = true, bool temp = true,
                    bool items = true);
int player_res_steam(bool calc_unid = true, bool temp = true,
                     bool items = true);

Replacement in crawl-ref/source/player.h at line 201 [4.945993]

B:BD[4.952236] → [8.3346:3410]

int player_res_poison(bool calc_unid = true, bool temp = true);

[4.952236]

[6.336595]

int player_res_poison(bool calc_unid = true, bool temp = true,
                      bool items = true);

Replacement in crawl-ref/source/player.h at line 204 [4.945993]

B:BD[6.336596] → [6.336596:336649]

bool player_control_teleport(bool calc_unid = true);

[6.336596]

[4.952265]

bool player_control_teleport(bool calc_unid = true, bool temp = true,
                             bool items = true);

Replacement in crawl-ref/source/player.cc at line 1193 [4.962854]
B:BD[8.3490] → [8.3490:3538]
```
int player_res_steam(bool calc_unid, bool temp)
```
[8.3490]
[6.344717]
```
int player_res_steam(bool calc_unid, bool temp, bool items)
```

Replacement in crawl-ref/source/player.cc at line 1200 [4.962854]

B:BD[6.344826] → [6.344826:344889]

    if (player_equip(EQ_BODY_ARMOUR, ARM_STEAM_DRAGON_ARMOUR))

[6.344826]

[6.344889]

    if (items && player_equip(EQ_BODY_ARMOUR, ARM_STEAM_DRAGON_ARMOUR))

Replacement in crawl-ref/source/player.cc at line 1203 [4.962854]

B:BD[6.344908] → [8.3539:3596]

    return (res + player_res_fire(calc_unid, temp) / 2);

[6.344908]

[6.344959]

    return (res + player_res_fire(calc_unid, temp, items) / 2);

Replacement in crawl-ref/source/player.cc at line 1212 [4.962854]
B:BD[8.3675] → [8.3675:3722]
```
int player_res_fire(bool calc_unid, bool temp)
```
[8.3675]
[4.977276]
```
int player_res_fire(bool calc_unid, bool temp, bool items)
```

Replacement in crawl-ref/source/player.cc at line 1216 [4.962854]

B:BD[4.977295] → [4.977295:977335]

B:BD[4.977335] → [5.198719:198851]

    /* rings of fire resistance/fire */
    rf += player_equip( EQ_RINGS, RING_PROTECTION_FROM_FIRE, calc_unid );
    rf += player_equip( EQ_RINGS, RING_FIRE, calc_unid );

[4.977295]

[4.977445]

    if (items)
    {
        /* rings of fire resistance/fire */
        rf += player_equip( EQ_RINGS, RING_PROTECTION_FROM_FIRE, calc_unid );
        rf += player_equip( EQ_RINGS, RING_FIRE, calc_unid );

Replacement in crawl-ref/source/player.cc at line 1222 [4.962854]

B:BD[4.977446] → [4.977446:977469]

B:BD[4.977469] → [5.198852:198909]

    /* rings of ice */
    rf -= player_equip( EQ_RINGS, RING_ICE, calc_unid );

[4.977446]

[4.977515]

        /* rings of ice */
        rf -= player_equip( EQ_RINGS, RING_ICE, calc_unid );

Replacement in crawl-ref/source/player.cc at line 1225 [4.962854]

B:BD[4.977516] → [4.977516:977533]

B:BD[4.977533] → [5.198910:198969]

    /* Staves */
    rf += player_equip( EQ_STAFF, STAFF_FIRE, calc_unid );

[4.977516]

[4.977581]

        /* Staves */
        rf += player_equip( EQ_STAFF, STAFF_FIRE, calc_unid );

Replacement in crawl-ref/source/player.cc at line 1228 [4.962854]

B:BD[4.977582] → [4.977582:977798]

    // body armour:
    rf += 2 * player_equip( EQ_BODY_ARMOUR, ARM_DRAGON_ARMOUR );
    rf += player_equip( EQ_BODY_ARMOUR, ARM_GOLD_DRAGON_ARMOUR );
    rf -= player_equip( EQ_BODY_ARMOUR, ARM_ICE_DRAGON_ARMOUR );

[4.977582]

[4.977798]

        // body armour:
        rf += 2 * player_equip( EQ_BODY_ARMOUR, ARM_DRAGON_ARMOUR );
        rf += player_equip( EQ_BODY_ARMOUR, ARM_GOLD_DRAGON_ARMOUR );
        rf -= player_equip( EQ_BODY_ARMOUR, ARM_ICE_DRAGON_ARMOUR );

Replacement in crawl-ref/source/player.cc at line 1233 [4.962854]

B:BD[4.977799] → [4.977799:977959]

    // ego armours
    rf += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_FIRE_RESISTANCE );
    rf += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_RESISTANCE );

[4.977799]

[4.977959]

        // ego armours
        rf += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_FIRE_RESISTANCE );
        rf += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_RESISTANCE );

Replacement in crawl-ref/source/player.cc at line 1237 [4.962854]

B:BD[4.977960] → [4.977960:977984]

B:BD[4.977984] → [5.198970:199016]

    // randart weapons:
    rf += scan_randarts(RAP_FIRE, calc_unid);

[4.977960]

[4.978019]

        // randart weapons:
        rf += scan_randarts(RAP_FIRE, calc_unid);
    }

Replacement in crawl-ref/source/player.cc at line 1283 [4.962854]
B:BD[4.978679] → [5.199017:199053]
```
int player_res_cold(bool calc_unid)
```
[4.978679]
[4.978705]
```
int player_res_cold(bool calc_unid, bool temp, bool items)
```
Replacement in crawl-ref/source/player.cc at line 1287 [4.962854]
B:BD[9.2951] → [9.2951:2986]
```
    if (you.species == SP_VAMPIRE)
```
[9.2951]
[9.2986]
```
    if (temp)
```

Replacement in crawl-ref/source/player.cc at line 1289 [4.962854]

B:BD[9.2992] → [9.2992:3063]

B:BD[9.3063] → [10.2889:2938]

        if (you.hunger_state <= HS_NEAR_STARVING)
            rc += 2;
        else if (you.hunger_state < HS_SATIATED)

[9.2992]

[9.3111]

        // spells:
        if (you.duration[DUR_RESIST_COLD] > 0)
            rc++;
        if (you.duration[DUR_FIRE_SHIELD])
            rc -= 2;
        // transformations:
        switch (you.attribute[ATTR_TRANSFORMATION])
        {
        case TRAN_ICE_BEAST:
            rc += 3;
            break;
        case TRAN_DRAGON:
            rc--;
            break;
        case TRAN_LICH:

Insertion in crawl-ref/source/player.cc at line 1307 [4.962854]

[9.3129]

            break;
        case TRAN_AIR:
            rc -= 2;
            break;
        }
        if (you.species == SP_VAMPIRE)
        {
            if (you.hunger_state <= HS_NEAR_STARVING)
                rc += 2;
            else if (you.hunger_state < HS_SATIATED)
                rc++;
        }

Replacement in crawl-ref/source/player.cc at line 1323 [4.962854]

B:BD[11.4195] → [12.5832:5869]

∅:D[12.5869] → [5.199054:199185]

B:BD[4.978764] → [5.199054:199185]

    // rings of fire resistance/fire
    rc += player_equip( EQ_RINGS, RING_PROTECTION_FROM_COLD, calc_unid );
    rc += player_equip( EQ_RINGS, RING_ICE, calc_unid );

[11.4195]

[4.978873]

    if (items)
    {
        // rings of fire resistance/fire
        rc += player_equip( EQ_RINGS, RING_PROTECTION_FROM_COLD, calc_unid );
        rc += player_equip( EQ_RINGS, RING_ICE, calc_unid );

Replacement in crawl-ref/source/player.cc at line 1329 [4.962854]
B:BD[4.978874] → [12.5870:5890]
∅:D[12.5890] → [5.199186:199244]
B:BD[4.978897] → [5.199186:199244]
```
    // rings of ice
    rc -= player_equip( EQ_RINGS, RING_FIRE, calc_unid );
```
[4.978874]
[4.978944]
```
        // rings of ice
        rc -= player_equip( EQ_RINGS, RING_FIRE, calc_unid );
```
Replacement in crawl-ref/source/player.cc at line 1332 [4.962854]
B:BD[4.978945] → [12.5891:5905]
∅:D[12.5905] → [5.199245:199304]
B:BD[4.978962] → [5.199245:199304]
```
    // Staves
    rc += player_equip( EQ_STAFF, STAFF_COLD, calc_unid );
```
[4.978945]
[4.979010]
```
        // Staves
        rc += player_equip( EQ_STAFF, STAFF_COLD, calc_unid );
```

Replacement in crawl-ref/source/player.cc at line 1335 [4.962854]

B:BD[4.979011] → [4.979011:979227]

    // body armour:
    rc += 2 * player_equip( EQ_BODY_ARMOUR, ARM_ICE_DRAGON_ARMOUR );
    rc += player_equip( EQ_BODY_ARMOUR, ARM_GOLD_DRAGON_ARMOUR );
    rc -= player_equip( EQ_BODY_ARMOUR, ARM_DRAGON_ARMOUR );

[4.979011]

[4.979227]

        // body armour:
        rc += 2 * player_equip( EQ_BODY_ARMOUR, ARM_ICE_DRAGON_ARMOUR );
        rc += player_equip( EQ_BODY_ARMOUR, ARM_GOLD_DRAGON_ARMOUR );
        rc -= player_equip( EQ_BODY_ARMOUR, ARM_DRAGON_ARMOUR );

Replacement in crawl-ref/source/player.cc at line 1340 [4.962854]

B:BD[4.979228] → [4.979228:979388]

    // ego armours
    rc += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_COLD_RESISTANCE );
    rc += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_RESISTANCE );

[4.979228]

[4.979388]

        // ego armours
        rc += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_COLD_RESISTANCE );
        rc += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_RESISTANCE );

Replacement in crawl-ref/source/player.cc at line 1344 [4.962854]

B:BD[4.979389] → [4.979389:979413]

B:BD[4.979413] → [5.199305:199351]

B:BD[5.199351] → [13.2918:2991]

    // randart weapons:
    rc += scan_randarts(RAP_COLD, calc_unid);
    // spells:
    if (you.duration[DUR_RESIST_COLD] > 0)
        rc++;

[4.979389]

[4.979448]

        // randart weapons:
        rc += scan_randarts(RAP_COLD, calc_unid);
    }

Deletion in crawl-ref/source/player.cc at line 1354 [4.962854]

B:BD[4.979695] → [14.4381:4420]

∅:D[14.4420] → [4.979720:980031]

B:BD[4.979720] → [4.979720:980031]

    if (you.duration[DUR_FIRE_SHIELD])
        rc -= 2;
    // transformations:
    switch (you.attribute[ATTR_TRANSFORMATION])
    {
    case TRAN_ICE_BEAST:
        rc += 3;
        break;
    case TRAN_DRAGON:
        rc--;
        break;
    case TRAN_LICH:
        rc++;
        break;
    case TRAN_AIR:
        rc -= 2;
        break;
    }

Replacement in crawl-ref/source/player.cc at line 1362 [4.962854]
B:BD[6.344967] → [6.344967:345020]
```
int player_res_acid(bool consider_unidentified_gear)
```
[6.344967]
[6.345020]
```
int player_res_acid(bool calc_unid, bool items)
```

Replacement in crawl-ref/source/player.cc at line 1374 [4.962854]

B:BD[6.345270] → [6.345270:345344]

    if (wearing_amulet(AMU_RESIST_CORROSION, consider_unidentified_gear))

[6.345270]

[6.345344]

    if (items && wearing_amulet(AMU_RESIST_CORROSION, calc_unid))

Replacement in crawl-ref/source/player.cc at line 1402 [4.962854]
∅:D[6.345828] → [5.199352:199395]
B:BD[4.980123] → [5.199352:199395]
```
int player_res_electricity(bool calc_unid)
```
[6.345828]
[4.980156]
```
int player_res_electricity(bool calc_unid, bool temp, bool items)
```

Insertion in crawl-ref/source/player.cc at line 1405 [4.962854]

[4.980174]


    if (temp)
    {
        if (you.duration[DUR_INSULATION])
            re++;
        // transformations:
        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_STATUE)
            re += 1;
        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
            re += 2;  // multiple levels currently meaningless

Replacement in crawl-ref/source/player.cc at line 1418 [4.962854]

B:BD[4.980175] → [4.980175:980227]

    if (you.duration[DUR_INSULATION])
        re++;

[4.980175]

[4.980227]

        if (you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION])
            re = 3;
        else if (re > 1)
            re = 1;
    }

Replacement in crawl-ref/source/player.cc at line 1424 [4.962854]

B:BD[4.980228] → [4.980228:980241]

B:BD[4.980241] → [5.199396:199454]

    // staff
    re += player_equip( EQ_STAFF, STAFF_AIR, calc_unid );

[4.980228]

[4.980288]

    if (items)
    {
        // staff
        re += player_equip( EQ_STAFF, STAFF_AIR, calc_unid );

Replacement in crawl-ref/source/player.cc at line 1429 [4.962854]

B:BD[4.980289] → [4.980289:980376]

    // body armour:
    re += player_equip( EQ_BODY_ARMOUR, ARM_STORM_DRAGON_ARMOUR );

[4.980289]

[4.980376]

        // body armour:
        re += player_equip( EQ_BODY_ARMOUR, ARM_STORM_DRAGON_ARMOUR );

Replacement in crawl-ref/source/player.cc at line 1432 [4.962854]

B:BD[4.980377] → [4.980377:980401]

B:BD[4.980401] → [5.199455:199508]

    // randart weapons:
    re += scan_randarts(RAP_ELECTRICITY, calc_unid);

[4.980377]

[4.980443]

        // randart weapons:
        re += scan_randarts(RAP_ELECTRICITY, calc_unid);
    }

Deletion in crawl-ref/source/player.cc at line 1443 [4.962854]

B:BD[4.980623] → [4.980623:980781]

B:BD[4.980781] → [15.181:240]

∅:D[15.240] → [4.980840:980841]

B:BD[4.980840] → [4.980840:980841]

B:BD[4.980841] → [2.2614:2671]

∅:D[2.2671] → [4.980902:980955]

B:BD[4.980902] → [4.980902:980955]


    // transformations:
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_STATUE)
        re += 1;
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
        re += 2;  // multiple levels currently meaningless
    if (you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION])
        re = 3;
    else if (re > 1)
        re = 1;

Replacement in crawl-ref/source/player.cc at line 1465 [4.962854]
B:BD[6.346208] → [16.11031:11076]
```
bool player_control_teleport(bool calc_unid)
```
[6.346208]
[16.11076]
```
bool player_control_teleport(bool calc_unid, bool temp, bool items)
```

Replacement in crawl-ref/source/player.cc at line 1467 [4.962854]

B:BD[16.11078] → [16.11078:11199]

    return ( you.duration[DUR_CONTROL_TELEPORT]
             || player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid)

[16.11078]

[17.6970]

    return ( (you.duration[DUR_CONTROL_TELEPORT] && temp)
             || (player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid)
                 && items)

Replacement in crawl-ref/source/player.cc at line 1482 [4.962854]
B:BD[8.4344] → [8.4344:4393]
```
int player_res_poison(bool calc_unid, bool temp)
```
[8.4344]
[4.981122]
```
int player_res_poison(bool calc_unid, bool temp, bool items)
```

Replacement in crawl-ref/source/player.cc at line 1486 [4.962854]

B:BD[18.2581] → [19.3535:3596]

∅:D[19.3596] → [10.2939:3008]

B:BD[18.2641] → [10.2939:3008]

∅:D[10.3008] → [18.2709:2723]

B:BD[18.2709] → [18.2709:2723]

    // Only thirsty vampires are naturally poison resistant.
    if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED)
        rp++;

[18.2581]

[4.981140]

    if (items)
    {
        // rings of poison resistance
        rp += player_equip( EQ_RINGS, RING_POISON_RESISTANCE, calc_unid );

Replacement in crawl-ref/source/player.cc at line 1491 [4.962854]

B:BD[4.981141] → [20.2844:2878]

∅:D[20.2878] → [5.199548:199619]

B:BD[4.981178] → [5.199548:199619]

    // rings of poison resistance
    rp += player_equip( EQ_RINGS, RING_POISON_RESISTANCE, calc_unid );

[4.981141]

[4.981238]

        // Staves
        rp += player_equip( EQ_STAFF, STAFF_POISON, calc_unid );

Replacement in crawl-ref/source/player.cc at line 1494 [4.962854]

B:BD[4.981239] → [20.2879:2893]

∅:D[20.2893] → [5.199620:199681]

B:BD[4.981256] → [5.199620:199681]

    // Staves
    rp += player_equip( EQ_STAFF, STAFF_POISON, calc_unid );

[4.981239]

[4.981306]

        // the staff of Olgreb:
        if (you.equip[EQ_WEAPON] != -1
            && you.inv[you.equip[EQ_WEAPON]].base_type == OBJ_WEAPONS
            && you.inv[you.equip[EQ_WEAPON]].special == SPWPN_STAFF_OF_OLGREB)
        {
            rp++;
        }

Replacement in crawl-ref/source/player.cc at line 1502 [4.962854]

B:BD[4.981307] → [20.2894:2922]

∅:D[20.2922] → [4.981338:981540]

B:BD[4.981338] → [4.981338:981540]

    // the staff of Olgreb:
    if (you.equip[EQ_WEAPON] != -1
        && you.inv[you.equip[EQ_WEAPON]].base_type == OBJ_WEAPONS
        && you.inv[you.equip[EQ_WEAPON]].special == SPWPN_STAFF_OF_OLGREB)
    {
        rp++;
    }

[4.981307]

[11.4246]

        // ego armour:
        rp += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_POISON_RESISTANCE );

Replacement in crawl-ref/source/player.cc at line 1505 [4.962854]

∅:D[9.3294] → [4.981541:981635]

∅:D[11.4247] → [4.981541:981635]

B:BD[4.981541] → [4.981541:981635]

    // ego armour:
    rp += player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_POISON_RESISTANCE );

[11.4247]

[4.981635]

        // body armour:
        rp += player_equip( EQ_BODY_ARMOUR, ARM_GOLD_DRAGON_ARMOUR );
        rp += player_equip( EQ_BODY_ARMOUR, ARM_SWAMP_DRAGON_ARMOUR );

Replacement in crawl-ref/source/player.cc at line 1509 [4.962854]

B:BD[4.981636] → [4.981636:981790]

B:BD[4.981865] → [4.981865:981889]

B:BD[4.981889] → [5.199682:199730]

    // body armour:
    rp += player_equip( EQ_BODY_ARMOUR, ARM_GOLD_DRAGON_ARMOUR );
    rp += player_equip( EQ_BODY_ARMOUR, ARM_SWAMP_DRAGON_ARMOUR );
    // randart weapons:
    rp += scan_randarts(RAP_POISON, calc_unid);

[4.981636]

[4.982138]

        // randart weapons:
        rp += scan_randarts(RAP_POISON, calc_unid);
    }

Insertion in crawl-ref/source/player.cc at line 1518 [4.962854]

[4.982283]

[8.4409]

        // Only thirsty vampires are naturally poison resistant.
        if (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED)
            rp++;

Replacement in crawl-ref/source/player.cc at line 4182 [4.962854]
B:BD[4.1043049] → [6.353049:353091]
```
int player_mental_clarity(bool calc_unid)
```
[4.1043049]
[6.353091]
```
int player_mental_clarity(bool calc_unid, bool items)
```

Replacement in crawl-ref/source/player.cc at line 4184 [4.962854]

B:BD[6.353093] → [11.8008:8080]

    const int ret = 3 * player_equip(EQ_AMULET, AMU_CLARITY, calc_unid)

[6.353093]

[17.10568]

    const int ret = (3 * player_equip(EQ_AMULET, AMU_CLARITY, calc_unid)
                       * items)

Insertion in crawl-ref/source/itemname.cc at line 2429 [4.2667494]
[21.3087]
[21.3087]
```
        if (is_artefact(item))
            return false;
```

Replacement in crawl-ref/source/itemname.cc at line 2456 [4.2667494]

B:BD[3.8169] → [3.8169:8209]

            return (player_res_poison()

[3.8169]

[3.8209]

            return (player_res_poison(true, temp, false)

Insertion in crawl-ref/source/itemname.cc at line 2464 [4.2667494]

[3.8383]


        case RING_TELEPORT_CONTROL:
            return (player_control_teleport(true, temp, false));