fiddlerwoaroof/crawl - Change V3YASGPC7MVXZE75XX7YQ7U6LFEJDNCTQA6NMI6R5TB5KEZH4RCQC

Trees -- a new wall type, can be seen through (2nd square blocks LOS).

Available as 't' for vault builders. Can be ignited using wands of fire, but the fire can't be controlled.

Created by Adam Borowski on October 9, 2009

V3YASGPC7MVXZE75XX7YQ7U6LFEJDNCTQA6NMI6R5TB5KEZH4RCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 426 [6.16817]

[4.372]

[5.1596]

static unsigned short _tree_colour(const coord_def& where)
{
    uint32_t h = where.x;
    h+=h<<10; h^=h>>6;
    h += where.y;
    h+=h<<10; h^=h>>6;
    h+=h<<3; h^=h>>11; h+=h<<15;
    return (h>>30) ? GREEN : LIGHTGREEN;
}

Insertion in crawl-ref/source/view.cc at line 516 [6.16817]

[7.418]

[4.608]

                else if (object == DNGN_TREES)
                    *colour = _tree_colour(where) | colmask;

Insertion in crawl-ref/source/view.cc at line 1655 [6.16817]
[8.2517]
[8.2517]
```
    case CLOUD_FOREST_FIRE:
```

Replacement in crawl-ref/source/view.cc at line 3020 [6.16817]

B:BD[9.405] → [9.405:477]

        ':', '|', '}', '%', '$', '"', '#',             // book .. cloud

[9.405]

[9.477]

        ':', '|', '}', '%', '$', '"', '#', '@',        // book .. trees

Replacement in crawl-ref/source/view.cc at line 3030 [6.16817]

B:BD[9.865] → [9.865:937]

        '+', '\\', '}', '%', '$', '"', '#',            // book .. cloud

[9.865]

[9.937]

        '+', '\\', '}', '%', '$', '"', '#', 234,       // book .. trees

Replacement in crawl-ref/source/view.cc at line 3040 [6.16817]

B:BD[9.1325] → [9.1325:1397]

        '+', '\\', '}', '%', '$', '"', '#',            // book .. cloud

[9.1325]

[9.1397]

        '+', '\\', '}', '%', '$', '"', '#', '@',       // book .. trees

Replacement in crawl-ref/source/view.cc at line 3050 [6.16817]
B:BD[10.7142] → [10.7142:7185]
```
        '+', '|', '}', '%', '$', '"', '#',
```
[10.7142]
[9.1557]
```
        '+', '|', '}', '%', '$', '"', '#', 0x2663,
```
Replacement in crawl-ref/source/view.cc at line 3066 [6.16817]
B:BD[11.41569] → [11.41569:41600]
```
        "item_amulet", "cloud"
```
[11.41569]
[11.41600]
```
        "item_amulet", "cloud", "trees",
```

Insertion in crawl-ref/source/view.cc at line 3162 [6.16817]

[12.3234]

[13.602]

        case DNGN_TREES:
            Feature[i].dchar        = DCHAR_TREES;
            Feature[i].magic_symbol = Options.char_table[ DCHAR_WALL_MAGIC ];
            Feature[i].colour       = BLACK; // overridden later
            Feature[i].minimap      = MF_WALL;
            break;

Insertion in crawl-ref/source/monstuff.cc at line 5449 [6.1396662]
[14.2833]
[14.2833]
```
    case CLOUD_FOREST_FIRE:
```
Insertion in crawl-ref/source/monstuff.cc at line 8826 [6.1396662]
[15.5017]
[15.5017]
```
            || targ_cloud_type == CLOUD_FOREST_FIRE
```
Insertion in crawl-ref/source/monstuff.cc at line 9334 [6.1396662]
[6.1548592]
[6.1548617]
```
    case CLOUD_FOREST_FIRE:
```

Replacement in crawl-ref/source/mapdef.cc at line 847 [11.594797]

B:BD[16.140875] → [16.140875:140942]

    return (gly == 'x' || gly == 'c' || gly == 'b' || gly == 'v');

[16.140875]

[16.140942]

    return (gly == 'x' || gly == 'c' || gly == 'b' || gly == 'v' || gly == 't');

Insertion in crawl-ref/source/losparam.cc at line 99 [3.5319]
[3.6410]
[3.6410]
```
        return OPC_HALF;
    else if (f == DNGN_TREES)
```

Insertion in crawl-ref/source/enum.h at line 434 [6.3287960]

[17.8108]

    CLOUD_FOREST_FIRE,
    CLOUD_OPAQUE_FIRST = CLOUD_BLACK_SMOKE,
    CLOUD_OPAQUE_LAST  = CLOUD_FOREST_FIRE,

