fiddlerwoaroof/crawl - Change F7X6HVUKHZXYURABYAZJHRYBV7UZTIPOWJMGCMDK26FQ66WGKFZAC

Adding deck type and subtype icons.

Improved yaktaur captain icon. Removing unused nethack misc item tiles. Better vampire tiles. Fixed rim logic when composing tiles for tilesheet.

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

Created by ennewalker on January 5, 2008

F7X6HVUKHZXYURABYAZJHRYBV7UZTIPOWJMGCMDK26FQ66WGKFZAC

Dependencies

[2] 25CH7HH4LKXFIZ75YNMXS3TSXO6O27DYSOPLOD45K4OCNFWLS4LQC

In channels

main

Change contents

Insertion in crawl-ref/source/tile1.cc at line 5 [2.96318]
[2.96375]
[2.96375]
```
#include "decks.h"
```
Replacement in crawl-ref/source/tile1.cc at line 1057 [2.96318]
B:BD[2.141328] → [2.141328:141355]
```
int tileidx_misc(int type)
```
[2.141328]
[2.141355]
```
int tileidx_misc(const item_def &item)
```

Replacement in crawl-ref/source/tile1.cc at line 1059 [2.96318]

B:BD[2.141357] → [2.141357:142305]

  int ch = TILE_ERROR;
  switch(type)
  {
    case MISC_BOTTLED_EFREET: ch = TILE_MISC_BOTTLED_EFREET; break;
    case MISC_CRYSTAL_BALL_OF_SEEING: ch = TILE_MISC_CRYSTAL_BALL_OF_SEEING; break;
    case MISC_AIR_ELEMENTAL_FAN: ch = TILE_MISC_AIR_ELEMENTAL_FAN; break;
    case MISC_LAMP_OF_FIRE: ch = TILE_MISC_LAMP_OF_FIRE; break;
    case MISC_STONE_OF_EARTH_ELEMENTALS: ch = TILE_MISC_STONE_OF_EARTH_ELEMENTALS; break;
    case MISC_LANTERN_OF_SHADOWS: ch = TILE_MISC_LANTERN_OF_SHADOWS; break;
    case MISC_HORN_OF_GERYON: ch = TILE_MISC_HORN_OF_GERYON; break;
    case MISC_BOX_OF_BEASTS: ch = TILE_MISC_BOX_OF_BEASTS; break;
    case MISC_CRYSTAL_BALL_OF_ENERGY: ch = TILE_MISC_CRYSTAL_BALL_OF_ENERGY; break;
    case MISC_EMPTY_EBONY_CASKET: ch = TILE_MISC_EMPTY_EBONY_CASKET; break;
    case MISC_CRYSTAL_BALL_OF_FIXATION: ch = TILE_MISC_CRYSTAL_BALL_OF_FIXATION; break;
    case MISC_DISC_OF_STORMS: ch = TILE_MISC_DISC_OF_STORMS; break;

[2.141357]

[2.142305]

    int ch;
    switch(item.sub_type)
    {
    case MISC_BOTTLED_EFREET:
        ch = TILE_MISC_BOTTLED_EFREET;
        break;
    case MISC_CRYSTAL_BALL_OF_SEEING:
        ch = TILE_MISC_CRYSTAL_BALL_OF_SEEING;
        break;
    case MISC_AIR_ELEMENTAL_FAN:
        ch = TILE_MISC_AIR_ELEMENTAL_FAN;
        break;
    case MISC_LAMP_OF_FIRE:
        ch = TILE_MISC_LAMP_OF_FIRE;
        break;
    case MISC_STONE_OF_EARTH_ELEMENTALS:
        ch = TILE_MISC_STONE_OF_EARTH_ELEMENTALS;
        break;
    case MISC_LANTERN_OF_SHADOWS:
        ch = TILE_MISC_LANTERN_OF_SHADOWS;
        break;
    case MISC_HORN_OF_GERYON:
        ch = TILE_MISC_HORN_OF_GERYON;
        break;
    case MISC_BOX_OF_BEASTS:
        ch = TILE_MISC_BOX_OF_BEASTS;
        break;
    case MISC_CRYSTAL_BALL_OF_ENERGY:
        ch = TILE_MISC_CRYSTAL_BALL_OF_ENERGY;
        break;
    case MISC_EMPTY_EBONY_CASKET:
        ch = TILE_MISC_EMPTY_EBONY_CASKET;
        break;
    case MISC_CRYSTAL_BALL_OF_FIXATION:
        ch = TILE_MISC_CRYSTAL_BALL_OF_FIXATION;
        break;
    case MISC_DISC_OF_STORMS:
        ch = TILE_MISC_DISC_OF_STORMS;
        break;

Replacement in crawl-ref/source/tile1.cc at line 1099 [2.96318]

B:BD[2.142306] → [2.142306:142944]

    case MISC_DECK_OF_ESCAPE: ch = TILE_MISC_DECK_OF_WONDERS; break;
    case MISC_DECK_OF_DESTRUCTION: ch = TILE_MISC_DECK_OF_WONDERS; break;
    case MISC_DECK_OF_DUNGEONS: ch = TILE_MISC_DECK_OF_WONDERS; break;
    case MISC_DECK_OF_SUMMONING: ch = TILE_MISC_DECK_OF_SUMMONINGS; break;
    case MISC_DECK_OF_WONDERS: ch = TILE_MISC_DECK_OF_WONDERS; break;
    case MISC_DECK_OF_PUNISHMENT: ch = TILE_MISC_DECK_OF_WONDERS; break;
    case MISC_DECK_OF_WAR: ch = TILE_MISC_DECK_OF_WONDERS; break;
    case MISC_DECK_OF_CHANGES: ch = TILE_MISC_DECK_OF_WONDERS; break;
    case MISC_DECK_OF_DEFENSE: ch = TILE_MISC_DECK_OF_WONDERS; break;

[2.142306]

[2.142944]

    case MISC_DECK_OF_ESCAPE:
    case MISC_DECK_OF_DESTRUCTION:
    case MISC_DECK_OF_DUNGEONS:
    case MISC_DECK_OF_SUMMONING:
    case MISC_DECK_OF_WONDERS:
    case MISC_DECK_OF_PUNISHMENT:
    case MISC_DECK_OF_WAR:
    case MISC_DECK_OF_CHANGES:
    case MISC_DECK_OF_DEFENSE:
        switch (item.special)
        {
        case DECK_RARITY_LEGENDARY:
            ch = TILE_MISC_DECK_LEGENDARY;
            break;
        case DECK_RARITY_RARE:
            ch = TILE_MISC_DECK_RARE;
            break;
        case DECK_RARITY_COMMON:
        default:
            ch = TILE_MISC_DECK;
            break;
        }
        if (item.flags & ISFLAG_KNOW_TYPE)
        {
            // NOTE: order of tiles must be identical to order of decks.
            int offset = item.sub_type - MISC_DECK_OF_ESCAPE + 1;
            ch += offset;
        }
        break;

Replacement in crawl-ref/source/tile1.cc at line 1129 [2.96318]

B:BD[2.142945] → [2.142945:143024]

    case MISC_RUNE_OF_ZOT: ch = TILE_MISC_RUNE_OF_ZOT; break;
  }
  return ch;

[2.142945]

[2.143024]

    case MISC_RUNE_OF_ZOT:
        ch = TILE_MISC_RUNE_OF_ZOT;
        break;
    default:
        ch = TILE_ERROR;
        break;
    }
    return ch;

