fiddlerwoaroof/crawl - Change J7KCPTGASQNRAKVKQ5FCXZ75E75PK7I2BB6MFSI3COWU6HRKTWSAC

Implement FR 1897310: auto-travel through clouds if you are (semi)permanently

immune to them, i.e. your equipment and/or mutations confer resistance at the necessary level.

Implement FR 1872840: When transforming, only remove clothes you cannot wear when transformed. Also fix some inconsistencies in what you could keep wearing and what you could put on while transformed.

And a few more monspeak/wpnnoise replacements.

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

Created by j-p-e-g on March 10, 2008

J7KCPTGASQNRAKVKQ5FCXZ75E75PK7I2BB6MFSI3COWU6HRKTWSAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/transfor.cc at line 39 [6.143977]

B:BD[6.144833] → [6.144833:144910]

B:BD[6.144910] → [7.312:447]

∅:D[7.447] → [6.145024:145098]

B:BD[6.145024] → [6.145024:145098]

B:BD[6.145098] → [7.448:622]

∅:D[7.622] → [6.145203:145204]

B:BD[6.145203] → [6.145203:145204]

    // if we're removing body armour, the cloak will come off as well -- bwr
    if ( removed.find(EQ_BODY_ARMOUR) != removed.end() &&
         you.equip[EQ_BODY_ARMOUR] != -1 )
        removed.insert(EQ_CLOAK);
    // if we're removing gloves, the weapon will come off as well -- bwr
    // but this makes Statue Form odd -- haranp
    if ( removed.find(EQ_GLOVES) != removed.end() &&
         you.equip[EQ_GLOVES] != -1 )
        removed.insert(EQ_WEAPON);

Insertion in crawl-ref/source/transfor.cc at line 184 [6.143977]

[6.148480]

        // spiders CAN wear soft helmets
        if ( you.equip[EQ_HELMET] == -1
             || !is_hard_helmet(you.inv[you.equip[EQ_HELMET]]))
        {
             rem_stuff.erase(EQ_HELMET);
        }

Insertion in crawl-ref/source/transfor.cc at line 211 [6.143977]

[8.252]

        // bats CAN wear soft helmets
        if ( you.equip[EQ_HELMET] == -1
             || !is_hard_helmet(you.inv[you.equip[EQ_HELMET]]))
        {
             rem_stuff.erase(EQ_HELMET);
        }

Insertion in crawl-ref/source/transfor.cc at line 244 [6.143977]

[9.166]

[6.149159]

        // ice beasts CAN wear soft helmets
        if ( you.equip[EQ_HELMET] == -1
             || !is_hard_helmet(you.inv[you.equip[EQ_HELMET]]))
        {
             rem_stuff.erase(EQ_HELMET);
        }

Deletion in crawl-ref/source/transfor.cc at line 296 [6.143977]
B:BD[9.457] → [9.457:492]
```
        rem_stuff.erase(EQ_BOOTS);
```
Replacement in crawl-ref/source/player.h at line 151 [6.945993]
B:BD[6.951038] → [10.197054:197099]
```
int player_prot_life(bool calc_unid = true);
```
[6.951038]
[6.951066]
```
int player_prot_life(bool calc_unid = true, bool temp = true);
```

Replacement in crawl-ref/source/player.h at line 186 [6.945993]

B:BD[6.951952] → [10.197197:197241]

B:BD[10.197241] → [11.336549:336594]

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

[6.951952]

[6.951979]

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

Replacement in crawl-ref/source/player.h at line 194 [6.945993]
B:BD[6.952236] → [10.197242:197288]
```
int player_res_poison(bool calc_unid = true);
```
[6.952236]
[11.336595]
```
int player_res_poison(bool calc_unid = true, bool temp = true);
```

Replacement in crawl-ref/source/player.cc at line 1092 [6.962854]

B:BD[6.977250] → [11.344680:344717]

int player_res_steam(bool calc_unid)

[6.977250]

[11.344717]