Insertion in crawl-ref/source/enum.h at line 953 [6.3287960]
[11.911282]
[9.5926]
```
    DCHAR_TREES,
```
Insertion in crawl-ref/source/enum.h at line 1025 [6.3287960]
[13.4907]
[13.4907]
```
    DNGN_TREES,
```
Insertion in crawl-ref/source/dungeon.cc at line 4839 [6.3429798]
[12.13109]
[18.10789]
```
            (rawfeat == 't') ? DNGN_TREES :
```
Insertion in crawl-ref/source/dungeon.cc at line 4927 [6.3429798]
[12.13294]
[6.3605851]
```
                   (vgrid == 't') ? DNGN_TREES :
```
Insertion in crawl-ref/source/directn.cc at line 2657 [6.3697945]
[19.8421]
[20.467095]
```
    case DNGN_TREES:
        return ("Trees");
```
Insertion in crawl-ref/source/cloud.cc at line 28 [6.4095717]
[2.4427]
[6.4096060]
```
#include "los.h"
```

Insertion in crawl-ref/source/cloud.cc at line 132 [6.4095717]

[21.4980]

}
static void _spread_fire(const cloud_struct &cloud)
{
    int make_flames = one_chance_in(5);
    for ( adjacent_iterator ai(cloud.pos); ai; ++ai )
    {
        if (!in_bounds(*ai)
            || env.cgrid(*ai) != EMPTY_CLOUD
            || is_sanctuary(*ai))
            continue;
        // burning trees produce flames all around
        if (!grid_is_solid(*ai) && make_flames)
            _place_new_cloud( CLOUD_FIRE, *ai, cloud.decay/2+1, cloud.whose,
                              cloud.killer, cloud.spread_rate );
        // forest fire doesn't spread in all directions at once,
        // every neighbouring square gets a separate roll
        if (grd(*ai) == DNGN_TREES && one_chance_in(20))
        {
            if (see_grid(*ai))
                mpr("The forest fire spreads!");
            grd(*ai) = DNGN_FLOOR;
            _place_new_cloud( cloud.type, *ai, random2(30)+25, cloud.whose,
                              cloud.killer, cloud.spread_rate );
        }
    }

Replacement in crawl-ref/source/cloud.cc at line 170 [6.4095717]

B:BD[21.5138] → [22.14761:14808]

    if (x_chance_in_y(cloud.spread_rate, 100))

[21.5138]

[23.383]

    if (cloud.type == CLOUD_FOREST_FIRE)
        _spread_fire(cloud);
    else if (x_chance_in_y(cloud.spread_rate, 100))

Replacement in crawl-ref/source/cloud.cc at line 385 [6.4095717]

B:BD[24.561] → [25.43408:43514]

    return (ctype == CLOUD_BLACK_SMOKE
            || ctype >= CLOUD_GREY_SMOKE && ctype <= CLOUD_STEAM);

[24.561]

[26.8944]

    return (ctype >= CLOUD_OPAQUE_FIRST && ctype <= CLOUD_OPAQUE_LAST);

Insertion in crawl-ref/source/cloud.cc at line 455 [6.4095717]
[27.8112]
[27.8112]
```
    case CLOUD_FOREST_FIRE: return BEAM_FIRE;
```
Insertion in crawl-ref/source/cloud.cc at line 492 [6.4095717]
[28.4150]
[28.4150]
```
    case CLOUD_FOREST_FIRE:
```
Insertion in crawl-ref/source/cloud.cc at line 579 [6.4095717]
[29.5139]
[29.5139]
```
    case CLOUD_FOREST_FIRE:
```
Insertion in crawl-ref/source/cloud.cc at line 748 [6.4095717]
[29.9358]
[30.3623]
```
    case CLOUD_FOREST_FIRE:
```
Insertion in crawl-ref/source/cloud.cc at line 798 [6.4095717]
[29.10055]
[29.10055]
```
    case CLOUD_FOREST_FIRE:
        return "fire";
```

Replacement in crawl-ref/source/beam.cc at line 1712 [6.4128068]

B:BD[31.14654] → [31.14654:14727]

    // Fire only affects wax walls.
    if (grd(pos()) != DNGN_WAX_WALL)

[31.14654]

[31.14727]

    dungeon_feature_type feat;
    // Fire only affects wax walls and trees.
    if ((feat=grd(pos())) != DNGN_WAX_WALL && (feat != DNGN_TREES))

Replacement in crawl-ref/source/beam.cc at line 1723 [6.4128068]
B:BD[31.14838] → [31.14838:14876]
```
        if (flavour != BEAM_HELLFIRE)
```
[31.14838]
[31.14876]
```
        if (flavour != BEAM_HELLFIRE && feat == DNGN_WAX_WALL)
```

Replacement in crawl-ref/source/beam.cc at line 1738 [6.4128068]

B:BD[31.15258] → [31.15258:15458]

        if (see_grid(pos()))
            emit_message(MSGCH_PLAIN, "The wax bubbles and burns!");
        else if (player_can_smell())
            emit_message(MSGCH_PLAIN, "You smell burning wax.");

[31.15258]

[32.2960]

        if (feat == DNGN_WAX_WALL)
        {
            if (see_grid(pos()))
                emit_message(MSGCH_PLAIN, "The wax bubbles and burns!");
            else if (player_can_smell())
                emit_message(MSGCH_PLAIN, "You smell burning wax.");
            place_cloud(CLOUD_FIRE, pos(), random2(10)+15, whose_kill(), killer());
        }
        else
        {
            if (see_grid(pos()))
                emit_message(MSGCH_PLAIN, "The tree burns like a torch!");
            else if (player_can_smell())
                emit_message(MSGCH_PLAIN, "You smell burning wood.");
            if (whose_kill() == KC_YOU)
                did_god_conduct(DID_KILL_PLANT, 1, effect_known, 0);
            else if (whose_kill() == KC_FRIENDLY)
                did_god_conduct(DID_ALLY_KILLED_PLANT, 1, effect_known, 0);
            place_cloud(CLOUD_FOREST_FIRE, pos(), random2(30)+25, whose_kill(), killer(), 5);
        }

Deletion in crawl-ref/source/beam.cc at line 1759 [6.4128068]
∅:D[32.2961] → [31.15471:15551]
B:BD[31.15471] → [31.15471:15551]
```
        place_cloud(CLOUD_FIRE, pos(), random2(10)+15, whose_kill(), killer());
```

Replacement in crawl-ref/source/beam.cc at line 3121 [6.4128068]

B:BD[6.4212467] → [31.28023:28068]

    if (is_fiery() && wall == DNGN_WAX_WALL)

[6.4212467]

[33.949]

    if (is_fiery() && (wall == DNGN_WAX_WALL || wall == DNGN_TREES))

Insertion in crawl-ref/docs/develop/level_design.txt at line 159 [34.350]
[34.5801]
[34.5801]
```
 t - trees - a single square doesn't block LOS                (DNGN_TREES)
```

Trees -- a new wall type, can be seen through (2nd square blocks LOS).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 426 [6.16817]

Insertion in crawl-ref/source/view.cc at line 516 [6.16817]

Insertion in crawl-ref/source/view.cc at line 1655 [6.16817]

Replacement in crawl-ref/source/view.cc at line 3020 [6.16817]

Replacement in crawl-ref/source/view.cc at line 3030 [6.16817]

Replacement in crawl-ref/source/view.cc at line 3040 [6.16817]

Replacement in crawl-ref/source/view.cc at line 3050 [6.16817]

Replacement in crawl-ref/source/view.cc at line 3066 [6.16817]

Insertion in crawl-ref/source/view.cc at line 3162 [6.16817]

Insertion in crawl-ref/source/monstuff.cc at line 5449 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8826 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 9334 [6.1396662]

Replacement in crawl-ref/source/mapdef.cc at line 847 [11.594797]

Insertion in crawl-ref/source/losparam.cc at line 99 [3.5319]

Insertion in crawl-ref/source/enum.h at line 434 [6.3287960]

Insertion in crawl-ref/source/enum.h at line 953 [6.3287960]

Insertion in crawl-ref/source/enum.h at line 1025 [6.3287960]

Insertion in crawl-ref/source/dungeon.cc at line 4839 [6.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 4927 [6.3429798]

Insertion in crawl-ref/source/directn.cc at line 2657 [6.3697945]

Insertion in crawl-ref/source/cloud.cc at line 28 [6.4095717]

Insertion in crawl-ref/source/cloud.cc at line 132 [6.4095717]

Replacement in crawl-ref/source/cloud.cc at line 170 [6.4095717]

Replacement in crawl-ref/source/cloud.cc at line 385 [6.4095717]

Insertion in crawl-ref/source/cloud.cc at line 455 [6.4095717]

Insertion in crawl-ref/source/cloud.cc at line 492 [6.4095717]

Insertion in crawl-ref/source/cloud.cc at line 579 [6.4095717]

Insertion in crawl-ref/source/cloud.cc at line 748 [6.4095717]

Insertion in crawl-ref/source/cloud.cc at line 798 [6.4095717]

Replacement in crawl-ref/source/beam.cc at line 1712 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 1723 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 1738 [6.4128068]

Deletion in crawl-ref/source/beam.cc at line 1759 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 3121 [6.4128068]

Insertion in crawl-ref/docs/develop/level_design.txt at line 159 [34.350]