* 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

65 files changed, 279 insertions, 276 deletions

diff --git a/crawl-ref/README.txt b/crawl-ref/README.txt
index dee42cb165..c32c404beb 100644
--- a/crawl-ref/README.txt
+++ b/crawl-ref/README.txt
@@ -34,7 +34,7 @@ for a step by step guide on how to set this up.
 
 Tiles:
 Crawl features an alternative to the classical ASCII display; Tile-based
-Crawl is often a lot more accessible by new players. Tiles are available for
+Crawl is often a lot more accessible to new players. Tiles are available for
 Linux, Windows and OS X.
 Unfortunately, it is not yet possible to combine tiles and Internet play.
 
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index 5f84370253..a1003b1385 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -585,7 +585,7 @@ void abyss_teleport( bool new_area )
     // Get new monsters and colours.
     init_pandemonium();
 #ifdef USE_TILE
-    tile_init_flavor();
+    tile_init_flavour();
 #endif
 
     for (int i = 0; i < MAX_MONSTERS; ++i)
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 010e5ee080..6647a304e3 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -4117,7 +4117,7 @@ static void _handle_nearby_ability(monsters *monster)
     {
         // Non-humanoid-ish monsters have a low chance of speaking
         // without the M_SPEAKS flag, to give the dungeon some
-        // atmosphere/flavor.
+        // atmosphere/flavour.
         int chance = MON_SPEAK_CHANCE * 4;
 
         // Band members are a lot less likely to speak, since there's
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index b6b5d4795f..1d5d53e637 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -589,9 +589,7 @@ static void _get_status_lights(std::vector<status_light>& out)
     }
 
     if (you.duration[DUR_PRAYER])
-    {
         out.push_back(status_light(WHITE, "Pray"));  // no end of effect warning
-    }
 
     if (you.duration[DUR_REPEL_UNDEAD])
     {
@@ -602,9 +600,7 @@ static void _get_status_lights(std::vector<status_light>& out)
     }
 
     if (you.duration[DUR_TELEPORT])
-    {
         out.push_back(status_light(LIGHTBLUE, "Tele"));
-    }
 
     if (you.duration[DUR_DEFLECT_MISSILES])
     {
@@ -684,29 +680,19 @@ static void _get_status_lights(std::vector<status_light>& out)
     }
 
     if (you.duration[DUR_SURE_BLADE])
-    {
         out.push_back(status_light(BLUE, "Blade"));
-    }
 
     if (you.confused())
-    {
         out.push_back(status_light(RED, "Conf"));
-    }
 
     if (you.duration[DUR_LOWERED_MR])
-    {
         out.push_back(status_light(RED, "-MR"));
-    }
 
     if (you.duration[DUR_BEHELD])
-    {
         out.push_back(status_light(RED, "Bhld"));
-    }
 
     if (you.duration[DUR_LIQUID_FLAMES])
-    {
         out.push_back(status_light(RED, "Fire"));
-    }
 
     if (you.duration[DUR_POISONING])
     {
@@ -727,9 +713,7 @@ static void _get_status_lights(std::vector<status_light>& out)
     }
 
     if (you.attribute[ATTR_HELD])
-    {
         out.push_back(status_light(RED, "Held"));
-    }
 
     if (you.backlit(false))
     {
@@ -746,9 +730,7 @@ static void _get_status_lights(std::vector<status_light>& out)
     }
 
     if (you.duration[DUR_SLOW] && !you.duration[DUR_HASTE])
-    {
         out.push_back(status_light(RED, "Slow"));
-    }
     else if (you.duration[DUR_HASTE] && !you.duration[DUR_SLOW])
     {
         int color = _dur_colour( BLUE, (you.duration[DUR_HASTE] <= 6) );
@@ -756,10 +738,7 @@ static void _get_status_lights(std::vector<status_light>& out)
     }
 
     if (you.duration[DUR_BREATH_WEAPON])
-    {
         out.push_back(status_light(YELLOW, "BWpn"));
-    }
-
 }
 
 static void _print_status_lights(int y)
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

diff --git a/crawl-ref/source/rltiles/dc-main.txt b/crawl-ref/source/rltiles/dc-main.txt
index 71038a0656..71e76b71fe 100644
--- a/crawl-ref/source/rltiles/dc-main.txt
+++ b/crawl-ref/source/rltiles/dc-main.txt
@@ -11,7 +11,7 @@ dc-dngn/dngn_unseen
 %rim 0

 

 ## Corpse

-%include dc-co.txt

+%include dc-corpse.txt

 

 ####PLAYER 

 ####include dc-jobs.txt

diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 9e9d014805..27c19b6e05 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -7,10 +7,10 @@ fire_elemental MONS_FIRE_ELEMENTAL /*'#'*/
 %rim 0

 vapour MONS_VAPOUR /*'#'*/

 %rim 1

-#item/gem/gold_piece MONS_GOLD_MIMIC /*(YELLOW) An apparently harmless pile of gold coins hides a nasty venomous shapechanging predator.

 death_cob MONS_DEATH_COB /*'%'*/

 

 ## Arch demons

+%sdir dc-mon/unique

 asmodeus MONS_ASMODEUS /*'&'*/

 cerebov MONS_CEREBOV /*'&'*/

 dispater MONS_DISPATER /*'&'*/

@@ -19,9 +19,8 @@ geryon MONS_GERYON /*'&'*/
 gloorx_vloq MONS_GLOORX_VLOQ /*'&'*/

 lom_lobon MONS_LOM_LOBON /*'&'*/

 mnoleg MONS_MNOLEG /*'&'*/

+%sdir dc-mon

 pandemonium_demon MONS_PANDEMONIUM_DEMON /*'&'*/

-#item/weapon/halberd MONS_DANCING_WEAPON /*'('(BLACK) A weapon dancing in the air. 

-#weapon_mimic MONS_WEAPON_MIMIC /*')'(BLACK) An apparently abandoned weapon, actually a vicious little beast in disguise.

 ball_lightning MONS_BALL_LIGHTNING /*'*'*/

 %rim 0

 orb_of_fire MONS_ORB_OF_FIRE /*'*'*/

@@ -81,7 +80,6 @@ big_fish MONS_BIG_FISH /*';'*/
 electrical_eel MONS_ELECTRICAL_EEL /*';'*/

 giant_goldfish MONS_GIANT_GOLDFISH /*';'*/

 lava_fish MONS_LAVA_FISH /*';'*/

-#scroll_mimic MONS_SCROLL_MIMIC /*'?'(LIGHTGREY) An ancient parchment covered in arcane runes. Did it just twitch?

 

 ## Humans

 shapeshifter MONS_SHAPESHIFTER /*'@'*/

@@ -93,39 +91,37 @@ necromancer MONS_NECROMANCER /*'@'*/
 wizard MONS_WIZARD /*'@'*/

 human MONS_HUMAN /*'@'*/

 

-## Unique human  NO_SPELLS first

-terence0 MONS_TERENCE /*'@'*/

-edmund0 MONS_EDMUND /*'@'*/

-donald MONS_DONALD /*'@'*/

