fiddlerwoaroof/crawl - Change ZP2KE7A2LE7Z2S7AC45WE4CXDSEVDTWIMV2EM4IBUKXYJIDU6R7QC

[1601595] Lava smokes, swamp shallow water tends to mist.

Cold spells fired over water trail freezing cloud.

Smoke/steam spreads out a bit as it dissipates. I can't seem to make this look as pretty as I imagined it. :-(

MAX_CLOUDS is still on 100. We may want to increase this.

Monster pale draconians are pegged back to speed 10 (was 12).

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

Created by dshaligram on November 24, 2006

ZP2KE7A2LE7Z2S7AC45WE4CXDSEVDTWIMV2EM4IBUKXYJIDU6R7QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 891 [3.16817]

[2.13191]

[3.57299]

                    break;
                case CLOUD_MIST:
                    which_colour = EC_MIST;

Replacement in crawl-ref/source/travel.cc at line 459 [4.39949]

B:BD[4.53717] → [4.53717:53762]

        cloud_type == CLOUD_BLACK_SMOKE_MON;

[4.53717]

[4.53762]

        cloud_type == CLOUD_BLACK_SMOKE_MON ||
        cloud_type == CLOUD_MIST;

Insertion in crawl-ref/source/stuff.cc at line 1099 [3.224557]

[2.114922]

        break;
    case EC_MIST:
        ret = tmp_rand < 100? CYAN : BLUE;

Replacement in crawl-ref/source/mon-data.h at line 3668 [3.1826214]

B:BD[2.529694] → [2.529694:529771]

    9, 14, 12, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH,

[2.529694]

[2.529771]

    9, 14, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH,

Deletion in crawl-ref/source/misc.h at line 39 [3.1928926]

B:BD[3.1929907] → [3.1929907:1930140]

void manage_clouds(void);
// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: acr
 * *********************************************************************** */

Insertion in crawl-ref/source/misc.h at line 135 [3.1928926]
[2.540755]
[2.540755]
```
bool grid_is_watery( int grid );
```
Insertion in crawl-ref/source/misc.h at line 146 [3.1928926]
[2.541077]
[2.541077]
```
void setup_environment_effects();
```
Insertion in crawl-ref/source/misc.h at line 149 [3.1928926]
[2.541078]
[2.541078]
```
// Lava smokes, swamp water mists.
void run_environment_effects();
```

Insertion in crawl-ref/source/misc.cc at line 163 [3.1933596]

