* Also allow definition of equipment tiles in art-data.txt.

* Rename some tiles and tile folders.


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

90 files changed, 102 insertions, 13 deletions

diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index 9bb0f8a660..7ba05ae239 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -115,7 +115,7 @@ white WHITE
 
 ###Boots
 %parts_ctg BOOTS
-%sdir player/boot
+%sdir player/boots
 
 short_red SHORT_RED
 short_purple SHORT_PURPLE
@@ -153,7 +153,7 @@ centaur_barding_red CENTAUR_BARDING_RED
 
 ### Body armour
 %parts_ctg LEG
-%sdir player/leg
+%sdir player/legs
 
 bikini_red BIKINI_RED
 loincloth_red LOINCLOTH_RED
@@ -349,7 +349,7 @@ lears_chain_mail LEARS_CHAIN_MAIL
 
 ### Arms
 %parts_ctg ARM
-%sdir player/arm
+%sdir player/gloves
 glove_red GLOVE_RED
 glove_gray GLOVE_GRAY
 glove_white GLOVE_WHITE
@@ -482,14 +482,14 @@ black_whip BLACK_WHIP
 hammer3 HAMMER
 hammer HAMMER1
 hammer2 HAMMER2
-frail_stick FRAIL_STICK
-frail_ball FRAIL
-frail_spike SPIKED_FRAIL
-frail_stick_slant GREAT_FRAIL
-frail_ball2 FRAIL_BALL2
-frail_balls FRAIL_BALLS
-frail_ball3 FRAIL_BALL3
-frail_ball4 FRAIL_BALL4
+flail_stick FLAIL_STICK
+flail_ball FLAIL
+flail_spike SPIKED_FLAIL
+flail_stick_slant GREAT_FLAIL
+flail_ball2 FLAIL_BALL2
+flail_balls FLAIL_BALLS
+flail_ball3 FLAIL_BALL3
+flail_ball4 FLAIL_BALL4
 nunchaku NUNCHAKU
 
 ## polearms
@@ -580,7 +580,7 @@ crossbow4 CROSSBOW4
 blowgun BLOWGUN
 
 ##missiles
-dirt DIRT
+dart DART
 
 ## misc
 bone_lantern BONE_LANTERN
diff --git a/crawl-ref/source/rltiles/dc-unrand.txt b/crawl-ref/source/rltiles/dc-unrand.txt
index 62df756cc5..7dc57e3e95 100644
--- a/crawl-ref/source/rltiles/dc-unrand.txt
+++ b/crawl-ref/source/rltiles/dc-unrand.txt
@@ -1,3 +1,7 @@
+# This file is automatically generated from source/art-data.txt via
+# util/art-data.pl.  Do not directly edit this file, but rather change
+# art-data.txt.
+
 %sdir item/armour/artefact
 urand_ignorance UNRAND_IGNORANCE
 urand_augmentation UNRAND_AUGMENTATION