-joseph0 MONS_JOSEPH /*'@'*/

-norbert MONS_NORBERT /*'@'*/

+%sdir dc-mon/unique

+## Unique human, in alphabetical order

 agnes MONS_AGNES /*'@'*/

-maud0 MONS_MAUD /*'@'*/

-

-adolf MONS_ADOLF /*'@'*/

-duane0 MONS_DUANE /*'@'*/

-frances0 MONS_FRANCES /*'@'*/

-harold0 MONS_HAROLD /*'@'*/

-jozef0 MONS_JOZEF /*'@'*/

-norris2 MONS_NORRIS /*'@'*/

-rupert0 MONS_RUPERT /*'@'*/

-sigmund MONS_SIGMUND /*'@'*/

-wayne0 MONS_WAYNE /*'@'*/

-

-josephine MONS_JOSEPHINE /*'@'*/

+donald MONS_DONALD /*'@'*/

+duane MONS_DUANE /*'@'*/

+edmund MONS_EDMUND /*'@'*/

 erica MONS_ERICA /*'@'*/

+frances MONS_FRANCES /*'@'*/

 francis MONS_FRANCIS /*'@'*/

+frederick MONS_FREDERICK

+harold MONS_HAROLD /*'@'*/

 jessica MONS_JESSICA /*'@'*/

+joseph MONS_JOSEPH /*'@'*/

+josephine MONS_JOSEPHINE /*'@'*/

+jozef MONS_JOZEF /*'@'*/

 louise MONS_LOUISE /*'@'*/

 margery MONS_MARGERY /*'@'*/

+maud MONS_MAUD /*'@'*/

 michael MONS_MICHAEL /*'@'*/

+norbert MONS_NORBERT /*'@'*/

+norris MONS_NORRIS /*'@'*/

 psyche MONS_PSYCHE /*'@'*/

-frederick MONS_FREDERICK

+rupert MONS_RUPERT /*'@'*/

+sigmund MONS_SIGMUND /*'@'*/

+terence MONS_TERENCE /*'@'*/

+wayne MONS_WAYNE /*'@'*/

+%sdir dc-mon

 

 ##Angels

 angel MONS_ANGEL /*'A'*/

 daeva MONS_DAEVA /*'A'*/

-####nh-mon0/m/large_mimic MONS_SHUGGOTH /*'A'(LIGHTGREEN) A vile creature with an elongated head, spiked tail and wicked six-fingered claws. Its awesome strength is matched by its umbrage at being transported to this backwater dimension. 

 

 ## Beetles

 boring_beetle MONS_BORING_BEETLE /*'B'*/

@@ -134,7 +130,10 @@ giant_beetle MONS_GIANT_BEETLE /*'B'*/
 program_bug MONS_PROGRAM_BUG /*'B'*/

 

 ## Giants

+%sdir dc-mon/unique

 antaeus MONS_ANTAEUS /*'C'*/

+polyphemus MONS_POLYPHEMUS

+%sdir dc-mon

 cyclops MONS_CYCLOPS /*'C'*/

 ettin MONS_ETTIN /*'C'*/

 fire_giant MONS_FIRE_GIANT /*'C'*/

@@ -142,9 +141,11 @@ frost_giant MONS_FROST_GIANT /*'C'*/
 hill_giant MONS_HILL_GIANT /*'C'*/

 stone_giant MONS_STONE_GIANT /*'C'*/

 titan MONS_TITAN /*'C'*/

-polyphemus MONS_POLYPHEMUS

 

 ## Dragons

+%sdir dc-mon/unique

+xtahua MONS_XTAHUA /*'D'*/

+%sdir dc-mon

 dragon MONS_DRAGON /*'D'*/

 golden_dragon MONS_GOLDEN_DRAGON /*'D'*/

 hydra1 MONS_HYDRA /*'D'*/

@@ -162,9 +163,7 @@ shadow_dragon MONS_SHADOW_DRAGON /*'D'*/
 skeletal_dragon MONS_SKELETAL_DRAGON /*'D'*/

 storm_dragon MONS_STORM_DRAGON /*'D'*/

 swamp_dragon MONS_SWAMP_DRAGON /*'D'*/

-tiamat MONS_TIAMAT

 wyvern MONS_WYVERN /*'D'*/

-xtahua MONS_XTAHUA /*'D'*/

 

 ## Efreet only

 efreet MONS_EFREET /*'E'*/

@@ -213,8 +212,10 @@ kobold MONS_KOBOLD /*'K'*/
 kobold_demonologist MONS_KOBOLD_DEMONOLOGIST /*'K'*/

 

 ## Liches

-ancient_lich MONS_ANCIENT_LICH /*'L'*/

+%sdir dc-mon/unique

 boris MONS_BORIS /*'L'*/

+%sdir dc-mon

+ancient_lich MONS_ANCIENT_LICH /*'L'*/

 lich MONS_LICH /*'L'*/

 

 ## Mummies

@@ -230,7 +231,9 @@ naga_warrior0 MONS_NAGA_WARRIOR /*'N'*/
 guardian_naga MONS_GUARDIAN_NAGA /*'N'*/

 naga_mage MONS_NAGA_MAGE /*'N'*/

 

+%sdir dc-mon/unique

 erolcha MONS_EROLCHA /*'O'*/

+%sdir dc-mon

 ogre MONS_OGRE /*'O'*/

 ogre_mage MONS_OGRE_MAGE /*'O'*/

 two_headed_ogre MONS_TWO_HEADED_OGRE /*'O'*/

@@ -242,7 +245,7 @@ queen_ant MONS_QUEEN_ANT /*'Q'*/
 queen_bee MONS_QUEEN_BEE /*'Q'*/

 

 rakshasa MONS_RAKSHASA /*'R'*/

-rakshasa_fake MONS_RAKSHASA_FAKE /*'R'*/

+rakshasa MONS_RAKSHASA_FAKE /*'R'*/

 

 black_snake MONS_BLACK_SNAKE /*'S'*/

 brown_snake MONS_BROWN_SNAKE /*'S'*/

@@ -253,10 +256,12 @@ small_snake MONS_SMALL_SNAKE /*'S'*/
 snake MONS_SNAKE /*'S'*/

 yellow_snake MONS_YELLOW_SNAKE /*'S'*/

 

+%sdir dc-mon/unique

+snorg MONS_SNORG /*'T'*/

+%sdir dc-mon

 deep_troll MONS_DEEP_TROLL /*'T'*/

 iron_troll MONS_IRON_TROLL /*'T'*/

 rock_troll MONS_ROCK_TROLL /*'T'*/

-snorg MONS_SNORG /*'T'*/

 troll MONS_TROLL /*'T'*/

 

 bear MONS_BEAR /*'U'*/

@@ -292,7 +297,6 @@ yak MONS_YAK /*'Y'*/
 simulacrum_large MONS_SIMULACRUM_LARGE /*'Z'*/

 skeleton_large MONS_SKELETON_LARGE /*'Z'*/

 zombie_large MONS_ZOMBIE_LARGE /*'Z'*/