[2.542885]

}
bool grid_is_watery( int grid )
{
    return (grid_is_water(grid) || grid == DNGN_BLUE_FOUNTAIN);

Deletion in crawl-ref/source/misc.cc at line 1586 [3.1933596]

B:BD[3.1973298] → [3.1973298:1974572]


void manage_clouds(void)
{
    // amount which cloud dissipates - must be unsigned! {dlb}
    unsigned int dissipate = 0;
    for (unsigned char cc = 0; cc < MAX_CLOUDS; cc++)
    {
        if (env.cloud[cc].type == CLOUD_NONE)   // no cloud -> next iteration
            continue;
        dissipate = you.time_taken;
        // water -> flaming clouds:
        // lava -> freezing clouds:
        if ((env.cloud[cc].type == CLOUD_FIRE
                || env.cloud[cc].type == CLOUD_FIRE_MON)
            && grd[env.cloud[cc].x][env.cloud[cc].y] == DNGN_DEEP_WATER)
        {
            dissipate *= 4;
        }
        else if ((env.cloud[cc].type == CLOUD_COLD
                    || env.cloud[cc].type == CLOUD_COLD_MON)
                && grd[env.cloud[cc].x][env.cloud[cc].y] == DNGN_LAVA)
        {
            dissipate *= 4;
        }
        // double the amount when slowed - must be applied last(!):
        if (you.slow)
            dissipate *= 2;
        // apply calculated rate to the actual cloud:
        env.cloud[cc].decay -= dissipate;
        // check for total dissipatation and handle accordingly:
        if (env.cloud[cc].decay < 1)
            delete_cloud( cc );
    }
    return;
}                               // end manage_clouds()

Insertion in crawl-ref/source/misc.cc at line 2159 [3.1933596]

[2.554684]

}
////////////////////////////////////////////////////////////////////////////
// Living breathing dungeon stuff.
//
static std::vector<coord_def> sfx_seeds;
void setup_environment_effects()
{
    sfx_seeds.clear();
    for (int x = X_BOUND_1; x <= X_BOUND_2; ++x)
    {
        for (int y = Y_BOUND_1; y <= Y_BOUND_2; ++y)
        {
            if (!in_bounds(x, y))
                continue;
            const int grid = grd[x][y];
            if (grid == DNGN_LAVA 
                    || (grid == DNGN_SHALLOW_WATER
                        && you.where_are_you == BRANCH_SWAMP))
            {
                coord_def c = { x, y };
                sfx_seeds.push_back(c);
            }
        }
    }
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "%u environment effect seeds", sfx_seeds.size());
#endif
}
static void apply_environment_effect(const coord_def &c)
{
    const int grid = grd[c.x][c.y];
    if (grid == DNGN_LAVA)
        check_place_cloud( CLOUD_BLACK_SMOKE_MON, 
                           c.x, c.y, random_range( 4, 8 ) );
    else if (grid == DNGN_SHALLOW_WATER)
        check_place_cloud( CLOUD_MIST, 
                           c.x, c.y, random_range( 2, 5 ) );
}
static const int Base_Sfx_Chance = 5;
void run_environment_effects()
{
    if (!you.time_taken)
        return;
    // Each square in sfx_seeds has this chance of doing something special
    // per turn.
    const int sfx_chance = Base_Sfx_Chance * you.time_taken / 10;
    const int nseeds = sfx_seeds.size();
    // If there is a large number of seeds, speed things up by fudging the
    // numbers.
    if (nseeds > 100)
    {
        int nsels = div_rand_round( sfx_seeds.size() * sfx_chance, 100 );
        if (one_chance_in(5))
            nsels += random2(nsels * 3);
        for (int i = 0; i < nsels; ++i)
            apply_environment_effect( sfx_seeds[ random2(nseeds) ] );
    }
    else
    {
        for (int i = 0; i < nseeds; ++i)
        {
            if (random2(100) >= sfx_chance)
                continue;
            apply_environment_effect( sfx_seeds[i] );
        }
    }

Replacement in crawl-ref/source/initfile.cc at line 71 [3.2957258]
B:BD[2.785667] → [2.785667:785701]
```
        "rock", "stone", "random"
```
[2.785667]
[2.785701]
```
        "rock", "stone", "mist", "random"
```
Insertion in crawl-ref/source/files.cc at line 1121 [3.3084589]
[3.3111276]
[3.3111276]
```
    setup_environment_effects();
```
Insertion in crawl-ref/source/enum.h at line 533 [3.3287960]
[3.3301990]
[2.906178]
```
    CLOUD_MIST,
```
Insertion in crawl-ref/source/enum.h at line 1162 [3.3287960]
[2.915254]
[2.915254]
```
    EC_MIST,            // colour of mist
```

Replacement in crawl-ref/source/direct.cc at line 1544 [3.3697945]

B:BD[3.3724912] → [3.3724912:3725057]

              || cloud_type == CLOUD_BLACK_SMOKE_MON) ? "black smoke"
                                                      : "buggy goodness");

[3.3724912]

[3.3725057]

              || cloud_type == CLOUD_BLACK_SMOKE_MON) ? "black smoke" :
            (cloud_type == CLOUD_MIST)?                 "thin mist" :
                                                        "buggy goodness");

Insertion in crawl-ref/source/cloud.h at line 20 [3.4095213]
[3.4095560]
[3.4095560]
```
void check_place_cloud( int cl_type, int x, int y, int lifetime );
```
Insertion in crawl-ref/source/cloud.h at line 23 [3.4095213]
[3.4095676]
[3.4095676]
```
void manage_clouds(void);
```
Insertion in crawl-ref/source/cloud.cc at line 19 [3.4095717]
[3.4096041]
[3.4096041]
```
#include "misc.h"
```

Replacement in crawl-ref/source/cloud.cc at line 22 [3.4095717]

B:BD[3.4096061] → [3.4096061:4096092]

void delete_cloud( int cloud )

[3.4096061]

[3.4096092]

// Returns true if this cloud spreads out as it dissipates.
static bool cloud_spreads(const cloud_struct &cloud)

Replacement in crawl-ref/source/cloud.cc at line 25 [3.4095717]
B:BD[3.4096094] → [3.4096094:4096141]
```
    if (env.cloud[ cloud ].type != CLOUD_NONE)
```
[3.4096094]
[3.4096141]
```
    switch (cloud.type)
```

Replacement in crawl-ref/source/cloud.cc at line 27 [3.4095717]