Replacement in crawl-ref/source/tile1.cc at line 1151 [2.96318]

B:BD[2.143301] → [2.143301:143356]

	case OBJ_WEAPONS:
        if(is_fixed_artefact(item))

[2.143301]

[2.143356]

    case OBJ_WEAPONS:
        if (is_fixed_artefact(item))

Replacement in crawl-ref/source/tile1.cc at line 1154 [2.96318]

B:BD[2.143409] → [2.143409:143464]

        else
        if (is_unrandom_artefact( item ))

[2.143409]

[2.143464]

        else if (is_unrandom_artefact( item ))

Deletion in crawl-ref/source/tile1.cc at line 1158 [2.96318]
B:BD[2.143590] → [2.143590:143598]
```
	break;
```
Replacement in crawl-ref/source/tile1.cc at line 1160 [2.96318]
B:BD[2.143619] → [2.143619:143658]
```
	return tileidx_missile(item);
	break;
```
[2.143619]
[2.143658]
```
        return tileidx_missile(item);
```
Replacement in crawl-ref/source/tile1.cc at line 1162 [2.96318]
B:BD[2.143659] → [2.143659:143684]
```
        case OBJ_ARMOUR:
```
[2.143659]
[2.143684]
```
    case OBJ_ARMOUR:
```
Deletion in crawl-ref/source/tile1.cc at line 1167 [2.96318]
B:BD[2.143852] → [2.143852:143860]
```
	break;
```
Replacement in crawl-ref/source/tile1.cc at line 1168 [2.96318]
B:BD[2.143861] → [2.143861:143901]
```
        case OBJ_WANDS:
#if 1 //ID Item
```
[2.143861]
[2.143901]
```
    case OBJ_WANDS:
```
Deletion in crawl-ref/source/tile1.cc at line 1173 [2.96318]
B:BD[2.144061] → [2.144061:144068]
```
#endif
```
Deletion in crawl-ref/source/tile1.cc at line 1174 [2.96318]
B:BD[2.144121] → [2.144121:144129]
```
	break;
```
Replacement in crawl-ref/source/tile1.cc at line 1176 [2.96318]
B:BD[2.144146] → [2.144146:144182]
```
	return tileidx_food(item);
	break;
```
[2.144146]
[2.144182]
```
        return tileidx_food(item);
```
Replacement in crawl-ref/source/tile1.cc at line 1178 [2.96318]
B:BD[2.144183] → [2.144183:144225]
```
        case OBJ_SCROLLS:
#if 1 //ID Item
```
[2.144183]
[2.144225]
```
    case OBJ_SCROLLS:
```
Deletion in crawl-ref/source/tile1.cc at line 1182 [2.96318]
B:BD[2.144376] → [2.144376:144383]
```
#endif
```
Deletion in crawl-ref/source/tile1.cc at line 1183 [2.96318]
B:BD[2.144411] → [2.144411:144419]
```
	break;
```
Replacement in crawl-ref/source/tile1.cc at line 1184 [2.96318]
B:BD[2.144420] → [2.144420:144470]
```
        case OBJ_GOLD:
	return TILE_GOLD;
	break;
```
[2.144420]
[2.144470]
```
    case OBJ_GOLD:
        return TILE_GOLD;
```
Replacement in crawl-ref/source/tile1.cc at line 1187 [2.96318]
B:BD[2.144471] → [2.144471:144499]
```
        case OBJ_JEWELLERY:
```
[2.144471]
[2.144499]
```
    case OBJ_JEWELLERY:
```