-#armour_mimic MONS_ARMOUR_MIMIC /*'['(BLACK) An apparently abandoned suit of finely-made armour, actually a vicious little beast in disguise.

 

 giant_ant MONS_GIANT_ANT /*'a'*/

 giant_cockroach MONS_GIANT_COCKROACH /*'a'*/

@@ -342,10 +346,12 @@ deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER
 fungus MONS_FUNGUS /*'f'*/

 wandering_mushroom MONS_WANDERING_MUSHROOM /*'f'*/

 

+%sdir dc-mon/unique

+ijyb MONS_IJYB /*'g'*/

+%sdir dc-mon

 goblin0 MONS_GOBLIN /*'g'*/

 hobgoblin0 MONS_HOBGOBLIN /*'g'*/

 gnoll0 MONS_GNOLL /*'g'*/

-ijyb0 MONS_IJYB /*'g'*/

 boggart MONS_BOGGART /*'g'*/

 gargoyle MONS_GARGOYLE /*'g'*/

 metal_gargoyle MONS_METAL_GARGOYLE /*'g'*/

@@ -381,12 +387,14 @@ ghoul MONS_GHOUL /*'n'*/
 necrophage MONS_NECROPHAGE /*'n'*/

 rotting_hulk MONS_ROTTING_HULK /*'n'*/

 

+%sdir dc-mon/unique

+blork_the_orc MONS_BLORK_THE_ORC /*'o'*/

+urug MONS_URUG /*'o'*/

+%sdir dc-mon

 orc0 MONS_ORC /*'o'*/

 orc_warrior0 MONS_ORC_WARRIOR /*'o'*/

 orc_knight0 MONS_ORC_KNIGHT /*'o'*/

 orc_warlord0 MONS_ORC_WARLORD /*'o'*/

-blork_the_orc0 MONS_BLORK_THE_ORC /*'o'*/

-urug0 MONS_URUG /*'o'*/

 orc_priest MONS_ORC_PRIEST /*'o'*/

 orc_high_priest MONS_ORC_HIGH_PRIEST /*'o'*/

 orc_sorcerer MONS_ORC_SORCERER /*'o'*/

@@ -413,6 +421,7 @@ giant_mite MONS_GIANT_MITE /*'s'*/
 redback MONS_REDBACK /*'s'*/

 scorpion MONS_SCORPION /*'s'*/

 wolf_spider MONS_WOLF_SPIDER /*'s'*/

+trapdoor_spider MONS_TRAPDOOR_SPIDER /*'s'*/

 

 ugly_thing MONS_UGLY_THING /*'u'*/

 very_ugly_thing MONS_VERY_UGLY_THING /*'u'*/

@@ -438,6 +447,9 @@ moth_of_wrath MONS_MOTH_OF_WRATH /*'y'*/
 red_wasp MONS_RED_WASP /*'y'*/

 yellow_wasp MONS_YELLOW_WASP /*'y'*/

 

+%sdir dc-mon/unique

+murray MONS_MURRAY

+%sdir dc-mon

 curse_skull MONS_CURSE_SKULL /*'z'*/

 curse_toe MONS_CURSE_TOE /*'z'*/

 flying_skull MONS_FLYING_SKULL /*'z'*/

@@ -445,10 +457,9 @@ simulacrum_small MONS_SIMULACRUM_SMALL /*'z'*/
 skeletal_warrior0 MONS_SKELETAL_WARRIOR /*'z'*/

 skeleton_small MONS_SKELETON_SMALL /*'z'*/

 zombie_small MONS_ZOMBIE_SMALL /*'z'*/

-murray MONS_MURRAY

+flaming_corpse MONS_FLAMING_CORPSE /*'z'*/

 

 water_elemental MONS_WATER_ELEMENTAL /*'{'*/

-####nh-mon0/m/large_mimic MONS_MOLLUSC_LORD

 

 merfolk_fighter MONS_MERFOLK_FIGHTER

 merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER

@@ -462,6 +473,8 @@ dngn_ice_statue ICE_STATUE
 dngn_silver_statue SILVER_STATUE

 %sdir dc-mon

 

+%sdir dc-mon/unique

+tiamat MONS_TIAMAT

 %sdir dc-mon/draco

 draco-base-brown DRACO_BASE

 draco-base-black

