94 files changed, 385 insertions, 157 deletions
diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index 3b1ec64a08..4ef7aee41a 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -26,32 +26,39 @@
 #
 # ####### TILES #############################
 #
-# Each unrandart needs two tiles, one item tile and one equipment tile for the
-# player doll. For the former, you can define the image file within this
-# file using the keyword TILE. The files are assumed to be png and the syntax
-# does not include the file type. The artefacts' base type decides where a
-# tile needs to be placed. These are as follows:
+# Each unrandart needs at the very least an item tile, and weapons and armour
+# also need an equipment tile for the player doll. For the former, you can
+# define the image file within this file using the keyword TILE. The files are
+# assumed to be png and the syntax does not include the file type. The
+# artefacts' base type decides where a tile needs to be placed. These are as
+# follows:
 #     Weapons: rltiles/item/weapon/artefact
 #     Armour:  rltiles/item/armour/artefact
 #     Rings:   rltiles/item/ring/artefact
 #     Amulets: rltiles/item/amulet/artefact
 #
-# For a start, placeholders (e.g. the base type tiles) are fine, but they'll
-# eventually need to be replaced with proper tiles.
 # If the tile requires a black outline (because it would be hard to see
-# otherwise) add "BOOL: tilerim". Otherwise the image is used without
-# modification.
+# otherwise) add "tilerim" to the artefact's boolean properties. Otherwise
+# the image is used without modification.
 #
 # For the equipment tile, place the tile into the appropriate subfolder of
-# player/ subfolder and define it in dc-player.txt. You'll also need to assign
-# these tiles to the corresponding artefacts in tilepick.cc, using the keyword
-# "TILEP_" plus the equipment slot (as defined by the most recent "parts_ctg"
-# in dc-player.txt) plus the actual definition, e.g. TILEP_CLOAK_RATSKIN_CLOAK.
-# To find the places where you'll need to add your new tile, simply search
-# tilepick.cc for another artefact of the same base type. If no special tile
-# has been defined the code will fall through to tiles according to the
-# base type and colour.
+# rltiles/player/ and define it in rltiles/dc-player.txt as well as here, using
+# the keyword TILE_EQ. Tiles are sorted into folders by equipment slot:
+#     Weapons:     rltiles/player/hand1/artefact
+#     Body armour: rltiles/player/body
+#     Boots:       rltiles/player/boots
+#     Cloaks:      rltiles/player/cloak
+#     Gloves:      rltiles/player/gloves
+#     Shields:     rltiles/player/hand2
+#     Helms, caps: rltiles/player/head
 #
+# Rings and amulets are too small to be displayed with the player doll.
+#
+# To begin with, placeholders (e.g. the base type tiles) are fine, but they'll
+# eventually need to be replaced with proper tiles, though this is less of a
+# problem for the equipment tiles.
+# No checks are made for whether path or files actually exist. However, if that
+# is not the case the tile compilation will fail.
 
 #############################################################################
 
@@ -126,11 +133,13 @@
 # NAME:     Name of artefact when identified.
 # MUTATE:   Gives artifact mutagenic glow.
 # STEALTH:  Stealth modifier.
-# STR:      Strenght modifier.
+# STR:      Strength modifier.
 # TILE:     The file containing the artefact's tile, with file type png.
 #           See Tiles section above.
+# TILE_EQ:  The file containing the equipment tile for the player doll as
+#           defined in rltiles/dc-player.txt. See Tiles section above.
 
-#################################################################3
+##################################################################
 
 # This entry must always be first.
 ENUM:   DUMMY1
@@ -148,6 +157,7 @@ OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +7/+7
 COLOUR:  YELLOW
 TILE:    spwpn_singing_sword
+TILE_EQ: singing_sword
 DESC_ID: This blessed weapon loves nothing more than to sing to its owner,
          whether they want it to or not.
 
@@ -157,6 +167,7 @@ OBJ:     OBJ_WEAPONS/WPN_BATTLEAXE
 PLUS:    +3/+11
 COLOUR:  RED
 TILE:    spwpn_wrath_of_trog
+TILE_EQ: axe_trog
 DESC_ID: This was the favourite weapon of the old god Trog, before it was
          lost one day. It induces a bloodthirsty berserker rage in anyone
          who uses it to strike another.
@@ -167,6 +178,7 @@ OBJ:     OBJ_WEAPONS/WPN_MACE
 PLUS:    0/0   # Set on generation
 COLOUR:  BLACK # Set on generation
 TILE:    spwpn_mace_of_variability
+TILE_EQ: mace_of_variability
 DESC_ID: It is rather unreliable.
 
 NAME:    Glaive of Prune
@@ -175,6 +187,7 @@ OBJ:     OBJ_WEAPONS/WPN_GLAIVE
 PLUS:    0/+12
 COLOUR:  MAGENTA
 TILE:    spwpn_glaive_of_prune
+TILE_EQ: glaive_of_prune
 DESC_ID: 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