diff --git a/crawl-ref/source/rltiles/item/weapon/artefact/urand_fiery_devil.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_hellfire.png
index b7c751c284..b7c751c284 100644
--- a/crawl-ref/source/rltiles/item/weapon/artefact/urand_fiery_devil.png
+++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_hellfire.png
diff --git a/crawl-ref/source/rltiles/player/boot/blue_gold.png b/crawl-ref/source/rltiles/player/boots/blue_gold.png
index 17dd9ca21b..17dd9ca21b 100644
--- a/crawl-ref/source/rltiles/player/boot/blue_gold.png
+++ b/crawl-ref/source/rltiles/player/boots/blue_gold.png
diff --git a/crawl-ref/source/rltiles/player/boot/hooves.png b/crawl-ref/source/rltiles/player/boots/hooves.png
index 3882db2546..3882db2546 100644
--- a/crawl-ref/source/rltiles/player/boot/hooves.png
+++ b/crawl-ref/source/rltiles/player/boots/hooves.png
diff --git a/crawl-ref/source/rltiles/player/boot/long_red.png b/crawl-ref/source/rltiles/player/boots/long_red.png
index f1cceba443..f1cceba443 100644
--- a/crawl-ref/source/rltiles/player/boot/long_red.png
+++ b/crawl-ref/source/rltiles/player/boots/long_red.png
diff --git a/crawl-ref/source/rltiles/player/boot/long_white.png b/crawl-ref/source/rltiles/player/boots/long_white.png
index 03d6d490e4..03d6d490e4 100644
--- a/crawl-ref/source/rltiles/player/boot/long_white.png
+++ b/crawl-ref/source/rltiles/player/boots/long_white.png
diff --git a/crawl-ref/source/rltiles/player/boot/mesh_black.png b/crawl-ref/source/rltiles/player/boots/mesh_black.png
index 7b11c2f88e..7b11c2f88e 100644
--- a/crawl-ref/source/rltiles/player/boot/mesh_black.png
+++ b/crawl-ref/source/rltiles/player/boots/mesh_black.png
diff --git a/crawl-ref/source/rltiles/player/boot/mesh_blue.png b/crawl-ref/source/rltiles/player/boots/mesh_blue.png
index 4f339780a4..4f339780a4 100644
--- a/crawl-ref/source/rltiles/player/boot/mesh_blue.png
+++ b/crawl-ref/source/rltiles/player/boots/mesh_blue.png
diff --git a/crawl-ref/source/rltiles/player/boot/mesh_red.png b/crawl-ref/source/rltiles/player/boots/mesh_red.png
index 60d42c8fec..60d42c8fec 100644
--- a/crawl-ref/source/rltiles/player/boot/mesh_red.png
+++ b/crawl-ref/source/rltiles/player/boots/mesh_red.png
diff --git a/crawl-ref/source/rltiles/player/boot/mesh_white.png b/crawl-ref/source/rltiles/player/boots/mesh_white.png
index bf98920195..bf98920195 100644
--- a/crawl-ref/source/rltiles/player/boot/mesh_white.png
+++ b/crawl-ref/source/rltiles/player/boots/mesh_white.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_brown.png b/crawl-ref/source/rltiles/player/boots/middle_brown.png
index 020a73dd4b..020a73dd4b 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_brown.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_brown.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_brown2.png b/crawl-ref/source/rltiles/player/boots/middle_brown2.png
index 2f8fc3fd79..2f8fc3fd79 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_brown2.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_brown2.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_brown3.png b/crawl-ref/source/rltiles/player/boots/middle_brown3.png
index c1763222e8..c1763222e8 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_brown3.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_brown3.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_gold.png b/crawl-ref/source/rltiles/player/boots/middle_gold.png
index c2c43a2a24..c2c43a2a24 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_gold.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_gold.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_gray.png b/crawl-ref/source/rltiles/player/boots/middle_gray.png
index 11e5f92458..11e5f92458 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_gray.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_gray.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_green.png b/crawl-ref/source/rltiles/player/boots/middle_green.png
index 0b31f036b8..0b31f036b8 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_green.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_green.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_purple.png b/crawl-ref/source/rltiles/player/boots/middle_purple.png
index aaec68aaa5..aaec68aaa5 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_purple.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_purple.png
diff --git a/crawl-ref/source/rltiles/player/boot/middle_ybrown.png b/crawl-ref/source/rltiles/player/boots/middle_ybrown.png
index 65fa2e0372..65fa2e0372 100644
--- a/crawl-ref/source/rltiles/player/boot/middle_ybrown.png
+++ b/crawl-ref/source/rltiles/player/boots/middle_ybrown.png
diff --git a/crawl-ref/source/rltiles/player/boot/pj.png b/crawl-ref/source/rltiles/player/boots/pj.png
index abd1af3da7..abd1af3da7 100644
--- a/crawl-ref/source/rltiles/player/boot/pj.png
+++ b/crawl-ref/source/rltiles/player/boots/pj.png
diff --git a/crawl-ref/source/rltiles/player/boot/short_brown.png b/crawl-ref/source/rltiles/player/boots/short_brown.png
index 8f6dbbbf5a..8f6dbbbf5a 100644
--- a/crawl-ref/source/rltiles/player/boot/short_brown.png
+++ b/crawl-ref/source/rltiles/player/boots/short_brown.png
diff --git a/crawl-ref/source/rltiles/player/boot/short_brown2.png b/crawl-ref/source/rltiles/player/boots/short_brown2.png
index f88fbfeef8..f88fbfeef8 100644
--- a/crawl-ref/source/rltiles/player/boot/short_brown2.png
+++ b/crawl-ref/source/rltiles/player/boots/short_brown2.png
diff --git a/crawl-ref/source/rltiles/player/boot/short_purple.png b/crawl-ref/source/rltiles/player/boots/short_purple.png
index 59c79c4f26..59c79c4f26 100644
--- a/crawl-ref/source/rltiles/player/boot/short_purple.png
+++ b/crawl-ref/source/rltiles/player/boots/short_purple.png
diff --git a/crawl-ref/source/rltiles/player/boot/short_red.png b/crawl-ref/source/rltiles/player/boots/short_red.png
index 4d328ce083..4d328ce083 100644
--- a/crawl-ref/source/rltiles/player/boot/short_red.png
+++ b/crawl-ref/source/rltiles/player/boots/short_red.png
diff --git a/crawl-ref/source/rltiles/player/arm/claws.png b/crawl-ref/source/rltiles/player/gloves/claws.png
index 94b14f9871..94b14f9871 100644
--- a/crawl-ref/source/rltiles/player/arm/claws.png
+++ b/crawl-ref/source/rltiles/player/gloves/claws.png
diff --git a/crawl-ref/source/rltiles/player/arm/gauntlet_blue.png b/crawl-ref/source/rltiles/player/gloves/gauntlet_blue.png
index ae5e6a19a2..ae5e6a19a2 100644
--- a/crawl-ref/source/rltiles/player/arm/gauntlet_blue.png
+++ b/crawl-ref/source/rltiles/player/gloves/gauntlet_blue.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_black.png b/crawl-ref/source/rltiles/player/gloves/glove_black.png
index 163cd63035..163cd63035 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_black.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_black.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_black2.png b/crawl-ref/source/rltiles/player/gloves/glove_black2.png
index eb9583c19f..eb9583c19f 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_black2.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_black2.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_blue.png b/crawl-ref/source/rltiles/player/gloves/glove_blue.png
index e4d2ba216d..e4d2ba216d 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_blue.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_blue.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_brown.png b/crawl-ref/source/rltiles/player/gloves/glove_brown.png
index 5dfec17f1d..5dfec17f1d 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_brown.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_brown.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_chunli.png b/crawl-ref/source/rltiles/player/gloves/glove_chunli.png
index cabe5ddeab..cabe5ddeab 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_chunli.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_chunli.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_gold.png b/crawl-ref/source/rltiles/player/gloves/glove_gold.png
index dd0fb210ae..dd0fb210ae 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_gold.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_gold.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_gray.png b/crawl-ref/source/rltiles/player/gloves/glove_gray.png
index 21c48d4f91..21c48d4f91 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_gray.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_gray.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_grayfist.png b/crawl-ref/source/rltiles/player/gloves/glove_grayfist.png
index eecf0823a5..eecf0823a5 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_grayfist.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_grayfist.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_orange.png b/crawl-ref/source/rltiles/player/gloves/glove_orange.png
index d80976e0b3..d80976e0b3 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_orange.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_orange.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_purple.png b/crawl-ref/source/rltiles/player/gloves/glove_purple.png
index 8acc77742c..8acc77742c 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_purple.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_purple.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_red.png b/crawl-ref/source/rltiles/player/gloves/glove_red.png
index 8a303ddc6d..8a303ddc6d 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_red.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_red.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_short_blue.png b/crawl-ref/source/rltiles/player/gloves/glove_short_blue.png
index 8c66f5ee77..8c66f5ee77 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_short_blue.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_short_blue.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_short_gray.png b/crawl-ref/source/rltiles/player/gloves/glove_short_gray.png
index c97d4a0ea3..c97d4a0ea3 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_short_gray.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_short_gray.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_short_green.png b/crawl-ref/source/rltiles/player/gloves/glove_short_green.png
index b87642dda3..b87642dda3 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_short_green.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_short_green.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_short_red.png b/crawl-ref/source/rltiles/player/gloves/glove_short_red.png
index 34c8b27b39..34c8b27b39 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_short_red.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_short_red.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_short_white.png b/crawl-ref/source/rltiles/player/gloves/glove_short_white.png
index a5afc95356..a5afc95356 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_short_white.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_short_white.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_short_yellow.png b/crawl-ref/source/rltiles/player/gloves/glove_short_yellow.png
index b7a45949e6..b7a45949e6 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_short_yellow.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_short_yellow.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_white.png b/crawl-ref/source/rltiles/player/gloves/glove_white.png
index 4cfad6167b..4cfad6167b 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_white.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_white.png
diff --git a/crawl-ref/source/rltiles/player/arm/glove_wrist_purple.png b/crawl-ref/source/rltiles/player/gloves/glove_wrist_purple.png
index 1452db4303..1452db4303 100644
--- a/crawl-ref/source/rltiles/player/arm/glove_wrist_purple.png
+++ b/crawl-ref/source/rltiles/player/gloves/glove_wrist_purple.png
diff --git a/crawl-ref/source/rltiles/player/hand1/dirt.png b/crawl-ref/source/rltiles/player/hand1/dart.png
index 3990f80782..3990f80782 100644
--- a/crawl-ref/source/rltiles/player/hand1/dirt.png
+++ b/crawl-ref/source/rltiles/player/hand1/dart.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_ball.png b/crawl-ref/source/rltiles/player/hand1/flail_ball.png
index 4dc386905c..4dc386905c 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_ball.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_ball.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_ball2.png b/crawl-ref/source/rltiles/player/hand1/flail_ball2.png
index dd44aff8a3..dd44aff8a3 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_ball2.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_ball2.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_ball3.png b/crawl-ref/source/rltiles/player/hand1/flail_ball3.png
index 115ea7b12e..115ea7b12e 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_ball3.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_ball3.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_ball4.png b/crawl-ref/source/rltiles/player/hand1/flail_ball4.png
index 5411f43c1b..5411f43c1b 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_ball4.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_ball4.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_balls.png b/crawl-ref/source/rltiles/player/hand1/flail_balls.png
index 8b18cef302..8b18cef302 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_balls.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_balls.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_spike.png b/crawl-ref/source/rltiles/player/hand1/flail_spike.png
index 52729193df..52729193df 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_spike.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_spike.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_stick.png b/crawl-ref/source/rltiles/player/hand1/flail_stick.png
index c9e32cb279..c9e32cb279 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_stick.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_stick.png
diff --git a/crawl-ref/source/rltiles/player/hand1/frail_stick_slant.png b/crawl-ref/source/rltiles/player/hand1/flail_stick_slant.png
index b1f0e90ebe..b1f0e90ebe 100644
--- a/crawl-ref/source/rltiles/player/hand1/frail_stick_slant.png
+++ b/crawl-ref/source/rltiles/player/hand1/flail_stick_slant.png
diff --git a/crawl-ref/source/rltiles/player/leg/belt_gray.png b/crawl-ref/source/rltiles/player/legs/belt_gray.png
index 0e416888a1..0e416888a1 100644
--- a/crawl-ref/source/rltiles/player/leg/belt_gray.png
+++ b/crawl-ref/source/rltiles/player/legs/belt_gray.png
diff --git a/crawl-ref/source/rltiles/player/leg/belt_redbrown.png b/crawl-ref/source/rltiles/player/legs/belt_redbrown.png
index 7d77237115..7d77237115 100644
--- a/crawl-ref/source/rltiles/player/leg/belt_redbrown.png
+++ b/crawl-ref/source/rltiles/player/legs/belt_redbrown.png
diff --git a/crawl-ref/source/rltiles/player/leg/bikini_red.png b/crawl-ref/source/rltiles/player/legs/bikini_red.png
index 9df0f45953..9df0f45953 100644
--- a/crawl-ref/source/rltiles/player/leg/bikini_red.png
+++ b/crawl-ref/source/rltiles/player/legs/bikini_red.png
diff --git a/crawl-ref/source/rltiles/player/leg/chunli.png b/crawl-ref/source/rltiles/player/legs/chunli.png
index 756528b2d9..756528b2d9 100644
--- a/crawl-ref/source/rltiles/player/leg/chunli.png
+++ b/crawl-ref/source/rltiles/player/legs/chunli.png
diff --git a/crawl-ref/source/rltiles/player/leg/garter.png b/crawl-ref/source/rltiles/player/legs/garter.png
index 9d977fab13..9d977fab13 100644
--- a/crawl-ref/source/rltiles/player/leg/garter.png
+++ b/crawl-ref/source/rltiles/player/legs/garter.png
diff --git a/crawl-ref/source/rltiles/player/leg/leg_armor00.png b/crawl-ref/source/rltiles/player/legs/leg_armor00.png
index 8bdbbe8667..8bdbbe8667 100644
--- a/crawl-ref/source/rltiles/player/leg/leg_armor00.png
+++ b/crawl-ref/source/rltiles/player/legs/leg_armor00.png
diff --git a/crawl-ref/source/rltiles/player/leg/leg_armor01.png b/crawl-ref/source/rltiles/player/legs/leg_armor01.png
index d19b9d9743..d19b9d9743 100644
--- a/crawl-ref/source/rltiles/player/leg/leg_armor01.png
+++ b/crawl-ref/source/rltiles/player/legs/leg_armor01.png
diff --git a/crawl-ref/source/rltiles/player/leg/leg_armor02.png b/crawl-ref/source/rltiles/player/legs/leg_armor02.png
index b972fb769d..b972fb769d 100644
--- a/crawl-ref/source/rltiles/player/leg/leg_armor02.png
+++ b/crawl-ref/source/rltiles/player/legs/leg_armor02.png
diff --git a/crawl-ref/source/rltiles/player/leg/leg_armor03.png b/crawl-ref/source/rltiles/player/legs/leg_armor03.png
index e67dbfd316..e67dbfd316 100644
--- a/crawl-ref/source/rltiles/player/leg/leg_armor03.png
+++ b/crawl-ref/source/rltiles/player/legs/leg_armor03.png
diff --git a/crawl-ref/source/rltiles/player/leg/leg_armor04.png b/crawl-ref/source/rltiles/player/legs/leg_armor04.png
index d81d15b75c..d81d15b75c 100644
--- a/crawl-ref/source/rltiles/player/leg/leg_armor04.png
+++ b/crawl-ref/source/rltiles/player/legs/leg_armor04.png
diff --git a/crawl-ref/source/rltiles/player/leg/leg_armor05.png b/crawl-ref/source/rltiles/player/legs/leg_armor05.png
index a70d2493e0..a70d2493e0 100644
--- a/crawl-ref/source/rltiles/player/leg/leg_armor05.png
+++ b/crawl-ref/source/rltiles/player/legs/leg_armor05.png
diff --git a/crawl-ref/source/rltiles/player/leg/loincloth_red.png b/crawl-ref/source/rltiles/player/legs/loincloth_red.png
index 216cb92cf2..216cb92cf2 100644
--- a/crawl-ref/source/rltiles/player/leg/loincloth_red.png
+++ b/crawl-ref/source/rltiles/player/legs/loincloth_red.png
diff --git a/crawl-ref/source/rltiles/player/leg/long_red.png b/crawl-ref/source/rltiles/player/legs/long_red.png
index 8eaeb3040d..8eaeb3040d 100644
--- a/crawl-ref/source/rltiles/player/leg/long_red.png
+++ b/crawl-ref/source/rltiles/player/legs/long_red.png
diff --git a/crawl-ref/source/rltiles/player/leg/metal_gray.png b/crawl-ref/source/rltiles/player/legs/metal_gray.png
index 90c9131264..90c9131264 100644
--- a/crawl-ref/source/rltiles/player/leg/metal_gray.png
+++ b/crawl-ref/source/rltiles/player/legs/metal_gray.png
diff --git a/crawl-ref/source/rltiles/player/leg/metal_green.png b/crawl-ref/source/rltiles/player/legs/metal_green.png
index 05212e4510..05212e4510 100644
--- a/crawl-ref/source/rltiles/player/leg/metal_green.png
+++ b/crawl-ref/source/rltiles/player/legs/metal_green.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants16.png b/crawl-ref/source/rltiles/player/legs/pants16.png
index bd64a401de..bd64a401de 100644
--- a/crawl-ref/source/rltiles/player/leg/pants16.png
+++ b/crawl-ref/source/rltiles/player/legs/pants16.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_black.png b/crawl-ref/source/rltiles/player/legs/pants_black.png
index 44b9fa066a..44b9fa066a 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_black.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_black.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_blue.png b/crawl-ref/source/rltiles/player/legs/pants_blue.png
index 753b7a72f7..753b7a72f7 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_blue.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_blue.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_brown.png b/crawl-ref/source/rltiles/player/legs/pants_brown.png
index 9294ca6f87..9294ca6f87 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_brown.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_brown.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_darkgreen.png b/crawl-ref/source/rltiles/player/legs/pants_darkgreen.png
index 14275b4471..14275b4471 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_darkgreen.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_darkgreen.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_l_white.png b/crawl-ref/source/rltiles/player/legs/pants_l_white.png
index e788fc4aed..e788fc4aed 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_l_white.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_l_white.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_orange.png b/crawl-ref/source/rltiles/player/legs/pants_orange.png
index 1ae53e38be..1ae53e38be 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_orange.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_orange.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_red.png b/crawl-ref/source/rltiles/player/legs/pants_red.png
index e20d1980b2..e20d1980b2 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_red.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_red.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_short_brown.png b/crawl-ref/source/rltiles/player/legs/pants_short_brown.png
index 1ab4db6b67..1ab4db6b67 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_short_brown.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_short_brown.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_short_brown3.png b/crawl-ref/source/rltiles/player/legs/pants_short_brown3.png
index 216d8b8300..216d8b8300 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_short_brown3.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_short_brown3.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_short_darkbrown.png b/crawl-ref/source/rltiles/player/legs/pants_short_darkbrown.png
index 6b5bc17782..6b5bc17782 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_short_darkbrown.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_short_darkbrown.png
diff --git a/crawl-ref/source/rltiles/player/leg/pants_short_gray.png b/crawl-ref/source/rltiles/player/legs/pants_short_gray.png
index 8f9bab8b6f..8f9bab8b6f 100644
--- a/crawl-ref/source/rltiles/player/leg/pants_short_gray.png
+++ b/crawl-ref/source/rltiles/player/legs/pants_short_gray.png
diff --git a/crawl-ref/source/rltiles/player/leg/pj.png b/crawl-ref/source/rltiles/player/legs/pj.png
index 930f938450..930f938450 100644
--- a/crawl-ref/source/rltiles/player/leg/pj.png
+++ b/crawl-ref/source/rltiles/player/legs/pj.png
diff --git a/crawl-ref/source/rltiles/player/leg/skirt_blue.png b/crawl-ref/source/rltiles/player/legs/skirt_blue.png
index 7d86ef261a..7d86ef261a 100644
--- a/crawl-ref/source/rltiles/player/leg/skirt_blue.png
+++ b/crawl-ref/source/rltiles/player/legs/skirt_blue.png
diff --git a/crawl-ref/source/rltiles/player/leg/skirt_green.png b/crawl-ref/source/rltiles/player/legs/skirt_green.png
index 5a1f939ca6..5a1f939ca6 100644
--- a/crawl-ref/source/rltiles/player/leg/skirt_green.png
+++ b/crawl-ref/source/rltiles/player/legs/skirt_green.png
diff --git a/crawl-ref/source/rltiles/player/leg/skirt_red.png b/crawl-ref/source/rltiles/player/legs/skirt_red.png
index 3e8d07f962..3e8d07f962 100644
--- a/crawl-ref/source/rltiles/player/leg/skirt_red.png
+++ b/crawl-ref/source/rltiles/player/legs/skirt_red.png
diff --git a/crawl-ref/source/rltiles/player/leg/skirt_white.png b/crawl-ref/source/rltiles/player/legs/skirt_white.png
index e5b2de01dc..e5b2de01dc 100644
--- a/crawl-ref/source/rltiles/player/leg/skirt_white.png
+++ b/crawl-ref/source/rltiles/player/legs/skirt_white.png
diff --git a/crawl-ref/source/rltiles/player/leg/skirt_white2.png b/crawl-ref/source/rltiles/player/legs/skirt_white2.png
index ef7f557c65..ef7f557c65 100644
--- a/crawl-ref/source/rltiles/player/leg/skirt_white2.png
+++ b/crawl-ref/source/rltiles/player/legs/skirt_white2.png
diff --git a/crawl-ref/source/rltiles/player/leg/trouser_green.png b/crawl-ref/source/rltiles/player/legs/trouser_green.png
index d666026fdc..d666026fdc 100644
--- a/crawl-ref/source/rltiles/player/leg/trouser_green.png
+++ b/crawl-ref/source/rltiles/player/legs/trouser_green.png
diff --git a/crawl-ref/source/rltiles/tiledef-unrand.cc b/crawl-ref/source/rltiles/tiledef-unrand.cc
index 177e996618..f304c803dd 100644
--- a/crawl-ref/source/rltiles/tiledef-unrand.cc
+++ b/crawl-ref/source/rltiles/tiledef-unrand.cc
@@ -1,4 +1,8 @@
-// This file has been automatically generated.
+/*
+ * This file is automatically generated from source/art-data.txt via
+ * util/art-data.pl.  Do not directly edit this file, but rather change
+ * art-data.txt.
+ */
 
 #include "AppHdr.h"
 #include "tiledef-unrand.h"
