fiddlerwoaroof/crawl - Change EQNA77UM24FFYQ2N44FG53KQGLS43ZGEX7XS5UWR6MM2HE3JBKAAC

Add a few new tiles, one the exclusion centre (I can't be the only one

who has trouble to remove an exclusion because I can't find its centre) and four additional blood variations. They are all rather similar to the up to now only one - too similar, perhaps. In any case, those areas of bloodsoaked battlefields (such as you'll encounter in the Abyss or Pandemonium) look a bit more interesting now. The way the variant is chosen is unfortunately rather hacky, and might lead to unexpected patterns.

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

Created by j-p-e-g on June 27, 2008

EQNA77UM24FFYQ2N44FG53KQGLS43ZGEX7XS5UWR6MM2HE3JBKAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tiles.h at line 164 [3.7013]

B:BD[2.216] → [2.216:292]

    TILE_FLAG_TRAVEL_EX = 0x00080000,
    TILE_FLAG_SANCTUARY = 0x00100000,

[2.216]

[3.11870]

    TILE_FLAG_TRAV_EXCL = 0x00080000,
    TILE_FLAG_EXCL_CTR  = 0x00100000,
    TILE_FLAG_SANCTUARY = 0x00200000,

Replacement in crawl-ref/source/tile2.cc at line 420 [3.13289]
B:BD[3.28095] → [3.28095:28116]
```
    return tc0->idx;
```
[3.28044]
[3.28116]
```
    return (tc0->idx);
```

Replacement in crawl-ref/source/tile2.cc at line 424 [3.13289]

B:BD[3.28120] → [3.28120:28195]

/*** overlay a tile onto an exsisting image with transpalency operation */

[3.28120]

[4.2256]

// Overlay a tile onto an existing image with transparency operation.

Replacement in crawl-ref/source/tile2.cc at line 441 [3.13289]

B:BD[3.28576] → [3.28576:28654]

    x0 = (tile % TILE_PER_ROW)*TILE_X;
    y0 = (tile / TILE_PER_ROW)*TILE_Y;

[3.28576]

[3.28654]

    x0 = (tile % TILE_PER_ROW) * TILE_X;
    y0 = (tile / TILE_PER_ROW) * TILE_Y;

Replacement in crawl-ref/source/tile2.cc at line 446 [3.13289]
B:BD[3.28683] → [5.1371:1394]
```
        if (*copy ==2)
```
[3.28683]
[5.1394]
```
        if (*copy == 2)
```

Replacement in crawl-ref/source/tile2.cc at line 449 [3.13289]

B:BD[3.28763] → [5.1405:1450]

                img, ox, oy + idx*uy, mask);

[3.28763]

[5.1450]

                           img, ox, oy + idx*uy, mask);

Replacement in crawl-ref/source/tile2.cc at line 454 [3.13289]

B:BD[3.28888] → [5.1472:1517]

                img, ox, oy + idx*uy, mask);

[3.28888]

[5.1517]

                          img, ox, oy + idx*uy, mask);

Replacement in crawl-ref/source/tile2.cc at line 458 [3.13289]
B:BD[3.29010] → [5.1528:1552]
```
    else if (*copy ==2)
```
[3.29010]
[3.29033]
```
    else if (*copy == 2)
```

Replacement in crawl-ref/source/tile2.cc at line 461 [3.13289]

B:BD[3.29104] → [5.1553:1595]

            img, ox, oy + idx*uy, *copy);

[3.29104]

[5.1595]

                 img, ox, oy + idx*uy, *copy);

Replacement in crawl-ref/source/tile2.cc at line 466 [3.13289]

B:BD[3.29236] → [5.1611:1653]

            img, ox, oy + idx*uy, *copy);

[3.29236]

[3.29288]

                img, ox, oy + idx*uy, *copy);

Replacement in crawl-ref/source/tile2.cc at line 660 [3.13289]

B:BD[6.173] → [4.3561:3627]

        _tcache_overlay(tcache_image, ix, TILE_BLOOD0, &c, NULL);

[6.173]

[6.250]

        _tcache_overlay(tcache_image, ix, TILE_BLOOD0 + ix % 5, &c, NULL);

Replacement in crawl-ref/source/tile2.cc at line 673 [3.13289]