@@ -186,6 +199,7 @@ OBJ:     OBJ_WEAPONS/WPN_GREAT_SWORD
 PLUS:    0/0 # Set on wield
 COLOUR:  RED
 TILE:    spwpn_sword_of_power
+TILE_EQ: sword_of_power
 BOOL:    tilerim
 DESC_ID: It rewards the powerful with power and the meek with weakness.
 
@@ -195,6 +209,7 @@ OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    0/0 # Set on wield
 COLOUR:  GREEN
 TILE:    spwpn_staff_of_olgreb
+TILE_EQ: olgreb
 BRAND:   SPWPN_VENOM
 BOOL:    poison
 DESC_ID: It was the magical weapon wielded by the mighty wizard Olgreb
@@ -208,6 +223,7 @@ OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    0/0 # Set on wield
 COLOUR:  BROWN
 TILE:    spwpn_wucad_mu
+TILE_EQ: wucad_mu
 DESC_ID: Its power varies in proportion to its wielder's intelligence.
          Using it can be a bit risky.
 
@@ -217,6 +233,7 @@ OBJ:     OBJ_WEAPONS/WPN_DAGGER
 PLUS:    +3/+4
 COLOUR:  WHITE
 TILE:    spwpn_vampires_tooth
+TILE_EQ: vampires_tooth
 BRAND:   SPWPN_VAMPIRICISM
 DESC_ID: It is lethally vampiric.
 
@@ -226,6 +243,7 @@ OBJ:     OBJ_WEAPONS/WPN_SCYTHE
 PLUS:    +13/+13
 COLOUR:  DARKGREY
 TILE:    spwpn_scythe_of_curses
+TILE_EQ: finisher
 BOOL:    cursed
 DESC_ID: This weapon carries a terrible and highly irritating curse.
 
@@ -235,6 +253,7 @@ OBJ:     OBJ_WEAPONS/WPN_MACE
 PLUS:    +7/+6
 COLOUR:  YELLOW
 TILE:    spwpn_sceptre_of_torment
+TILE_EQ: mace_ruby
 BOOL:    tilerim
 DESC_ID: This truly accursed weapon is an instrument of Hell.
 
@@ -244,6 +263,7 @@ OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +9/+9
 COLOUR:  LIGHTGREY
 TILE:    spwpn_sword_of_zonguldrok
+TILE_EQ: zonguldrok
 BOOL:    tilerim
 DESC_ID: This dreadful weapon is used at the user's peril.
 
@@ -253,6 +273,7 @@ OBJ:     OBJ_WEAPONS/WPN_GREAT_SWORD
 PLUS:    +6/+6
 COLOUR:  YELLOW
 TILE:    spwpn_sword_of_cerebov
+TILE_EQ: sword_twist
 BRAND:   SPWPN_FLAMING
 BOOL:    cursed, tilerim
 DESC:    Eerie flames cover its twisted blade.
@@ -263,6 +284,7 @@ OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    +4/+4
 COLOUR:  YELLOW
 TILE:    spwpn_staff_of_dispater
+TILE_EQ: dispater
 BOOL:    tilerim
 DESC_ID: This legendary item can unleash the fury of Hell.
 
@@ -272,6 +294,7 @@ OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    +7/+7
 COLOUR:  RED
 TILE:    spwpn_sceptre_of_asmodeus
+TILE_EQ: asmodeus
 BOOL:    tilerim
 DESC_ID: It carries some of the powers of the arch-fiend Asmodeus.
 
@@ -283,6 +306,7 @@ OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +7/+8
 COLOUR:  DARKGREY
 TILE:    urand_bloodbane
+TILE_EQ: bloodbane
 BRAND:   SPWPN_VORPAL
 ANGRY:   1
 BOOL:    berserk
@@ -294,6 +318,7 @@ OBJ:     OBJ_WEAPONS/WPN_SCIMITAR
 PLUS:    +7/+5
 COLOUR:  RED
 TILE:    urand_flaming_death
+TILE_EQ: flaming_death
 BRAND:   SPWPN_FLAMING
 FIRE:    2
 COLD:    -1
@@ -306,6 +331,7 @@ OBJ:     OBJ_WEAPONS/WPN_MACE
 PLUS:    +5/+5
 COLOUR:  WHITE
 TILE:    urand_brilliance
+TILE_EQ: mace_of_brilliance
 BRAND:   SPWPN_HOLY_WRATH
 AC:      5
 INT:     5
@@ -318,6 +344,7 @@ OBJ:     OBJ_WEAPONS/WPN_DEMON_BLADE
 PLUS:    +13/+4
 COLOUR:  MAGENTA
 TILE:    urand_leech
+TILE_EQ: leech
 BRAND:   SPWPN_VAMPIRICISM
 EV:      -1
 STR:     -1
@@ -332,6 +359,7 @@ OBJ:     OBJ_WEAPONS/WPN_DAGGER
 PLUS:    +5/+7
 COLOUR:  LIGHTBLUE
 TILE:    urand_chilly_death
+TILE_EQ: chilly_death
 BRAND:   SPWPN_FREEZING
 FIRE:    -1
 COLD:    2
