fiddlerwoaroof/crawl - Change YP2ADVIVFDLAU4NYFG7BTHV6BMH7VPKUYQ6WVQF3Z725L3DSX7HAC

Adding merfolk monster tiles.

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

Created by ennewalker on January 11, 2008

YP2ADVIVFDLAU4NYFG7BTHV6BMH7VPKUYQ6WVQF3Z725L3DSX7HAC

Dependencies

In channels

main

Change contents

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

B:BD[3.97921] → [2.178:213]

    int mons = menv[mon_idx].type;

[3.97921]

[3.97977]

    const monsters* mon = &menv[mon_idx];
    int grid = grd[mon->x][mon->y];
    bool in_water = (grid == DNGN_SHALLOW_WATER || grid == DNGN_DEEP_WATER);

Replacement in crawl-ref/source/tile1.cc at line 62 [3.96318]
B:BD[3.97978] → [2.214:231]
```
    switch(mons)
```
[3.97978]
[2.231]
```
    switch (mon->type)
```
Deletion in crawl-ref/source/tile1.cc at line 160 [3.96318]
∅:D[2.3055] → [3.100479:100480]
B:BD[3.100479] → [3.100479:100480]

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

B:BD[2.3089] → [2.3089:3173]

    {
        // 7 different colours
        struct monsters *mon = &menv[mon_idx];

Deletion in crawl-ref/source/tile1.cc at line 162 [3.96318]
B:BD[2.3237] → [2.3237:3243]
∅:D[2.3243] → [3.100667:100668]
B:BD[3.100667] → [3.100667:100668]
```
    }
```
Deletion in crawl-ref/source/tile1.cc at line 192 [3.96318]
∅:D[2.4197] → [3.101516:101517]
B:BD[3.101516] → [3.101516:101517]

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

B:BD[2.4223] → [2.4223:4307]

    {
        // 7 different colours
        struct monsters *mon = &menv[mon_idx];

Deletion in crawl-ref/source/tile1.cc at line 194 [3.96318]
B:BD[2.4363] → [2.4363:4369]
∅:D[2.4369] → [3.101688:101689]
B:BD[3.101688] → [3.101688:101689]
```
    }
```
Deletion in crawl-ref/source/tile1.cc at line 260 [3.96318]
B:BD[3.103561] → [3.103561:103606]
```
      struct monsters *mon = &menv[mon_idx];
```
Deletion in crawl-ref/source/tile1.cc at line 705 [3.96318]
B:BD[3.116015] → [3.116015:116060]
```
      struct monsters *mon = &menv[mon_idx];
```

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

B:BD[2.22073] → [2.22073:22099]

        return TILE_TODO;

[2.22073]

[2.22099]

        if (in_water)
            return TILE_MONS_MERFOLK_FIGHTER_WATER;
        else
            return TILE_MONS_MERFOLK_FIGHTER;

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

B:BD[2.22122] → [2.22122:22148]

        return TILE_TODO;

[2.22122]

[2.22148]

        if (in_water)
            return TILE_MONS_MERMAID_WATER;
        else
            return TILE_MONS_MERMAID;

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

[3.141308]

  case MONS_MERMAID: ch=TILE_CORPSE_MERMAID; break;
  case MONS_MERFOLK: ch=TILE_CORPSE_MERFOLK_FIGHTER; break;

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

[3.216215]

            case TILE_MONS_MERMAID:
            case TILE_MONS_MERMAID_WATER:
            case TILE_MONS_MERFOLK_FIGHTER:
            case TILE_MONS_MERFOLK_FIGHTER_WATER:

Replacement in crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp at line 1 [3.1889280]
B:BD[3.1889280] → [3.1889281:1891383]
[3.1889280]
Replacement in crawl-ref/source/rltiles/player/base/merfolk_f.bmp at line 1 [3.1897888]
B:BD[3.1897888] → [3.1897889:1899991]
[3.1897888]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 495 [3.4192854]

[3.4207291]


merfolk_fighter MONS_MERFOLK_FIGHTER
merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER
mermaid MONS_MERMAID
mermaid_water MONS_MERMAID_WATER

File addition: mermaid_water.bmp (----------)
[3.4207328]
File move: merfolk_fs.bmp → mermaid.bmp
BF:BFD[3.1846279] → [3.1897841:1897886]
BF:BF[3.1897886] → [3.1895737:1895737]
[3.4207328]
[3.1895737]
Replacement in crawl-ref/source/rltiles/dc-mon/mermaid.bmp at line 1 [3.1895737]
B:BD[3.1895737] → [3.1895738:1897840]
[3.1895737]
File addition: merfolk_fighter_water.bmp (----------)
[3.4207328]
File move: merfolk_ms.bmp → merfolk_fighter.bmp
BF:BFD[3.1846279] → [3.1893540:1893585]
BF:BF[3.1893585] → [3.1891436:1891436]
[3.4207328]
[3.1891436]
Replacement in crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp at line 1 [3.1891436]
B:BD[3.1891436] → [3.1891437:1893539]
[3.1891436]

Insertion in crawl-ref/source/rltiles/dc-co.txt at line 257 [3.5647738]

[3.5654905]

%sdir dc-mon
%back dc-misc/blood_red
mermaid_water CORPSE_MERMAID
merfolk_fighter_water CORPSE_MERFOLK_FIGHTER

Adding merfolk monster tiles.

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/rltiles/player/base/merfolk_water_f.bmp at line 1 [3.1889280]

Replacement in crawl-ref/source/rltiles/player/base/merfolk_f.bmp at line 1 [3.1897888]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 495 [3.4192854]

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

File move: merfolk_fs.bmp → mermaid.bmp

Replacement in crawl-ref/source/rltiles/dc-mon/mermaid.bmp at line 1 [3.1895737]

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

File move: merfolk_ms.bmp → merfolk_fighter.bmp

Replacement in crawl-ref/source/rltiles/dc-mon/merfolk_fighter.bmp at line 1 [3.1891436]

Insertion in crawl-ref/source/rltiles/dc-co.txt at line 257 [3.5647738]