B:BD[3.4096147] → [3.4096147:4096479]

        const int cloud_x = env.cloud[ cloud ].x;
        const int cloud_y = env.cloud[ cloud ].y;
        env.cloud[ cloud ].type = CLOUD_NONE;
        env.cloud[ cloud ].decay = 0;
        env.cloud[ cloud ].x = 0;
        env.cloud[ cloud ].y = 0;
        env.cgrid[ cloud_x ][ cloud_y ] = EMPTY_CLOUD;
        env.cloud_no--;

[3.4096147]

[3.4096479]

    case CLOUD_STEAM:
    case CLOUD_STEAM_MON:
    case CLOUD_GREY_SMOKE:
    case CLOUD_BLACK_SMOKE:
    case CLOUD_GREY_SMOKE_MON:
    case CLOUD_BLACK_SMOKE_MON:
        return (true);
    default:
        return (false);

Insertion in crawl-ref/source/cloud.cc at line 50 [3.4095717]

[3.4096803]


static void place_new_cloud(int cltype, int x, int y, int decay)
{
    if (env.cloud_no >= MAX_CLOUDS)
        return;

Insertion in crawl-ref/source/cloud.cc at line 56 [3.4095717]

[3.4096804]

    // find slot for cloud
    for (int ci = 0; ci < MAX_CLOUDS; ci++)
    {
        if (env.cloud[ci].type == CLOUD_NONE)   // ie is empty
        {
            new_cloud( ci, cltype, x, y, decay );
            break;
        }
    }
}
static int spread_cloud(const cloud_struct &cloud)
{
    const int spreadch = cloud.decay > 30? 80 :
                         cloud.decay > 20? 50 :
                                           30;
    int extra_decay = 0;
    for (int yi = -1; yi <= 1; ++yi)
    {
        for (int xi = -1; xi <= 1; ++xi)
        {
            if ((!xi && !yi) || random2(100) >= spreadch)
                continue;
            const int x = cloud.x + xi;
            const int y = cloud.y + yi;
            if (!in_bounds(x, y) 
                    || env.cgrid[x][y] != EMPTY_CLOUD
                    || grid_is_solid(grd[x][y]))
                continue;
            int newdecay = cloud.decay / 2 + 1;
            if (newdecay >= cloud.decay)
                newdecay = cloud.decay - 1;
            place_new_cloud( cloud.type, x, y, newdecay );
            extra_decay += 8;
        }
    }
    return (extra_decay);
}
static void dissipate_cloud(int cc, cloud_struct &cloud, int dissipate)
{
    // apply calculated rate to the actual cloud:
    cloud.decay -= dissipate;
    if (cloud_spreads(cloud) && cloud.decay > 10 && one_chance_in(5))
        cloud.decay -= spread_cloud(cloud);
    // check for total dissipation and handle accordingly:
    if (cloud.decay < 1)
        delete_cloud( cc );
}
void manage_clouds(void)
{
    // amount which cloud dissipates - must be unsigned! {dlb}
    unsigned int dissipate = 0;
    for (unsigned char cc = 0; cc < MAX_CLOUDS; cc++)
    {
        if (env.cloud[cc].type == CLOUD_NONE)   // no cloud -> next iteration
            continue;
        dissipate = you.time_taken;
        // water -> flaming clouds:
        // lava -> freezing clouds:
        if ((env.cloud[cc].type == CLOUD_FIRE
                || env.cloud[cc].type == CLOUD_FIRE_MON)
            && grd[env.cloud[cc].x][env.cloud[cc].y] == DNGN_DEEP_WATER)
        {
            dissipate *= 4;
        }
        else if ((env.cloud[cc].type == CLOUD_COLD
                    || env.cloud[cc].type == CLOUD_COLD_MON)
                && grd[env.cloud[cc].x][env.cloud[cc].y] == DNGN_LAVA)
        {
            dissipate *= 4;
        }
        // double the amount when slowed - must be applied last(!):
        if (you.slow)
            dissipate *= 2;
        dissipate_cloud( cc, env.cloud[cc], dissipate );
    }
    return;
}                               // end manage_clouds()
void delete_cloud( int cloud )
{
    if (env.cloud[ cloud ].type != CLOUD_NONE)
    {
        const int cloud_x = env.cloud[ cloud ].x;
        const int cloud_y = env.cloud[ cloud ].y;
        env.cloud[ cloud ].type = CLOUD_NONE;
        env.cloud[ cloud ].decay = 0;
        env.cloud[ cloud ].x = 0;
        env.cloud[ cloud ].y = 0;
        env.cgrid[ cloud_x ][ cloud_y ] = EMPTY_CLOUD;
        env.cloud_no--;
    }
}

