fiddlerwoaroof/crawl - Change CLBOD3ANEMCQTE6USMTZAH4UWNLB73AIT3ZCDHLUUTMLQTCZJ4GAC

Make miasma and miasma resistance more consistent. It no longer depends

on negative energy resistance, but on rotting resistance.

Created by David Lawrence Ramsey on September 29, 2009

CLBOD3ANEMCQTE6USMTZAH4UWNLB73AIT3ZCDHLUUTMLQTCZJ4GAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.h at line 242 [8.945993]
[6.3204]
[7.336595]
```
int player_res_rotting();
```

Replacement in crawl-ref/source/player.h at line 398 [8.945993]

B:BD[8.960344] → [8.960344:960407]

void rot_hp( int hp_loss );
void unrot_hp( int hp_recovered );

[8.960344]

[9.3161]

void rot_hp(int hp_loss);
void unrot_hp(int hp_recovered);

Replacement in crawl-ref/source/player.h at line 401 [8.945993]
∅:D[9.3182] → [8.960434:960462]
B:BD[8.960434] → [8.960434:960462]
```
void rot_mp( int mp_loss );
```
[9.3182]
[8.960462]
```
void rot_mp(int mp_loss);
```
Insertion in crawl-ref/source/player.h at line 428 [8.945993]
[10.2585]
[8.962259]
```
bool miasma_player();
```

Insertion in crawl-ref/source/player.cc at line 1713 [8.962854]

[8.982508]

