diff options
author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-05 17:17:54 +0000 |
---|---|---|
committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-05 17:17:54 +0000 |
commit | d3b7fd1f062b31f65e5a933efbf2f18f1e91dce0 (patch) | |
tree | 93db1223d8d92401cdca8cc7e1c22165b368f43d | |
parent | da4adcc1d6c955a34a6ac09b9e05c39dd967955c (diff) | |
download | crawl-ref-d3b7fd1f062b31f65e5a933efbf2f18f1e91dce0.tar.gz crawl-ref-d3b7fd1f062b31f65e5a933efbf2f18f1e91dce0.zip |
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
58 files changed, 260 insertions, 108 deletions
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index f4d45ea915..d4ecf72c59 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -579,15 +579,110 @@ misc_stone MISC_STONE_OF_EARTH_ELEMENTALS misc_lantern MISC_LANTERN_OF_SHADOWS
misc_horn MISC_HORN_OF_GERYON
misc_box MISC_BOX_OF_BEASTS
-misc_deck MISC_DECK_OF_WONDERS
-misc_deck MISC_DECK_OF_SUMMONINGS
+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
misc_crystal MISC_CRYSTAL_BALL_OF_ENERGY
misc_box MISC_EMPTY_EBONY_CASKET
misc_crystal MISC_CRYSTAL_BALL_OF_FIXATION
misc_disc MISC_DISC_OF_STORMS
misc_rune MISC_RUNE_OF_ZOT
-misc_deck MISC_DECK_OF_TRICKS
-misc_deck MISC_DECK_OF_POWER
misc_altar MISC_PORTABLE_ALTAR_OF_NEMELEX
#OBJ_CORPSES
diff --git a/crawl-ref/source/rltiles/dc-mon/yaktaur_captain.bmp b/crawl-ref/source/rltiles/dc-mon/yaktaur_captain.bmp Binary files differindex 5cc690800a..454347ae28 100644 --- a/crawl-ref/source/rltiles/dc-mon/yaktaur_captain.bmp +++ b/crawl-ref/source/rltiles/dc-mon/yaktaur_captain.bmp diff --git a/crawl-ref/source/rltiles/item/misc/bell.bmp b/crawl-ref/source/rltiles/item/misc/bell.bmp Binary files differdeleted file mode 100644 index 4c0c832502..0000000000 --- a/crawl-ref/source/rltiles/item/misc/bell.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/bell_of_opening.bmp b/crawl-ref/source/rltiles/item/misc/bell_of_opening.bmp Binary files differdeleted file mode 100644 index a513b10686..0000000000 --- a/crawl-ref/source/rltiles/item/misc/bell_of_opening.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/blindfold.bmp b/crawl-ref/source/rltiles/item/misc/blindfold.bmp Binary files differdeleted file mode 100644 index c4cbd18f32..0000000000 --- a/crawl-ref/source/rltiles/item/misc/blindfold.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/brass_lantern.bmp b/crawl-ref/source/rltiles/item/misc/brass_lantern.bmp Binary files differdeleted file mode 100644 index 0278fc3377..0000000000 --- a/crawl-ref/source/rltiles/item/misc/brass_lantern.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/can_of_grease.bmp b/crawl-ref/source/rltiles/item/misc/can_of_grease.bmp Binary files differdeleted file mode 100644 index 0011705476..0000000000 --- a/crawl-ref/source/rltiles/item/misc/can_of_grease.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/candelabrum_of_invocation.bmp b/crawl-ref/source/rltiles/item/misc/candelabrum_of_invocation.bmp Binary files differdeleted file mode 100644 index e5a3654594..0000000000 --- a/crawl-ref/source/rltiles/item/misc/candelabrum_of_invocation.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/chest.bmp b/crawl-ref/source/rltiles/item/misc/chest.bmp Binary files differdeleted file mode 100644 index 245cd99e0d..0000000000 --- a/crawl-ref/source/rltiles/item/misc/chest.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/credit_card.bmp b/crawl-ref/source/rltiles/item/misc/credit_card.bmp Binary files differdeleted file mode 100644 index 765df991c8..0000000000 --- a/crawl-ref/source/rltiles/item/misc/credit_card.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/crystal_ball.bmp b/crawl-ref/source/rltiles/item/misc/crystal_ball.bmp Binary files differdeleted file mode 100644 index 6a6829d18e..0000000000 --- a/crawl-ref/source/rltiles/item/misc/crystal_ball.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/drum.bmp b/crawl-ref/source/rltiles/item/misc/drum.bmp Binary files differdeleted file mode 100644 index 7e18ff3b49..0000000000 --- a/crawl-ref/source/rltiles/item/misc/drum.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/expensive_camera.bmp b/crawl-ref/source/rltiles/item/misc/expensive_camera.bmp Binary files differdeleted file mode 100644 index a9ec001854..0000000000 --- a/crawl-ref/source/rltiles/item/misc/expensive_camera.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/figurine.bmp b/crawl-ref/source/rltiles/item/misc/figurine.bmp Binary files differdeleted file mode 100644 index a7000d766f..0000000000 --- a/crawl-ref/source/rltiles/item/misc/figurine.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/flute.bmp b/crawl-ref/source/rltiles/item/misc/flute.bmp Binary files differdeleted file mode 100644 index 471c0a5ad6..0000000000 --- a/crawl-ref/source/rltiles/item/misc/flute.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/grappling_hook.bmp b/crawl-ref/source/rltiles/item/misc/grappling_hook.bmp Binary files differdeleted file mode 100644 index 7129fef8b2..0000000000 --- a/crawl-ref/source/rltiles/item/misc/grappling_hook.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/harp.bmp b/crawl-ref/source/rltiles/item/misc/harp.bmp Binary files differdeleted file mode 100644 index 89dadfcb7d..0000000000 --- a/crawl-ref/source/rltiles/item/misc/harp.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/heavy_iron_ball.bmp b/crawl-ref/source/rltiles/item/misc/heavy_iron_ball.bmp Binary files differdeleted file mode 100644 index 7e311acb85..0000000000 --- a/crawl-ref/source/rltiles/item/misc/heavy_iron_ball.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/horn.bmp b/crawl-ref/source/rltiles/item/misc/horn.bmp Binary files differdeleted file mode 100644 index b7e1980cf1..0000000000 --- a/crawl-ref/source/rltiles/item/misc/horn.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_changes.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_changes.bmp Binary files differnew file mode 100644 index 0000000000..a0620988e9 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_changes.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_defense.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_defense.bmp Binary files differnew file mode 100644 index 0000000000..d6660445e3 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_defense.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_destruction.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_destruction.bmp Binary files differnew file mode 100644 index 0000000000..ef2e2b59e0 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_destruction.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_dungeons.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_dungeons.bmp Binary files differnew file mode 100644 index 0000000000..f0779d502a --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_dungeons.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_escape.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_escape.bmp Binary files differnew file mode 100644 index 0000000000..ef9095aa5d --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_escape.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_punishment.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_punishment.bmp Binary files differnew file mode 100644 index 0000000000..4c3e34dd37 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_punishment.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_summoning.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_summoning.bmp Binary files differnew file mode 100644 index 0000000000..3dd4f6f1d4 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_summoning.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_war.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_war.bmp Binary files differnew file mode 100644 index 0000000000..4bf2eb1ead --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_war.bmp diff --git a/crawl-ref/source/rltiles/item/misc/i-deck_wonders.bmp b/crawl-ref/source/rltiles/item/misc/i-deck_wonders.bmp Binary files differnew file mode 100644 index 0000000000..4027549921 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/i-deck_wonders.bmp diff --git a/crawl-ref/source/rltiles/item/misc/ice_box.bmp b/crawl-ref/source/rltiles/item/misc/ice_box.bmp Binary files differdeleted file mode 100644 index 02b71b2685..0000000000 --- a/crawl-ref/source/rltiles/item/misc/ice_box.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/iron_chain.bmp b/crawl-ref/source/rltiles/item/misc/iron_chain.bmp Binary files differdeleted file mode 100644 index 91e6e91758..0000000000 --- a/crawl-ref/source/rltiles/item/misc/iron_chain.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/lamp.bmp b/crawl-ref/source/rltiles/item/misc/lamp.bmp Binary files differdeleted file mode 100644 index b142b4042d..0000000000 --- a/crawl-ref/source/rltiles/item/misc/lamp.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/land_mine.bmp b/crawl-ref/source/rltiles/item/misc/land_mine.bmp Binary files differdeleted file mode 100644 index b803886052..0000000000 --- a/crawl-ref/source/rltiles/item/misc/land_mine.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/large_box.bmp b/crawl-ref/source/rltiles/item/misc/large_box.bmp Binary files differdeleted file mode 100644 index df6b139a00..0000000000 --- a/crawl-ref/source/rltiles/item/misc/large_box.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/leash.bmp b/crawl-ref/source/rltiles/item/misc/leash.bmp Binary files differdeleted file mode 100644 index be873483d8..0000000000 --- a/crawl-ref/source/rltiles/item/misc/leash.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/lenses.bmp b/crawl-ref/source/rltiles/item/misc/lenses.bmp Binary files differdeleted file mode 100644 index 9485f50428..0000000000 --- a/crawl-ref/source/rltiles/item/misc/lenses.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/lock_pick.bmp b/crawl-ref/source/rltiles/item/misc/lock_pick.bmp Binary files differdeleted file mode 100644 index f3bff0df73..0000000000 --- a/crawl-ref/source/rltiles/item/misc/lock_pick.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/magic_marker.bmp b/crawl-ref/source/rltiles/item/misc/magic_marker.bmp Binary files differdeleted file mode 100644 index ce14f09b0a..0000000000 --- a/crawl-ref/source/rltiles/item/misc/magic_marker.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/mirror.bmp b/crawl-ref/source/rltiles/item/misc/mirror.bmp Binary files differdeleted file mode 100644 index f1693445f5..0000000000 --- a/crawl-ref/source/rltiles/item/misc/mirror.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/misc_deck.bmp b/crawl-ref/source/rltiles/item/misc/misc_deck.bmp Binary files differindex ccc966cb2f..4708454ddd 100644 --- a/crawl-ref/source/rltiles/item/misc/misc_deck.bmp +++ b/crawl-ref/source/rltiles/item/misc/misc_deck.bmp diff --git a/crawl-ref/source/rltiles/item/misc/beartrap.bmp b/crawl-ref/source/rltiles/item/misc/misc_deck_legendary.bmp Binary files differindex cf0ce1ff20..d8c6b0db46 100644 --- a/crawl-ref/source/rltiles/item/misc/beartrap.bmp +++ b/crawl-ref/source/rltiles/item/misc/misc_deck_legendary.bmp diff --git a/crawl-ref/source/rltiles/item/misc/bugle.bmp b/crawl-ref/source/rltiles/item/misc/misc_deck_rare.bmp Binary files differindex 3467b82b58..0451ef9220 100644 --- a/crawl-ref/source/rltiles/item/misc/bugle.bmp +++ b/crawl-ref/source/rltiles/item/misc/misc_deck_rare.bmp diff --git a/crawl-ref/source/rltiles/item/misc/pick_axe.bmp b/crawl-ref/source/rltiles/item/misc/pick_axe.bmp Binary files differdeleted file mode 100644 index 69097a8bc2..0000000000 --- a/crawl-ref/source/rltiles/item/misc/pick_axe.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/sack.bmp b/crawl-ref/source/rltiles/item/misc/sack.bmp Binary files differdeleted file mode 100644 index b451a514a4..0000000000 --- a/crawl-ref/source/rltiles/item/misc/sack.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/saddle.bmp b/crawl-ref/source/rltiles/item/misc/saddle.bmp Binary files differdeleted file mode 100644 index bce2509866..0000000000 --- a/crawl-ref/source/rltiles/item/misc/saddle.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/skeleton_key.bmp b/crawl-ref/source/rltiles/item/misc/skeleton_key.bmp Binary files differdeleted file mode 100644 index 96a6368764..0000000000 --- a/crawl-ref/source/rltiles/item/misc/skeleton_key.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/statue.bmp b/crawl-ref/source/rltiles/item/misc/statue.bmp Binary files differdeleted file mode 100644 index a7000d766f..0000000000 --- a/crawl-ref/source/rltiles/item/misc/statue.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/stethoscope.bmp b/crawl-ref/source/rltiles/item/misc/stethoscope.bmp Binary files differdeleted file mode 100644 index f15135d9d3..0000000000 --- a/crawl-ref/source/rltiles/item/misc/stethoscope.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/tallow_candle.bmp b/crawl-ref/source/rltiles/item/misc/tallow_candle.bmp Binary files differdeleted file mode 100644 index ef89a9fbf1..0000000000 --- a/crawl-ref/source/rltiles/item/misc/tallow_candle.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/tin_opener.bmp b/crawl-ref/source/rltiles/item/misc/tin_opener.bmp Binary files differdeleted file mode 100644 index c61d41993d..0000000000 --- a/crawl-ref/source/rltiles/item/misc/tin_opener.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/tinning_kit.bmp b/crawl-ref/source/rltiles/item/misc/tinning_kit.bmp Binary files differdeleted file mode 100644 index c36acd7bef..0000000000 --- a/crawl-ref/source/rltiles/item/misc/tinning_kit.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/towel.bmp b/crawl-ref/source/rltiles/item/misc/towel.bmp Binary files differdeleted file mode 100644 index 6d4aee70e9..0000000000 --- a/crawl-ref/source/rltiles/item/misc/towel.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/unicorn_horn.bmp b/crawl-ref/source/rltiles/item/misc/unicorn_horn.bmp Binary files differdeleted file mode 100644 index 3a0ea24926..0000000000 --- a/crawl-ref/source/rltiles/item/misc/unicorn_horn.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/wax_candle.bmp b/crawl-ref/source/rltiles/item/misc/wax_candle.bmp Binary files differdeleted file mode 100644 index ef89a9fbf1..0000000000 --- a/crawl-ref/source/rltiles/item/misc/wax_candle.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/item/misc/whistle.bmp b/crawl-ref/source/rltiles/item/misc/whistle.bmp Binary files differdeleted file mode 100644 index 8fa49062ea..0000000000 --- a/crawl-ref/source/rltiles/item/misc/whistle.bmp +++ /dev/null diff --git a/crawl-ref/source/rltiles/player/base/vampire_f.bmp b/crawl-ref/source/rltiles/player/base/vampire_f.bmp Binary files differindex db6902bd24..317fc45e8c 100644 --- a/crawl-ref/source/rltiles/player/base/vampire_f.bmp +++ b/crawl-ref/source/rltiles/player/base/vampire_f.bmp diff --git a/crawl-ref/source/rltiles/player/base/vampire_m.bmp b/crawl-ref/source/rltiles/player/base/vampire_m.bmp Binary files differindex 5860f49ea6..53305a5a93 100644 --- a/crawl-ref/source/rltiles/player/base/vampire_m.bmp +++ b/crawl-ref/source/rltiles/player/base/vampire_m.bmp diff --git a/crawl-ref/source/rltiles/tool/dctile.c b/crawl-ref/source/rltiles/tool/dctile.c index aaadeca911..4bc2c0af9e 100644 --- a/crawl-ref/source/rltiles/tool/dctile.c +++ b/crawl-ref/source/rltiles/tool/dctile.c @@ -95,7 +95,7 @@ void cp_floor(){ #define TILEX 32 #define TILEY 32 -void make_rim(){ +void make_rim(unsigned char buf[3][TILEX*TILEY]){ static unsigned char dflag[TILEX][TILEY]; int x,y,c,dd[3],ad; int n0,n1,n2; @@ -109,7 +109,7 @@ void make_rim(){ for(x=0;x<TILEX;x++){ dflag[x][y]=1; ad=ADR(x,y); - for(c=0;c<3;c++)dd[c]=dbuf[c][ad]; + for(c=0;c<3;c++)dd[c]=buf[c][ad]; if( (dd[0]==bkg[0])&&(dd[1]==bkg[1])&& (dd[2]==bkg[2])) dflag[x][y]=0; if( (dd[0]==0)&&(dd[1]==0)&& (dd[2]==0)) dflag[x][y]=2; } @@ -144,7 +144,7 @@ void make_rim(){ } // n1 = tiles adjacent but not diagonal that are tile pixels if(n1!=0 ) - dbuf[0][x+y*32]=dbuf[1][x+y*32]=dbuf[2][x+y*32]=0x10; + buf[0][x+y*32]=buf[1][x+y*32]=buf[2][x+y*32]=0x10; } } } @@ -252,7 +252,7 @@ dbuf[2][ADR(xx,yy)]=0; } #endif -if(rim==1)make_rim(); +if(rim==1)make_rim(dbuf); } @@ -442,20 +442,33 @@ void process_config(char *fname) // compose an image onto the current buffer if (getname(tmp,"compose",st)) { + unsigned char tempbuf[3][TILEX * TILEY]; + if(load_pxxx(st)){ printf("no file pxxx/%s.bmp or %s/%s.bmp\n",st,sdir,st); getchar(); exit(1); } + + // 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]; + } + if (rim == 1) + make_rim(tempbuf); + for(i=0;i<32*32;i++) { - if (tbuf[0][i] != bkg[0] || - tbuf[1][i] != bkg[1] || - tbuf[2][i] != bkg[2]) + if (tempbuf[0][i] != bkg[0] || + tempbuf[1][i] != bkg[1] || + tempbuf[2][i] != bkg[2]) { - cbuf[0][i] = tbuf[0][i]; - cbuf[1][i] = tbuf[1][i]; - cbuf[2][i] = tbuf[2][i]; + cbuf[0][i] = tempbuf[0][i]; + cbuf[1][i] = tempbuf[1][i]; + cbuf[2][i] = tempbuf[2][i]; } } continue; @@ -487,7 +500,14 @@ void process_config(char *fname) tbuf[1][i] = cbuf[1][i]; tbuf[2][i] = cbuf[2][i]; } + + // Rim has already been applied during composing, so turn it off + // temporarily. + int storerim = rim; + rim = 0; cp_monst_32(); + rim = storerim; + bflush(); } else diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index 56b758b886..9c3f15c76c 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -2,6 +2,7 @@ #include <stdio.h> #include "AppHdr.h" +#include "decks.h" #include "direct.h" #include "externs.h" #include "food.h" @@ -1053,37 +1054,86 @@ int tileidx_corpse(int mon) return ch; } -int tileidx_misc(int type) +int tileidx_misc(const item_def &item) { - 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; - - 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; - - case MISC_RUNE_OF_ZOT: ch = TILE_MISC_RUNE_OF_ZOT; break; - } - return ch; + 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; + + 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; + + case MISC_RUNE_OF_ZOT: + ch = TILE_MISC_RUNE_OF_ZOT; + break; + default: + ch = TILE_ERROR; + break; + } + return ch; } /*****************************************************/ @@ -1098,112 +1148,99 @@ int tileidx_item(const item_def &item) switch (clas) { - case OBJ_WEAPONS: - if(is_fixed_artefact(item)) + case OBJ_WEAPONS: + if (is_fixed_artefact(item)) return tileidx_fixed_artifact(special); - else - if (is_unrandom_artefact( item )) + else if (is_unrandom_artefact( item )) return tileidx_unrand_artifact(find_unrandart_index(item)); else return tileidx_weapon(item); - break; case OBJ_MISSILES: - return tileidx_missile(item); - break; + return tileidx_missile(item); - case OBJ_ARMOUR: + case OBJ_ARMOUR: if (is_unrandom_artefact( item )) return tileidx_unrand_artifact(find_unrandart_index(item)); else return tileidx_armour(item); - break; - case OBJ_WANDS: -#if 1 //ID Item + case OBJ_WANDS: if (id[ IDTYPE_WANDS ][type] == ID_KNOWN_TYPE || (item.flags &ISFLAG_KNOW_TYPE )) return TILE_WAND_FLAME + type; else -#endif return TILE_WAND_OFFSET + special % 12; - break; case OBJ_FOOD: - return tileidx_food(item); - break; + return tileidx_food(item); - case OBJ_SCROLLS: -#if 1 //ID Item + case OBJ_SCROLLS: if (id[ IDTYPE_SCROLLS ][type] == ID_KNOWN_TYPE || (item.flags &ISFLAG_KNOW_TYPE )) return TILE_SCR_IDENTIFY + type; -#endif return TILE_SCROLL; - break; - case OBJ_GOLD: - return TILE_GOLD; - break; + case OBJ_GOLD: + return TILE_GOLD; - case OBJ_JEWELLERY: + case OBJ_JEWELLERY: if (type < AMU_RAGE) - { // 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; + { + 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; } - break; - case OBJ_POTIONS: + case OBJ_POTIONS: if (id[ IDTYPE_POTIONS ][type] == ID_KNOWN_TYPE || (item.flags &ISFLAG_KNOW_TYPE )) - return TILE_POT_HEALING + type; - else - return TILE_POTION_OFFSET + special % 14; - break; + { + return TILE_POT_HEALING + type; + } + else + { + return TILE_POTION_OFFSET + special % 14; + } - case OBJ_BOOKS: + case OBJ_BOOKS: type= special % 10; - 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; - - case OBJ_STAVES: - return TILE_STAFF_OFFSET + special % 10; - break; - - case OBJ_CORPSES: + 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; + + case OBJ_STAVES: + return TILE_STAFF_OFFSET + special % 10; + + case OBJ_CORPSES: if (item.sub_type == CORPSE_SKELETON) return TILE_FOOD_BONE; else return tileidx_corpse(item.plus); - break; - case OBJ_ORBS: - return TILE_ORB; - break; + case OBJ_ORBS: + return TILE_ORB; - case OBJ_MISCELLANY: - return tileidx_misc(type); - break; + case OBJ_MISCELLANY: + return tileidx_misc(item); - default: - break; + default: + return TILE_ERROR; } - return TILE_ERROR; } /* |