Insertion in crawl-ref/source/cloud.cc at line 184 [3.4095717]

[3.4097298]

// Places a cloud with the given stats assuming one doesn't already
// exist at that point.
void check_place_cloud( int cl_type, int x, int y, int lifetime )
{
    if (!in_bounds(x, y) || env.cgrid[x][y] != EMPTY_CLOUD)
        return;
    place_cloud( cl_type, x, y, lifetime );
}

Insertion in crawl-ref/source/cloud.cc at line 212 [3.4095717]
[3.4098094]
[3.4098094]
```
            || env.cloud[ target_cgrid ].type == CLOUD_MIST
```
Insertion in crawl-ref/source/cloud.cc at line 236 [3.4095717]
[3.4098837]
[3.4098837]
```
                || env.cloud[ ci ].type == CLOUD_MIST
```

Replacement in crawl-ref/source/beam.cc at line 2725 [3.4128068]

B:BD[3.4216595] → [3.4216595:4216719]

        || ((grd[x][y] == DNGN_DEEP_WATER || grd[x][y] == DNGN_SHALLOW_WATER)
              && beam.flavour == BEAM_FIRE) )

[3.4216595]

[3.4216719]

        || (grid_is_watery(grd[x][y]) && beam.flavour == BEAM_FIRE) )

Insertion in crawl-ref/source/beam.cc at line 2731 [3.4128068]

[3.4216866]

    if (beam.flavour == BEAM_COLD && grid_is_watery(grd[x][y]))
    {
        cloud_type = YOU_KILL(beam.thrower) ? CLOUD_COLD : CLOUD_COLD_MON;
        place_cloud( cloud_type, x, y, 2 + random2(5) );
    }

Insertion in crawl-ref/source/acr.cc at line 74 [3.4397395]
[3.4399988]
[4.549256]
```
#include "cloud.h"
```
Insertion in crawl-ref/source/acr.cc at line 2077 [3.4397395]
[2.1270204]
[2.1270204]
```
    run_environment_effects();
```

[1601595] Lava smokes, swamp shallow water tends to mist.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 891 [3.16817]

Replacement in crawl-ref/source/travel.cc at line 459 [4.39949]

Insertion in crawl-ref/source/stuff.cc at line 1099 [3.224557]

Replacement in crawl-ref/source/mon-data.h at line 3668 [3.1826214]

Deletion in crawl-ref/source/misc.h at line 39 [3.1928926]

Insertion in crawl-ref/source/misc.h at line 135 [3.1928926]

Insertion in crawl-ref/source/misc.h at line 146 [3.1928926]

Insertion in crawl-ref/source/misc.h at line 149 [3.1928926]

Insertion in crawl-ref/source/misc.cc at line 163 [3.1933596]

Deletion in crawl-ref/source/misc.cc at line 1586 [3.1933596]

Insertion in crawl-ref/source/misc.cc at line 2159 [3.1933596]

Replacement in crawl-ref/source/initfile.cc at line 71 [3.2957258]

Insertion in crawl-ref/source/files.cc at line 1121 [3.3084589]

Insertion in crawl-ref/source/enum.h at line 533 [3.3287960]

Insertion in crawl-ref/source/enum.h at line 1162 [3.3287960]

Replacement in crawl-ref/source/direct.cc at line 1544 [3.3697945]

Insertion in crawl-ref/source/cloud.h at line 20 [3.4095213]

Insertion in crawl-ref/source/cloud.h at line 23 [3.4095213]

Insertion in crawl-ref/source/cloud.cc at line 19 [3.4095717]

Replacement in crawl-ref/source/cloud.cc at line 22 [3.4095717]

Replacement in crawl-ref/source/cloud.cc at line 25 [3.4095717]

Replacement in crawl-ref/source/cloud.cc at line 27 [3.4095717]

Insertion in crawl-ref/source/cloud.cc at line 50 [3.4095717]

Insertion in crawl-ref/source/cloud.cc at line 56 [3.4095717]

Insertion in crawl-ref/source/cloud.cc at line 184 [3.4095717]

Insertion in crawl-ref/source/cloud.cc at line 212 [3.4095717]

Insertion in crawl-ref/source/cloud.cc at line 236 [3.4095717]

Replacement in crawl-ref/source/beam.cc at line 2725 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 2731 [3.4128068]

Insertion in crawl-ref/source/acr.cc at line 74 [3.4397395]

Insertion in crawl-ref/source/acr.cc at line 2077 [3.4397395]