@@ -345,6 +373,7 @@ OBJ:      OBJ_WEAPONS/WPN_DAGGER
 PLUS:     -1/+4
 COLOUR:   LIGHTRED
 TILE:     urand_morg
+TILE_EQ:  morg
 BRAND:    SPWPN_PAIN
 INT:      5
 MAGIC:    30
@@ -358,6 +387,7 @@ OBJ:     OBJ_WEAPONS/WPN_SCYTHE
 PLUS:    +3/+5
 COLOUR:  DARKGREY
 TILE:    urand_finisher
+TILE_EQ: finisher
 BRAND:   SPWPN_SPEED
 STR:     3
 BOOL:    cursed
@@ -369,6 +399,7 @@ OBJ:     OBJ_WEAPONS/WPN_SLING
 PLUS:    +9/+12
 COLOUR:  LIGHTBLUE
 TILE:    urand_punk
+TILE_EQ: punk
 BRAND:   SPWPN_FROST
 COLD:    1
 DESC:    A sling made of weird blue leather.
@@ -380,6 +411,7 @@ OBJ:      OBJ_WEAPONS/WPN_BOW
 PLUS:     +8/+8
 COLOUR:   YELLOW
 TILE:     urand_krishna
+TILE_EQ:  krishna
 BRAND:    SPWPN_SPEED
 DEX:      3
 BOOL:     seeinv
@@ -393,6 +425,7 @@ OBJ:     OBJ_WEAPONS/WPN_GIANT_CLUB
 PLUS:    +0/+5
 COLOUR:  BROWN
 TILE:    urand_skullcrusher
+TILE_EQ: giant_club_slant
 BRAND:   SPWPN_SPEED
 STR:     5
 
@@ -402,6 +435,7 @@ OBJ:      OBJ_WEAPONS/WPN_GLAIVE
 PLUS:     +5/+8
 COLOUR:   LIGHTCYAN
 TILE:     urand_guard
+TILE_EQ:  glaive_of_the_guard
 BRAND:    SPWPN_ELECTROCUTION
 AC:       5
 BOOL:     seeinv, berserk
@@ -414,6 +448,7 @@ OBJ:      OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:     +12/+10
 COLOUR:   WHITE
 TILE:     urand_jihad
+TILE_EQ:  jihad
 BRAND:    SPWPN_HOLY_WRATH
 EV:       3
 MAGIC:    20
@@ -428,7 +463,8 @@ APPEAR:  flaming crossbow
 OBJ:     OBJ_WEAPONS/WPN_CROSSBOW
 PLUS:    +6/+9
 COLOUR:  LIGHTRED
-TILE:    urand_fiery_devil
+TILE:    urand_hellfire
+TILE_EQ: crossbow_fire
 BRAND:   SPWPN_FLAME
 FIRE:    2
 COLD:    -1
@@ -441,6 +477,7 @@ OBJ:     OBJ_WEAPONS/WPN_GREAT_SWORD
 PLUS:    +13/+13
 COLOUR:  BLUE
 TILE:    urand_doom_knight
+TILE_EQ: doom_knight
 BRAND:   SPWPN_PAIN
 MAGIC:   50
 BOOL:    nospell
@@ -452,6 +489,7 @@ OBJ:     OBJ_WEAPONS/WPN_MORNINGSTAR
 PLUS:    +5/+5
 COLOUR:  LIGHTCYAN
 TILE:    urand_eos
+TILE_EQ: eos
 BRAND:   SPWPN_ELECTROCUTION
 BOOL:    elec, seeinv, notelep
 
@@ -465,6 +503,7 @@ OBJ:      OBJ_WEAPONS/WPN_SPEAR
 PLUS:     +2/+10
 COLOUR:   DARKGREY
 TILE:     urand_botono
+TILE_EQ:  botono
 BRAND:    SPWPN_VAMPIRICISM
 STEALTH:  -30
 BOOL:     poison, life, noises
@@ -476,6 +515,7 @@ OBJ:      OBJ_WEAPONS/WPN_TRIDENT
 PLUS:     +10/+4
 COLOUR:   CYAN
 TILE:     urand_octopus_king
+TILE_EQ:  trident_octopus_king
 BRAND:    SPWPN_VENOM
 BOOL:     elec, poison
 MAGIC:    50
@@ -483,16 +523,17 @@ DESC_END: This trident was stolen many years ago from the Octopus King's
           garden by a really unimportant and already dead man. But beware
           of the Octopus King's wrath!
 
-NAME:   mithril axe "Arga"
-APPEAR: mithril axe
-OBJ:    OBJ_WEAPONS/WPN_WAR_AXE
-PLUS:   +10/+6
-COLOUR: WHITE
-TILE:   urand_arga
-BRAND:  SPWPN_SPEED
-STR:    2
-MAGIC:  30
-DESC:   A beautiful mithril axe, probably lost by some dwarven hero.
+NAME:    mithril axe "Arga"
+APPEAR:  mithril axe
+OBJ:     OBJ_WEAPONS/WPN_WAR_AXE
+PLUS:    +10/+6
+COLOUR:  WHITE
+TILE:    urand_arga
+TILE_EQ: arga
+BRAND:   SPWPN_SPEED
+STR:     2
+MAGIC:   30
+DESC:    A beautiful mithril axe, probably lost by some dwarven hero.
 
 NAME:     Elemental Staff
 APPEAR:   black staff