@@ -88,3 +92,83 @@ int unrandart_to_tile(int unrand)
     }
 }
 
+int unrandart_to_doll_tile(int unrand)
+{
+    switch (unrand)
+    {
+    // ARM
+    case UNRAND_WAR:               return TILEP_ARM_GLOVE_BLACK;
+    case UNRAND_FENCERS_GLOVES:    return TILEP_ARM_GLOVE_WHITE;
+    // BODY
+    case UNRAND_AUGMENTATION:      return TILEP_BODY_ROBE_WHITE_BLUE;
+    case UNRAND_MISFORTUNE:        return TILEP_BODY_ROBE_MISFORTUNE;
+    case UNRAND_LEAR:              return TILEP_BODY_LEARS_CHAIN_MAIL;
+    case UNRAND_ZHOR:              return TILEP_BODY_ZHOR;
+    case UNRAND_SALAMANDER:        return TILEP_BODY_LEATHER_RED;
+    case UNRAND_FOLLY:             return TILEP_BODY_ROBE_RED2;
+    case UNRAND_MAXWELL:           return TILEP_BODY_MAXWELL;
+    case UNRAND_NIGHT:             return TILEP_BODY_ROBE_OF_NIGHT;
+    case UNRAND_DRAGON_KING:       return TILEP_BODY_DRAGONARM_GOLD;
+    // BOOTS
+    case UNRAND_BOOTS_ASSASSIN:    return TILEP_BOOTS_MIDDLE_GRAY;
+    // CLOAK
+    case UNRAND_THIEF:             return TILEP_CLOAK_BLACK;
+    case UNRAND_FLASH:             return TILEP_CLOAK_RED;
+    case UNRAND_STARLIGHT:         return TILEP_CLOAK_WHITE;
+    case UNRAND_RATSKIN_CLOAK:     return TILEP_CLOAK_RATSKIN_CLOAK;
+    // HAND1
+    case UNRAND_SINGING_SWORD:     return TILEP_HAND1_SINGING_SWORD;
+    case UNRAND_TROG:              return TILEP_HAND1_AXE_TROG;
+    case UNRAND_VARIABILITY:       return TILEP_HAND1_MACE_OF_VARIABILITY;
+    case UNRAND_PRUNE:             return TILEP_HAND1_GLAIVE_OF_PRUNE;
+    case UNRAND_POWER:             return TILEP_HAND1_SWORD_OF_POWER;
+    case UNRAND_OLGREB:            return TILEP_HAND1_OLGREB;
+    case UNRAND_WUCAD_MU:          return TILEP_HAND1_WUCAD_MU;
+    case UNRAND_VAMPIRES_TOOTH:    return TILEP_HAND1_VAMPIRES_TOOTH;
+    case UNRAND_CURSES:            return TILEP_HAND1_FINISHER;
+    case UNRAND_TORMENT:           return TILEP_HAND1_MACE_RUBY;
+    case UNRAND_ZONGULDROK:        return TILEP_HAND1_ZONGULDROK;
+    case UNRAND_CEREBOV:           return TILEP_HAND1_SWORD_TWIST;
+    case UNRAND_DISPATER:          return TILEP_HAND1_DISPATER;
+    case UNRAND_ASMODEUS:          return TILEP_HAND1_ASMODEUS;
+    case UNRAND_BLOODBANE:         return TILEP_HAND1_BLOODBANE;
+    case UNRAND_FLAMING_DEATH:     return TILEP_HAND1_FLAMING_DEATH;
+    case UNRAND_BRILLIANCE:        return TILEP_HAND1_MACE_OF_BRILLIANCE;
+    case UNRAND_LEECH:             return TILEP_HAND1_LEECH;
+    case UNRAND_CHILLY_DEATH:      return TILEP_HAND1_CHILLY_DEATH;
+    case UNRAND_MORG:              return TILEP_HAND1_MORG;
+    case UNRAND_FINISHER:          return TILEP_HAND1_FINISHER;
+    case UNRAND_PUNK:              return TILEP_HAND1_PUNK;
+    case UNRAND_KRISHNA:           return TILEP_HAND1_KRISHNA;
+    case UNRAND_SKULLCRUSHER:      return TILEP_HAND1_GIANT_CLUB_SLANT;
+    case UNRAND_GUARD:             return TILEP_HAND1_GLAIVE_OF_THE_GUARD;
+    case UNRAND_JIHAD:             return TILEP_HAND1_JIHAD;
+    case UNRAND_HELLFIRE:          return TILEP_HAND1_FIERY_DEVIL;
+    case UNRAND_DOOM_KNIGHT:       return TILEP_HAND1_DOOM_KNIGHT;
+    case UNRAND_EOS:               return TILEP_HAND1_EOS;
+    case UNRAND_BOTONO:            return TILEP_HAND1_BOTONO;
+    case UNRAND_OCTOPUS_KING:      return TILEP_HAND1_TRIDENT_OCTOPUS_KING;
+    case UNRAND_ARGA:              return TILEP_HAND1_ARGA;
+    case UNRAND_ELEMENTAL_STAFF:   return TILEP_HAND1_ELEMENTAL_STAFF;
+    case UNRAND_SNIPER:            return TILEP_HAND1_SNIPER;
+    case UNRAND_PIERCER:           return TILEP_HAND1_GREAT_BOW;
+    case UNRAND_BLOWGUN_ASSASSIN:  return TILEP_HAND1_BLOWGUN;
+    case UNRAND_WYRMBANE:          return TILEP_HAND1_WYRMBANE;
+    case UNRAND_SPRIGGANS_KNIFE:   return TILEP_HAND1_SPRIGGANS_KNIFE;
+    case UNRAND_PLUTONIUM_SWORD:   return TILEP_HAND1_PLUTONIUM_SWORD;
+    case UNRAND_UNDEADHUNTER:      return TILEP_HAND1_UNDEADHUNTER;
+    case UNRAND_SERPENT_SCOURGE:   return TILEP_HAND1_SERPENT_SCOURGE;
+    case UNRAND_ACCURACY:          return TILEP_HAND1_KNIFE_OF_ACCURACY;
+    case UNRAND_CRYSTAL_SPEAR:     return TILEP_HAND1_CRYSTAL_SPEAR;
+    // HAND2
+    case UNRAND_IGNORANCE:         return TILEP_HAND2_SHIELD_OF_IGNORANCE;
+    case UNRAND_BULLSEYE:          return TILEP_HAND2_BULLSEYE;
+    case UNRAND_RESISTANCE:        return TILEP_HAND2_SHIELD_OF_RESISTANCE;
+    // HELM
+    case UNRAND_DYROVEPREVA:       return TILEP_HELM_DYROVEPREVA;
+    case UNRAND_DRAGONMASK:        return TILEP_HELM_ART_DRAGONHELM;
+    case UNRAND_ALCHEMIST:         return TILEP_HELM_TURBAN_PURPLE;
+    default: return -1;
+    }
+}
+
diff --git a/crawl-ref/source/rltiles/tiledef-unrand.h b/crawl-ref/source/rltiles/tiledef-unrand.h
index 866135ab1d..e52b6ebc39 100644
--- a/crawl-ref/source/rltiles/tiledef-unrand.h
+++ b/crawl-ref/source/rltiles/tiledef-unrand.h
@@ -2,5 +2,6 @@
 #define TILEDEF_UNRAND_H
 
 int unrandart_to_tile(int unrand);
+int unrandart_to_doll_tile(int unrand);
 
 #endif