B:BD[5.2337] → [5.2337:2403]

    if ((bg0 & TILE_FLAG_TRAVEL_EX) && !(bg0 & TILE_FLAG_UNSEEN))

[5.2337]

[4.3760]

    if ((bg0 & TILE_FLAG_TRAV_EXCL) && !(bg0 & TILE_FLAG_UNSEEN))

Insertion in crawl-ref/source/tile2.cc at line 675 [3.13289]

[4.3836]

[5.2515]

    else if ((bg0 & TILE_FLAG_EXCL_CTR) && !(bg0 & TILE_FLAG_UNSEEN))
        _tcache_overlay(tcache_image, ix, TILE_TRAVEL_EXCL_CENTRE, &c, NULL);

Replacement in crawl-ref/source/tile2.cc at line 752 [3.13289]

∅:D[7.399] → [5.3449:3514]

B:BD[5.3449] → [5.3449:3514]

    if ((bg0 & TILE_FLAG_TRAVEL_EX) && (bg0 & TILE_FLAG_UNSEEN))

[7.399]

[5.3514]

    if ((bg0 & TILE_FLAG_TRAV_EXCL) && (bg0 & TILE_FLAG_UNSEEN))

Insertion in crawl-ref/source/tile2.cc at line 755 [3.13289]

[4.4850]