// If temp is set to false, temporary sources or resistance won't be counted.
int player_res_steam(bool calc_unid, bool temp)

Replacement in crawl-ref/source/player.cc at line 1103 [6.962854]
B:BD[11.344908] → [11.344908:344959]
```
    return (res + player_res_fire(calc_unid) / 2);
```
[11.344908]
[11.344959]
```
    return (res + player_res_fire(calc_unid, temp) / 2);
```
Replacement in crawl-ref/source/player.cc at line 1111 [6.962854]
∅:D[11.344963] → [10.198682:198718]
B:BD[6.977250] → [10.198682:198718]
```
int player_res_fire(bool calc_unid)
```
[11.344963]
[6.977276]
```
// If temp is set to false, temporary sources or resistance won't be counted.
int player_res_fire(bool calc_unid, bool temp)
```
Deletion in crawl-ref/source/player.cc at line 1144 [6.962854]
∅:D[4.2949] → [6.978172:978173]
B:BD[6.978172] → [6.978172:978173]
B:BD[6.978173] → [12.2844:2916]
```
    // spells:
    if (you.duration[DUR_RESIST_FIRE] > 0)
        rf++;
```

Replacement in crawl-ref/source/player.cc at line 1148 [6.962854]

B:BD[6.978237] → [13.4341:4380]

∅:D[13.4380] → [6.978262:978279]

B:BD[6.978262] → [6.978262:978279]

    if (you.duration[DUR_FIRE_SHIELD])
        rf += 2;

[6.978237]