@@ -500,6 +541,7 @@ OBJ:      OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:     +3/+1
 COLOUR:   DARKGREY
 TILE:     urand_elemental
+TILE_EQ:  elemental_staff
 BRAND:    SPWPN_PROTECTION
 FIRE:     2
 COLD:     2
@@ -515,6 +557,7 @@ OBJ:     OBJ_WEAPONS/WPN_HAND_CROSSBOW
 PLUS:    +10/+0
 COLOUR:  DARKGREY
 TILE:    urand_sniper
+TILE_EQ: sniper
 BRAND:   SPWPN_VENOM
 BOOL:    seeinv
 DESC:    A hand crossbow made of some black material.
@@ -525,6 +568,7 @@ OBJ:     OBJ_WEAPONS/WPN_LONGBOW
 PLUS:    +2/+10
 COLOUR:  CYAN
 TILE:    urand_piercer
+TILE_EQ: great_bow
 BRAND:   SPWPN_VORPAL
 EV:      -2
 DESC:    An exceptionally large metal longbow.
@@ -536,6 +580,7 @@ OBJ:     OBJ_WEAPONS/WPN_BLOWGUN
 PLUS:    +6/+6
 COLOUR:  WHITE
 TILE:    urand_blowgun
+TILE_EQ: blowgun
 STEALTH: 60
 BOOL:    inv, tilerim
 DESC:    It is designed for easy concealment, but still packs a nasty punch.
@@ -546,6 +591,7 @@ OBJ:     OBJ_WEAPONS/WPN_SPEAR
 PLUS:    +9/+6
 COLOUR:  LIGHTGREEN
 TILE:    urand_wyrmbane
+TILE_EQ: wyrmbane
 BRAND:   SPWPN_DRAGON_SLAYING
 AC:      5
 FIRE:    1
@@ -557,6 +603,7 @@ OBJ:      OBJ_WEAPONS/WPN_KNIFE
 PLUS:     +4/+10
 COLOUR:   LIGHTCYAN
 TILE:     urand_spriggans_knife
+TILE_EQ:  spriggans_knife
 BOOL:     tilerim
 EV:       4
 DEX:      4
@@ -573,6 +620,7 @@ OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +12/+16
 COLOUR:  LIGHTGREEN
 TILE:    urand_plutonium
+TILE_EQ: plutonium_sword
 MUTATE:  6
 CURSED:  1
 STEALTH: -20
@@ -584,6 +632,7 @@ OBJ:     OBJ_WEAPONS/WPN_GREAT_MACE
 PLUS:    +7/+7
 COLOUR:  LIGHTGREY
 TILE:    urand_undeadhunter
+TILE_EQ: undeadhunter
 BRAND:   SPWPN_HOLY_WRATH
 BOOL:    life
 
@@ -593,6 +642,7 @@ OBJ:     OBJ_WEAPONS/WPN_WHIP
 PLUS:    +5/+10
 COLOUR:  DARKGREY
 TILE:    urand_serpent_scourge
+TILE_EQ: serpent_scourge
 BRAND:   SPWPN_VENOM
 BOOL:    poison, tilerim
 DESC_ID: A double-ended whip made from the cured hides of the Lair of Beasts'
@@ -604,6 +654,7 @@ OBJ:      OBJ_WEAPONS/WPN_DAGGER
 PLUS:     +27/-1
 COLOUR:   LIGHTCYAN
 TILE:     urand_knife_of_accuracy
+TILE_EQ:  knife_of_accuracy
 BOOL:     tilerim
 DESC_END: It is almost unerringly accurate.
 
@@ -615,6 +666,7 @@ OBJ:      OBJ_WEAPONS/WPN_SPEAR
 PLUS:     +6/+6
 COLOUR:   GREEN
 TILE:     urand_crystal_spear
+TILE_EQ:  crystal_spear
 INT:      3
 DESC_END: Presumably this relic led to the invention of the famous spell, or maybe the other way around.
 
@@ -624,6 +676,7 @@ OBJ:     OBJ_ARMOUR/ARM_LARGE_SHIELD
 PLUS:    +5
 COLOUR:  BROWN
 TILE:    urand_ignorance
+TILE_EQ: shield_of_ignorance
 AC:      2
 EV:      2
 INT:     -6
@@ -636,6 +689,7 @@ OBJ:     OBJ_ARMOUR/ARM_ROBE
 PLUS:    +4
 COLOUR:  LIGHTRED
 TILE:    urand_augmentation
+TILE_EQ: robe_white_blue
 STR:     2
 INT:     2
 DEX:     2
@@ -647,6 +701,7 @@ OBJ:      OBJ_ARMOUR/ARM_CLOAK
 PLUS:     +1
 COLOUR:   DARKGREY
 TILE:     urand_thief