[11.2447]

}
int player_res_rotting()
{
    if (you.is_undead
        && (you.is_undead != US_SEMI_UNDEAD || you.hunger_state < HS_SATIATED))
    {
        return (1);
    }
    return (0);

Replacement in crawl-ref/source/player.cc at line 5053 [8.962854]
B:BD[8.1053254] → [8.1053254:1053281]
```
void rot_hp( int hp_loss )
```
[8.1053254]
[8.1053281]
```
void rot_hp(int hp_loss)
```
Replacement in crawl-ref/source/player.cc at line 5064 [8.962854]
B:BD[8.1053361] → [8.1053361:1053395]
```
void unrot_hp( int hp_recovered )
```
[8.1053361]
[8.1053395]
```
void unrot_hp(int hp_recovered)
```
Replacement in crawl-ref/source/player.cc at line 5076 [8.962854]
B:BD[8.1053566] → [8.1053566:1053592]
```
int player_rotted( void )
```
[8.1053566]
[8.1053592]
```
int player_rotted()
```
Replacement in crawl-ref/source/player.cc at line 5081 [8.962854]
B:BD[8.1053630] → [8.1053630:1053657]
```
void rot_mp( int mp_loss )
```
[8.1053630]
[8.1053657]
```
void rot_mp(int mp_loss)
```

Insertion in crawl-ref/source/player.cc at line 5515 [8.962854]

[12.2449]


bool miasma_player()
{
    ASSERT(!crawl_state.arena);
    if (player_res_rotting())
        return (false);
    bool success = poison_player(1);

Insertion in crawl-ref/source/player.cc at line 5525 [8.962854]

[12.2450]

    if (you.hp_max > 4 && coinflip())
    {
        rot_hp(1);
        success = true;
    }
    if (one_chance_in(3))
    {
        potion_effect(POT_SLOWING, 5);
        success = true;
    }
    return (success);
}

Replacement in crawl-ref/source/player.cc at line 5745 [8.962854]
B:BD[13.746] → [14.2613:2644]
```
    if (you.res_rotting() > 0)
```
[13.746]
[13.769]
```
    if (player_res_rotting())
```
Insertion in crawl-ref/source/player.cc at line 7011 [8.962854]
[15.2523]
[15.2523]
```
int player::res_rotting() const
{
    return (player_res_rotting());
}
```
Deletion in crawl-ref/source/player.cc at line 7040 [8.962854]
B:BD[14.2648] → [14.2648:2790]
B:BD[14.2790] → [3.2613:2633]
∅:D[3.2633] → [14.2808:2814]
B:BD[14.2808] → [14.2808:2814]
B:BD[14.2814] → [3.2634:2651]
∅:D[3.2651] → [16.4316:4319]
∅:D[14.2828] → [16.4316:4319]
B:BD[17.4947] → [16.4316:4319]
```
int player::res_rotting() const
{
    if (you.is_undead
        && (you.is_undead != US_SEMI_UNDEAD || you.hunger_state < HS_SATIATED))
    {
        return (1);
    }
    return (0);
}
```
Replacement in crawl-ref/source/player.cc at line 7175 [8.962854]
B:BD[17.6275] → [18.2727:2769]
```
    if (res_rotting() > 0 || amount <= 0)
```
[17.6275]
[19.2681]
```
    if (player_res_rotting() || amount <= 0)
```
Replacement in crawl-ref/source/ouch.cc at line 218 [8.1104358]
B:BD[7.361502] → [20.6192:6242]
```
        if (x_chance_in_y(player_prot_life(), 3))
```
[7.361502]
[7.361547]
```
        if (player_res_rotting())
```
Replacement in crawl-ref/source/monstuff.cc at line 5426 [8.1396662]
B:BD[21.2763] → [21.2763:2811]
```
        return (mons_res_miasma(monster) <= 0);
```
[21.2763]
[21.2811]
```
        return (!mons_res_rotting(monster));
```
Replacement in crawl-ref/source/monstuff.cc at line 9373 [8.1396662]
B:BD[8.1551520] → [22.1662:1704]
```
        if (mons_res_miasma(monster) > 0)
```
[8.1551520]
[8.1551576]
```
        if (mons_res_rotting(monster))
```
Deletion in crawl-ref/source/monstuff.cc at line 9375 [8.1396662]
B:BD[8.1551596] → [8.1551596:1551597]
B:BD[8.1551597] → [23.559:605]
∅:D[23.605] → [8.1551668:1551763]
∅:D[24.6642] → [8.1551668:1551763]
∅:D[25.10758] → [8.1551668:1551763]
B:BD[8.1551668] → [8.1551668:1551763]
```
        poison_monster(monster, cloud.whose);
        if (monster->max_hit_points > 4 && coinflip())
            monster->max_hit_points--;
```
Replacement in crawl-ref/source/monstuff.cc at line 9376 [8.1396662]
B:BD[8.1551764] → [8.1551764:1551798]
```
        beam.flavour = BEAM_SLOW;
```
[8.1551764]
[8.1551798]
```
        miasma_monster(monster, cloud.whose);
```
Deletion in crawl-ref/source/monstuff.cc at line 9378 [8.1396662]
B:BD[8.1551799] → [8.1551799:1551829]
B:BD[8.1551829] → [26.3835:3891]
∅:D[26.3891] → [8.1551870:1551871]
B:BD[8.1551870] → [8.1551870:1551871]
```
        if (one_chance_in(3))
            beam.apply_enchantment_to_monster(monster);
```
Deletion in crawl-ref/source/mon-util.h at line 628 [8.1682293]
B:BD[27.4028] → [27.4028:4070]
```
int mons_res_miasma(const monsters *mon);
```
Deletion in crawl-ref/source/mon-util.cc at line 1481 [8.1699344]
B:BD[8.1714963] → [28.6163:6165]
∅:D[28.6165] → [22.1756:1757]
B:BD[8.1715018] → [22.1756:1757]
B:BD[22.1757] → [27.5592:5633]
∅:D[27.5633] → [22.1800:1802]
B:BD[22.1800] → [22.1800:1802]
B:BD[22.1802] → [29.2642:2731]
B:BD[29.2731] → [2.2643:2663]
∅:D[2.2663] → [29.2751:2774]
B:BD[29.2751] → [29.2751:2774]
```
}
int mons_res_miasma(const monsters *mon)
{
    if (mons_holiness(mon) != MH_NATURAL
        || mon->type == MONS_DEATH_DRAKE)
    {
        return (1);
    }
    return (0);
```
Replacement in crawl-ref/source/mon-util.cc at line 3037 [8.1699344]
∅:D[30.5028] → [8.1744856:1744892]
B:BD[8.1744856] → [8.1744856:1744892]
```
    // handled here as well. -- bwr
```
[30.5028]
[8.1744892]
```
    // handled here as well. - bwr
```
Deletion in crawl-ref/source/mon-util.cc at line 3045 [8.1699344]
B:BD[31.2990] → [32.7778:7801]
```
    case SPELL_MIASMA:
```

Insertion in crawl-ref/source/mon-util.cc at line 3073 [8.1699344]

[31.3539]

    case SPELL_MIASMA:
        ret = (!foe || foe->res_rotting());
        break;

Replacement in crawl-ref/source/fight.cc at line 2013 [8.3140790]
B:BD[33.5642] → [2.2769:2791]
```
    case BEAM_MIASMA:
```
[33.5642]
[34.7094]
```
    case BEAM_MIASMA: // rotting
```
Insertion in crawl-ref/source/externs.h at line 389 [8.3270163]
[17.85779]
[5.5244]
```
    virtual int res_rotting() const = 0;
```
Deletion in crawl-ref/source/externs.h at line 392 [8.3270163]
B:BD[10.4085] → [35.4357:4398]
```
    virtual int res_rotting() const = 0;
```
Insertion in crawl-ref/source/externs.h at line 1116 [8.3270163]
[17.87394]
[5.5285]
```
    int res_rotting() const;
```
Deletion in crawl-ref/source/externs.h at line 1119 [8.3270163]
B:BD[10.4120] → [35.4399:4428]
```
    int res_rotting() const;
```
Insertion in crawl-ref/source/externs.h at line 1477 [8.3270163]
[5.5342]
[15.2860]
```
    int res_rotting() const;
```
Deletion in crawl-ref/source/externs.h at line 1480 [8.3270163]
B:BD[10.4155] → [35.4429:4458]
```
    int res_rotting() const;
```
Replacement in crawl-ref/source/cloud.cc at line 514 [8.4095717]
B:BD[4.5390] → [4.5390:5427]
```
        if (player_prot_life() >= 3)
```
[4.5390]
[4.5427]
```
        if (player_res_rotting())
```
Deletion in crawl-ref/source/cloud.cc at line 518 [8.4095717]
B:BD[4.5484] → [4.5484:5485]
Insertion in crawl-ref/source/cloud.cc at line 519 [8.4095717]
[4.5500]
[4.5500]
Replacement in crawl-ref/source/cloud.cc at line 669 [8.4095717]
B:BD[36.8741] → [37.14563:14613]
```
        if (x_chance_in_y(player_prot_life(), 3))
```
[36.8741]
[36.8786]
```
        if (player_res_rotting())
```
Replacement in crawl-ref/source/cloud.cc at line 672 [8.4095717]
B:BD[36.8807] → [36.8807:8833]
```
        poison_player(1);
```
[36.8807]
[36.8833]
```
        miasma_player();
```

Deletion in crawl-ref/source/cloud.cc at line 680 [8.4095717]

∅:D[38.8296] → [36.9017:9123]

B:BD[36.9017] → [36.9017:9123]

        potion_effect(POT_SLOWING, 5);
        if (you.hp_max > 4 && coinflip())
            rot_hp(1);

Insertion in crawl-ref/source/cloud.cc at line 681 [8.4095717]
[36.9138]
[36.9138]
Replacement in crawl-ref/source/cloud.cc at line 711 [8.4095717]
B:BD[36.9811] → [36.9811:9864]
```
        return (player_prot_life(false, temp) <= 2);
```
[36.9811]
[36.9864]
```
        return (player_res_rotting());
```
Insertion in crawl-ref/source/beam.h at line 291 [8.4124541]
[10.4527]
[12.4902]
```
bool miasma_monster(monsters *monster, kill_category who);
```
Replacement in crawl-ref/source/beam.cc at line 2362 [8.4128068]
B:BD[7.1230955] → [39.3041:3093]
```
        if (mons_res_negative_energy(monster) == 3)
```
[7.1230955]
[7.1231009]
```
        if (mons_res_rotting(monster))
```
Replacement in crawl-ref/source/beam.cc at line 2375 [8.4128068]
B:BD[7.1231307] → [40.3401:3448]
B:BD[40.3448] → [26.22954:23015]
∅:D[40.3509] → [7.1231424:1231425]
∅:D[41.13707] → [7.1231424:1231425]
∅:D[26.23015] → [7.1231424:1231425]
∅:D[25.36138] → [7.1231424:1231425]
B:BD[7.1231424] → [7.1231424:1231425]
B:BD[7.1231425] → [40.3510:3584]
∅:D[40.3584] → [7.1231501:1231515]
B:BD[7.1231501] → [7.1231501:1231515]
B:BD[7.1231515] → [42.2047:2074]
∅:D[42.2074] → [7.1231549:1231591]
B:BD[7.1231549] → [7.1231549:1231591]
B:BD[7.1231591] → [26.23016:23076]
∅:D[40.3630] → [7.1231638:1231652]
∅:D[26.23076] → [7.1231638:1231652]
B:BD[7.1231638] → [7.1231638:1231652]
```
            if (mons_res_poison(monster) <= 0)
                poison_monster(monster, pbolt.whose_kill());
            if (one_chance_in(3 + 2 * mons_res_negative_energy(monster)))
            {
                bolt beam;
                beam.flavour = BEAM_SLOW;
                beam.apply_enchantment_to_monster(monster);
            }
```
[7.1231307]
[7.1231652]
```
            miasma_monster(monster, pbolt.whose_kill());
```
Deletion in crawl-ref/source/beam.cc at line 2655 [8.4128068]
∅:D[11.3385] → [7.1233686:1233687]
B:BD[7.1233686] → [7.1233686:1233687]
B:BD[7.1233687] → [11.3386:3444]
```
    const bool res_poison = mons_res_poison(monster) > 0;
```
Replacement in crawl-ref/source/beam.cc at line 2663 [8.4128068]
B:BD[7.1233889] → [7.1233889:1233913]
```
        if (res_poison)
```
[7.1233889]
[7.1233913]
```
        if (mons_res_poison(monster) > 0)
```

Insertion in crawl-ref/source/beam.cc at line 2716 [8.4128068]

[8.4197325]

[34.8759]

// Actually poisons, rots, and/or slows a monster with miasma (with
// message).
bool miasma_monster(monsters *monster, kill_category who)
{
    if (!monster->alive())
        return (false);
    if (mons_res_rotting(monster))
        return (false);
    bool success = poison_monster(monster, who);
    if (monster->max_hit_points > 4 && coinflip())
    {
        monster->max_hit_points--;
        monster->hit_points = std::min(monster->max_hit_points,
                                       monster->hit_points);
        success = true;
    }
    if (one_chance_in(3))
    {
        bolt beam;
        beam.flavour = BEAM_SLOW;
        beam.apply_enchantment_to_monster(monster);
        success = true;
    }
    return (success);
}

Insertion in crawl-ref/source/beam.cc at line 3388 [8.4128068]
[43.5319]
[43.5319]
```
        return (mons_res_rotting(mon));
```
Insertion in crawl-ref/source/beam.cc at line 3432 [8.4128068]
[43.6314]
[43.6314]
```
        return (player_res_rotting());
```
Replacement in crawl-ref/source/beam.cc at line 4021 [8.4128068]
∅:D[26.44274] → [7.1245178:1245222]
B:BD[7.1245178] → [7.1245178:1245222]
B:BD[7.1245222] → [44.25814:25824]
∅:D[44.25824] → [7.1245222:1245252]
B:BD[7.1245222] → [7.1245222:1245252]
B:BD[7.1245252] → [44.25825:25868]
∅:D[44.25868] → [7.1245252:1245253]
B:BD[7.1245252] → [7.1245252:1245253]
B:BD[7.1245253] → [45.2968:3023]
∅:D[45.3023] → [44.25869:25879]
B:BD[7.1245310] → [44.25869:25879]
B:BD[44.25879] → [45.3024:3067]
∅:D[45.3067] → [44.25880:25923]
B:BD[7.1245355] → [44.25880:25923]
∅:D[44.25923] → [7.1245355:1245361]
B:BD[7.1245355] → [7.1245355:1245361]
```
    {
        if (player_res_poison() <= 0)
        {
            poison_player(1);
            was_affected = true;
        }
        if (one_chance_in(3 + 2 * player_prot_life()))
        {
            potion_effect(POT_SLOWING, 5);
            was_affected = true;
        }
    }
```
[26.44274]
[7.1245361]
```
        was_affected = miasma_player();
```

Make miasma and miasma resistance more consistent. It no longer depends

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/player.h at line 242 [8.945993]

Replacement in crawl-ref/source/player.h at line 398 [8.945993]

Replacement in crawl-ref/source/player.h at line 401 [8.945993]

Insertion in crawl-ref/source/player.h at line 428 [8.945993]

Insertion in crawl-ref/source/player.cc at line 1713 [8.962854]

Replacement in crawl-ref/source/player.cc at line 5053 [8.962854]

Replacement in crawl-ref/source/player.cc at line 5064 [8.962854]

Replacement in crawl-ref/source/player.cc at line 5076 [8.962854]

Replacement in crawl-ref/source/player.cc at line 5081 [8.962854]

Insertion in crawl-ref/source/player.cc at line 5515 [8.962854]

Insertion in crawl-ref/source/player.cc at line 5525 [8.962854]

Replacement in crawl-ref/source/player.cc at line 5745 [8.962854]

Insertion in crawl-ref/source/player.cc at line 7011 [8.962854]

Deletion in crawl-ref/source/player.cc at line 7040 [8.962854]

Replacement in crawl-ref/source/player.cc at line 7175 [8.962854]

Replacement in crawl-ref/source/ouch.cc at line 218 [8.1104358]

Replacement in crawl-ref/source/monstuff.cc at line 5426 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 9373 [8.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 9375 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 9376 [8.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 9378 [8.1396662]

Deletion in crawl-ref/source/mon-util.h at line 628 [8.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 1481 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3037 [8.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3045 [8.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3073 [8.1699344]

Replacement in crawl-ref/source/fight.cc at line 2013 [8.3140790]

Insertion in crawl-ref/source/externs.h at line 389 [8.3270163]

Deletion in crawl-ref/source/externs.h at line 392 [8.3270163]

Insertion in crawl-ref/source/externs.h at line 1116 [8.3270163]

Deletion in crawl-ref/source/externs.h at line 1119 [8.3270163]

Insertion in crawl-ref/source/externs.h at line 1477 [8.3270163]

Deletion in crawl-ref/source/externs.h at line 1480 [8.3270163]

Replacement in crawl-ref/source/cloud.cc at line 514 [8.4095717]

Deletion in crawl-ref/source/cloud.cc at line 518 [8.4095717]

Insertion in crawl-ref/source/cloud.cc at line 519 [8.4095717]

Replacement in crawl-ref/source/cloud.cc at line 669 [8.4095717]

Replacement in crawl-ref/source/cloud.cc at line 672 [8.4095717]

Deletion in crawl-ref/source/cloud.cc at line 680 [8.4095717]

Insertion in crawl-ref/source/cloud.cc at line 681 [8.4095717]

Replacement in crawl-ref/source/cloud.cc at line 711 [8.4095717]

Insertion in crawl-ref/source/beam.h at line 291 [8.4124541]

Replacement in crawl-ref/source/beam.cc at line 2362 [8.4128068]

Replacement in crawl-ref/source/beam.cc at line 2375 [8.4128068]

Deletion in crawl-ref/source/beam.cc at line 2655 [8.4128068]

Replacement in crawl-ref/source/beam.cc at line 2663 [8.4128068]

Insertion in crawl-ref/source/beam.cc at line 2716 [8.4128068]

Insertion in crawl-ref/source/beam.cc at line 3388 [8.4128068]

Insertion in crawl-ref/source/beam.cc at line 3432 [8.4128068]

Replacement in crawl-ref/source/beam.cc at line 4021 [8.4128068]