[6.978279]

    // spells:
    if (temp)
    {
        if (you.duration[DUR_RESIST_FIRE] > 0)
            rf++;

Replacement in crawl-ref/source/player.cc at line 1154 [6.962854]

B:BD[6.978280] → [6.978280:978580]

    // transformations:
    switch (you.attribute[ATTR_TRANSFORMATION])
    {
    case TRAN_ICE_BEAST:
        rf--;
        break;
    case TRAN_DRAGON:
        rf += 2;
        break;
    case TRAN_SERPENT_OF_HELL:
        rf += 2;
        break;
    case TRAN_AIR:
        rf -= 2;
        break;

[6.978280]

[6.978580]

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

Replacement in crawl-ref/source/player.cc at line 1174 [6.962854]
B:BD[6.978586] → [6.978586:978587]
[6.978586]
[6.978587]
```
    
```

Replacement in crawl-ref/source/player.cc at line 1368 [6.962854]

B:BD[6.981094] → [10.199509:199547]

int player_res_poison(bool calc_unid)

[6.981094]

[6.981122]

// If temp is set to false, temporary sources or resistance won't be counted.
int player_res_poison(bool calc_unid, bool temp)

Deletion in crawl-ref/source/player.cc at line 1394 [6.962854]
B:BD[6.981790] → [6.981790:981865]
```
    // spells:
    if (you.duration[DUR_RESIST_POISON] > 0)
        rp++;
```
Replacement in crawl-ref/source/player.cc at line 1400 [6.962854]
B:BD[6.982205] → [6.982205:982277]
```
    // transformations:
    switch (you.attribute[ATTR_TRANSFORMATION])
```
[6.982205]
[6.982277]
```
    if (temp)
```

Replacement in crawl-ref/source/player.cc at line 1402 [6.962854]

B:BD[6.982283] → [6.982283:982451]

    case TRAN_LICH:
    case TRAN_ICE_BEAST:
    case TRAN_STATUE:
    case TRAN_DRAGON:
    case TRAN_SERPENT_OF_HELL:
    case TRAN_AIR:
        rp++;
        break;

[6.982283]

[6.982451]

        // spells:
        if (you.duration[DUR_RESIST_POISON] > 0)
            rp++;
        // transformations:
        switch (you.attribute[ATTR_TRANSFORMATION])
        {
        case TRAN_LICH:
        case TRAN_ICE_BEAST:
        case TRAN_STATUE:
        case TRAN_DRAGON:
        case TRAN_SERPENT_OF_HELL:
        case TRAN_AIR:
            rp++;
            break;
        }

Replacement in crawl-ref/source/player.cc at line 1590 [6.962854]

B:BD[6.985402] → [10.199731:199768]

int player_prot_life(bool calc_unid)

[6.985402]

[6.985429]

// If temp is set to false, temporary sources of resistance won't be counted.
int player_prot_life(bool calc_unid, bool temp)

Insertion in crawl-ref/source/player.cc at line 1595 [6.962854]

[11.346522]

[4.3295]

    // Hunger is temporary, true, but that's something you can control.
    // (Especially as life protection only increases the hungrier you get.)

Insertion in crawl-ref/source/player.cc at line 1604 [6.962854]
[4.3457]
[4.3457]
```
            break;
```
Insertion in crawl-ref/source/player.cc at line 1608 [6.962854]
[4.3530]
[4.3530]
```
            break;
```
Insertion in crawl-ref/source/player.cc at line 1611 [6.962854]
[4.3576]
[4.3576]
```
            break;
```

Insertion in crawl-ref/source/player.cc at line 1617 [6.962854]

[4.3629]

    // same here: Your piety status is something you can more or less control.
    // TSO's protection
    if (you.religion == GOD_SHINING_ONE && you.piety > pl * 50)
        pl = you.piety / 50;

Insertion in crawl-ref/source/player.cc at line 1622 [6.962854]

[4.3630]

[11.346522]

    if (temp)
    {
        // Now, transformations could stop at any time.
        switch (you.attribute[ATTR_TRANSFORMATION])
        {
        case TRAN_STATUE:
            pl += 1;
            break;
        case TRAN_SERPENT_OF_HELL:
            pl += 2;
            break;
        case TRAN_LICH:
            pl += 3;
            break;
        default:
           break;
        }
    }

Deletion in crawl-ref/source/player.cc at line 1650 [6.962854]

B:BD[6.985676] → [6.985676:985937]

    switch (you.attribute[ATTR_TRANSFORMATION])
    {
    case TRAN_STATUE:
        pl += 1;
        break;
    case TRAN_SERPENT_OF_HELL:
        pl += 2;
        break;
    case TRAN_LICH:
        pl += 3;
        break;
    default:
        break;
    }

Deletion in crawl-ref/source/player.cc at line 1655 [6.962854]

B:BD[6.986081] → [14.2519:2544]

B:BD[14.2544] → [3.2524:2617]


    // TSO's protection
    if (you.religion == GOD_SHINING_ONE && you.piety > pl * 50)
        pl = you.piety / 50;

Insertion in crawl-ref/source/misc.cc at line 1609 [6.1933596]
[15.340]
[15.340]
```
    // always harmful
```
Deletion in crawl-ref/source/misc.cc at line 1611 [6.1933596]
B:BD[15.386] → [15.386:408]
```
    case CLOUD_STINK:
```

Insertion in crawl-ref/source/misc.cc at line 1612 [6.1933596]

[15.455]

[15.480]

        return (true);
    // only harmful if the player doesn't have the necessary resistances
    // Takes into account what the player can *know* and what s/he can
    // also expect to be the case a few turns later (ignores spells).
    case CLOUD_STINK:

Insertion in crawl-ref/source/misc.cc at line 1618 [6.1933596]
[15.503]
[15.530]
```
        return (!player_res_poison(false, false));
```
Insertion in crawl-ref/source/misc.cc at line 1620 [6.1933596]
[15.552]
[15.578]
```
        return (player_res_steam(false, false) <= 0);
```

Replacement in crawl-ref/source/misc.cc at line 1622 [6.1933596]

B:BD[15.628] → [15.628:651]

        return (true);

[15.601]

[15.651]

        return (player_prot_life(false, false) <= 2);
    // smoke, never harmful

Replacement in crawl-ref/source/item_use.cc at line 893 [6.2781507]

B:BD[2.515] → [2.515:574]

               mpr("That helmet does not fit your head!");

[2.515]

[2.574]

                mpr("That helmet does not fit your head!");

Replacement in crawl-ref/source/item_use.cc at line 898 [6.2781507]
B:BD[6.2800937] → [16.2009:2060]
```
    else if (!can_equip( slot, ignore_temporary ))
```
[6.2800937]
[6.2800974]
```
    
    if (!can_equip( slot, ignore_temporary ))
```
Replacement in crawl-ref/source/item_use.cc at line 902 [6.2781507]
∅:D[16.2082] → [6.2801000:2801061]
B:BD[6.2801000] → [6.2801000:2801061]
```
           mpr("You can't wear that in your present form.");
```
[16.2082]
[6.2801061]
```
            mpr("You can't wear that in your present form.");
```
Replacement in crawl-ref/source/dat/database/wpnnoise.txt at line 6 [17.5869]
B:BD[17.6095] → [5.2691:2752]
```
# spnnoise.txt contains the messages of randart weapons with
```
[17.6095]
[17.6153]
```
# wpnnoise.txt contains the messages of randart weapons with
```
Replacement in crawl-ref/docs/monster_speech.txt at line 11 [18.15456]
B:BD[17.23908] → [17.23908:23963]
```
speak.txt handles messages for monsters communicating.
```
[17.23908]
[17.23963]
```
monspeak.txt handles messages for monsters communicating.
```

Replacement in crawl-ref/docs/monster_speech.txt at line 15 [18.15456]

B:BD[17.24026] → [17.24026:24094]

noise.txt handles messages randart weapons with the noisy property.

[17.24026]

[17.24094]

wpnnoise.txt handles messages randart weapons with the noisy property.

Implement FR 1897310: auto-travel through clouds if you are (semi)permanently

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/transfor.cc at line 39 [6.143977]

Insertion in crawl-ref/source/transfor.cc at line 184 [6.143977]

Insertion in crawl-ref/source/transfor.cc at line 211 [6.143977]

Insertion in crawl-ref/source/transfor.cc at line 244 [6.143977]

Deletion in crawl-ref/source/transfor.cc at line 296 [6.143977]

Replacement in crawl-ref/source/player.h at line 151 [6.945993]

Replacement in crawl-ref/source/player.h at line 186 [6.945993]

Replacement in crawl-ref/source/player.h at line 194 [6.945993]

Replacement in crawl-ref/source/player.cc at line 1092 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1103 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1111 [6.962854]

Deletion in crawl-ref/source/player.cc at line 1144 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1148 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1154 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1174 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1368 [6.962854]

Deletion in crawl-ref/source/player.cc at line 1394 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1400 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1402 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1590 [6.962854]

Insertion in crawl-ref/source/player.cc at line 1595 [6.962854]

Insertion in crawl-ref/source/player.cc at line 1604 [6.962854]

Insertion in crawl-ref/source/player.cc at line 1608 [6.962854]

Insertion in crawl-ref/source/player.cc at line 1611 [6.962854]

Insertion in crawl-ref/source/player.cc at line 1617 [6.962854]

Insertion in crawl-ref/source/player.cc at line 1622 [6.962854]

Deletion in crawl-ref/source/player.cc at line 1650 [6.962854]

Deletion in crawl-ref/source/player.cc at line 1655 [6.962854]

Insertion in crawl-ref/source/misc.cc at line 1609 [6.1933596]

Deletion in crawl-ref/source/misc.cc at line 1611 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 1612 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 1618 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 1620 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 1622 [6.1933596]

Replacement in crawl-ref/source/item_use.cc at line 893 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 898 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 902 [6.2781507]

Replacement in crawl-ref/source/dat/database/wpnnoise.txt at line 6 [17.5869]

Replacement in crawl-ref/docs/monster_speech.txt at line 11 [18.15456]

Replacement in crawl-ref/docs/monster_speech.txt at line 15 [18.15456]