Tiles (un)randart overhaul:

Added missing/new tiles.
Player tiles and item tiles now more consistent with each other.
Unrandarts now more distinct from their mundane counterparts.
Graphics more consistent with descriptions/colors from unrand.h.
Removed more old, ugly, unused tiles.

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

51 files changed, 83 insertions, 54 deletions

diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 6ccde1a11d..2492282abf 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -6,16 +6,18 @@ spwpn_wrath_of_trog SPWPN_WRATH_OF_TROG /* This was the favourite weapon of the
 spwpn_scythe_of_curses SPWPN_SCYTHE_OF_CURSES /* This weapon carries a terrible and highly irritating curse.

 spwpn_mace_of_variability SPWPN_MACE_OF_VARIABILITY /* It is rather unreliable.

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

+%rim 1

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

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

 spwpn_sword_of_cerebov SPWPN_SWORD_OF_CEREBOV /* Eerie flames cover its twisted blade. 

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

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

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

+%rim 0

 spwpn_knife_of_accuracy SPWPN_KNIFE_OF_ACCURACY /* It is almost unerringly accurate.

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

 spwpn_vampires_tooth SPWPN_VAMPIRES_TOOTH /* It is lethally vampiric.

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

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

 

 ##### Unrandom artifacts

 %include dc-urand.txt

@@ -271,8 +273,10 @@ shield_kite2 ARM_SHIELD_1
 shield_round2 ARM_SHIELD_2

 

 #dwarvish_roundshield ARM_BUCKLER

+%rim 0

 small_shield ARM_BUCKLER /* A small shield.

 small_shield2 ARM_BUCKLER_1

+%rim 1

 

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

 shield_large2 ARM_LARGE_SHIELD_1

diff --git a/crawl-ref/source/rltiles/dc-pl.txt b/crawl-ref/source/rltiles/dc-pl.txt
index 28e02ecd72..0152b79ac4 100644
--- a/crawl-ref/source/rltiles/dc-pl.txt
+++ b/crawl-ref/source/rltiles/dc-pl.txt
@@ -227,6 +227,7 @@ robe_white2 ROBE_WHITE2
 robe_red2 ROBE_RED2

 robe_white_red ROBE_WHITE_RED

 robe_white_green ROBE_WHITE_GREEN

+robe_white_blue ROBE_WHITE_BLUE

 robe_blue_white ROBE_BLUE_WHITE

 robe_red_gold ROBE_RED_GOLD

 robe_black_red ROBE_BLACK_RED

@@ -236,6 +237,7 @@ robe_brown2 ROBE_BROWN2
 robe_green_gold ROBE_GREEN_GOLD

 robe_brown3 ROBE_BROWN3

 robe_gray2 ROBE_GRAY2

+robe_misfortune ROBE_MISFORTUNE

 dress_white DRESS_WHITE

 arwen ARWEN

 skirt_onep_grey SKIRT_ONEP_GREY

@@ -431,6 +433,14 @@ plutonium_sword PLUTONIUM_SWORD
 jihad JIHAD

 singing_sword SINGING_SWORD

 zonguldrok ZONGULDROK

+sword_of_power SWORD_OF_POWER

+knife_of_accuracy KNIFE_OF_ACCURACY

+vampires_tooth VAMPIRES_TOOTH

+wucad_mu WUCAD_MU

+dire_lajatang DIRE_LAJATANG

+wyrmbane WYRMBANE

+spriggans_knife SPRIGGANS_KNIFE

+eos EOS

 

 ## blunt

 club CLUB

@@ -442,6 +452,7 @@ giant_club GIANT_CLUB
 giant_club_slant GIANT_CLUB_SLANT

 giant_club_spike GIANT_CLUB_SPIKE

 giant_club_spike_slant GIANT_CLUB_SPIKE_SLANT

+giant_club_plain GIANT_CLUB_PLAIN

 whip WHIP

 sceptre SCEPTRE

 mace MACE2

@@ -453,6 +464,7 @@ morningstar2 MORNINGSTAR
 eveningstar EVENINGSTAR

 large_mace LARGE_MACE

 black_whip BLACK_WHIP

+serpent_scourge SERPENT_SCOURGE

 hammer3 HAMMER

 hammer HAMMER1

 hammer2 HAMMER2

@@ -466,6 +478,8 @@ frail_ball3 FRAIL_BALL3
 frail_ball4 FRAIL_BALL4

 nunchaku NUNCHAKU

 mace_of_variability MACE_OF_VARIABILITY

+mace_of_brilliance MACE_OF_BRILLIANCE

+undeadhunter UNDEADHUNTER

 

 ## polearms

 spear1 SPEAR

@@ -481,6 +495,7 @@ trident_demon DEMON_TRIDENT
 trident_elec TRIDENT_ELEC

 trident2 TRIDENT2

 trident3 TRIDENT3

+trident_octopus_king TRIDENT_OCTOPUS_KING

 lance LANCE

 lance2 LANCE2

 scythe SCYTHE

@@ -500,6 +515,7 @@ fork2 FORK2
 glaive_of_prune GLAIVE_OF_PRUNE

 voodoo VOODOO

 finisher FINISHER

+glaive_of_the_guard GLAIVE_OF_THE_GUARD

 

 ## staves

 

@@ -562,6 +578,7 @@ crossbow2 CROSSBOW2
 crossbow3 CROSSBOW3

 crossbow4 CROSSBOW4

 blowgun BLOWGUN

+blowgun_assassin BLOWGUN_ASSASSIN

 punk PUNK

 sniper SNIPER

 crossbow_fire FIERY_DEVIL

@@ -653,6 +670,7 @@ shield_middle_ethn SHIELD_MIDDLE_ETHN
 shield_long_cross SHIELD_LONG_CROSS

 shield_shaman SHIELD_SHAMAN

 shield_of_resistance SHIELD_OF_RESISTANCE

+shield_of_ignorance SHIELD_OF_IGNORANCE

 gil-galad

 

 book_black BOOK_BLACK

diff --git a/crawl-ref/source/rltiles/dc-urand.txt b/crawl-ref/source/rltiles/dc-urand.txt
index c740c58e31..d24b22149b 100644
--- a/crawl-ref/source/rltiles/dc-urand.txt
+++ b/crawl-ref/source/rltiles/dc-urand.txt
@@ -1,6 +1,6 @@
 %sdir item
 weapon/urand_bloodbane URAND_BLOODBANE
-weapon/urand_fkaming_death URAND_FLAMING_DEATH
+weapon/urand_flaming_death URAND_FLAMING_DEATH
 weapon/urand_brilliance URAND_BRILLIANCE
 weapon/urand_leech URAND_LEECH
 weapon/urand_chilly_death URAND_CHILLY_DEATH
@@ -21,8 +21,14 @@ weapon/urand_elemental URAND_ELEMENTAL
 weapon/urand_sniper URAND_SNIPER
 weapon/urand_erchidel URAND_ERCHIDEL
 weapon/urand_plutonium URAND_PLUTONIUM
-weapon/urand_undeadhunter URAND_UNDERADHUNTER
+weapon/urand_undeadhunter URAND_UNDEADHUNTER
+%rim 1
 weapon/urand_blowgun URAND_BLOWGUN
+weapon/urand_serpent_scourge URAND_SERPENT_SCOURGE
+weapon/urand_dire_lajatang URAND_DIRE_LAJATANG
+weapon/urand_wyrmbane URAND_WYRMBANE
+weapon/urand_spriggans_knife URAND_SPRIGGANS_KNIFE
+%rim 0
 armor/urand_ignorance URAND_IGNORANCE
 armor/urand_zin URAND_ZIN
 armor/urand_augmentation URAND_AUGMENTATION
@@ -51,4 +57,5 @@ ring/urand_mage URAND_MAGE
 amulet/urand_cekugob URAND_CEKUGOB
 amulet/urand_four_winds URAND_FOUR_WINDS
 amulet/urand_bloodlust URAND_BLOODLUST
+amulet/urand_brooch_of_shielding URAND_BROOCH_OF_SHIELDING
 
diff --git a/crawl-ref/source/rltiles/item/amulet/urand_brooch_of_shielding.bmp b/crawl-ref/source/rltiles/item/amulet/urand_brooch_of_shielding.bmp
new file mode 100644
index 0000000000..7d9fd01d9a
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/amulet/urand_brooch_of_shielding.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/urand_bullseye.bmp b/crawl-ref/source/rltiles/item/armor/urand_bullseye.bmp
index 63afb41c02..c8d1edc8f3 100644
--- a/crawl-ref/source/rltiles/item/armor/urand_bullseye.bmp
+++ b/crawl-ref/source/rltiles/item/armor/urand_bullseye.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/urand_edison.bmp b/crawl-ref/source/rltiles/item/armor/urand_edison.bmp
index 009794e305..746b3fe55a 100644
--- a/crawl-ref/source/rltiles/item/armor/urand_edison.bmp
+++ b/crawl-ref/source/rltiles/item/armor/urand_edison.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/urand_flash.bmp b/crawl-ref/source/rltiles/item/armor/urand_flash.bmp
index 348b49eeee..da569e4567 100644
--- a/crawl-ref/source/rltiles/item/armor/urand_flash.bmp
+++ b/crawl-ref/source/rltiles/item/armor/urand_flash.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/ancient_sword.bmp b/crawl-ref/source/rltiles/item/weapon/ancient_sword.bmp
deleted file mode 100644
index 192751ba1d..0000000000
--- a/crawl-ref/source/rltiles/item/weapon/ancient_sword.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/weapon/dwarvish_mattock.bmp b/crawl-ref/source/rltiles/item/weapon/dwarvish_mattock.bmp
deleted file mode 100644
index a77daf0931..0000000000
--- a/crawl-ref/source/rltiles/item/weapon/dwarvish_mattock.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/weapon/dwarvish_spear.bmp b/crawl-ref/source/rltiles/item/weapon/dwarvish_spear.bmp
deleted file mode 100644
index ef3d8d0748..0000000000
--- a/crawl-ref/source/rltiles/item/weapon/dwarvish_spear.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/weapon/lajatang.bmp b/crawl-ref/source/rltiles/item/weapon/lajatang.bmp
index 3a6e3cf93b..2a9b414517 100644
--- a/crawl-ref/source/rltiles/item/weapon/lajatang.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/lajatang.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/lance.bmp b/crawl-ref/source/rltiles/item/weapon/lance.bmp
deleted file mode 100644
index 3b222d8c8a..0000000000
--- a/crawl-ref/source/rltiles/item/weapon/lance.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/weapon/shuriken.bmp b/crawl-ref/source/rltiles/item/weapon/shuriken.bmp
deleted file mode 100644
index 15b536ad96..0000000000
--- a/crawl-ref/source/rltiles/item/weapon/shuriken.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/weapon/spwpn_wucad_mu.bmp b/crawl-ref/source/rltiles/item/weapon/spwpn_wucad_mu.bmp
new file mode 100644
index 0000000000..24e68c786f
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/spwpn_wucad_mu.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_blowgun.bmp b/crawl-ref/source/rltiles/item/weapon/urand_blowgun.bmp
index 6fb2915c89..265e370800 100644
--- a/crawl-ref/source/rltiles/item/weapon/urand_blowgun.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/urand_blowgun.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_brilliance.bmp b/crawl-ref/source/rltiles/item/weapon/urand_brilliance.bmp
index 953f436ded..a7a8ddccd5 100644
--- a/crawl-ref/source/rltiles/item/weapon/urand_brilliance.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/urand_brilliance.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_dire_lajatang.bmp b/crawl-ref/source/rltiles/item/weapon/urand_dire_lajatang.bmp
new file mode 100644
index 0000000000..b6807796bb
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/urand_dire_lajatang.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_doom_knight.bmp b/crawl-ref/source/rltiles/item/weapon/urand_doom_knight.bmp
index 8f366d6f4b..111349191e 100644
--- a/crawl-ref/source/rltiles/item/weapon/urand_doom_knight.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/urand_doom_knight.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_eos.bmp b/crawl-ref/source/rltiles/item/weapon/urand_eos.bmp
index ecc7342524..d42f8fc1f2 100644
--- a/crawl-ref/source/rltiles/item/weapon/urand_eos.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/urand_eos.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_fkaming_death.bmp b/crawl-ref/source/rltiles/item/weapon/urand_flaming_death.bmp
index 87d7330e83..87d7330e83 100644
--- a/crawl-ref/source/rltiles/item/weapon/urand_fkaming_death.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/urand_flaming_death.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/boomerang.bmp b/crawl-ref/source/rltiles/item/weapon/urand_serpent_scourge.bmp
index c758e19efc..78068a2e49 100644
--- a/crawl-ref/source/rltiles/item/weapon/boomerang.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/urand_serpent_scourge.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/crysknife.bmp b/crawl-ref/source/rltiles/item/weapon/urand_spriggans_knife.bmp
index 9729908637..3e1e4dd72c 100644
--- a/crawl-ref/source/rltiles/item/weapon/crysknife.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/urand_spriggans_knife.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_wyrmbane.bmp b/crawl-ref/source/rltiles/item/weapon/urand_wyrmbane.bmp
new file mode 100644
index 0000000000..b19ea6b1bc
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/urand_wyrmbane.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/yumi.bmp b/crawl-ref/source/rltiles/item/weapon/yumi.bmp
deleted file mode 100644
index 8703557dc1..0000000000
--- a/crawl-ref/source/rltiles/item/weapon/yumi.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/player/body/edison.bmp b/crawl-ref/source/rltiles/player/body/edison.bmp
index f17a4366a3..7e4c19e824 100644
--- a/crawl-ref/source/rltiles/player/body/edison.bmp
+++ b/crawl-ref/source/rltiles/player/body/edison.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/athame.bmp b/crawl-ref/source/rltiles/player/body/robe_misfortune.bmp
index 69ad827678..27a36e3cee 100644
--- a/crawl-ref/source/rltiles/item/weapon/athame.bmp
+++ b/crawl-ref/source/rltiles/player/body/robe_misfortune.bmp
diff --git a/crawl-ref/source/rltiles/player/body/robe_white_blue.bmp b/crawl-ref/source/rltiles/player/body/robe_white_blue.bmp
new file mode 100644
index 0000000000..2692baadd8
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/body/robe_white_blue.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/blowgun.bmp b/crawl-ref/source/rltiles/player/hand1/blowgun.bmp
index d993f51243..8c320d9ce6 100644
--- a/crawl-ref/source/rltiles/player/hand1/blowgun.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/blowgun.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/worm_tooth.bmp b/crawl-ref/source/rltiles/player/hand1/blowgun_assassin.bmp
index 4a954b5ebc..e984ede5e3 100644
--- a/crawl-ref/source/rltiles/item/weapon/worm_tooth.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/blowgun_assassin.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/d_glaive.bmp b/crawl-ref/source/rltiles/player/hand1/d_glaive.bmp
index 70ada67598..7ad49fd93a 100644
--- a/crawl-ref/source/rltiles/player/hand1/d_glaive.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/d_glaive.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/dire_lajatang.bmp b/crawl-ref/source/rltiles/player/hand1/dire_lajatang.bmp
new file mode 100644
index 0000000000..a6a0b0fb2d
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/dire_lajatang.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/dwarvish_short_sword.bmp b/crawl-ref/source/rltiles/player/hand1/eos.bmp
index 377850a637..b3b089d0bf 100644
--- a/crawl-ref/source/rltiles/item/weapon/dwarvish_short_sword.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/eos.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/giant_club_plain.bmp b/crawl-ref/source/rltiles/player/hand1/giant_club_plain.bmp
new file mode 100644
index 0000000000..207f48e7b2
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/giant_club_plain.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/glaive_of_prune.bmp b/crawl-ref/source/rltiles/player/hand1/glaive_of_prune.bmp
index 657674944a..6226761aee 100644
--- a/crawl-ref/source/rltiles/player/hand1/glaive_of_prune.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/glaive_of_prune.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/glaive_of_the_guard.bmp b/crawl-ref/source/rltiles/player/hand1/glaive_of_the_guard.bmp
new file mode 100644
index 0000000000..8778d7df6b
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/glaive_of_the_guard.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/scalpel.bmp b/crawl-ref/source/rltiles/player/hand1/knife_of_accuracy.bmp
index d5d1f4dee8..70f5855259 100644
--- a/crawl-ref/source/rltiles/item/weapon/scalpel.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/knife_of_accuracy.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/aklys.bmp b/crawl-ref/source/rltiles/player/hand1/mace_of_brilliance.bmp
index f8eecd2cdc..025c9cbb18 100644
--- a/crawl-ref/source/rltiles/item/weapon/aklys.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/mace_of_brilliance.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/mace_of_variability.bmp b/crawl-ref/source/rltiles/player/hand1/mace_of_variability.bmp
index 025c9cbb18..2ace404133 100644
--- a/crawl-ref/source/rltiles/player/hand1/mace_of_variability.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/mace_of_variability.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/morg.bmp b/crawl-ref/source/rltiles/player/hand1/morg.bmp
index 3ef6ed6ced..5f6bb8aa0a 100644
--- a/crawl-ref/source/rltiles/player/hand1/morg.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/morg.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/serpent_scourge.bmp b/crawl-ref/source/rltiles/player/hand1/serpent_scourge.bmp
new file mode 100644
index 0000000000..4a302b2be2
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/serpent_scourge.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/silver_dagger.bmp b/crawl-ref/source/rltiles/player/hand1/spriggans_knife.bmp
index 9a8f68a7a9..889ce03978 100644
--- a/crawl-ref/source/rltiles/item/weapon/silver_dagger.bmp
+++ b/crawl-ref/source/rltiles/player/hand1/spriggans_knife.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/sword_of_power.bmp b/crawl-ref/source/rltiles/player/hand1/sword_of_power.bmp
new file mode 100644
index 0000000000..818790b366
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/sword_of_power.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/trident_octopus_king.bmp b/crawl-ref/source/rltiles/player/hand1/trident_octopus_king.bmp
new file mode 100644
index 0000000000..45b81e898e
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/trident_octopus_king.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/undeadhunter.bmp b/crawl-ref/source/rltiles/player/hand1/undeadhunter.bmp
new file mode 100644
index 0000000000..971eb63cc1
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/undeadhunter.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/vampires_tooth.bmp b/crawl-ref/source/rltiles/player/hand1/vampires_tooth.bmp
new file mode 100644
index 0000000000..174557db9d
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/vampires_tooth.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/wucad_mu.bmp b/crawl-ref/source/rltiles/player/hand1/wucad_mu.bmp
new file mode 100644
index 0000000000..684fbacd6e
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/wucad_mu.bmp
diff --git a/crawl-ref/source/rltiles/player/hand1/wyrmbane.bmp b/crawl-ref/source/rltiles/player/hand1/wyrmbane.bmp
new file mode 100644
index 0000000000..be72e95a86
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/wyrmbane.bmp
diff --git a/crawl-ref/source/rltiles/player/hand2/shield_of_ignorance.bmp b/crawl-ref/source/rltiles/player/hand2/shield_of_ignorance.bmp
new file mode 100644
index 0000000000..0415162bff
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand2/shield_of_ignorance.bmp
diff --git a/crawl-ref/source/rltiles/player/hand2/shield_of_resistance.bmp b/crawl-ref/source/rltiles/player/hand2/shield_of_resistance.bmp
index 0415162bff..76e481f3de 100644
--- a/crawl-ref/source/rltiles/player/hand2/shield_of_resistance.bmp
+++ b/crawl-ref/source/rltiles/player/hand2/shield_of_resistance.bmp
diff --git a/crawl-ref/source/rltiles/player/head/dyrovepreva.bmp b/crawl-ref/source/rltiles/player/head/dyrovepreva.bmp
index 9c036c856a..2faa3e254a 100644
--- a/crawl-ref/source/rltiles/player/head/dyrovepreva.bmp
+++ b/crawl-ref/source/rltiles/player/head/dyrovepreva.bmp
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 0fe5805dcd..af79c65a75 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -906,22 +906,17 @@ static int _tileidx_unrand_artefact(int idx)
         case 44: return TILE_URAND_ERCHIDEL;
         case 45: return TILE_URAND_NIGHT;
         case 46: return TILE_URAND_PLUTONIUM;
-        case 47: return TILE_URAND_UNDERADHUNTER;
+        case 47: return TILE_URAND_UNDEADHUNTER;
         case 48: return TILE_URAND_DRAGON_KING;
         case 49: return TILE_URAND_ALCHEMIST;
         case 50: return TILE_URAND_FENCER;
         case 51: return TILE_URAND_MAGE;
         case 52: return TILE_URAND_BLOWGUN;
-        case 53: //return TILE_URAND_WYRMBANE;
-                 return TILE_WPN_SPEAR + 1;
-        case 54: //return TILE_URAND_SPRIGGAN;
-                 return TILE_WPN_KNIFE + 1;
-        case 55: //return TILE_URAND_LAJATANG;
-                 return TILE_WPN_LAJATANG + 1;
-        case 56: //return TILE_URAND_BROOCH;
-                 return TILE_AMU_RANDOM_OFFSET + 2;
-        case 57: //return TILE_URAND_SERPENT_SCOURGE;
-                 return TILE_WPN_WHIP + 1;
+        case 53: return TILE_URAND_WYRMBANE;
+        case 54: return TILE_URAND_SPRIGGANS_KNIFE;
+        case 55: return TILE_URAND_DIRE_LAJATANG;
+        case 56: return TILE_URAND_BROOCH_OF_SHIELDING;
+        case 57: return TILE_URAND_SERPENT_SCOURGE;
         default: return TILE_TODO;
     }
 }
@@ -2871,11 +2866,10 @@ int tilep_equ_weapon(const item_def &item)
             case SPWPN_SCEPTRE_OF_ASMODEUS: return TILEP_HAND1_ASMODEUS;
             case SPWPN_STAFF_OF_OLGREB:     return TILEP_HAND1_OLGREB;
 
-            case SPWPN_SWORD_OF_POWER: 
-            case SPWPN_KNIFE_OF_ACCURACY:
-            case SPWPN_VAMPIRES_TOOTH:
-            case SPWPN_STAFF_OF_WUCAD_MU:
-                break;
+            case SPWPN_SWORD_OF_POWER:      return TILEP_HAND1_SWORD_OF_POWER;
+            case SPWPN_KNIFE_OF_ACCURACY:   return TILEP_HAND1_KNIFE_OF_ACCURACY;
+            case SPWPN_VAMPIRES_TOOTH:      return TILEP_HAND1_VAMPIRES_TOOTH;
+            case SPWPN_STAFF_OF_WUCAD_MU:   return TILEP_HAND1_WUCAD_MU;
         }
     }
 
@@ -2887,48 +2881,54 @@ int tilep_equ_weapon(const item_def &item)
             case 2:  return TILEP_HAND1_BLOODBANE;
             // Flaming Death
             case 4:  return TILEP_HAND1_FLAMING_DEATH;
-            //mace of Brilliance
-            case 8:  return TILEP_HAND1_MACE_OF_VARIABILITY;
-            //demon blade Leech
+            // mace of Brilliance
+            case 8:  return TILEP_HAND1_MACE_OF_BRILLIANCE;
+            // demon blade Leech
             case 12: return TILEP_HAND1_LEECH;
-            //dagger of Chilly Death
+            // dagger of Chilly Death
             case 15: return TILEP_HAND1_CHILLY_DEATH;
-            //dagger \"Morg\"
+            // dagger "Morg"
             case 17: return TILEP_HAND1_MORG;
-            //scythe \"Finisher
+            // scythe "Finisher"
             case 18: return TILEP_HAND1_FINISHER;
-            //sling \"Punk
+            // sling "Punk
             case 19: return TILEP_HAND1_PUNK;
-            //bow of Krishna
+            // bow of Krishna
             case 20: return TILEP_HAND1_KRISHNA;
-            //giant club \"Skullcrusher
-            case 22: break;
-            //glaive of the Guard
-            case 24: break;
-            //sword of Jihad
+            // giant club "Skullcrusher"
+            case 22: return TILEP_HAND1_GIANT_CLUB_SLANT;
+            // glaive of the Guard
+            case 24: return TILEP_HAND1_GLAIVE_OF_THE_GUARD;
+            // sword of Jihad
             case 25: return TILEP_HAND1_JIHAD;
-            //crossbow \"Fiery Devil
+            // crossbow "Fiery Devil"
             case 28: return TILEP_HAND1_FIERY_DEVIL;
-            //sword of Doom Knight
+            // sword of Doom Knight
             case 31: return TILEP_HAND1_DOOM_KNIGHT;
-            //Eos
-            case 35: break;
-            //spear of Voo-Doo
+            // Eos
+            case 35: return TILEP_HAND1_EOS;
+            // spear of Voo-Doo
             case 39: return TILEP_HAND1_VOODOO;
-            //trident of the Octopus king
-            case 40: break;
-            //mithril axe \"Arga
+            // trident of the Octopus king
+            case 40: return TILEP_HAND1_TRIDENT_OCTOPUS_KING;
+            // mithril axe "Arga"
             case 42: return TILEP_HAND1_ARGA;
-            //Elemental Staff
+            // Elemental Staff
             case 43: return TILEP_HAND1_ELEMENTAL_STAFF;
-            //hand crossbow \"Sniper
+            // hand crossbow "Sniper"
             case 44: return TILEP_HAND1_SNIPER;
-            //bow \"Erchidel
+            // bow "Erchidel"
             case 45: return TILEP_HAND1_GREAT_BOW;
-            //plutonium sword
+            // plutonium sword
             case 47: return TILEP_HAND1_PLUTONIUM_SWORD;
-            //mace \"Undeadhunter
-            case 48: return TILEP_HAND1_LARGE_MACE;
+            // mace "Undeadhunter"
+            case 48: return TILEP_HAND1_UNDEADHUNTER;
+            // blowgun of the Assassin
+            case 53: return TILEP_HAND1_BLOWGUN_ASSASSIN;
+            case 54: return TILEP_HAND1_WYRMBANE;
+            case 55: return TILEP_HAND1_SPRIGGANS_KNIFE;
+            case 56: return TILEP_HAND1_DIRE_LAJATANG;
+            case 58: return TILEP_HAND1_SERPENT_SCOURGE;
         }
     }
 
@@ -2943,7 +2943,7 @@ int tilep_equ_weapon(const item_def &item)
     case WPN_DIRE_FLAIL:        return TILEP_HAND1_GREAT_FRAIL;
     case WPN_MORNINGSTAR:       return TILEP_HAND1_MORNINGSTAR;
     case WPN_EVENINGSTAR:       return TILEP_HAND1_EVENINGSTAR;
-    case WPN_GIANT_CLUB:        return TILEP_HAND1_GIANT_CLUB_SLANT;
+    case WPN_GIANT_CLUB:        return TILEP_HAND1_GIANT_CLUB_PLAIN;
     case WPN_GIANT_SPIKED_CLUB: return TILEP_HAND1_GIANT_CLUB_SPIKE_SLANT;
     case WPN_ANCUS:             return TILEP_HAND1_MACE;
     case WPN_WHIP:              return TILEP_HAND1_WHIP;
@@ -2973,7 +2973,7 @@ int tilep_equ_weapon(const item_def &item)
     case WPN_EXECUTIONERS_AXE: return TILEP_HAND1_EXECUTIONERS_AXE;
     case WPN_BARDICHE:         return TILEP_HAND1_GLAIVE3;
 
-    //Pole
+    // Pole
     case WPN_SPEAR:         return TILEP_HAND1_SPEAR;
     case WPN_HALBERD:       return TILEP_HAND1_HALBERD;
     case WPN_GLAIVE:        return TILEP_HAND1_GLAIVE;
@@ -2984,7 +2984,7 @@ int tilep_equ_weapon(const item_def &item)
     case WPN_TRIDENT:       return TILEP_HAND1_TRIDENT2;
     case WPN_LAJATANG:      return TILEP_HAND1_D_GLAIVE;
 
-    //Ranged
+    // Ranged
     case WPN_SLING:         return TILEP_HAND1_SLING;
     case WPN_BOW:           return TILEP_HAND1_BOW2;
     case WPN_CROSSBOW:      return TILEP_HAND1_CROSSBOW;
@@ -3006,11 +3006,11 @@ int tilep_equ_armour(const item_def &item)
         switch (find_unrandart_index(item) + 1)
         {
             // Holy Armour of Zin
-            case 6:  return TILEP_BODY_ARMOR_MUMMY;
+            case 6: return TILEP_BODY_ARMOR_MUMMY;
             // robe of Augmentation
-            case 7:  return TILEP_BODY_ROBE_RED2;
+            case 7: return TILEP_BODY_ROBE_WHITE_BLUE;
             // robe of Misfortune
-            case 14: return TILEP_BODY_ARWEN;
+            case 14: return TILEP_BODY_ROBE_MISFORTUNE;
             // Lear's chain mail
             case 26: return TILEP_BODY_LEARS_CHAIN_MAIL;
             // skin of Zhor
@@ -3018,7 +3018,7 @@ int tilep_equ_armour(const item_def &item)
             // salamander hide armour
             case 29: return TILEP_BODY_LEATHER_RED;
             // robe of Folly
-            case 33: return TILEP_BODY_ROBE_BLACK;
+            case 33: return TILEP_BODY_ROBE_RED2;
             // Edison's patent armour
             case 38: return TILEP_BODY_EDISON;
             // robe of Night
@@ -3100,7 +3100,7 @@ int tilep_equ_shield(const item_def &item)
         switch (find_unrandart_index(item) + 1)
         {
             // shield of Ignorance
-            case 5:  return TILEP_HAND2_SHIELD_SHAMAN;
+            case 5:  return TILEP_HAND2_SHIELD_OF_IGNORANCE;
             // Bullseye
             case 10: return TILEP_HAND2_BULLSEYE;
             // shield of Resistance