+TILE_EQ:  black
 EV:       2
 DEX:      2
 DAM:      -3
@@ -660,6 +715,7 @@ OBJ:     OBJ_ARMOUR/ARM_SHIELD
 PLUS:    +10
 COLOUR:  RED
 TILE:    urand_bullseye
+TILE_EQ: bullseye
 EV:      -5
 
 NAME:    crown of Dyrovepreva
@@ -668,6 +724,7 @@ OBJ:     OBJ_ARMOUR/ARM_CAP
 PLUS:    +3
 COLOUR:  BROWN
 TILE:    urand_dyrovepreva
+TILE_EQ: dyrovepreva
 INT:     2
 METAB:   1
 BOOL:    elec, seeinv
@@ -679,6 +736,7 @@ OBJ:      OBJ_ARMOUR/ARM_ROBE
 PLUS:     -5
 COLOUR:   MAGENTA
 TILE:     urand_misfortune
+TILE_EQ:  robe_misfortune
 EV:       -4
 STR:      -2
 INT:      -2
@@ -695,6 +753,7 @@ OBJ:      OBJ_ARMOUR/ARM_CLOAK
 PLUS:     +3
 COLOUR:   RED
 TILE:     urand_flash
+TILE_EQ:  red
 EV:       4
 BOOL:     lev, cantelep
 DESC:     A vibrating cloak.
@@ -706,6 +765,7 @@ OBJ:      OBJ_ARMOUR/ARM_BOOTS
 PLUS:     +2
 COLOUR:   BROWN
 TILE:     urand_assassin
+TILE_EQ:  middle_gray
 DEX:      3
 STEALTH:  80
 BOOL:     inv
@@ -719,6 +779,7 @@ OBJ:     OBJ_ARMOUR/ARM_CHAIN_MAIL
 PLUS:    -1
 COLOUR:  YELLOW
 TILE:    urand_lear
+TILE_EQ: lears_chain_mail
 DEX:     -3
 BOOL:    cursed, nospell
 DESC:    A chain mail made of pure gold.
@@ -729,6 +790,7 @@ OBJ:     OBJ_ARMOUR/ARM_ANIMAL_SKIN
 PLUS:    +4
 COLOUR:  BROWN
 TILE:    urand_zhor
+TILE_EQ: zhor
 COLD:    2
 DESC:    The skin of some strange animal.
 
@@ -739,29 +801,32 @@ OBJ:     OBJ_ARMOUR/ARM_LEATHER_ARMOUR
 PLUS:    +3
 COLOUR:  RED
 TILE:    urand_salamander
+TILE_EQ: leather_red
 FIRE:    2
 BOOL:    berserk
 DESC:    A leather armour made of a salamander's skin.
 
-NAME:   gauntlets of War
-APPEAR: thick gauntlets
-OBJ:    OBJ_ARMOUR/ARM_GLOVES
-PLUS:   +3
-COLOUR: BROWN
-TILE:   urand_war
-ACC:    3
-DAM:    3
-
-NAME:   shield of Resistance
-APPEAR: bronze shield
-OBJ:    OBJ_ARMOUR/ARM_SHIELD
-PLUS:   +3
-COLOUR: LIGHTRED
-TILE:   urand_resistance
-FIRE:   1
-COLD:   1
-MAGIC:  40
-DESC:   A bronze shield.
+NAME:    gauntlets of War
+APPEAR:  thick gauntlets
+OBJ:     OBJ_ARMOUR/ARM_GLOVES
+PLUS:    +3
+COLOUR:  BROWN
+TILE:    urand_war
+TILE_EQ: glove_black
+ACC:     3
+DAM:     3
+
+NAME:    shield of Resistance
+APPEAR:  bronze shield
+OBJ:     OBJ_ARMOUR/ARM_SHIELD
+PLUS:    +3
+COLOUR:  LIGHTRED
+TILE:    urand_resistance
+TILE_EQ: shield_of_resistance
+FIRE:    1
+COLD:    1
+MAGIC:   40
+DESC:    A bronze shield.
 
 NAME:    robe of Folly
 APPEAR:  dull robe
@@ -769,6 +834,7 @@ OBJ:     OBJ_ARMOUR/ARM_ROBE
 PLUS:    -1
 COLOUR:  LIGHTGREY
 TILE:    urand_folly
+TILE_EQ: robe_red2
 INT:     -5
 CURSED:  2
 BOOL:    nospell
@@ -781,6 +847,7 @@ OBJ:     OBJ_ARMOUR/ARM_PLATE_MAIL
 PLUS:    +10
 COLOUR:  LIGHTGREEN
 TILE:    urand_maxwell
+TILE_EQ: maxwell
 BOOL:    nospell, notelep, cursed
 DESC:    A weird-looking armour.
 
@@ -790,6 +857,7 @@ APPEAR:  blue mask
 OBJ:     OBJ_ARMOUR/ARM_CAP
 COLOUR:  BLUE
 TILE:    urand_dragonmask
+TILE_EQ: art_dragonhelm
 MAGIC:   40
 ACC:     2
 DAM:     2
