* Tweak Snorg's tile to increase the difference to the plain troll.

* Add a new tile each for the flaming corpse and trapdoor spider.
* Add a sticky flame overlay for the player tile.
* Move all unique monsters into dc-mon/unique (minus Adolf).
* Remove comments and commented out monsters from the tile definitions.
* Minor comment fixes and code cleanup.

I'm really starting to get the hang of the tile creation. :)


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

1 files changed, 97 insertions, 96 deletions

diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 2d99f06d9b..d110e7eb5c 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -16,23 +16,23 @@
 #####OBJ_WEAPONS

 #####ARTIFACTS

 %sdir item/weapon

-spwpn_singing_sword SPWPN_SINGING_SWORD /* This blessed weapon loves nothing more than to sing to its owner, whether they want it to or not. 

-spwpn_wrath_of_trog SPWPN_WRATH_OF_TROG /* This was the favourite weapon of the old god Trog, before he lost it one day.   It induces a bloodthirsty berserker rage in anyone who uses it to strike another.

-spwpn_scythe_of_curses SPWPN_SCYTHE_OF_CURSES /* This weapon carries a terrible and highly irritating curse.

-spwpn_mace_of_variability SPWPN_MACE_OF_VARIABILITY /* It is rather unreliable.

-spwpn_glaive_of_prune SPWPN_GLAIVE_OF_PRUNE /* It is the creation of a mad god, and carries a curse which transforms anyone possessing it into a prune. Fortunately, the curse works very slowly, and one can use it briefly with no consequences worse than slightly purple skin and a few wrinkles.

+spwpn_singing_sword SPWPN_SINGING_SWORD

+spwpn_wrath_of_trog SPWPN_WRATH_OF_TROG

+spwpn_scythe_of_curses SPWPN_SCYTHE_OF_CURSES

+spwpn_mace_of_variability SPWPN_MACE_OF_VARIABILITY

+spwpn_glaive_of_prune SPWPN_GLAIVE_OF_PRUNE

 %rim 1

-spwpn_sceptre_of_torment SPWPN_SCEPTRE_OF_TORMENT /* This truly accursed weapon is an instrument of Hell.

-spwpn_sword_of_zonguldrok SPWPN_SWORD_OF_ZONGULDROK /* This dreadful weapon is used at the user's peril.

-spwpn_sword_of_cerebov SPWPN_SWORD_OF_CEREBOV /* Eerie flames cover its twisted blade. 

-spwpn_staff_of_dispater SPWPN_STAFF_OF_DISPATER /* This legendary item can unleash the fury of Hell.

-spwpn_sceptre_of_asmodeus SPWPN_SCEPTRE_OF_ASMODEUS /* It carries some of the powers of the arch-fiend Asmodeus.

-spwpn_sword_of_power SPWPN_SWORD_OF_POWER /* It rewards the powerful with power and the meek with weakness.

+spwpn_sceptre_of_torment SPWPN_SCEPTRE_OF_TORMENT

+spwpn_sword_of_zonguldrok SPWPN_SWORD_OF_ZONGULDROK

+spwpn_sword_of_cerebov SPWPN_SWORD_OF_CEREBOV

+spwpn_staff_of_dispater SPWPN_STAFF_OF_DISPATER

+spwpn_sceptre_of_asmodeus SPWPN_SCEPTRE_OF_ASMODEUS

+spwpn_sword_of_power SPWPN_SWORD_OF_POWER

 %rim 0

-spwpn_knife_of_accuracy SPWPN_KNIFE_OF_ACCURACY /* It is almost unerringly accurate.

-spwpn_staff_of_olgreb SPWPN_STAFF_OF_OLGREB /* It was the magical weapon wielded by the mighty wizard Olgreb before he met his fate somewhere within these dungeons. It grants its wielder resistance to the effects of poison and increases their ability to use venomous magic, and carries magical powers which can be evoked.

-spwpn_vampires_tooth SPWPN_VAMPIRES_TOOTH /* It is lethally vampiric.

-spwpn_wucad_mu SPWPN_STAFF_OF_WUCAD_MU /* Its power varies in proportion to its wielder's intelligence.   Using it can be a bit risky.

+spwpn_knife_of_accuracy SPWPN_KNIFE_OF_ACCURACY

+spwpn_staff_of_olgreb SPWPN_STAFF_OF_OLGREB

+spwpn_vampires_tooth SPWPN_VAMPIRES_TOOTH

+spwpn_wucad_mu SPWPN_STAFF_OF_WUCAD_MU

 

 ##### Unrandom artifacts

 %include dc-urand.txt

@@ -41,10 +41,10 @@ spwpn_wucad_mu SPWPN_STAFF_OF_WUCAD_MU /* Its power varies in proportion to its
 %sdir item/weapon

 %rim 1

 ##Blunt

-club WPN_CLUB/* D5H4S12 A heavy piece of wood.

-mace WPN_MACE/* D8H3S14 A long handle with a heavy lump on one end.

+club WPN_CLUB

+mace WPN_MACE

 mace2

-mace_large WPN_GREAT_MACE/* D16H-3S18 A large and heavy mace.

+mace_large WPN_GREAT_MACE

 mace_large2

 flail WPN_FLAIL

 flail2

@@ -58,94 +58,94 @@ eveningstar WPN_EVENINGSTAR
 eveningstar2

 hammer WPN_HAMMER

 hammer2

-ankus WPN_ANKUS/* D9H1S14 A large and vicious toothed club.

-bullwhip WPN_WHIP/* D3H1S14 A whip.

-demon_whip WPN_DEMON_WHIP/* D10H1S14 A terrible weapon, woven in the depths of the inferno.

-giant_club WPN_GIANT_CLUB/* D15H-5S16 A giant lump of wood, shaped for an ogre's hands.

-giant_spiked_club WPN_GIANT_SPIKED_CLUB/* D18H-6S17 A giant lump of wood with sharp spikes at one end.

+ankus WPN_ANKUS

+bullwhip WPN_WHIP

+demon_whip WPN_DEMON_WHIP

+giant_club WPN_GIANT_CLUB

+giant_spiked_club WPN_GIANT_SPIKED_CLUB

 

 ##Edged

-knife WPN_KNIFE/* D2H0S11 A simple survival knife. Designed more for utility than combat, it looks quite capable of butchering a corpse.

+knife WPN_KNIFE

 

-dagger WPN_DAGGER/* D3H6S11 A long knife or a very short sword, which can be held or thrown.

+dagger WPN_DAGGER

 orcish_dagger WPN_DAGGER_ORC

 elven_dagger WPN_DAGGER_ELF

 

-short_sword WPN_SHORT_SWORD/* D6H5S12 A sword with a short, slashing blade.

+short_sword WPN_SHORT_SWORD

 short_sword2

 orcish_short_sword WPN_SHORT_SWORD_ORC

 elven_short_sword WPN_SHORT_SWORD_ELF

 

-long_sword2 WPN_LONG_SWORD/* D10H3S14 A sword with a long, slashing blade.

+long_sword2 WPN_LONG_SWORD

 %rim 0

 long_sword3

 %rim 1

 orcish_long_sword WPN_LONG_SWORD_ORC

 

-greatsword WPN_GREAT_SWORD/* D16H-1S17 A sword with a very long, heavy blade and a long handle.

+greatsword WPN_GREAT_SWORD

 greatsword2

 orcish_great_sword WPN_GREAT_SWORD_ORC

 

-falchion WPN_FALCHION/* D8H2S13 A sword with a broad slashing blade.

+falchion WPN_FALCHION

 falchion2

-scimitar WPN_SCIMITAR/* D11H1S14 A long sword with a curved blade.

+scimitar WPN_SCIMITAR

 scimitar2

 

-silver_saber WPN_SABRE/* D7H4S12 A sword with a medium length slashing blade.

+silver_saber WPN_SABRE

 sabre2

 

-quickblade WPN_QUICK_BLADE/* D5H6S7 A small and magically quick sword.

+quickblade WPN_QUICK_BLADE

 

-katana2 WPN_KATANA/* D13H4S13 A very rare and extremely effective imported weapon, featuring a long single-edged blade.

+katana2 WPN_KATANA

 katana3

 

-double_sword WPN_DOUBLE_SWORD/* D15H3S16 A magical weapon with two razor-sharp blades.

-triple_sword WPN_TRIPLE_SWORD/* D19H-1S19 A magical weapon with three great razor-sharp blades.

-demon_blade WPN_DEMON_BLADE/* D13H2S15 A terrible weapon, forged in the fires of Hell.

+double_sword WPN_DOUBLE_SWORD

+triple_sword WPN_TRIPLE_SWORD

+demon_blade WPN_DEMON_BLADE

 

 ##Axe

-hand_axe WPN_HAND_AXE/* D7H2S13 An small axe designed for either hand combat or throwing.

+hand_axe WPN_HAND_AXE

 hand_axe2

-war_axe WPN_WAR_AXE/* D11H0S16 An axe intended for hand to hand combat. 

+war_axe WPN_WAR_AXE

 war_axe2

-broad_axe WPN_BROAD_AXE/* D14H1S17 An axe with a large blade.

+broad_axe WPN_BROAD_AXE

 broad_axe2

 broad_axe3

-battle_axe WPN_BATTLEAXE/* D17H-2S18 A large axe with a double-headed blade.

+battle_axe WPN_BATTLEAXE

 battle_axe2

 battle_axe3

-executioner_axe WPN_EXECUTIONERS_AXE /* D20H-4S20 A huge axe.

+executioner_axe WPN_EXECUTIONERS_AXE

 executioner_axe2

 

 ##Ranged

-blowgun WPN_BLOWGUN /* D1H0S10 A long, light tube, open at both ends.  Doing very little damage,  its main use is to fire poisoned needles from afar.  It makes very little noise.

+blowgun WPN_BLOWGUN

 blowgun2

-sling WPN_SLING /* D1H-1S11 A piece of cloth and leather for launching stones, which do a small amount of damage on impact.

-bow WPN_BOW /* D2H-3S11 A curved piece of wood and string, for shooting arrows. It does good damage in combat, and a skilled user can use it to great effect.

+sling WPN_SLING

+bow WPN_BOW

 bow2

-crossbow WPN_CROSSBOW /* D2H-1S15 A piece of machinery used for firing bolts, which takes some time to load and fire. It does very good damage in combat.

+crossbow WPN_CROSSBOW

 crossbow2

-hand_crossbow WPN_HAND_CROSSBOW /* D1H-1S15 A small crossbow, for firing darts.

+hand_crossbow WPN_HAND_CROSSBOW

 hand_crossbow2

 

 ##Pole

-quarterstaff WPN_QUARTERSTAFF /* D7H6S12 A sturdy wooden pole.

+quarterstaff WPN_QUARTERSTAFF

 

-elven_spear WPN_SPEAR /* D5H3S13 A long stick with a pointy blade on one end, to be held or thrown.

+elven_spear WPN_SPEAR

 spear2

-trident WPN_TRIDENT /* D9H-2S17 A hafted weapon with three points at one end. 

+trident WPN_TRIDENT

 trident2

-halberd WPN_HALBERD /* D13H-3S19 A long pole with a spiked axe head on one end.

+halberd WPN_HALBERD

 halberd2

-scythe WPN_SCYTHE /* D14H-4S22 A farm implement, usually unsuited to combat.

+scythe WPN_SCYTHE

 scythe2

-glaive WPN_GLAIVE /* D15H-3S18 A pole with a large, heavy blade on one end.

+glaive WPN_GLAIVE

 glaive2

 orcish_glaive WPN_GLAIVE_ORC

 bardiche WPN_BARDICHE

 bardiche2

 

-demon_trident WPN_DEMON_TRIDENT /* D15H-2S17 A terrible weapon, molded by fire and brimstone.

+demon_trident WPN_DEMON_TRIDENT

 

 # SS new weapons

 %rim 0

@@ -156,11 +156,11 @@ lajatang WPN_LAJATANG
 lajatang2

 

 ######OBJ_MISSILES

-item/gem/stone MI_STONE /* D2H4 A stone.

+item/gem/stone MI_STONE

 effect/stone0 MI_STONE0

 sling_bullet MI_SLING_BULLET

 effect/sling_bullet0 MI_SLING_BULLET0

-ya MI_ARROW /* D2H6 An arrow.

+ya MI_ARROW

 effect/arrow0 MI_ARROW0

 effect/arrow1 MI_ARROW1

 effect/arrow2 MI_ARROW2

@@ -170,7 +170,7 @@ effect/arrow5 MI_ARROW5
 effect/arrow6 MI_ARROW6

 effect/arrow7 MI_ARROW7

 

-crossbow_bolt MI_BOLT /* D2H8 A crossbow bolt.

+crossbow_bolt MI_BOLT

 effect/bolt0 MI_BOLT0

 effect/bolt1 MI_BOLT1

 effect/bolt2 MI_BOLT2

@@ -180,7 +180,7 @@ effect/bolt5 MI_BOLT5
 effect/bolt6 MI_BOLT6

 effect/bolt7 MI_BOLT7

 

-dart MI_DART /* D2H4 A small throwing weapon.

+dart MI_DART

 dart-p MI_DART_P

 effect/dart0 MI_DART0

 effect/dart1 MI_DART1

@@ -191,7 +191,7 @@ effect/dart5 MI_DART5
 effect/dart6 MI_DART6

 effect/dart7 MI_DART7

 

-needle MI_NEEDLE /* D0H1 A needle.

+needle MI_NEEDLE

 needle-p MI_NEEDLE_P

 effect/needle0 MI_NEEDLE0

 effect/needle1 MI_NEEDLE1

@@ -223,62 +223,62 @@ effect/throwing_net6 MI_THROWING_NET6
 effect/throwing_net7 MI_THROWING_NET7

 effect/net_trap TRAP_NET

 

-item/gem/rock MI_LARGE_ROCK /* D20H10 A rock, used by giants as a missile.

+item/gem/rock MI_LARGE_ROCK

 effect/rock0 MI_LARGE_ROCK0

 ######OBJ_ARMOUR

 %sdir item/armor

-robe ARM_ROBE /* A1E0 A cloth robe.

+robe ARM_ROBE

 robe2

 robe3

 

-leather_armor2 ARM_LEATHER_ARMOUR /* A2E-1 A suit made of hardened leather.

+leather_armor2 ARM_LEATHER_ARMOUR

 breast_plate2

 leather_armor4

 orcish_leather_armor ARM_LEATHER_ARMOUR_ORC

 elven_leather_armor ARM_LEATHER_ARMOUR_ELF

 

-ring_mail ARM_RING_MAIL /* A4E-2 A leather suit covered in little rings.

+ring_mail ARM_RING_MAIL

 ring_mail2

 orcish_ringmail ARM_RING_MAIL_ORC

 elven_ringmail ARM_RING_MAIL_ELF

 dwarven_ringmail ARM_RING_MAIL_DWA

 

-scale_mail ARM_SCALE_MAIL /* A5E-2 A leather suit covered in little metal plates.

+scale_mail ARM_SCALE_MAIL

 scale_mail2

 elven_scalemail ARM_SCALE_MAIL_ELF

 

-chain_mail1 ARM_CHAIN_MAIL /* A6E-3 A suit made of interlocking metal rings.

+chain_mail1 ARM_CHAIN_MAIL

 chain_mail2

 chain_mail3 ARM_CHAIN_MAIL_ELF

 orcish_chain_mail ARM_CHAIN_MAIL_ORC

 

-splint_mail ARM_SPLINT_MAIL /* A8E-5 A suit made of splints of metal.

-banded_mail ARM_BANDED_MAIL /* A7E-4 A suit made of bands of metal.

+splint_mail ARM_SPLINT_MAIL

+banded_mail ARM_BANDED_MAIL

 

-plate_mail2 ARM_PLATE_MAIL /* A9E-5 A suit of mail and large plates of metal.

+plate_mail2 ARM_PLATE_MAIL

 orcish_platemail ARM_PLATE_MAIL_ORC

 

-crystal_plate_mail ARM_CRYSTAL_PLATE_MAIL /* A16E-8

+crystal_plate_mail ARM_CRYSTAL_PLATE_MAIL

 

-animal_skin ARM_ANIMAL_SKIN /* A1E0 The skins of several animals.

+animal_skin ARM_ANIMAL_SKIN

 animal_skin2

 

-troll_hide ARM_TROLL_HIDE /* A1E-1 The stiff and knobbly hide of a troll. I suppose you could wear it if you really wanted to.

-troll_leather_armour ARM_TROLL_LEATHER_ARMOUR /* A3E-1 A magical armour, made from the stiff and knobbly skin of a common troll. It magically regenerates its wearer's flesh at a fairly slow rate (unless already a troll).

-green_dragon_scales ARM_DRAGON_HIDE /* A2E-2 The scaly skin of a dragon. I suppose you could wear it if you really wanted to.

-green_dragon_scale_mail ARM_DRAGON_ARMOUR /* A8E-2 A magical armour, made from the scales of a fire-breathing dragon. It provides great protection from the effects of fire, but renders its wearer more susceptible to the effects of cold.

-ice_dragon_hide ARM_ICE_DRAGON_HIDE /* A2E-2 The scaly skin of a dragon. I suppose you could wear it if you really wanted to.

-ice_dragon_armour ARM_ICE_DRAGON_ARMOUR /* A9E-2 A magical armour, made from the scales of a cold-breathing dragon. It provides great protection from the effects of cold, but renders its wearer more susceptible to the effects of fire and heat. 

-silver_dragon_scales ARM_STEAM_DRAGON_HIDE /* A0E0 The soft and supple scaley skin of a steam dragon. I suppose you could wear it if you really wanted to. 

-silver_dragon_scale_mail ARM_STEAM_DRAGON_ARMOUR /* A3E0 A magical armour, made from the scales of a steam-breathing dragon. Although unlike the armour made from the scales of some larger dragons it does not provide its wearer with much in the way of special magical protection, it is extremely light and as supple as cloth.

-mottled_dragon_hide ARM_MOTTLED_DRAGON_HIDE /* A1E-1 The weirdly-patterned scaley skin of a mottled dragon. I suppose you could wear it if you really wanted to.

-mottled_dragon_armour ARM_MOTTLED_DRAGON_ARMOUR /* A5E-1 A magical armour made from the scales of a mottled dragon. Although unlike the armour made from the scales of some larger dragons it does not provide its wearer with much in the way of special magical protection, it is as light and relatively uncumbersome as leather armour.

-blue_dragon_scales ARM_STORM_DRAGON_HIDE /* A2E-5 The hide of a storm dragon, covered in extremely hard blue scales. I suppose you could wear it if you really wanted to.

-blue_dragon_scale_mail ARM_STORM_DRAGON_ARMOUR /* A10E-5 A magical armour made from the scales of a lightning-breathing dragon. It is heavier than most dragon scale armours, but gives its wearer great resistance to electrical discharges.

-gold_dragon_hide ARM_GOLD_DRAGON_HIDE /* A2E-10 The extremely tough and heavy skin of a golden dragon, covered in shimmering golden scales. I suppose you could wear it if you really wanted to.

-gold_dragon_armour ARM_GOLD_DRAGON_ARMOUR /* A13E-10 A magical armour made from the golden scales of a golden dragon. It is extremely heavy and cumbersome, but confers resistances to fire, cold, and poison on its wearer. 

-swamp_dragon_hide ARM_SWAMP_DRAGON_HIDE /* A1E-2 The slimy skin of a swamp-dwelling dragon. I suppose you could wear it if you really wanted to.

-swamp_dragon_armour ARM_SWAMP_DRAGON_ARMOUR /* A7E-2 A magical armour made from the scales of a swamp dragon. It confers resistance to poison on its wearer.

+troll_hide ARM_TROLL_HIDE

+troll_leather_armour ARM_TROLL_LEATHER_ARMOUR

+green_dragon_scales ARM_DRAGON_HIDE

+green_dragon_scale_mail ARM_DRAGON_ARMOUR

+ice_dragon_hide ARM_ICE_DRAGON_HIDE

+ice_dragon_armour ARM_ICE_DRAGON_ARMOUR

+silver_dragon_scales ARM_STEAM_DRAGON_HIDE

+silver_dragon_scale_mail ARM_STEAM_DRAGON_ARMOUR

+mottled_dragon_hide ARM_MOTTLED_DRAGON_HIDE

+mottled_dragon_armour ARM_MOTTLED_DRAGON_ARMOUR

+blue_dragon_scales ARM_STORM_DRAGON_HIDE

+blue_dragon_scale_mail ARM_STORM_DRAGON_ARMOUR

+gold_dragon_hide ARM_GOLD_DRAGON_HIDE

+gold_dragon_armour ARM_GOLD_DRAGON_ARMOUR

+swamp_dragon_hide ARM_SWAMP_DRAGON_HIDE

+swamp_dragon_armour ARM_SWAMP_DRAGON_ARMOUR

 

 naga_barding_blue ARM_NAGA_BARDING

 naga_barding_metal

@@ -289,44 +289,44 @@ centaur_barding_metal
 centaur_barding_magenta

 centaur_barding_red

 

-elven_shield ARM_SHIELD /* A0E0 A piece of metal, to be strapped on one's arm. It is cumbersome to wear, and slightly slows the rate at which you may attack.

+elven_shield ARM_SHIELD

 shield_kite2

 shield_round2

 

 #dwarvish_roundshield ARM_BUCKLER

 %rim 0

-buckler ARM_BUCKLER /* A small shield.

+buckler ARM_BUCKLER

 buckler2

 buckler3

 %rim 1

 

-large_shield ARM_LARGE_SHIELD /* Like a normal shield, only larger. It is very cumbersome to wear, and slows the rate at which you may attack.

+large_shield ARM_LARGE_SHIELD

 shield_large2

 shield_kite3

 

-leather_cloak ARM_CLOAK /* A1E0 A cloth cloak.

+leather_cloak ARM_CLOAK

 cloak2

 cloak3

 cloak4

 

 #####ARM_HELMET

-elven_leather_helm THELM_CAP /* A cloth or leather cap.

-wizard_hat THELM_WIZARD_HAT /* A conical cloth hat.

+elven_leather_helm THELM_CAP

+wizard_hat THELM_WIZARD_HAT

 wizard_hat2

 

-visored_helmet THELM_HELM /* A1E0 A piece of metal headgear.

+visored_helmet THELM_HELM

 etched_helmet

 helm3

 helm_visor1

 

 ###### GLOVES

-glove1 ARM_GLOVES /* A1E0 A pair of gloves.

+glove1 ARM_GLOVES

 glove3

 glove5

 gauntlet2

 

 ###### BOOTS

-boots_brown1 ARM_BOOTS /* A1E0 A pair of sturdy boots.

+boots_brown1 ARM_BOOTS

 jackboots

 boots_stripe1

 boots_green2

@@ -625,7 +625,7 @@ light_brown
 light_brown

 dark_brown

 dark_brown

-###########3metal 8

+###########metal 8

 bronze BOOK_METAL_OFFSET

 copper

 silver

@@ -634,7 +634,7 @@ glittering
 metal_blue

 metal_cyan

 metal_green

-############4papi 1

+############papyrus 1

 cloth BOOK_PAPYRUS

 #####################OBJ_STAVES

 %sdir item/staff

@@ -833,6 +833,7 @@ runes/rune_mnoleg MISC_RUNE_MNOLEG
 runes/rune_lom_lobon MISC_RUNE_LOM_LOBON

 

 #OBJ_CORPSES

+#handled in dc-corpse.txt

 

 #OBJ_GOLD

 %sdir item/gem