[8.2740]

                        NULL);
    }
    else if ((bg0 & TILE_FLAG_EXCL_CTR) && (bg0 & TILE_FLAG_UNSEEN))
    {
        _tcache_overlay(tcache_image, ix, TILE_TRAVEL_EXCL_CENTRE, &c,

Deletion in crawl-ref/source/tile1.cc at line 3666 [3.96318]
B:BD[3.199432] → [3.199432:199438]
```
    {
```

Replacement in crawl-ref/source/tile1.cc at line 3680 [3.96318]

B:BD[9.462] → [9.462:532]

                bool door_left = (x > 0 && grd[x-1][y] == grd[x][y]);

[9.462]

[9.532]

                bool door_left  = (x > 0 && grd[x-1][y] == grd[x][y]);

Replacement in crawl-ref/source/tile1.cc at line 3693 [3.96318]

B:BD[9.1178] → [9.1178:1254]

                    // NOTE: this requires that closed gates and open gates

[9.1178]

[9.1254]

                    // NOTE: This requires that closed gates and open gates

Replacement in crawl-ref/source/tile1.cc at line 3707 [3.96318]

B:BD[3.199917] → [3.199917:199988]

                int left_grd = (x > 0) ? grd[x-1][y] : DNGN_ROCK_WALL;

[3.199917]

[3.199988]

                int left_grd  = (x > 0) ? grd[x-1][y] : DNGN_ROCK_WALL;

Replacement in crawl-ref/source/tile1.cc at line 3709 [3.96318]

B:BD[3.200066] → [3.200066:200212]

                int up_grd = (y > 0) ? grd[x][y-1] : DNGN_ROCK_WALL;
                int down_grd = (y < GYM - 1) ? grd[x][y+1] : DNGN_ROCK_WALL;

[3.200066]

[10.4170]

                int up_grd    = (y > 0) ? grd[x][y-1] : DNGN_ROCK_WALL;
                int down_grd  = (y < GYM - 1) ? grd[x][y+1] : DNGN_ROCK_WALL;

Insertion in crawl-ref/source/tile1.cc at line 3791 [3.96318]
[3.203678]
[3.203678]
```
                    {
```
Insertion in crawl-ref/source/tile1.cc at line 3794 [3.96318]
[3.203799]
[3.203799]
```
                    }
```
Insertion in crawl-ref/source/tile1.cc at line 3796 [3.96318]
[3.203835]
[3.203835]
```
                    {
```
Insertion in crawl-ref/source/tile1.cc at line 3799 [3.96318]
[3.203956]
[3.203956]
```
                    }
```
Insertion in crawl-ref/source/tile1.cc at line 3812 [3.96318]
[3.204493]
[3.204493]
```
                    {
```
Insertion in crawl-ref/source/tile1.cc at line 3815 [3.96318]
[3.204614]
[3.204614]
```
                    }
```
Insertion in crawl-ref/source/tile1.cc at line 3817 [3.96318]
[3.204650]
[3.204650]
```
                    {
```
Insertion in crawl-ref/source/tile1.cc at line 3820 [3.96318]
[3.204771]
[3.204771]
```
                    }
```
Deletion in crawl-ref/source/tile1.cc at line 3874 [3.96318]
B:BD[3.206914] → [3.206914:206920]
```
    }
```

Replacement in crawl-ref/source/tile1.cc at line 3902 [3.96318]

∅:D[11.1807] → [3.207647:207893]

B:BD[3.207647] → [3.207647:207893]

            if (env.tile_flavor[x][y].special != SPECIAL_N &&
                env.tile_flavor[x][y].special != SPECIAL_S &&
                env.tile_flavor[x][y].special != SPECIAL_E &&
                env.tile_flavor[x][y].special != SPECIAL_W)

[11.1807]

[3.207893]

            if (env.tile_flavor[x][y].special != SPECIAL_N
                && env.tile_flavor[x][y].special != SPECIAL_S
                && env.tile_flavor[x][y].special != SPECIAL_E
                && env.tile_flavor[x][y].special != SPECIAL_W)

Replacement in crawl-ref/source/tile1.cc at line 3910 [3.96318]

B:BD[3.207948] → [3.207948:208165]

            int right_flavor = x < GXM - 1 ? env.tile_flavor[x+1][y].special :
                SPECIAL_FULL;
            int down_flavor = y < GYM - 1 ? env.tile_flavor[x][y+1].special :
                SPECIAL_FULL;

[3.207948]

[3.208165]

            int right_flavor = x < GXM - 1 ? env.tile_flavor[x+1][y].special
                                           : SPECIAL_FULL;
            int down_flavor  = y < GYM - 1 ? env.tile_flavor[x][y+1].special
                                           : SPECIAL_FULL;

Insertion in crawl-ref/source/tile1.cc at line 4245 [3.96318]
[12.396]
[12.396]

Replacement in crawl-ref/source/tile1.cc at line 4248 [3.96318]

B:BD[12.443] → [12.443:498]

                tileb[count+1] |= TILE_FLAG_TRAVEL_EX;

[12.443]

[12.498]

                if (is_exclude_root(gc))
                    tileb[count+1] |= TILE_FLAG_EXCL_CTR;
                else
                    tileb[count+1] |= TILE_FLAG_TRAV_EXCL;

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 45 [3.4951691]

[6.8674]

[3.4952499]

dc-misc/blood_red1 BLOOD1
dc-misc/blood_red2 BLOOD2
dc-misc/blood_red3 BLOOD3
dc-misc/blood_red4 BLOOD4

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 82 [3.4951691]
[5.6594]
[13.24725]
```
travel_exclusion_centre TRAVEL_EXCL_CENTRE
```
File addition: travel_exclusion_centre.bmp (----------)
[3.4955259]
File addition: blood_red4.bmp (----------)
[3.4955259]
File addition: blood_red3.bmp (----------)
[3.4955259]
File addition: blood_red2.bmp (----------)
[3.4955259]
File addition: blood_red1.bmp (----------)
[3.4955259]

Add a few new tiles, one the exclusion centre (I can't be the only one

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tiles.h at line 164 [3.7013]

Replacement in crawl-ref/source/tile2.cc at line 420 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 424 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 441 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 446 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 449 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 454 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 458 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 461 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 466 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 660 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 673 [3.13289]

Insertion in crawl-ref/source/tile2.cc at line 675 [3.13289]

Replacement in crawl-ref/source/tile2.cc at line 752 [3.13289]

Insertion in crawl-ref/source/tile2.cc at line 755 [3.13289]

Deletion in crawl-ref/source/tile1.cc at line 3666 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3680 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3693 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3707 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3709 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3791 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3794 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3796 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3799 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3812 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3815 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3817 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 3820 [3.96318]

Deletion in crawl-ref/source/tile1.cc at line 3874 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3902 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3910 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 4245 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 4248 [3.96318]

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 45 [3.4951691]

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 82 [3.4951691]

File addition: travel_exclusion_centre.bmp (----------)

File addition: blood_red4.bmp (----------)

File addition: blood_red3.bmp (----------)

File addition: blood_red2.bmp (----------)

File addition: blood_red1.bmp (----------)