@@ -802,6 +870,7 @@ OBJ:      OBJ_ARMOUR/ARM_ROBE
 PLUS:     +4
 COLOUR:   DARKGREY
 TILE:     urand_night
+TILE_EQ:  robe_of_night
 MAGIC:    30
 STEALTH:  50
 BOOL:     seeinv, inv
@@ -815,6 +884,7 @@ OBJ:     OBJ_ARMOUR/ARM_GOLD_DRAGON_ARMOUR
 PLUS:    +5
 COLOUR:  YELLOW
 TILE:    urand_dragon_king
+TILE_EQ: dragonarm_gold
 MAGIC:   50
 
 NAME:    hat of the Alchemist
@@ -823,6 +893,7 @@ OBJ:     OBJ_ARMOUR/ARM_WIZARD_HAT
 PLUS:    +2
 COLOUR:  MAGENTA
 TILE:    urand_alchemist
+TILE_EQ: turban_purple
 FIRE:    1
 COLD:    1
 MAGIC:   30
@@ -835,6 +906,7 @@ OBJ:     OBJ_ARMOUR/ARM_GLOVES
 PLUS:    +2
 COLOUR:  WHITE
 TILE:    urand_fencer
+TILE_EQ: glove_white
 EV:      3
 DEX:     3
 ACC:     5
@@ -845,6 +917,7 @@ APPEAR:   phosphorescent cloak
 OBJ:      OBJ_ARMOUR/ARM_CLOAK
 COLOUR:   WHITE
 TILE:     urand_starlight
+TILE_EQ:  white
 EV:       4
 COLD:     1
 STEALTH:  -30
@@ -858,6 +931,7 @@ OBJ:      OBJ_ARMOUR/ARM_CLOAK
 PLUS:     +1
 COLOUR:   LIGHTRED
 TILE:     urand_ratskin_cloak