Replacement in crawl-ref/source/tile1.cc at line 1190 [2.96318]

B:BD[2.144529] → [2.144529:145042]

        { // rings
           if(is_random_artefact( item ))
	       return TILE_RING_RANDOM_OFFSET + color - 1;
           else 
	       return TILE_RING_NORMAL_OFFSET + special % 13;
        } else { // amu
        if (is_unrandom_artefact( item ))
            return tileidx_unrand_artifact(find_unrandart_index(item));
        else
           if(is_random_artefact( item ))
               return TILE_AMU_RANDOM_OFFSET + color - 1;
           else
               return TILE_AMU_NORMAL_OFFSET + special % 13;

[2.144529]

[2.145042]

        {
            if(is_random_artefact( item ))
                return TILE_RING_RANDOM_OFFSET + color - 1;
            else 
                return TILE_RING_NORMAL_OFFSET + special % 13;
        } else {
            if (is_unrandom_artefact( item ))
                return tileidx_unrand_artifact(find_unrandart_index(item));
            else if(is_random_artefact( item ))
                return TILE_AMU_RANDOM_OFFSET + color - 1;
            else
                return TILE_AMU_NORMAL_OFFSET + special % 13;

Deletion in crawl-ref/source/tile1.cc at line 1203 [2.96318]
B:BD[2.145053] → [2.145053:145061]
```
	break;
```
Replacement in crawl-ref/source/tile1.cc at line 1204 [2.96318]
B:BD[2.145062] → [2.145062:145088]
```
        case OBJ_POTIONS:
```
[2.145062]
[2.145088]
```
    case OBJ_POTIONS:
```

Replacement in crawl-ref/source/tile1.cc at line 1207 [2.96318]

B:BD[2.145193] → [2.145193:145308]

         return TILE_POT_HEALING + type;
         else
         return TILE_POTION_OFFSET + special % 14;
	 break;

[2.145193]

[2.145308]

        {
            return TILE_POT_HEALING + type;
        }
        else
        {
            return TILE_POTION_OFFSET + special % 14;
        }

Replacement in crawl-ref/source/tile1.cc at line 1215 [2.96318]
B:BD[2.145309] → [2.145309:145333]
```
        case OBJ_BOOKS:
```
[2.145309]
[2.145333]
```
    case OBJ_BOOKS:
```

Replacement in crawl-ref/source/tile1.cc at line 1217 [2.96318]

B:BD[2.145361] → [2.145361:145603]

        if(type<2) return TILE_BOOK_PAPER_OFFSET + color;
        if(type==2) return TILE_BOOK_LEATHER_OFFSET + special/10;
        if(type==3) return TILE_BOOK_METAL_OFFSET + special/10;
        if(type==4) return TILE_BOOK_PAPYRUS;
	break;

[2.145361]

[2.145603]

        if(type<2)
            return TILE_BOOK_PAPER_OFFSET + color;
        if(type==2)
            return TILE_BOOK_LEATHER_OFFSET + special/10;
        if(type==3)
            return TILE_BOOK_METAL_OFFSET + special/10;
        if(type==4)
            return TILE_BOOK_PAPYRUS;

Replacement in crawl-ref/source/tile1.cc at line 1226 [2.96318]

B:BD[2.145604] → [2.145604:145679]

        case OBJ_STAVES:
	return TILE_STAFF_OFFSET + special % 10;
	break;

[2.145604]

[2.145679]

    case OBJ_STAVES:
        return TILE_STAFF_OFFSET + special % 10;

Replacement in crawl-ref/source/tile1.cc at line 1229 [2.96318]
B:BD[2.145680] → [2.145680:145706]
```
        case OBJ_CORPSES:
```
[2.145680]
[2.145706]
```
    case OBJ_CORPSES:
```
Deletion in crawl-ref/source/tile1.cc at line 1234 [2.96318]
B:BD[2.145846] → [2.145846:145854]
```
	break;
```
Replacement in crawl-ref/source/tile1.cc at line 1235 [2.96318]
B:BD[2.145855] → [2.145855:145904]
```
        case OBJ_ORBS:
	return TILE_ORB;
	break;
```
[2.145855]
[2.145904]
```
    case OBJ_ORBS:
        return TILE_ORB;
```

Replacement in crawl-ref/source/tile1.cc at line 1238 [2.96318]

B:BD[2.145905] → [2.145905:145970]

        case OBJ_MISCELLANY:
	return tileidx_misc(type);
	break;

[2.145905]

[2.145970]

    case OBJ_MISCELLANY:
        return tileidx_misc(item);

Replacement in crawl-ref/source/tile1.cc at line 1241 [2.96318]
B:BD[2.145971] → [2.145971:145996]
```
        default:
	break;
```
[2.145971]
[2.145996]
```
    default:
        return TILE_ERROR;
```
Deletion in crawl-ref/source/tile1.cc at line 1244 [2.96318]
B:BD[2.146002] → [2.146002:146025]
```
    return TILE_ERROR;
```
Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 98 [2.521298]
B:BD[2.523366] → [2.523366:523383]
```
void make_rim(){
```
[2.523366]
[2.523383]
```
void make_rim(unsigned char buf[3][TILEX*TILEY]){
```
Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 112 [2.521298]
B:BD[2.523646] → [2.523646:523691]
```
          for(c=0;c<3;c++)dd[c]=dbuf[c][ad];
```
[2.523646]
[2.523691]
```
          for(c=0;c<3;c++)dd[c]=buf[c][ad];
```

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 147 [2.521298]

B:BD[2.524860] → [2.524860:524934]

                    dbuf[0][x+y*32]=dbuf[1][x+y*32]=dbuf[2][x+y*32]=0x10;

[2.524860]

[2.524934]

                    buf[0][x+y*32]=buf[1][x+y*32]=buf[2][x+y*32]=0x10;

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 255 [2.521298]
B:BD[2.527559] → [2.527559:527581]
```
if(rim==1)make_rim();
```
[2.527559]
[2.527581]
```
if(rim==1)make_rim(dbuf);
```
Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 445 [2.521298]
[2.532684]
[2.532684]
```
            unsigned char tempbuf[3][TILEX * TILEY];
```

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 451 [2.521298]

[2.532840]

            }
            // Copy into a temporary buffer so that we can use the rim func.
            for(i=0;i<TILEX*TILEY;i++)
            {
                tempbuf[0][i] = tbuf[0][i];
                tempbuf[1][i] = tbuf[1][i];
                tempbuf[2][i] = tbuf[2][i];

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 460 [2.521298]
[2.532854]
[2.532854]
```
            if (rim == 1)
                make_rim(tempbuf);
```

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 465 [2.521298]

B:BD[2.532901] → [2.532901:533031]

                if (tbuf[0][i] != bkg[0] ||
                    tbuf[1][i] != bkg[1] ||
                    tbuf[2][i] != bkg[2])

[2.532901]

[2.533031]

                if (tempbuf[0][i] != bkg[0] ||
                    tempbuf[1][i] != bkg[1] ||
                    tempbuf[2][i] != bkg[2])

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 469 [2.521298]

B:BD[2.533049] → [2.533049:533184]

                    cbuf[0][i] = tbuf[0][i];
                    cbuf[1][i] = tbuf[1][i];
                    cbuf[2][i] = tbuf[2][i];

[2.533049]

[2.533184]

                    cbuf[0][i] = tempbuf[0][i];
                    cbuf[1][i] = tempbuf[1][i];
                    cbuf[2][i] = tempbuf[2][i];

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 503 [2.521298]

[2.533868]


            // Rim has already been applied during composing, so turn it off
            // temporarily.
            int storerim = rim;
            rim = 0;

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 509 [2.521298]
[2.533895]
[2.533895]
```
            rim = storerim;
```
Replacement in crawl-ref/source/rltiles/player/base/vampire_m.bmp at line 1 [2.1846297]
B:BD[2.1846297] → [2.1846298:1848400]
[2.1846297]
Replacement in crawl-ref/source/rltiles/player/base/vampire_f.bmp at line 1 [2.1848447]
B:BD[2.1848447] → [2.1848448:1850550]
[2.1848447]
File deletion: whistle.bmp
BF:BFD[2.2927859] → [2.2929981:2930023]
BF:BFD[2.2930023] → [2.2927877:2927877]
B:BD[2.2927877] → [2.2927878:2929980]
File deletion: wax_candle.bmp
BF:BFD[2.2927859] → [2.2932129:2932174]
BF:BFD[2.2932174] → [2.2930025:2930025]
B:BD[2.2930025] → [2.2930026:2932128]
File deletion: unicorn_horn.bmp
BF:BFD[2.2927859] → [2.2934280:2934327]
BF:BFD[2.2934327] → [2.2932176:2932176]
B:BD[2.2932176] → [2.2932177:2934279]
File deletion: towel.bmp
BF:BFD[2.2927859] → [2.2936433:2936473]
BF:BFD[2.2936473] → [2.2934329:2934329]
B:BD[2.2934329] → [2.2934330:2936432]
File deletion: tinning_kit.bmp
BF:BFD[2.2927859] → [2.2938579:2938625]
BF:BFD[2.2938625] → [2.2936475:2936475]
B:BD[2.2936475] → [2.2936476:2938578]
File deletion: tin_opener.bmp
BF:BFD[2.2927859] → [2.2940731:2940776]
BF:BFD[2.2940776] → [2.2938627:2938627]
B:BD[2.2938627] → [2.2938628:2940730]
File deletion: tallow_candle.bmp
BF:BFD[2.2927859] → [2.2942882:2942930]
BF:BFD[2.2942930] → [2.2940778:2940778]
B:BD[2.2940778] → [2.2940779:2942881]
File deletion: stethoscope.bmp
BF:BFD[2.2927859] → [2.2945036:2945082]
BF:BFD[2.2945082] → [2.2942932:2942932]
B:BD[2.2942932] → [2.2942933:2945035]
File deletion: statue.bmp
BF:BFD[2.2927859] → [2.2947188:2947229]
BF:BFD[2.2947229] → [2.2945084:2945084]
B:BD[2.2945084] → [2.2945085:2947187]
File deletion: skeleton_key.bmp
BF:BFD[2.2927859] → [2.2949335:2949382]
BF:BFD[2.2949382] → [2.2947231:2947231]
B:BD[2.2947231] → [2.2947232:2949334]
File deletion: saddle.bmp
BF:BFD[2.2927859] → [2.2951488:2951529]
BF:BFD[2.2951529] → [2.2949384:2949384]
B:BD[2.2949384] → [2.2949385:2951487]
File deletion: sack.bmp
BF:BFD[2.2927859] → [2.2953635:2953674]
BF:BFD[2.2953674] → [2.2951531:2951531]
B:BD[2.2951531] → [2.2951532:2953634]
File deletion: pick_axe.bmp
BF:BFD[2.2927859] → [2.2955781:2955824]
BF:BFD[2.2955824] → [2.2953676:2953676]
B:BD[2.2953676] → [2.2953677:2955780]
File deletion: mirror.bmp
BF:BFD[2.2927859] → [2.2988037:2988078]
BF:BFD[2.2988078] → [2.2985933:2985933]
B:BD[2.2985933] → [2.2985934:2988036]
File deletion: magic_marker.bmp
BF:BFD[2.2927859] → [2.2990184:2990231]
BF:BFD[2.2990231] → [2.2988080:2988080]
B:BD[2.2988080] → [2.2988081:2990183]
File deletion: lock_pick.bmp
BF:BFD[2.2927859] → [2.2992337:2992381]
BF:BFD[2.2992381] → [2.2990233:2990233]
B:BD[2.2990233] → [2.2990234:2992336]
File deletion: lenses.bmp
BF:BFD[2.2927859] → [2.2994487:2994528]
BF:BFD[2.2994528] → [2.2992383:2992383]
B:BD[2.2992383] → [2.2992384:2994486]
File deletion: leash.bmp
BF:BFD[2.2927859] → [2.2996634:2996674]
BF:BFD[2.2996674] → [2.2994530:2994530]
B:BD[2.2994530] → [2.2994531:2996633]
File deletion: large_box.bmp
BF:BFD[2.2927859] → [2.2998780:2998824]
BF:BFD[2.2998824] → [2.2996676:2996676]
B:BD[2.2996676] → [2.2996677:2998779]
File deletion: land_mine.bmp
BF:BFD[2.2927859] → [2.3000930:3000974]
BF:BFD[2.3000974] → [2.2998826:2998826]
B:BD[2.2998826] → [2.2998827:3000929]
File deletion: lamp.bmp
BF:BFD[2.2927859] → [2.3003080:3003119]
BF:BFD[2.3003119] → [2.3000976:3000976]
B:BD[2.3000976] → [2.3000977:3003079]
File deletion: iron_chain.bmp
BF:BFD[2.2927859] → [2.3005225:3005270]
BF:BFD[2.3005270] → [2.3003121:3003121]
B:BD[2.3003121] → [2.3003122:3005224]
File deletion: ice_box.bmp
BF:BFD[2.2927859] → [2.3007376:3007418]
BF:BFD[2.3007418] → [2.3005272:3005272]
B:BD[2.3005272] → [2.3005273:3007375]
File deletion: horn.bmp
BF:BFD[2.2927859] → [2.3009524:3009563]
BF:BFD[2.3009563] → [2.3007420:3007420]
B:BD[2.3007420] → [2.3007421:3009523]
File deletion: heavy_iron_ball.bmp
BF:BFD[2.2927859] → [2.3011669:3011719]
BF:BFD[2.3011719] → [2.3009565:3009565]
B:BD[2.3009565] → [2.3009566:3011668]
File deletion: harp.bmp
BF:BFD[2.2927859] → [2.3013825:3013864]
BF:BFD[2.3013864] → [2.3011721:3011721]
B:BD[2.3011721] → [2.3011722:3013824]
File deletion: grappling_hook.bmp
BF:BFD[2.2927859] → [2.3015970:3016019]
BF:BFD[2.3016019] → [2.3013866:3013866]
B:BD[2.3013866] → [2.3013867:3015969]
File deletion: figurine.bmp
BF:BFD[2.2927859] → [2.3020271:3020314]
BF:BFD[2.3020314] → [2.3018167:3018167]
B:BD[2.3018167] → [2.3018168:3020270]
File deletion: expensive_camera.bmp
BF:BFD[2.2927859] → [2.3022421:3022472]
BF:BFD[2.3022472] → [2.3020316:3020316]
B:BD[2.3020316] → [2.3020317:3022420]
File deletion: drum.bmp
BF:BFD[2.2927859] → [2.3024578:3024617]
BF:BFD[2.3024617] → [2.3022474:3022474]
B:BD[2.3022474] → [2.3022475:3024577]
File deletion: crystal_ball.bmp
BF:BFD[2.2927859] → [2.3026723:3026770]
BF:BFD[2.3026770] → [2.3024619:3024619]
B:BD[2.3024619] → [2.3024620:3026722]
File deletion: credit_card.bmp
BF:BFD[2.2927859] → [2.3028876:3028922]
BF:BFD[2.3028922] → [2.3026772:3026772]
B:BD[2.3026772] → [2.3026773:3028875]
File deletion: chest.bmp
BF:BFD[2.2927859] → [2.3031028:3031068]
BF:BFD[2.3031068] → [2.3028924:3028924]
B:BD[2.3028924] → [2.3028925:3031027]
File deletion: candelabrum_of_invocation.bmp
BF:BFD[2.2927859] → [2.3033174:3033234]
BF:BFD[2.3033234] → [2.3031070:3031070]
B:BD[2.3031070] → [2.3031071:3033173]
File deletion: can_of_grease.bmp
BF:BFD[2.2927859] → [2.3035340:3035388]
BF:BFD[2.3035388] → [2.3033236:3033236]
B:BD[2.3033236] → [2.3033237:3035339]
File deletion: bugle.bmp
BF:BFD[2.2927859] → [2.3037494:3037534]
BF:BFD[2.3037534] → [2.3035390:3035390]
B:BD[2.3035390] → [2.3035391:3037493]
File deletion: brass_lantern.bmp
BF:BFD[2.2927859] → [2.3039640:3039688]
BF:BFD[2.3039688] → [2.3037536:3037536]
B:BD[2.3037536] → [2.3037537:3039639]
File deletion: blindfold.bmp
BF:BFD[2.2927859] → [2.3041794:3041838]
BF:BFD[2.3041838] → [2.3039690:3039690]
B:BD[2.3039690] → [2.3039691:3041793]
File deletion: bell.bmp
BF:BFD[2.2927859] → [2.3046100:3046139]
BF:BFD[2.3046139] → [2.3043996:3043996]
B:BD[2.3043996] → [2.3043997:3046099]
File deletion: beartrap.bmp
BF:BFD[2.2927859] → [2.3048245:3048288]
BF:BFD[2.3048288] → [2.3046141:3046141]
B:BD[2.3046141] → [2.3046142:3048244]
File move: bell_of_opening.bmp → misc_deck_rare.bmp
BF:BFD[2.2927859] → [2.3043944:3043994]
BF:BF[2.3043994] → [2.3041840:3041840]
[2.2927859]
[2.3041840]
Replacement in crawl-ref/source/rltiles/item/misc/misc_deck_rare.bmp at line 1 [2.3041840]
B:BD[2.3041840] → [2.3041841:3043943]
[2.3041840]
File move: flute.bmp → misc_deck_legendary.bmp
BF:BFD[2.2927859] → [2.3018125:3018165]
BF:BF[2.3018165] → [2.3016021:3016021]
[2.2927859]
[2.3016021]
Replacement in crawl-ref/source/rltiles/item/misc/misc_deck_legendary.bmp at line 1 [2.3016021]
B:BD[2.3016021] → [2.3016022:3018124]
[2.3016021]
Replacement in crawl-ref/source/rltiles/item/misc/misc_deck.bmp at line 1 [2.2973028]
B:BD[2.2973028] → [2.2973029:2975131]
[2.2973028]
File addition: i-deck_wonders.bmp (----------)
[2.2927859]
File addition: i-deck_war.bmp (----------)
[2.2927859]
File addition: i-deck_summoning.bmp (----------)
[2.2927859]
File addition: i-deck_punishment.bmp (----------)
[2.2927859]
File addition: i-deck_escape.bmp (----------)
[2.2927859]
File addition: i-deck_dungeons.bmp (----------)
[2.2927859]
File addition: i-deck_destruction.bmp (----------)
[2.2927859]
File addition: i-deck_defense.bmp (----------)
[2.2927859]
File addition: i-deck_changes.bmp (----------)
[2.2927859]
Replacement in crawl-ref/source/rltiles/dc-mon/yaktaur_captain.bmp at line 1 [2.4218108]
B:BD[2.4218108] → [2.4218109:4220211]
[2.4218108]

Replacement in crawl-ref/source/rltiles/dc-item.txt at line 582 [2.5044666]

B:BD[2.5064457] → [2.5064457:5064524]

misc_deck MISC_DECK_OF_WONDERS
misc_deck MISC_DECK_OF_SUMMONINGS

[2.5064457]

[2.5064524]

misc_deck MISC_DECK
%start
%compose misc_deck
%compose i-deck_escape
%finish
%start
%compose misc_deck
%compose i-deck_destruction
%finish
%start
%compose misc_deck
%compose i-deck_summoning
%finish
%start
%compose misc_deck
%compose i-deck_wonders
%finish
%start
%compose misc_deck
%compose i-deck_punishment
%finish
%start
%compose misc_deck
%compose i-deck_war
%finish
%start
%compose misc_deck
%compose i-deck_changes
%finish
%start
%compose misc_deck
%compose i-deck_defense
%finish
misc_deck_rare MISC_DECK_RARE
%start
%compose misc_deck_rare
%compose i-deck_escape
%finish
%start
%compose misc_deck_rare
%compose i-deck_destruction
%finish
%start
%compose misc_deck_rare
%compose i-deck_summoning
%finish
%start
%compose misc_deck_rare
%compose i-deck_wonders
%finish
%start
%compose misc_deck_rare
%compose i-deck_punishment
%finish
%start
%compose misc_deck_rare
%compose i-deck_war
%finish
%start
%compose misc_deck_rare
%compose i-deck_changes
%finish
%start
%compose misc_deck_rare
%compose i-deck_defense
%finish
misc_deck_legendary MISC_DECK_LEGENDARY
%start
%compose misc_deck_legendary
%compose i-deck_escape
%finish
%start
%compose misc_deck_legendary
%compose i-deck_destruction
%finish
%start
%compose misc_deck_legendary
%compose i-deck_summoning
%finish
%start
%compose misc_deck_legendary
%compose i-deck_wonders
%finish
%start
%compose misc_deck_legendary
%compose i-deck_punishment
%finish
%start
%compose misc_deck_legendary
%compose i-deck_war
%finish
%start
%compose misc_deck_legendary
%compose i-deck_changes
%finish
%start
%compose misc_deck_legendary
%compose i-deck_defense
%finish

Deletion in crawl-ref/source/rltiles/dc-item.txt at line 686 [2.5044666]
B:BD[2.5064703] → [2.5064703:5064764]
```
misc_deck MISC_DECK_OF_TRICKS
misc_deck MISC_DECK_OF_POWER
```

Adding deck type and subtype icons.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tile1.cc at line 5 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1057 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1059 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1099 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1129 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1151 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1154 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1158 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1160 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1162 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1167 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1168 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1173 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1174 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1176 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1178 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1182 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1183 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1184 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1187 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1190 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1203 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1204 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1207 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1215 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1217 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1226 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1229 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1234 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1235 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1238 [2.96318]

Replacement in crawl-ref/source/tile1.cc at line 1241 [2.96318]

Deletion in crawl-ref/source/tile1.cc at line 1244 [2.96318]

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 98 [2.521298]

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 112 [2.521298]

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 147 [2.521298]

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 255 [2.521298]

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 445 [2.521298]

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 451 [2.521298]

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 460 [2.521298]

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 465 [2.521298]

Replacement in crawl-ref/source/rltiles/tool/dctile.c at line 469 [2.521298]

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 503 [2.521298]

Insertion in crawl-ref/source/rltiles/tool/dctile.c at line 509 [2.521298]

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

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

File deletion: whistle.bmp

File deletion: wax_candle.bmp

File deletion: unicorn_horn.bmp

File deletion: towel.bmp

File deletion: tinning_kit.bmp

File deletion: tin_opener.bmp

File deletion: tallow_candle.bmp

File deletion: stethoscope.bmp

File deletion: statue.bmp

File deletion: skeleton_key.bmp

File deletion: saddle.bmp

File deletion: sack.bmp

File deletion: pick_axe.bmp

File deletion: mirror.bmp

File deletion: magic_marker.bmp

File deletion: lock_pick.bmp

File deletion: lenses.bmp

File deletion: leash.bmp

File deletion: large_box.bmp

File deletion: land_mine.bmp

File deletion: lamp.bmp

File deletion: iron_chain.bmp

File deletion: ice_box.bmp

File deletion: horn.bmp

File deletion: heavy_iron_ball.bmp

File deletion: harp.bmp

File deletion: grappling_hook.bmp

File deletion: figurine.bmp

File deletion: expensive_camera.bmp

File deletion: drum.bmp