diff --git a/crawl-ref/source/rltiles/dc-mon/adolf.png b/crawl-ref/source/rltiles/dc-mon/adolf.png
deleted file mode 100644
index 0a13794b62..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/adolf.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/dc-mon/flaming_corpse.png b/crawl-ref/source/rltiles/dc-mon/flaming_corpse.png
new file mode 100644
index 0000000000..008b4c41c3
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/flaming_corpse.png
diff --git a/crawl-ref/source/rltiles/dc-mon/rakshasa_fake.png b/crawl-ref/source/rltiles/dc-mon/rakshasa_fake.png
deleted file mode 100644
index 412743caae..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/rakshasa_fake.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/dc-mon/snorg.png b/crawl-ref/source/rltiles/dc-mon/snorg.png
deleted file mode 100644
index 26ab7d7578..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/snorg.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/dc-mon/trapdoor_spider.png b/crawl-ref/source/rltiles/dc-mon/trapdoor_spider.png
new file mode 100644
index 0000000000..655921ef47
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/trapdoor_spider.png
diff --git a/crawl-ref/source/rltiles/dc-mon/agnes.png b/crawl-ref/source/rltiles/dc-mon/unique/agnes.png
index 7ecba91be0..7ecba91be0 100644
--- a/crawl-ref/source/rltiles/dc-mon/agnes.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/agnes.png
diff --git a/crawl-ref/source/rltiles/dc-mon/antaeus.png b/crawl-ref/source/rltiles/dc-mon/unique/antaeus.png
index 1547c09fb8..1547c09fb8 100644
--- a/crawl-ref/source/rltiles/dc-mon/antaeus.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/antaeus.png
diff --git a/crawl-ref/source/rltiles/dc-mon/asmodeus.png b/crawl-ref/source/rltiles/dc-mon/unique/asmodeus.png
index 7fb5d8b051..7fb5d8b051 100644
--- a/crawl-ref/source/rltiles/dc-mon/asmodeus.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/asmodeus.png
diff --git a/crawl-ref/source/rltiles/dc-mon/blork_the_orc0.png b/crawl-ref/source/rltiles/dc-mon/unique/blork_the_orc.png
index 490093a373..490093a373 100644
--- a/crawl-ref/source/rltiles/dc-mon/blork_the_orc0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/blork_the_orc.png
diff --git a/crawl-ref/source/rltiles/dc-mon/boris.png b/crawl-ref/source/rltiles/dc-mon/unique/boris.png
index a93080122f..a93080122f 100644
--- a/crawl-ref/source/rltiles/dc-mon/boris.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/boris.png
diff --git a/crawl-ref/source/rltiles/dc-mon/cerebov.png b/crawl-ref/source/rltiles/dc-mon/unique/cerebov.png
index 793af6441c..793af6441c 100644
--- a/crawl-ref/source/rltiles/dc-mon/cerebov.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/cerebov.png
diff --git a/crawl-ref/source/rltiles/dc-mon/dispater.png b/crawl-ref/source/rltiles/dc-mon/unique/dispater.png
index 6c9764c33f..6c9764c33f 100644
--- a/crawl-ref/source/rltiles/dc-mon/dispater.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/dispater.png
diff --git a/crawl-ref/source/rltiles/dc-mon/donald.png b/crawl-ref/source/rltiles/dc-mon/unique/donald.png
index 2f49733b28..2f49733b28 100644
--- a/crawl-ref/source/rltiles/dc-mon/donald.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/donald.png
diff --git a/crawl-ref/source/rltiles/dc-mon/duane0.png b/crawl-ref/source/rltiles/dc-mon/unique/duane.png
index 5158fb3066..5158fb3066 100644
--- a/crawl-ref/source/rltiles/dc-mon/duane0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/duane.png
diff --git a/crawl-ref/source/rltiles/dc-mon/edmund0.png b/crawl-ref/source/rltiles/dc-mon/unique/edmund.png
index b2c48105e0..b2c48105e0 100644
--- a/crawl-ref/source/rltiles/dc-mon/edmund0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/edmund.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ereshkigal.png b/crawl-ref/source/rltiles/dc-mon/unique/ereshkigal.png
index 535c5e4e45..535c5e4e45 100644
--- a/crawl-ref/source/rltiles/dc-mon/ereshkigal.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/ereshkigal.png
diff --git a/crawl-ref/source/rltiles/dc-mon/erica.png b/crawl-ref/source/rltiles/dc-mon/unique/erica.png
index 4fe8221fb9..4fe8221fb9 100644
--- a/crawl-ref/source/rltiles/dc-mon/erica.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/erica.png
diff --git a/crawl-ref/source/rltiles/dc-mon/erolcha.png b/crawl-ref/source/rltiles/dc-mon/unique/erolcha.png
index ce741ebc1c..ce741ebc1c 100644
--- a/crawl-ref/source/rltiles/dc-mon/erolcha.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/erolcha.png
diff --git a/crawl-ref/source/rltiles/dc-mon/frances0.png b/crawl-ref/source/rltiles/dc-mon/unique/frances.png
index e0045ca0bd..e0045ca0bd 100644
--- a/crawl-ref/source/rltiles/dc-mon/frances0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/frances.png
diff --git a/crawl-ref/source/rltiles/dc-mon/francis.png b/crawl-ref/source/rltiles/dc-mon/unique/francis.png
index a4af9fa31a..a4af9fa31a 100644
--- a/crawl-ref/source/rltiles/dc-mon/francis.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/francis.png
diff --git a/crawl-ref/source/rltiles/dc-mon/frederick.png b/crawl-ref/source/rltiles/dc-mon/unique/frederick.png
index fffb297cbe..fffb297cbe 100644
--- a/crawl-ref/source/rltiles/dc-mon/frederick.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/frederick.png
diff --git a/crawl-ref/source/rltiles/dc-mon/geryon.png b/crawl-ref/source/rltiles/dc-mon/unique/geryon.png
index b6a906c77a..b6a906c77a 100644
--- a/crawl-ref/source/rltiles/dc-mon/geryon.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/geryon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/gloorx_vloq.png b/crawl-ref/source/rltiles/dc-mon/unique/gloorx_vloq.png
index c37c368f18..c37c368f18 100644
--- a/crawl-ref/source/rltiles/dc-mon/gloorx_vloq.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/gloorx_vloq.png
diff --git a/crawl-ref/source/rltiles/dc-mon/harold0.png b/crawl-ref/source/rltiles/dc-mon/unique/harold.png
index c81e76ee2f..c81e76ee2f 100644
--- a/crawl-ref/source/rltiles/dc-mon/harold0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/harold.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ijyb0.png b/crawl-ref/source/rltiles/dc-mon/unique/ijyb.png
index 14d6f46368..14d6f46368 100644
--- a/crawl-ref/source/rltiles/dc-mon/ijyb0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/ijyb.png
diff --git a/crawl-ref/source/rltiles/dc-mon/jessica.png b/crawl-ref/source/rltiles/dc-mon/unique/jessica.png
index 2ea86bcd6b..2ea86bcd6b 100644
--- a/crawl-ref/source/rltiles/dc-mon/jessica.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/jessica.png
diff --git a/crawl-ref/source/rltiles/dc-mon/joseph0.png b/crawl-ref/source/rltiles/dc-mon/unique/joseph.png
index fa14ac5a04..fa14ac5a04 100644
--- a/crawl-ref/source/rltiles/dc-mon/joseph0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/joseph.png
diff --git a/crawl-ref/source/rltiles/dc-mon/josephine.png b/crawl-ref/source/rltiles/dc-mon/unique/josephine.png
index 4e03e8823f..4e03e8823f 100644
--- a/crawl-ref/source/rltiles/dc-mon/josephine.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/josephine.png
diff --git a/crawl-ref/source/rltiles/dc-mon/jozef0.png b/crawl-ref/source/rltiles/dc-mon/unique/jozef.png
index ce9344b58b..ce9344b58b 100644
--- a/crawl-ref/source/rltiles/dc-mon/jozef0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/jozef.png
diff --git a/crawl-ref/source/rltiles/dc-mon/lom_lobon.png b/crawl-ref/source/rltiles/dc-mon/unique/lom_lobon.png
index 5445aa84c6..5445aa84c6 100644
--- a/crawl-ref/source/rltiles/dc-mon/lom_lobon.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/lom_lobon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/louise.png b/crawl-ref/source/rltiles/dc-mon/unique/louise.png
index 811fbf4760..811fbf4760 100644
--- a/crawl-ref/source/rltiles/dc-mon/louise.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/louise.png
diff --git a/crawl-ref/source/rltiles/dc-mon/margery.png b/crawl-ref/source/rltiles/dc-mon/unique/margery.png
index ea331a260c..ea331a260c 100644
--- a/crawl-ref/source/rltiles/dc-mon/margery.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/margery.png
diff --git a/crawl-ref/source/rltiles/dc-mon/maud0.png b/crawl-ref/source/rltiles/dc-mon/unique/maud.png
index 3b78b34fb7..3b78b34fb7 100644
--- a/crawl-ref/source/rltiles/dc-mon/maud0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/maud.png
diff --git a/crawl-ref/source/rltiles/dc-mon/michael.png b/crawl-ref/source/rltiles/dc-mon/unique/michael.png
index ad26a5098d..ad26a5098d 100644
--- a/crawl-ref/source/rltiles/dc-mon/michael.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/michael.png
diff --git a/crawl-ref/source/rltiles/dc-mon/mnoleg.png b/crawl-ref/source/rltiles/dc-mon/unique/mnoleg.png
index 9ca0328edb..9ca0328edb 100644
--- a/crawl-ref/source/rltiles/dc-mon/mnoleg.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/mnoleg.png
diff --git a/crawl-ref/source/rltiles/dc-mon/murray.png b/crawl-ref/source/rltiles/dc-mon/unique/murray.png
index f8a23ba0e9..f8a23ba0e9 100644
--- a/crawl-ref/source/rltiles/dc-mon/murray.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/murray.png
diff --git a/crawl-ref/source/rltiles/dc-mon/norbert.png b/crawl-ref/source/rltiles/dc-mon/unique/norbert.png
index e616d23efc..e616d23efc 100644
--- a/crawl-ref/source/rltiles/dc-mon/norbert.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/norbert.png
diff --git a/crawl-ref/source/rltiles/dc-mon/norris2.png b/crawl-ref/source/rltiles/dc-mon/unique/norris.png
index a482ca97dc..a482ca97dc 100644
--- a/crawl-ref/source/rltiles/dc-mon/norris2.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/norris.png
diff --git a/crawl-ref/source/rltiles/dc-mon/polyphemus.png b/crawl-ref/source/rltiles/dc-mon/unique/polyphemus.png
index b2603397da..b2603397da 100644
--- a/crawl-ref/source/rltiles/dc-mon/polyphemus.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/polyphemus.png
diff --git a/crawl-ref/source/rltiles/dc-mon/psyche.png b/crawl-ref/source/rltiles/dc-mon/unique/psyche.png
index d2e36a5a3b..d2e36a5a3b 100644
--- a/crawl-ref/source/rltiles/dc-mon/psyche.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/psyche.png
diff --git a/crawl-ref/source/rltiles/dc-mon/rupert0.png b/crawl-ref/source/rltiles/dc-mon/unique/rupert.png
index a9fe9b325a..a9fe9b325a 100644
--- a/crawl-ref/source/rltiles/dc-mon/rupert0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/rupert.png
diff --git a/crawl-ref/source/rltiles/dc-mon/sigmund.png b/crawl-ref/source/rltiles/dc-mon/unique/sigmund.png
index 9d9d4df413..9d9d4df413 100644
--- a/crawl-ref/source/rltiles/dc-mon/sigmund.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/sigmund.png
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/snorg.png b/crawl-ref/source/rltiles/dc-mon/unique/snorg.png
new file mode 100644
index 0000000000..523f0154bd
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/snorg.png
diff --git a/crawl-ref/source/rltiles/dc-mon/terence0.png b/crawl-ref/source/rltiles/dc-mon/unique/terence.png
index 2c8e493f6a..2c8e493f6a 100644
--- a/crawl-ref/source/rltiles/dc-mon/terence0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/terence.png
diff --git a/crawl-ref/source/rltiles/dc-mon/tiamat.png b/crawl-ref/source/rltiles/dc-mon/unique/tiamat.png
index 2080018bc4..2080018bc4 100644
--- a/crawl-ref/source/rltiles/dc-mon/tiamat.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/tiamat.png
diff --git a/crawl-ref/source/rltiles/dc-mon/urug0.png b/crawl-ref/source/rltiles/dc-mon/unique/urug.png
index 43a214d5cc..43a214d5cc 100644
--- a/crawl-ref/source/rltiles/dc-mon/urug0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/urug.png
diff --git a/crawl-ref/source/rltiles/dc-mon/wayne0.png b/crawl-ref/source/rltiles/dc-mon/unique/wayne.png
index 567554d8aa..567554d8aa 100644
--- a/crawl-ref/source/rltiles/dc-mon/wayne0.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/wayne.png
diff --git a/crawl-ref/source/rltiles/dc-mon/xtahua.png b/crawl-ref/source/rltiles/dc-mon/unique/xtahua.png
index 1e39ab5cca..1e39ab5cca 100644
--- a/crawl-ref/source/rltiles/dc-mon/xtahua.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/xtahua.png
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index c6a60c56fb..f28972b83a 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -92,6 +92,13 @@ halo_player TSO
 %rim 1

 %end

 

