fiddlerwoaroof/crawl - Change UPUR43MXCLHJOHYGKGRA4XAGB4GXW4RNCGCDCB2MXJDV3DIEISIAC

Add tiles for disturbance in shallow water (only preliminary since you

can only recognize them if you're looking for them), and for closed shops. Move statue tiles into monster folder.

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

Created by j-p-e-g on December 7, 2008

UPUR43MXCLHJOHYGKGRA4XAGB4GXW4RNCGCDCB2MXJDV3DIEISIAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilesdl.cc at line 192 [7.19415]
[6.1302]
[6.1302]
```
    init_player_map();
```
Insertion in crawl-ref/source/tilepick.cc at line 2248 [8.96318]
[2.308]
[2.308]
```
    if (shop_is_closed(where))
        return TILE_SHOP_CLOSED;
```
Insertion in crawl-ref/source/tilepick.cc at line 2252 [8.96318]
[2.355]
[9.1067]
```
    if (!shop)
        return TILE_ERROR;
```
Insertion in crawl-ref/source/tilepick.cc at line 2323 [8.96318]
[10.1189]
[2.1258]
```
    {
        int t = TILE_DNGN_SHALLOW_WATER;
```

Replacement in crawl-ref/source/tilepick.cc at line 2328 [8.96318]

∅:D[2.1385] → [11.2755:2805]

B:BD[11.2755] → [11.2755:2805]

            return TILE_DNGN_SHALLOW_WATER_MURKY;

[2.1385]

[2.1386]

            t = TILE_DNGN_SHALLOW_WATER_MURKY;
        }
        if (mgrd[gx][gy] != NON_MONSTER)
        {
            monsters *mon = &menv[mgrd[gx][gy]];
            // Add disturbance to tile.
            if (mons_is_submerged(mon))
                t++;

Replacement in crawl-ref/source/tilepick.cc at line 2337 [8.96318]
∅:D[2.1396] → [10.1189:1229]
∅:D[11.2805] → [10.1189:1229]
B:BD[10.1189] → [10.1189:1229]
```
        return TILE_DNGN_SHALLOW_WATER;
```
[2.1396]
[12.3646]
```
        return (t);
    }
```
Replacement in crawl-ref/source/tilepick.cc at line 2652 [8.96318]
B:BD[4.1888] → [4.1888:1896]
```
    // 
```
[4.1888]
[8.158626]
```
    //
```
Insertion in crawl-ref/source/shopping.h at line 21 [14.758673]
[13.1429]
[13.1429]
```
bool shop_is_closed(const coord_def &where);
```

Insertion in crawl-ref/source/shopping.cc at line 1670 [14.759950]

[15.92]

[16.7150]

// Returns true if a shop is out of stock.
bool shop_is_closed(const coord_def &where)
{
    for (int i = 0; i < MAX_SHOPS; i++)
        if (env.shop[i].pos == where)
            return _shop_get_stock(i).empty();
    return (false);
}

Replacement in crawl-ref/source/shopping.cc at line 1715 [14.759950]
B:BD[14.798175] → [14.798175:798192]
```
    // find shop
```
[14.798175]
[17.195290]
```
    // Find shop.
```

Replacement in crawl-ref/source/shopping.cc at line 1718 [14.759950]

B:BD[14.798249] → [14.798249:798306]

B:BD[14.798306] → [18.36570:36615]

∅:D[19.14080] → [14.798374:798428]

∅:D[18.36615] → [14.798374:798428]

B:BD[14.798374] → [14.798374:798428]

        // find shop index plus a little bit of paranoia
        if (env.shop[shoppy].pos == where &&
            env.shop[shoppy].type != SHOP_UNASSIGNED)

[14.798249]

[14.798428]

        // Find shop index plus a little bit of paranoia.
        if (env.shop[shoppy].pos == where
            && env.shop[shoppy].type != SHOP_UNASSIGNED)

Replacement in crawl-ref/source/rltiles/dc-mon.txt at line 205 [8.4192854]

B:BD[3.5029] → [3.5029:5194]

%sdir dc-dngn
dngn_ice_statue ICE_STATUE /*'8'*/
dngn_silver_statue SILVER_STATUE /*'8'*/
dngn_orange_crystal_statue ORANGE_CRYSTAL_STATUE /*'8'*/
%sdir dc-mon

[3.5029]

[3.5194]

ice_statue ICE_STATUE /*'8'*/
silver_statue SILVER_STATUE /*'8'*/
orange_crystal_statue ORANGE_CRYSTAL_STATUE /*'8'*/

File move: dngn_silver_statue.png → silver_statue.png
BF:BFD[8.5069500] → [20.1242297:1242350]
BF:BF[20.1242350] → [20.1241605:1241605]
[8.4207328]
[20.1241605]
File move: dngn_orange_crystal_statue.png → orange_crystal_statue.png
BF:BFD[8.5069500] → [20.1246831:1246892]
BF:BF[20.1246892] → [20.1246135:1246135]
[8.4207328]
[20.1246135]
File move: dngn_ice_statue.png → ice_statue.png
BF:BFD[8.5069500] → [20.1248897:1248947]
BF:BF[20.1248947] → [20.1248200:1248200]
[8.4207328]
[20.1248200]
Deletion in crawl-ref/source/rltiles/dc-dngn.txt at line 318 [8.4169495]
B:BD[7.155827] → [7.155827:155875]
```
dngn_deep_water
dngn_deep_water
dngn_deep_water
```
Replacement in crawl-ref/source/rltiles/dc-dngn.txt at line 319 [8.4169495]
B:BD[7.155913] → [7.155913:155970]
```
dngn_shallow_water
dngn_shallow_water
dngn_shallow_water
```
[7.155913]
[11.7459]
```
dngn_shallow_water_disturbance DNGN_SHALLOW_WATER_DISTURBANCE
```
Deletion in crawl-ref/source/rltiles/dc-dngn.txt at line 321 [8.4169495]
B:BD[11.7503] → [11.7503:7569]
```
dngn_deep_water_murky
dngn_deep_water_murky
dngn_deep_water_murky
```

Replacement in crawl-ref/source/rltiles/dc-dngn.txt at line 322 [8.4169495]

B:BD[11.7619] → [11.7619:7694]

dngn_shallow_water_murky
dngn_shallow_water_murky
dngn_shallow_water_murky

[11.7619]

[7.155970]

dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 366 [8.4169495]
[7.157237]
[2.3355]
```
%sdir dc-dngn/shops
```

Replacement in crawl-ref/source/rltiles/dc-dngn.txt at line 370 [8.4169495]

B:BD[2.3421] → [2.3421:3696]

shops/shop_general SHOP_GENERAL
shops/shop_weapon SHOP_WEAPONS
shops/shop_armour SHOP_ARMOUR
shops/shop_food SHOP_FOOD
shops/shop_books SHOP_BOOKS
shops/shop_scrolls SHOP_SCROLLS
shops/shop_wands SHOP_WANDS
shops/shop_jewellery SHOP_JEWELLERY
shops/shop_potions SHOP_POTIONS

[2.3421]

[2.3696]

shop_general SHOP_GENERAL
shop_weapon SHOP_WEAPONS
shop_armour SHOP_ARMOUR
shop_food SHOP_FOOD
shop_books SHOP_BOOKS
shop_scrolls SHOP_SCROLLS
shop_wands SHOP_WANDS
shop_jewellery SHOP_JEWELLERY
shop_potions SHOP_POTIONS

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 381 [8.4169495]
[2.3717]
[2.3717]
```
dngn_enter_shop_closed SHOP_CLOSED
%sdir dc-dngn
```
File deletion: dngn_enter_shop.png
BF:BFD[8.5069500] → [20.1254173:1254223]
BF:BFD[20.1254223] → [20.1253079:1253079]
B:BD[20.1253079] → [20.1253080:1253088]
B:BD[20.1253088] → [2.10974:12332]
File addition: dngn_enter_shop_closed.png (----------)
[2.3826]
File addition: dngn_enter_shop.png (----------)
[2.3826]
File addition: dngn_shallow_water_murky_disturbance.png (----------)
[8.5069500]
File addition: dngn_shallow_water_disturbance.png (----------)
[8.5069500]
Replacement in crawl-ref/source/mon-data.h at line 2162 [14.1826214]
∅:D[5.5353] → [21.5460:5514]
B:BD[21.5460] → [21.5460:5514]
```
    1000, 10, MONS_HARPY, MONS_HARPY, MH_NATURAL, -3,
```
[5.5353]
[21.5514]
```
    1000, 12, MONS_HARPY, MONS_HARPY, MH_NATURAL, -3,
```

Replacement in crawl-ref/source/mon-data.h at line 2166 [14.1826214]

B:BD[21.5637] → [21.5637:5708]

    2, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SCREECH, I_ANIMAL,

[21.5637]

[21.5708]

    2, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SCREECH, I_NORMAL,

Add tiles for disturbance in shallow water (only preliminary since you

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilesdl.cc at line 192 [7.19415]

Insertion in crawl-ref/source/tilepick.cc at line 2248 [8.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2252 [8.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2323 [8.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2328 [8.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2337 [8.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2652 [8.96318]

Insertion in crawl-ref/source/shopping.h at line 21 [14.758673]

Insertion in crawl-ref/source/shopping.cc at line 1670 [14.759950]

Replacement in crawl-ref/source/shopping.cc at line 1715 [14.759950]

Replacement in crawl-ref/source/shopping.cc at line 1718 [14.759950]

Replacement in crawl-ref/source/rltiles/dc-mon.txt at line 205 [8.4192854]

File move: dngn_silver_statue.png → silver_statue.png

File move: dngn_orange_crystal_statue.png → orange_crystal_statue.png

File move: dngn_ice_statue.png → ice_statue.png

Deletion in crawl-ref/source/rltiles/dc-dngn.txt at line 318 [8.4169495]

Replacement in crawl-ref/source/rltiles/dc-dngn.txt at line 319 [8.4169495]

Deletion in crawl-ref/source/rltiles/dc-dngn.txt at line 321 [8.4169495]

Replacement in crawl-ref/source/rltiles/dc-dngn.txt at line 322 [8.4169495]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 366 [8.4169495]

Replacement in crawl-ref/source/rltiles/dc-dngn.txt at line 370 [8.4169495]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 381 [8.4169495]

File deletion: dngn_enter_shop.png

File addition: dngn_enter_shop_closed.png (----------)

File addition: dngn_enter_shop.png (----------)

File addition: dngn_shallow_water_murky_disturbance.png (----------)

File addition: dngn_shallow_water_disturbance.png (----------)

Replacement in crawl-ref/source/mon-data.h at line 2162 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2166 [14.1826214]