+TILE_EQ:  ratskin
 INT:      -1
 DEX:      -1
 BOOL:     life, poison
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
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc
index ec9066f877..d634999df7 100644
--- a/crawl-ref/source/tilemcache.cc
+++ b/crawl-ref/source/tilemcache.cc
@@ -693,15 +693,15 @@ mcache_ghost::mcache_ghost(const monsters *mon)
     {
     case SK_MACES_FLAILS:
         if (dam > 30)
-            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_GREAT_FRAIL;
+            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_GREAT_FLAIL;
         else if (dam > 25)
             m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_GREAT_MACE;
         else if (dam > 20)
-            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_SPIKED_FRAIL;
+            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_SPIKED_FLAIL;
         else if (dam > 15)
             m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_MORNINGSTAR;
         else if (dam > 10)
-            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_FRAIL;
+            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_FLAIL;
         else if (dam > 5)
             m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_MACE;
         else
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index ca4667954a..88636bda76 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -3323,52 +3323,9 @@ int tilep_equ_weapon(const item_def &item)
 
     if (is_unrandom_artefact( item ))
     {
-        switch (find_unrandart_index(item))
-        {
-            case UNRAND_SINGING_SWORD:  return TILEP_HAND1_SINGING_SWORD;
-            case UNRAND_TROG:           return TILEP_HAND1_AXE_TROG;
-            case UNRAND_CURSES:         return TILEP_HAND1_FINISHER;
-            case UNRAND_VARIABILITY:    return TILEP_HAND1_MACE_OF_VARIABILITY;
-            case UNRAND_PRUNE:          return TILEP_HAND1_GLAIVE_OF_PRUNE;
-            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_OLGREB:         return TILEP_HAND1_OLGREB;
-            case UNRAND_POWER:          return TILEP_HAND1_SWORD_OF_POWER;
-            case UNRAND_VAMPIRES_TOOTH: return TILEP_HAND1_VAMPIRES_TOOTH;
-            case UNRAND_WUCAD_MU:       return TILEP_HAND1_WUCAD_MU;
-
-            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_PLUTONIUM_SWORD:    return TILEP_HAND1_PLUTONIUM_SWORD;
-            case UNRAND_BLOWGUN_ASSASSIN:   return TILEP_HAND1_BLOWGUN_ASSASSIN;
-            case UNRAND_WYRMBANE:           return TILEP_HAND1_WYRMBANE;
-            case UNRAND_SPRIGGANS_KNIFE:    return TILEP_HAND1_SPRIGGANS_KNIFE;
-            case UNRAND_SERPENT_SCOURGE:    return TILEP_HAND1_SERPENT_SCOURGE;
-            case UNRAND_ACCURACY:           return TILEP_HAND1_KNIFE_OF_ACCURACY;
-            case UNRAND_PIERCER:            return TILEP_HAND1_GREAT_BOW;
-            case UNRAND_CRYSTAL_SPEAR:      return TILEP_HAND1_CRYSTAL_SPEAR;
-        }
+        const int tile = unrandart_to_doll_tile(find_unrandart_index(item));
+        if (tile != -1)
+            return tile;
     }
 
     switch (item.sub_type)
@@ -3377,9 +3334,9 @@ int tilep_equ_weapon(const item_def &item)
     case WPN_CLUB:              return TILEP_HAND1_CLUB_SLANT;
     case WPN_MACE:              return TILEP_HAND1_MACE;
     case WPN_GREAT_MACE:        return TILEP_HAND1_GREAT_MACE;
-    case WPN_FLAIL:             return TILEP_HAND1_FRAIL;
-    case WPN_SPIKED_FLAIL:      return TILEP_HAND1_SPIKED_FRAIL;
-    case WPN_DIRE_FLAIL:        return TILEP_HAND1_GREAT_FRAIL;
+    case WPN_FLAIL:             return TILEP_HAND1_FLAIL;
+    case WPN_SPIKED_FLAIL:      return TILEP_HAND1_SPIKED_FLAIL;
+    case WPN_DIRE_FLAIL:        return TILEP_HAND1_GREAT_FLAIL;
     case WPN_MORNINGSTAR:       return TILEP_HAND1_MORNINGSTAR;
     case WPN_EVENINGSTAR:       return TILEP_HAND1_EVENINGSTAR;
     case WPN_GIANT_CLUB:        return TILEP_HAND1_GIANT_CLUB_PLAIN;
@@ -3451,18 +3408,9 @@ int tilep_equ_armour(const item_def &item)
 
     if (is_unrandom_artefact( item ))
     {
-        switch (find_unrandart_index(item))
-        {
-            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;
-            default: break;
-        }
+        const int tile = unrandart_to_doll_tile(find_unrandart_index(item));
+        if (tile != -1)
+            return tile;
     }
 
     switch (item.sub_type)
@@ -3534,13 +3482,9 @@ int tilep_equ_shield(const item_def &item)
 
     if (is_unrandom_artefact( item ))
     {
-        switch (find_unrandart_index(item))
-        {
-            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;
-            default: break;
-        }
+        const int tile = unrandart_to_doll_tile(find_unrandart_index(item));
+        if (tile != -1)
+            return tile;
     }
 
     switch (item.sub_type)
@@ -3562,11 +3506,9 @@ int tilep_equ_cloak(const item_def &item)
 
     if (is_unrandom_artefact( item ))
     {
-        switch (find_unrandart_index(item))
-        {
-            case UNRAND_RATSKIN_CLOAK:  return TILEP_CLOAK_RATSKIN_CLOAK;
-            default: break;
-        }
+        const int tile = unrandart_to_doll_tile(find_unrandart_index(item));
+        if (tile != -1)
+            return tile;
     }
 
     switch (item.colour)
@@ -3600,13 +3542,9 @@ int tilep_equ_helm(const item_def &item)
 
     if (is_unrandom_artefact(item))
     {
-        switch (find_unrandart_index(item))
-        {
-            case UNRAND_DYROVEPREVA:    return TILEP_HELM_DYROVEPREVA;
-            case UNRAND_DRAGONMASK:     return TILEP_HELM_ART_DRAGONHELM;
-            case UNRAND_ALCHEMIST:      return TILEP_HELM_TURBAN_PURPLE;
-            default: break;
-        }
+        const int tile = unrandart_to_doll_tile(find_unrandart_index(item));
+        if (tile != -1)
+            return tile;
 
         // Although there shouldn't be any, just in case
         // unhandled artefacts fall through to defaults...
@@ -3732,11 +3670,9 @@ int tilep_equ_gloves(const item_def &item)
 
     if (is_unrandom_artefact(item))
     {
-        switch (find_unrandart_index(item))
-        {
-            case UNRAND_WAR:            return TILEP_ARM_GLOVE_BLACK;
-            case UNRAND_FENCERS_GLOVES: return TILEP_ARM_GLOVE_WHITE;
-        }
+        const int tile = unrandart_to_doll_tile(find_unrandart_index(item));
+        if (tile != -1)
+            return tile;
     }
 
     switch (_get_etype(item))
@@ -3788,11 +3724,9 @@ int tilep_equ_boots(const item_def &item)
 
     if (is_unrandom_artefact(item))
     {
-        switch (find_unrandart_index(item))
-        {
-            case UNRAND_BOOTS_ASSASSIN: return TILEP_BOOTS_MIDDLE_GRAY;
-            default: break;
-        }
+        const int tile = unrandart_to_doll_tile(find_unrandart_index(item));
+        if (tile != -1)
+            return tile;
     }
 
     switch (etype)
diff --git a/crawl-ref/source/util/art-data.pl b/crawl-ref/source/util/art-data.pl
index afb8dd93f2..bbe4f68cdb 100755
--- a/crawl-ref/source/util/art-data.pl
+++ b/crawl-ref/source/util/art-data.pl
@@ -49,6 +49,7 @@ my %field_type = (
     DESC_END => "str",
     DESC_ID  => "str",
     TILE     => "str",
+    TILE_EQ  => "str",
     TILERIM  => "bool",
 
     plus      => "num",
@@ -650,7 +651,7 @@ sub write_tiles
 
         if ($artefact->{TILE} eq "")
         {
-            print STDERR "No tile defined for '$artefact->{NAME}'\n";
+            print STDERR "No TILE defined for '$artefact->{NAME}'\n";
             next;
         }
 
@@ -700,6 +701,13 @@ sub write_tiles
         }
     }
 
+    print TILES << "HEADER_END";
+# 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.
+
+HEADER_END
+
     # Output the tile definitions sorted by type (and thus path).
     foreach my $type (keys %art_by_type)
     {
@@ -718,6 +726,101 @@ sub write_tiles
     }
     close(TILES);
 
+    my %parts;
+    foreach my $artefact (@all_artefacts)
+    {
+        next if ($artefact->{NAME} =~ /DUMMY/);
+        if (not(defined $artefact->{TILE_EQ}) || $artefact->{TILE_EQ} eq "")
+        {
+            if ($artefact->{base_type} ne "OBJ_JEWELLERY")
+            {
+                print STDERR "TILE_EQ not defined for '$artefact->{NAME}'\n";
+            }
+            next;
+        }
+
+        my $part = "BODY";
+        if ($artefact->{base_type} eq "OBJ_WEAPONS")
+        {
+            $part = "HAND1";
+        }
+        elsif ($artefact->{base_type} ne "OBJ_ARMOUR")
+        {
+            next;
+        }
+        elsif ($artefact->{sub_type} =~ /_SHIELD/
+               || $artefact->{sub_type} =~ /_BUCKLER/)
+        {
+            $part = "HAND2";
+        }
+        elsif ($artefact->{sub_type} =~ /_CLOAK/)
+        {
+            $part = "CLOAK";
+        }
+        elsif ($artefact->{sub_type} =~ /_CAP/
+               || $artefact->{sub_type} =~ /_HAT/)
+        {
+            $part = "HELM";
+        }
+        elsif ($artefact->{sub_type} =~ /_SHIELD/)
+        {
+            $part = "HAND2";
+        }
+        elsif ($artefact->{sub_type} =~ /_BOOTS/)
+        {
+            $part = "BOOTS";
+        }
+        elsif ($artefact->{sub_type} =~ /_GLOVES/)
+        {
+            $part = "ARM";
+        }
+
+        if (defined $parts{$part})
+        {
+            push @{$parts{$part}}, $artefact;
+        }
+        else
+        {
+            $parts{$part} = [$artefact];
+        }
+    }
+
+    $tilefile = "dc-player.txt";
+    unless (open(TILES, "<$tilefile"))
+    {
+        die "Couldn't open '$tilefile' for reading: $!\n";
+    }
+
+    my $curr_part = "";
+    my $content = <TILES>;
+    my @lines   = split "\n", $content;
+    foreach my $line (@lines)
+    {
+        if ($line =~ /parts_ctg\s+(\S+)/)
+        {
+            $curr_part = $1;
+            next;
+        }
+        next if (not defined $parts{$curr_part});
+
+        if ($line =~ /^(\S+)\s+(\S+)/)
+        {
+            my $name = $1;
+            my $enum = $2;
+
+            foreach my $art (@{$parts{$curr_part}})
+            {
+                if ($art->{TILE_EQ} eq $name)
+                {
+                    $art->{TILE_EQ_ENUM} = "TILEP_".$curr_part."_".$enum;
+                    # Don't break from the loop in case several artefacts
+                    # share the same tile.
+                }
+            }
+        }
+    }
+    close(TILES);
+
     # Create tiledef-unrand.cc for the function unrandart_to_tile().
     # Should we also create tiledef-unrand.h this way?
     $tilefile = "tiledef-unrand.cc";
@@ -730,7 +833,11 @@ sub write_tiles
     }
 
     print TILES << "HEADER_END";