+%parts_ctg ENCH

+%rim 0

+%sdir player/ench

+sticky_flame STICKY_FLAME

+%rim 1

+%end

+

 ###Cloak

 %parts_ctg CLOAK

 %sdir player/cloak

diff --git a/crawl-ref/source/rltiles/item/misc/runes/misc_rune_shoals.png b/crawl-ref/source/rltiles/item/misc/runes/misc_rune_shoals.png
deleted file mode 100644
index 98b2037300..0000000000
--- a/crawl-ref/source/rltiles/item/misc/runes/misc_rune_shoals.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/misc/runes/misc_rune_snake.png b/crawl-ref/source/rltiles/item/misc/runes/misc_rune_snake.png
deleted file mode 100644
index bb84335cba..0000000000
--- a/crawl-ref/source/rltiles/item/misc/runes/misc_rune_snake.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/misc/runes/misc_rune_tomb.png b/crawl-ref/source/rltiles/item/misc/runes/misc_rune_tomb.png
deleted file mode 100644
index c77144e24c..0000000000
--- a/crawl-ref/source/rltiles/item/misc/runes/misc_rune_tomb.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/player/ench/sticky_flame.png b/crawl-ref/source/rltiles/player/ench/sticky_flame.png
new file mode 100644
index 0000000000..77abc072e3
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/ench/sticky_flame.png
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index 8edbbc7311..a4404f9e84 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -28,26 +28,26 @@
 #include "tiles.h"
 #include "transfor.h"
 
-static int wall_flavors     = 0;
-static int floor_flavors    = 0;
-static int special_flavors  = 0;
+static int wall_flavours    = 0;
+static int floor_flavours   = 0;
+static int special_flavours = 0;
 static int wall_tile_idx    = 0;
 static int floor_tile_idx   = 0;
 static int special_tile_idx = 0;
 
-int get_num_wall_flavors()
+int get_num_wall_flavours()
 {
-    return wall_flavors;
+    return wall_flavours;
 }
 
-int get_num_floor_flavors()
+int get_num_floor_flavours()
 {
-    return floor_flavors;
+    return floor_flavours;
 }
 
-int get_num_floor_special_flavors()
+int get_num_floor_special_flavours()
 {
-    return special_flavors;
+    return special_flavours;
 }
 
 int get_wall_tile_idx()
