fiddlerwoaroof/crawl - Change ZUC3U5KUXZOC2B2WWYGEZRVNLNJEJ7KL56UUMZY44VOOBG2H6ETAC

Bug 2820876: don't do a big cloud miscast in non-lethal mode if two player

turns in the cloud could kill the player.

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

Created by zelgadis on July 19, 2009

ZUC3U5KUXZOC2B2WWYGEZRVNLNJEJ7KL56UUMZY44VOOBG2H6ETAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-mis.h at line 127 [6.5473]

[5.1271]

    bool _big_cloud(cloud_type cl_type, int pow, int size,
                    int spread_rate = -1);

Insertion in crawl-ref/source/spl-mis.cc at line 540 [2.461]

[2.16163]


    return (true);
}
bool MiscastEffect::_big_cloud(cloud_type cl_type, int power, int size,
                               int spread_rate)
{
    if (avoid_lethal( 2 * max_cloud_damage(cl_type, power) ))
        return (false);

Insertion in crawl-ref/source/spl-mis.cc at line 550 [2.461]

[2.16164]

    do_msg(true);
    big_cloud(cl_type, kc, kt, target->pos(), power, size, spread_rate);

Replacement in crawl-ref/source/spl-mis.cc at line 844 [2.461]

B:BD[2.24850] → [2.24850:24978]

            do_msg();
            big_cloud(CLOUD_GREY_SMOKE, kc, kt, target->pos(), 20,
                      7 + random2(7));

[2.24850]

[2.24978]

            _big_cloud(CLOUD_GREY_SMOKE, 20, 7 + random2(7));

Replacement in crawl-ref/source/spl-mis.cc at line 2012 [2.461]

B:BD[2.62294] → [2.62294:62425]

            do_msg();
            big_cloud(random_smoke_type(), kc, kt, target->pos(), 20,
                      7 + random2(7));

[2.62294]

[2.62425]

            _big_cloud(random_smoke_type(), 20, 7 + random2(7));

Replacement in crawl-ref/source/spl-mis.cc at line 2242 [2.461]

B:BD[2.70214] → [2.70214:70314]

            do_msg();
            big_cloud(CLOUD_COLD, kc, kt, target->pos(), 20, 8 + random2(4));

[2.70214]

[2.70314]

            _big_cloud(CLOUD_COLD, 20, 8 + random2(4));

Replacement in crawl-ref/source/spl-mis.cc at line 2536 [2.461]

B:BD[2.80195] → [2.80195:80296]

            do_msg();
            big_cloud(CLOUD_STINK, kc, kt, target->pos(), 20, 9 + random2(4));

[2.80195]

[2.80296]

            _big_cloud(CLOUD_STINK, 20, 9 + random2(4));

Replacement in crawl-ref/source/spl-mis.cc at line 2567 [2.461]

B:BD[2.81418] → [2.81418:81520]

            do_msg();
            big_cloud(CLOUD_POISON, kc, kt, target->pos(), 20, 8 + random2(5));

[2.81418]

[2.81520]

            _big_cloud(CLOUD_POISON, 20, 8 + random2(5));

Deletion in crawl-ref/source/spl-mis.cc at line 2573 [2.461]
B:BD[2.81558] → [2.81558:81570]
```
// XXX MATT
```

Replacement in crawl-ref/source/spl-mis.cc at line 2673 [2.461]

B:BD[2.84805] → [2.84805:84906]

            do_msg();
            big_cloud(CLOUD_STINK, kc, kt, target->pos(), 20, 8 + random2(5));

[2.84805]

[2.84906]

            _big_cloud(CLOUD_STINK, 20, 8 + random2(5));

Replacement in crawl-ref/source/spl-mis.cc at line 2704 [2.461]

B:BD[2.85873] → [2.85873:85975]

            do_msg();
            big_cloud(CLOUD_POISON, kc, kt, target->pos(), 20, 7 + random2(7));

[2.85873]

[2.85975]

            _big_cloud(CLOUD_POISON, 20, 7 + random2(7));

Insertion in crawl-ref/source/cloud.h at line 58 [9.4095213]
[7.1156]
[8.3320]
```
int steam_cloud_damage(int decay);
```
Insertion in crawl-ref/source/cloud.h at line 63 [9.4095213]
[10.2918]
[10.2918]
```
int  max_cloud_damage(cloud_type cl_type, int power = -1);
```

Replacement in crawl-ref/source/cloud.cc at line 238 [9.4095717]

B:BD[7.1213] → [7.1213:1242]

    int decay = cloud.decay;

[7.1213]

[3.5352]

    return steam_cloud_damage(cloud.decay);
}
 
int steam_cloud_damage(int decay)
{

Insertion in crawl-ref/source/cloud.cc at line 433 [9.4095717]

[4.8696]

[10.4756]

    }
}
// NOTE: Keep in sync with in_a_cloud()
int max_cloud_damage(cloud_type cl_type, int power)
{
    int speed  = player_speed();
    int dam    = 0;
    int resist = 0;
    switch (cl_type)
    {
    case CLOUD_FIRE:
        if (you.duration[DUR_FIRE_SHIELD])
            return (0);
        resist = player_res_fire();
        // Intentional fall-throuigh
    case CLOUD_COLD:
        if (cl_type == CLOUD_COLD)
            resist = player_res_cold();
        if (resist <= 0)
        {
            dam += 32 * speed / 10;
            if (resist < 0)
                dam += 16 * speed / 10;
        }
        else
        {
            dam += 32 * speed / 10;
            dam /= (1 + resist * resist);
        }
        break;
    case CLOUD_STINK:
        if (player_res_poison())
            return (0);
        dam += 2 * speed / 10;
        break;
    case CLOUD_POISON:
        if (player_res_poison())
            return (0);
        dam += 9 * speed / 10;
        break;
    case CLOUD_STEAM:
    {
        ASSERT(power >= 0);
        if (player_res_steam() > 0 || power == 0)
            return (0);
        const int base_dam = steam_cloud_damage(power * 10);
        dam += (base_dam - 1) * speed / 10;
        const int res_fire = player_res_fire();
        if (res_fire < 0)
            dam += base_dam / 2 * speed / 10;
        else if (res_fire)
            dam /= 1 + (res_fire / 2);
        break;
    }
    case CLOUD_MIASMA:
        if (player_prot_life() >= 3)
            return (0);
        dam += 11 * speed / 10;
        break;
    default:
        break;

Insertion in crawl-ref/source/cloud.cc at line 512 [9.4095717]
[10.4762]
[10.4762]
```
    if (dam < 0)
        dam = 0;
    return (dam);
```
Insertion in crawl-ref/source/cloud.cc at line 519 [9.4095717]
[10.4765]
[10.4765]
```
// NOTE: Keep in sync with max_cloud_damage()
```