-// 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"
@@ -765,6 +872,30 @@ HEADER_END
     print TILES (" " x 4) . "default: return -1;\n";
     print TILES (" " x 4) . "}\n";
     print TILES "}\n\n";
+
+    print TILES "int unrandart_to_doll_tile(int unrand)\n{\n";
+    print TILES (" " x 4) . "switch (unrand)\n";
+    print TILES (" " x 4) . "{\n";
+    foreach my $part (sort keys %parts)
+    {
+        print TILES (" " x 4) . "// $part\n";
+        foreach my $artefact (@{$parts{$part}})
+        {
+            if (not defined $artefact->{TILE_EQ_ENUM})
+            {
+                print STDERR "Tile '$artefact->{TILE_EQ}' for part '$part' not "
+                           . "found in 'dc-player.txt'.\n";
+                next;
+            }
+            my $enum   = "UNRAND_$artefact->{_ENUM}";
+            my $t_enum = $artefact->{TILE_EQ_ENUM};
+            print TILES (" " x 4) . "case $enum:"
+                . " " x ($longest_enum - length($enum) + 2) . "return $t_enum;\n";
+        }
+    }
+    print TILES (" " x 4) . "default: return -1;\n";
+    print TILES (" " x 4) . "}\n";
+    print TILES "}\n\n";
     close(TILES);
 }