@@ -369,26 +369,22 @@ void TileLoadWall(bool wizard)
 {
     WallIdx(wall_tile_idx, floor_tile_idx, special_tile_idx);
 
-    // Number of flavors are generated automatically...
-    floor_flavors = tile_dngn_count(floor_tile_idx);
-    wall_flavors  = tile_dngn_count(wall_tile_idx);
+    // Number of flavours are generated automatically...
+    floor_flavours = tile_dngn_count(floor_tile_idx);
+    wall_flavours  = tile_dngn_count(wall_tile_idx);
 
     if (special_tile_idx != -1)
-    {
-        special_flavors = tile_dngn_count(special_tile_idx);
-    }
+        special_flavours = tile_dngn_count(special_tile_idx);
     else
-    {
-        special_flavors = 0;
-    }
+        special_flavours = 0;
 }
 
 int get_clean_map_idx(int tile_idx)
 {
     int idx = tile_idx & TILE_FLAG_MASK;
-    if (idx >= TILE_CLOUD_FIRE_0 && idx <= TILE_CLOUD_PURP_SMOKE ||
-        idx >= TILEP_MONS_SHADOW && idx <= TILEP_MONS_WATER_ELEMENTAL ||
-        idx >= TILEP_MCACHE_START)
+    if (idx >= TILE_CLOUD_FIRE_0 && idx <= TILE_CLOUD_PURP_SMOKE
+        || idx >= TILEP_MONS_SHADOW && idx <= TILEP_MONS_WATER_ELEMENTAL
+        || idx >= TILEP_MCACHE_START)
     {
         return 0;
     }
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc
index 46cdc3c023..a1f4fca1b8 100644
--- a/crawl-ref/source/tilemcache.cc
+++ b/crawl-ref/source/tilemcache.cc
@@ -5,7 +5,7 @@
 
 mcache_manager mcache;
 
-// Used internally for streaming
+// Used internally for streaming.
 enum mcache_type
 {
     MCACHE_MONSTER,
@@ -21,17 +21,13 @@ enum mcache_type
 static void unmarshallDoll(reader &th, dolls_data &doll)
 {
     for (unsigned int i = 0; i < TILEP_PART_MAX; i++)
-    {
         doll.parts[i] = unmarshallLong(th);
-    }
 }
 
 static void marshallDoll(writer &th, const dolls_data &doll)
 {
     for (unsigned int i = 0; i < TILEP_PART_MAX; i++)
-    {
         marshallLong(th, doll.parts[i]);
-    }
 }
 
 static void unmarshallDemon(reader &th, demon_data &demon)
@@ -661,10 +657,10 @@ mcache_ghost::mcache_ghost(const monsters *mon)
 
     for (int p = TILEP_PART_CLOAK; p < TILEP_PART_MAX; p++)
     {
-         if (m_doll.parts[p] == TILEP_SHOW_EQUIP)
-         {
-             int part_offset = pseudo_rand % tile_player_part_count[p];
-             m_doll.parts[p] = tile_player_part_start[p] + part_offset;
+        if (m_doll.parts[p] == TILEP_SHOW_EQUIP)
+        {
+            int part_offset = pseudo_rand % tile_player_part_count[p];
+            m_doll.parts[p] = tile_player_part_start[p] + part_offset;
         }
     }
 
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 0d2abc90ee..925b90ac28 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -57,7 +57,7 @@ void TileNewLevel(bool first_time)
 
     TileLoadWall(false);
     if (first_time)
-        tile_init_flavor();
+        tile_init_flavour();
 
     if (!player_in_mappable_area() || first_time)
     {
@@ -264,6 +264,8 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_OKLOB_PLANT;
     case MONS_WOLF_SPIDER:
         return TILEP_MONS_WOLF_SPIDER;
+    case MONS_TRAPDOOR_SPIDER:
+        return TILEP_MONS_TRAPDOOR_SPIDER;
     case MONS_SHADOW:
         return TILEP_MONS_SHADOW;
     case MONS_HUNGRY_GHOST:
@@ -401,6 +403,8 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_STONE_GIANT;
     case MONS_FLAYED_GHOST:
         return TILEP_MONS_FLAYED_GHOST;
+    case MONS_FLAMING_CORPSE:
+        return TILEP_MONS_FLAMING_CORPSE;
     case MONS_BUMBLEBEE:
         return TILEP_MONS_BUMBLEBEE;
     case MONS_REDBACK:
@@ -1585,6 +1589,8 @@ static int _tileidx_corpse(int mon)
         return TILE_CORPSE_WOLF_SPIDER;
     case MONS_REDBACK:
         return TILE_CORPSE_REDBACK;
+    case MONS_TRAPDOOR_SPIDER:
+        return TILE_CORPSE_TRAPDOOR_SPIDER;
     case MONS_MINOTAUR:
         return TILE_CORPSE_MINOTAUR;
     case MONS_UGLY_THING:
@@ -1861,7 +1867,7 @@ int tileidx_item(const item_def &item)
     int clas    = item.base_type;
     int type    = item.sub_type;
     int special = item.special;
-    int color   = item.colour;
+    int colour  = item.colour;
 
     id_arr& id = get_typeid_array();
 
@@ -1911,7 +1917,7 @@ int tileidx_item(const item_def &item)
         if (type < NUM_RINGS)
         {
             if (is_random_artefact( item ))
-                return TILE_RING_RANDOM_OFFSET + color - 1;
+                return TILE_RING_RANDOM_OFFSET + colour - 1;
             else if (id[ IDTYPE_JEWELLERY][type] == ID_KNOWN_TYPE
                      || (item.flags & ISFLAG_KNOW_TYPE))
             {
@@ -1927,7 +1933,7 @@ int tileidx_item(const item_def &item)
             if (is_unrandom_artefact( item ))
                 return _tileidx_unrand_artefact(find_unrandart_index(item));
             else if (is_random_artefact( item ))
-                return TILE_AMU_RANDOM_OFFSET + color - 1;
+                return TILE_AMU_RANDOM_OFFSET + colour - 1;
             else if (id[ IDTYPE_JEWELLERY][type] == ID_KNOWN_TYPE
                      || (item.flags & ISFLAG_KNOW_TYPE))
             {
@@ -1953,7 +1959,7 @@ int tileidx_item(const item_def &item)
     case OBJ_BOOKS:
         type= special % 10;
         if (type < 2)
-            return TILE_BOOK_PAPER_OFFSET + color;
+            return TILE_BOOK_PAPER_OFFSET + colour;
         if (type == 2)
             return TILE_BOOK_LEATHER_OFFSET + special/10;
         if (type == 3)
@@ -2493,7 +2499,7 @@ int tileidx_zap(int colour)
     return (TILE_SYM_BOLT_OFS - 1 + col);
 }
 
-// modify wall tile index depending on floor/wall flavor
+// Modify wall tile index depending on floor/wall flavour.
 static inline void _finalize_tile(unsigned int *tile, bool is_special,
                                   unsigned char wall_flv,
                                   unsigned char floor_flv,
@@ -2514,10 +2520,10 @@ static inline void _finalize_tile(unsigned int *tile, bool is_special,
     // Otherwise, we'll fall through to the next case and replace
     // special tiles with normal floor.
     if (orig == TILE_FLOOR_NORMAL && is_special
-        && get_num_floor_special_flavors() > 0)
+        && get_num_floor_special_flavours() > 0)
     {
         (*tile) = get_floor_special_tile_idx() + special_flv;
-        ASSERT(special_flv < get_num_floor_special_flavors());
+        ASSERT(special_flv < get_num_floor_special_flavours());
     }
     else if (orig == TILE_FLOOR_NORMAL)
     {
@@ -2582,7 +2588,7 @@ void tilep_calc_flags(const int parts[], int flag[])
  * body + optional beard, hair, etc
  */
 
-int draconian_color(int race, int level)
+static int _draconian_colour(int race, int level)
 {
     if (level < 0) // hack:monster
     {
@@ -2700,10 +2706,10 @@ void tilep_race_default(int race, int gender, int level, int *parts)
             if (player_mutation_level(MUT_BIG_WINGS))
             {
                 int st = tile_player_part_start[TILEP_PART_DRCWING];
-                parts[TILEP_PART_DRCWING] = st + draconian_color(race, level);
+                parts[TILEP_PART_DRCWING] = st + _draconian_colour(race, level);
             }
 
-            result = TILEP_BASE_DRACONIAN + draconian_color(race, level)*2;
+            result = TILEP_BASE_DRACONIAN + _draconian_colour(race, level) * 2;
             break;
 
         case SP_CENTAUR:
@@ -3069,36 +3075,36 @@ void tilep_scan_parts(char *fbuf, int *parts)
     int ccount = 0;
     for (int i = 0; parts_saved[i] != -1; i++)
     {
-         int idx;
-         ccount = 0;
-         int p = parts_saved[i];
-
-         while (fbuf[gcount] != ':' && fbuf[gcount] != '\n'
-                && ccount < 4 && gcount < 48)
-         {
-             ibuf[ccount++] = fbuf[gcount++];
-         }
-
-         ibuf[ccount] = '\0';
-         gcount++;
-
-         idx = tilep_str_to_part(ibuf);
-         if (p == TILEP_PART_BASE)
-         {
-             int p0 = (parts[p]-1) & (0xfe);
-             if (((1-idx) & 1) == 1)
-                 p0++;
-             parts[p] = p0 + 1;
-         }
-         else if (idx == TILEP_SHOW_EQUIP)
-             parts[p] = TILEP_SHOW_EQUIP;
-         else if (idx < 0)
-             parts[p] = 0;
-         // TODO enne - is this right? did the old count end at idx not just subtotal?
-         else if (idx > tile_player_part_count[p])
-             parts[p] = tile_player_part_count[p];
-         else
-             parts[p] = idx;
+        int idx;
+        ccount = 0;
+        int p = parts_saved[i];
+
+        while (fbuf[gcount] != ':' && fbuf[gcount] != '\n'
+               && ccount < 4 && gcount < 48)
+        {
+            ibuf[ccount++] = fbuf[gcount++];
+        }
+
+        ibuf[ccount] = '\0';
+        gcount++;
+
+        idx = tilep_str_to_part(ibuf);
+        if (p == TILEP_PART_BASE)
+        {
+            int p0 = (parts[p]-1) & (0xfe);
+            if (((1-idx) & 1) == 1)
+                p0++;
+            parts[p] = p0 + 1;
+        }
+        else if (idx == TILEP_SHOW_EQUIP)
+            parts[p] = TILEP_SHOW_EQUIP;
+        else if (idx < 0)
+            parts[p] = 0;
+        // TODO enne - is this right? did the old count end at idx not just subtotal?
+        else if (idx > tile_player_part_count[p])
+            parts[p] = tile_player_part_count[p];
+        else
+            parts[p] = idx;
     }
 }
 
@@ -3111,19 +3117,19 @@ void tilep_print_parts(char *fbuf, int *parts)
     char *ptr = fbuf;
     for (i = 0; parts_saved[i] != -1; i++)
     {
-         int p = parts_saved[i];
-         if (p == TILEP_PART_BASE) // 0:female  1:male
-         {
-             sprintf(ptr, "%03d", parts[p]%2);
-             ptr += 3;
-         }
-         else
-         {
-             tilep_part_to_str(parts[p], ptr);
-             ptr += 3;
-         }
-         *ptr = ':';
-         ptr++;
+        int p = parts_saved[i];
+        if (p == TILEP_PART_BASE) // 0:female  1:male
+        {
+            sprintf(ptr, "%03d", parts[p]%2);
+            ptr += 3;
+        }
+        else
+        {
+            tilep_part_to_str(parts[p], ptr);
+            ptr += 3;
+        }
+        *ptr = ':';
+        ptr++;
     }
     ptr--; // erase the last ':'
     *ptr = 0;
@@ -3734,8 +3740,8 @@ int get_ctg_idx(char *name)
     int i;
 
     for (i = 0; i < TILEP_PART_MAX; i++)
-         if (strcmp(name, tilep_parts_name[i]) == 0)
-             return i;
+        if (strcmp(name, tilep_parts_name[i]) == 0)
+            return i;
 
     return 0;
 }
@@ -3762,8 +3768,8 @@ int get_parts_idx(int part, char *name)
     int i;
 
     for (i = 0; i < tilep_parts_total[part]; i++)
-         if (strcmp(name, tilep_comment[ tilep_comment_ofs[part]+i]) == 0)
-             return i+1;
+        if (strcmp(name, tilep_comment[ tilep_comment_ofs[part]+i]) == 0)
+            return i+1;
 
     return res;
 }
@@ -3792,7 +3798,7 @@ int jitter(SpecialIdx i)
     return (i + random_range(-1, 1) + 8) % 8;
 }
 
-void tile_init_flavor()
+void tile_init_flavour()
 {
     const bool bazaar = _is_bazaar();
     const unsigned short baz_col = _get_bazaar_special_colour();
@@ -3800,13 +3806,13 @@ void tile_init_flavor()
     for (int x = 0; x < GXM; x++)
         for (int y = 0; y < GYM; y++)
         {
-            int max_wall_flavor  = get_num_wall_flavors() - 1;
-            int max_floor_flavor = get_num_floor_flavors() - 1;
-            int wall_flavor  = random_range(0, max_wall_flavor);
-            int floor_flavor = random_range(0, max_floor_flavor);
+            int max_wall_flavour  = get_num_wall_flavours() - 1;
+            int max_floor_flavour = get_num_floor_flavours() - 1;
+            int wall_flavour  = random_range(0, max_wall_flavour);
+            int floor_flavour = random_range(0, max_floor_flavour);
 
-            env.tile_flv[x][y].floor = get_floor_tile_idx() + floor_flavor;
-            env.tile_flv[x][y].wall = get_wall_tile_idx() + wall_flavor;
+            env.tile_flv[x][y].floor = get_floor_tile_idx() + floor_flavour;
+            env.tile_flv[x][y].wall = get_wall_tile_idx() + wall_flavour;
 
             if (grd[x][y] == DNGN_CLOSED_DOOR || grd[x][y] == DNGN_OPEN_DOOR)
             {
@@ -4027,7 +4033,7 @@ void tile_init_flavor()
     //
     // (KEY: N = normal floor, # = special floor)
     //
-    // Into these flavors:
+    // Into these flavours:
     // 1 - SPECIAL_S
     // 2 - SPECIAL_N
     // 3-6, not important
@@ -4036,7 +4042,6 @@ void tile_init_flavor()
     // of a south tile.  What we really want to do is to separate the
     // two regions, by making 1 a SPECIAL_SE and 2 a SPECIAL_NW tile.
     for (int x = 0; x < GXM - 1; x++)
-    {
         for (int y = 0; y < GYM - 1; y++)
         {
             if (grd[x][y] != DNGN_FLOOR || env.grid_colours[x][y] != baz_col)
@@ -4050,34 +4055,33 @@ void tile_init_flavor()
                 continue;
             }
 
-            int right_flavor = x < GXM - 1 ? env.tile_flv[x+1][y].special
+            int right_flavour = x < GXM - 1 ? env.tile_flv[x+1][y].special
                                            : SPECIAL_FULL;
-            int down_flavor  = y < GYM - 1 ? env.tile_flv[x][y+1].special
+            int down_flavour  = y < GYM - 1 ? env.tile_flv[x][y+1].special
                                            : SPECIAL_FULL;
-            int this_flavor = env.tile_flv[x][y].special;
+            int this_flavour  = env.tile_flv[x][y].special;
 
-            if (this_flavor == SPECIAL_N && right_flavor == SPECIAL_S)
+            if (this_flavour == SPECIAL_N && right_flavour == SPECIAL_S)
             {
                 env.tile_flv[x][y].special = SPECIAL_NE;
                 env.tile_flv[x+1][y].special = SPECIAL_SW;
             }
-            else if (this_flavor == SPECIAL_S && right_flavor == SPECIAL_N)
+            else if (this_flavour == SPECIAL_S && right_flavour == SPECIAL_N)
             {
                 env.tile_flv[x][y].special = SPECIAL_SE;
                 env.tile_flv[x+1][y].special = SPECIAL_NW;
             }
-            else if (this_flavor == SPECIAL_E && down_flavor == SPECIAL_W)
+            else if (this_flavour == SPECIAL_E && down_flavour == SPECIAL_W)
             {
                 env.tile_flv[x][y].special = SPECIAL_SE;
                 env.tile_flv[x][y+1].special = SPECIAL_NW;
             }
-            else if (this_flavor == SPECIAL_W && down_flavor == SPECIAL_E)
+            else if (this_flavour == SPECIAL_W && down_flavour == SPECIAL_E)
             {
                 env.tile_flv[x][y].special = SPECIAL_NE;
                 env.tile_flv[x][y+1].special = SPECIAL_SW;
             }
         }
-    }
 }
 
 // Called from view.cc.
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 8e61aa842d..e3eb26e384 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -325,11 +325,14 @@ void DungeonRegion::draw_player(unsigned int x, unsigned int y)
 
     result = default_doll;
 
-    result.parts[TILEP_PART_BASE] = default_doll.parts[TILEP_PART_BASE];
+    result.parts[TILEP_PART_BASE]    = default_doll.parts[TILEP_PART_BASE];
     result.parts[TILEP_PART_DRCHEAD] = default_doll.parts[TILEP_PART_DRCHEAD];
     result.parts[TILEP_PART_DRCWING] = default_doll.parts[TILEP_PART_DRCWING];
-    bool halo = inside_halo(you.pos());
+
+    const bool halo = inside_halo(you.pos());
     result.parts[TILEP_PART_HALO] = halo ? TILEP_HALO_TSO : 0;
+    result.parts[TILEP_PART_ENCH] =
+        (you.duration[DUR_LIQUID_FLAMES] ? TILEP_ENCH_STICKY_FLAME : 0);
 
     if (result.parts[TILEP_PART_HAND1] == TILEP_SHOW_EQUIP)
     {
@@ -394,6 +397,7 @@ void DungeonRegion::draw_player(unsigned int x, unsigned int y)
             result.parts[TILEP_PART_HELM] = 0;
         }
     }
+
     if (result.parts[TILEP_PART_BOOTS] == TILEP_SHOW_EQUIP)
     {
         int item = you.equip[EQ_BOOTS];
@@ -404,6 +408,7 @@ void DungeonRegion::draw_player(unsigned int x, unsigned int y)
         else
             result.parts[TILEP_PART_BOOTS] = 0;
     }
+
     if (result.parts[TILEP_PART_ARM] == TILEP_SHOW_EQUIP)
     {
         int item = you.equip[EQ_GLOVES];
@@ -420,6 +425,7 @@ void DungeonRegion::draw_player(unsigned int x, unsigned int y)
         else
             result.parts[TILEP_PART_ARM] = 0;
     }
+
     if (result.parts[TILEP_PART_LEG] == TILEP_SHOW_EQUIP)
         result.parts[TILEP_PART_LEG] = 0;
     if (result.parts[TILEP_PART_DRCWING] == TILEP_SHOW_EQUIP)
@@ -435,21 +441,22 @@ void DungeonRegion::draw_doll(const dolls_data &doll, unsigned int x,
 {
     int p_order[TILEP_PART_MAX] =
     {
-        TILEP_PART_SHADOW,
+        TILEP_PART_SHADOW,  //  0
         TILEP_PART_HALO,
+        TILEP_PART_ENCH,
         TILEP_PART_DRCWING,
         TILEP_PART_CLOAK,
-        TILEP_PART_BASE,
+        TILEP_PART_BASE,    //  5
         TILEP_PART_BOOTS,
         TILEP_PART_LEG,
         TILEP_PART_BODY,
         TILEP_PART_ARM,
-        TILEP_PART_HAND1,
+        TILEP_PART_HAND1,   // 10
         TILEP_PART_HAND2,
         TILEP_PART_HAIR,
         TILEP_PART_BEARD,
         TILEP_PART_HELM,
-        TILEP_PART_DRCHEAD
+        TILEP_PART_DRCHEAD // 15
     };
 
     int flags[TILEP_PART_MAX];
@@ -458,8 +465,8 @@ void DungeonRegion::draw_doll(const dolls_data &doll, unsigned int x,
     // For skirts, boots go under the leg armour.  For pants, they go over.
     if (doll.parts[TILEP_PART_LEG] < TILEP_LEG_SKIRT_OFS)
     {
-        p_order[5] = TILEP_PART_BOOTS;
-        p_order[6] = TILEP_PART_LEG;
+        p_order[6] = TILEP_PART_BOOTS;
+        p_order[7] = TILEP_PART_LEG;
     }
 
     for (int i = 0; i < TILEP_PART_MAX; i++)
@@ -1245,7 +1252,7 @@ void InventoryRegion::pack_verts()
             if (item.flag & TILEI_FLAG_FLOOR)
             {
                 add_quad(TEX_DUNGEON, get_floor_tile_idx()
-                         + m_flavour[i] % get_num_floor_flavors(), x, y);
+                         + m_flavour[i] % get_num_floor_flavours(), x, y);
             }
             else
                 add_quad(TEX_DUNGEON, TILE_ITEM_SLOT, x, y);
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index 7380c3a1e0..1d795e6270 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -92,13 +92,13 @@ void tile_draw_inv(int flag = -1);
 // Multiple pickup
 void tile_pick_menu();
 
-int get_num_wall_flavors();
-int get_num_floor_flavors();
-int get_num_floor_special_flavors();
+int get_num_wall_flavours();
+int get_num_floor_flavours();
+int get_num_floor_special_flavours();
 int get_wall_tile_idx();
 int get_floor_tile_idx();
 int get_floor_special_tile_idx();
-void tile_init_flavor();
+void tile_init_flavour();
 
 void tile_set_force_redraw_tiles(bool redraw);
 void tile_set_force_redraw_inv(bool redraw);