Adding naga and centaur barding tiles to replace bad placeholder art.

Removing more unused Nethack tiles.

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

57 files changed, 149 insertions, 90 deletions

diff --git a/crawl-ref/source/guic-x11.cc b/crawl-ref/source/guic-x11.cc
index ca75d74396..7870b3a19e 100644
--- a/crawl-ref/source/guic-x11.cc
+++ b/crawl-ref/source/guic-x11.cc
@@ -10,12 +10,7 @@
 #include <X11/keysymdef.h>
 #include <X11/Xmd.h>
 
-#if DEBUG
-#define ASSERT(p)       {if (!(p)) printf( __FILE__, __LINE__);}
-#else
-#define ASSERT(p)       ((void) 0)
-#endif
-
+#include "debug.h"
 #include "guic.h"
 #include "version.h"
 
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 1d3c10cdef..c3eb84b339 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -86,7 +86,9 @@ dngn_ice_statue DNGN_ICE_STATUE
 ###dc/wal1 DNGN_PERMAROCK_WALL
 ###dc/wal1 DNGN_LAST_SOLID_TILE
 
+%rim 1
 dngn_enter_hell DNGN_ENTER_HELL
+%rim 0
 dngn_branch_stairs DNGN_BRANCH_STAIRS
 dngn_trap_mechanical DNGN_TRAP_MECHANICAL
 dngn_trap_magical DNGN_TRAP_MAGICAL
@@ -114,7 +116,9 @@ dngn_exit DNGN_EXIT_ABYSS
 dngn_stone_arch DNGN_STONE_ARCH
 dngn_enter_pandemonium DNGN_ENTER_PANDEMONIUM
 dngn_exit DNGN_EXIT_PANDEMONIUM
+%rim 1
 dngn_transit_pandemonium DNGN_TRANSIT_PANDEMONIUM
+%rim 0
 ####846 DNGN_BUILDER_SPECIAL_WALL
 ####846 DNGN_BUILDER_SPECIAL_FLOOR
 dngn_enter DNGN_ENTER
@@ -131,7 +135,9 @@ dngn_enter DNGN_ENTER
 #851 DNGN_ENTER_ELVEN_HALLS
 #851 DNGN_ENTER_TOMB
 #851 DNGN_ENTER_SWAMP
+%rim 1
 dngn_return DNGN_RETURN
+%rim 0
 #850 DNGN_RETURN_FROM_ORCISH_MINES
 #850 DNGN_RETURN_FROM_HIVE
 #850 DNGN_RETURN_FROM_LAIR
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index d4ecf72c59..550a35ae73 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -257,8 +257,14 @@ gold_dragon_armour ARM_GOLD_DRAGON_ARMOUR /* A13E-10 A magical armour made from
 swamp_dragon_hide ARM_SWAMP_DRAGON_HIDE /* A1E-2 The slimy skin of a swamp-dwelling dragon. I suppose you could wear it if you really wanted to.

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

 

-naga_barding ARM_NAGA_BARDING

-centaur_barding ARM_CENTAUR_BARDING

+naga_barding_blue ARM_NAGA_BARDING

+naga_barding_metal

+naga_barding_magenta

+naga_barding_red

+centaur_barding_blue ARM_CENTAUR_BARDING

+centaur_barding_metal

+centaur_barding_magenta

+centaur_barding_red

 

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

 shield_kite2 ARM_SHIELD_1

diff --git a/crawl-ref/source/rltiles/dc-pl.txt b/crawl-ref/source/rltiles/dc-pl.txt
index 29a8841e6d..66f00dc4b4 100644
--- a/crawl-ref/source/rltiles/dc-pl.txt
+++ b/crawl-ref/source/rltiles/dc-pl.txt
@@ -90,8 +90,14 @@ vampire_m
 shadow

 %rim 1

 %sdir player/barding

-naga_barding NAGA_BARDING

-centaur_barding CENTAUR_BARDING

+naga_barding_blue NAGA_BARDING

+naga_barding_metal NAGA_BARDING_METAL

+naga_barding_magenta NAGA_BARDING_MAGENTA

+naga_barding_red NAGA_BARDING_RED

+centaur_barding_blue CENTAUR_BARDING

+centaur_barding_metal CENTAUR_BARDING_METAL

+centaur_barding_magenta CENTAUR_BARDING_MAGENTA

+centaur_barding_red CENTAUR_BARDING_RED

 %end

 

 ###Cloak

diff --git a/crawl-ref/source/rltiles/item/armor/alchemy_smock.bmp b/crawl-ref/source/rltiles/item/armor/alchemy_smock.bmp
deleted file mode 100644
index e5919edfb6..0000000000
--- a/crawl-ref/source/rltiles/item/armor/alchemy_smock.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/bronze_plate_mail.bmp b/crawl-ref/source/rltiles/item/armor/bronze_plate_mail.bmp
deleted file mode 100644
index 98a8219a5c..0000000000
--- a/crawl-ref/source/rltiles/item/armor/bronze_plate_mail.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/dwarvish_iron_helm.bmp b/crawl-ref/source/rltiles/item/armor/centaur_barding_blue.bmp
index 4bfd413261..b8544163c3 100644
--- a/crawl-ref/source/rltiles/item/armor/dwarvish_iron_helm.bmp
+++ b/crawl-ref/source/rltiles/item/armor/centaur_barding_blue.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/buckled_boots.bmp b/crawl-ref/source/rltiles/item/armor/centaur_barding_magenta.bmp
index 8d860c9c6d..629f0e0764 100644
--- a/crawl-ref/source/rltiles/item/armor/buckled_boots.bmp
+++ b/crawl-ref/source/rltiles/item/armor/centaur_barding_magenta.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/centaur_barding_metal.bmp b/crawl-ref/source/rltiles/item/armor/centaur_barding_metal.bmp
new file mode 100644
index 0000000000..4f71650bff
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/armor/centaur_barding_metal.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/centaur_barding_red.bmp b/crawl-ref/source/rltiles/item/armor/centaur_barding_red.bmp
new file mode 100644
index 0000000000..e893f4e6e2
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/armor/centaur_barding_red.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/combat_boots.bmp b/crawl-ref/source/rltiles/item/armor/combat_boots.bmp
deleted file mode 100644
index 9a2ccc35b3..0000000000
--- a/crawl-ref/source/rltiles/item/armor/combat_boots.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/cornuthaum.bmp b/crawl-ref/source/rltiles/item/armor/cornuthaum.bmp
deleted file mode 100644
index 29a1adb70e..0000000000
--- a/crawl-ref/source/rltiles/item/armor/cornuthaum.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/crested_helmet.bmp b/crawl-ref/source/rltiles/item/armor/crested_helmet.bmp
deleted file mode 100644
index 21ddeab105..0000000000
--- a/crawl-ref/source/rltiles/item/armor/crested_helmet.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/dented_pot.bmp b/crawl-ref/source/rltiles/item/armor/dented_pot.bmp
deleted file mode 100644
index d65035bddc..0000000000
--- a/crawl-ref/source/rltiles/item/armor/dented_pot.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/dunce_cap.bmp b/crawl-ref/source/rltiles/item/armor/dunce_cap.bmp
deleted file mode 100644
index 29a1adb70e..0000000000
--- a/crawl-ref/source/rltiles/item/armor/dunce_cap.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/dwarvish_cloak.bmp b/crawl-ref/source/rltiles/item/armor/dwarvish_cloak.bmp
deleted file mode 100644
index 1b96f658ee..0000000000
--- a/crawl-ref/source/rltiles/item/armor/dwarvish_cloak.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/dwarvish_mithril_coat.bmp b/crawl-ref/source/rltiles/item/armor/dwarvish_mithril_coat.bmp
deleted file mode 100644
index f5fb214311..0000000000
--- a/crawl-ref/source/rltiles/item/armor/dwarvish_mithril_coat.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/elven_cloak.bmp b/crawl-ref/source/rltiles/item/armor/elven_cloak.bmp
deleted file mode 100644
index 584fd9775c..0000000000
--- a/crawl-ref/source/rltiles/item/armor/elven_cloak.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/elven_mithril_coat.bmp b/crawl-ref/source/rltiles/item/armor/elven_mithril_coat.bmp
deleted file mode 100644
index 0bf6c84ac3..0000000000
--- a/crawl-ref/source/rltiles/item/armor/elven_mithril_coat.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/fencing_gloves.bmp b/crawl-ref/source/rltiles/item/armor/fencing_gloves.bmp
deleted file mode 100644
index 976c88601c..0000000000
--- a/crawl-ref/source/rltiles/item/armor/fencing_gloves.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/hawaiian_shirt.bmp b/crawl-ref/source/rltiles/item/armor/hawaiian_shirt.bmp
deleted file mode 100644
index 25fd0d3d2e..0000000000
--- a/crawl-ref/source/rltiles/item/armor/hawaiian_shirt.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/hiking_boots.bmp b/crawl-ref/source/rltiles/item/armor/hiking_boots.bmp
deleted file mode 100644
index 82255d4fe1..0000000000
--- a/crawl-ref/source/rltiles/item/armor/hiking_boots.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/leather_jacket.bmp b/crawl-ref/source/rltiles/item/armor/leather_jacket.bmp
deleted file mode 100644
index b9c4f00891..0000000000
--- a/crawl-ref/source/rltiles/item/armor/leather_jacket.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/low_boots.bmp b/crawl-ref/source/rltiles/item/armor/low_boots.bmp
deleted file mode 100644
index 89caccbfbb..0000000000
--- a/crawl-ref/source/rltiles/item/armor/low_boots.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/mud_boots.bmp b/crawl-ref/source/rltiles/item/armor/mud_boots.bmp
deleted file mode 100644
index 2ab2f6c09d..0000000000
--- a/crawl-ref/source/rltiles/item/armor/mud_boots.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/mummy_wrapping.bmp b/crawl-ref/source/rltiles/item/armor/mummy_wrapping.bmp
deleted file mode 100644
index 4d2264d86a..0000000000
--- a/crawl-ref/source/rltiles/item/armor/mummy_wrapping.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/dwarvish_roundshield.bmp b/crawl-ref/source/rltiles/item/armor/naga_barding_blue.bmp
index 5a5a3d01b4..2aba5ebe86 100644
--- a/crawl-ref/source/rltiles/item/armor/dwarvish_roundshield.bmp
+++ b/crawl-ref/source/rltiles/item/armor/naga_barding_blue.bmp
diff --git a/crawl-ref/source/rltiles/player/barding/naga_barding.bmp b/crawl-ref/source/rltiles/item/armor/naga_barding_magenta.bmp
index 91329474c1..dca0716ad3 100644
--- a/crawl-ref/source/rltiles/player/barding/naga_barding.bmp
+++ b/crawl-ref/source/rltiles/item/armor/naga_barding_magenta.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/centaur_barding.bmp b/crawl-ref/source/rltiles/item/armor/naga_barding_metal.bmp
index 94f8579a0a..4c10bf9aac 100644
--- a/crawl-ref/source/rltiles/item/armor/centaur_barding.bmp
+++ b/crawl-ref/source/rltiles/item/armor/naga_barding_metal.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/naga_barding_red.bmp b/crawl-ref/source/rltiles/item/armor/naga_barding_red.bmp
new file mode 100644
index 0000000000..fd3f123451
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/armor/naga_barding_red.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/oilskin_cloak.bmp b/crawl-ref/source/rltiles/item/armor/oilskin_cloak.bmp
deleted file mode 100644
index f80aa2e8d0..0000000000
--- a/crawl-ref/source/rltiles/item/armor/oilskin_cloak.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/old_gloves.bmp b/crawl-ref/source/rltiles/item/armor/old_gloves.bmp
deleted file mode 100644
index e13b54b1b9..0000000000
--- a/crawl-ref/source/rltiles/item/armor/old_gloves.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/opera_cloak.bmp b/crawl-ref/source/rltiles/item/armor/opera_cloak.bmp
deleted file mode 100644
index cb9344b264..0000000000
--- a/crawl-ref/source/rltiles/item/armor/opera_cloak.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/orcish_cloak.bmp b/crawl-ref/source/rltiles/item/armor/orcish_cloak.bmp
deleted file mode 100644
index e3fb87b3fb..0000000000
--- a/crawl-ref/source/rltiles/item/armor/orcish_cloak.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/orcish_shield.bmp b/crawl-ref/source/rltiles/item/armor/orcish_shield.bmp
deleted file mode 100644
index 5fd3ae3fe6..0000000000
--- a/crawl-ref/source/rltiles/item/armor/orcish_shield.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/ornamental_cope.bmp b/crawl-ref/source/rltiles/item/armor/ornamental_cope.bmp
deleted file mode 100644
index d0f83e4fa5..0000000000
--- a/crawl-ref/source/rltiles/item/armor/ornamental_cope.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/padded_gloves.bmp b/crawl-ref/source/rltiles/item/armor/padded_gloves.bmp
deleted file mode 100644
index 8253f3873f..0000000000
--- a/crawl-ref/source/rltiles/item/armor/padded_gloves.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/piece_of_cloth.bmp b/crawl-ref/source/rltiles/item/armor/piece_of_cloth.bmp
deleted file mode 100644
index 15b1547b2e..0000000000
--- a/crawl-ref/source/rltiles/item/armor/piece_of_cloth.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/plate_mail.bmp b/crawl-ref/source/rltiles/item/armor/plate_mail.bmp
deleted file mode 100644
index c89aa22d70..0000000000
--- a/crawl-ref/source/rltiles/item/armor/plate_mail.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/plumed_helmet.bmp b/crawl-ref/source/rltiles/item/armor/plumed_helmet.bmp
deleted file mode 100644
index f4738f187a..0000000000
--- a/crawl-ref/source/rltiles/item/armor/plumed_helmet.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/riding_boots.bmp b/crawl-ref/source/rltiles/item/armor/riding_boots.bmp
deleted file mode 100644
index 2085fa6a6b..0000000000
--- a/crawl-ref/source/rltiles/item/armor/riding_boots.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/riding_gloves.bmp b/crawl-ref/source/rltiles/item/armor/riding_gloves.bmp
deleted file mode 100644
index 5fcc6ccf79..0000000000
--- a/crawl-ref/source/rltiles/item/armor/riding_gloves.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/s_suit.bmp b/crawl-ref/source/rltiles/item/armor/s_suit.bmp
deleted file mode 100644
index 9c67095935..0000000000
--- a/crawl-ref/source/rltiles/item/armor/s_suit.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/shield_of_reflection.bmp b/crawl-ref/source/rltiles/item/armor/shield_of_reflection.bmp
deleted file mode 100644
index adc66af9ed..0000000000
--- a/crawl-ref/source/rltiles/item/armor/shield_of_reflection.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/snow_boots.bmp b/crawl-ref/source/rltiles/item/armor/snow_boots.bmp
deleted file mode 100644
index ccecd209c3..0000000000
--- a/crawl-ref/source/rltiles/item/armor/snow_boots.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/t_shirt.bmp b/crawl-ref/source/rltiles/item/armor/t_shirt.bmp
deleted file mode 100644
index 67d4585227..0000000000
--- a/crawl-ref/source/rltiles/item/armor/t_shirt.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/tattered_cape.bmp b/crawl-ref/source/rltiles/item/armor/tattered_cape.bmp
deleted file mode 100644
index cb923ff2d4..0000000000
--- a/crawl-ref/source/rltiles/item/armor/tattered_cape.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/armor/uruk_hai_shield.bmp b/crawl-ref/source/rltiles/item/armor/uruk_hai_shield.bmp
deleted file mode 100644
index c3236d7f2b..0000000000
--- a/crawl-ref/source/rltiles/item/armor/uruk_hai_shield.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/player/barding/centaur_barding.bmp b/crawl-ref/source/rltiles/player/barding/centaur_barding_blue.bmp
index f927c126dc..75d1bb7eb7 100644
--- a/crawl-ref/source/rltiles/player/barding/centaur_barding.bmp
+++ b/crawl-ref/source/rltiles/player/barding/centaur_barding_blue.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/naga_barding.bmp b/crawl-ref/source/rltiles/player/barding/centaur_barding_magenta.bmp
index 84c6a26032..50c8ac78fc 100644
--- a/crawl-ref/source/rltiles/item/armor/naga_barding.bmp
+++ b/crawl-ref/source/rltiles/player/barding/centaur_barding_magenta.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/fedora.bmp b/crawl-ref/source/rltiles/player/barding/centaur_barding_metal.bmp
index 25a775e857..5bac44086d 100644
--- a/crawl-ref/source/rltiles/item/armor/fedora.bmp
+++ b/crawl-ref/source/rltiles/player/barding/centaur_barding_metal.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/orcish_helm.bmp b/crawl-ref/source/rltiles/player/barding/centaur_barding_red.bmp
index 6ed9673773..165b346a3b 100644
--- a/crawl-ref/source/rltiles/item/armor/orcish_helm.bmp
+++ b/crawl-ref/source/rltiles/player/barding/centaur_barding_red.bmp
diff --git a/crawl-ref/source/rltiles/player/barding/naga_barding_blue.bmp b/crawl-ref/source/rltiles/player/barding/naga_barding_blue.bmp
new file mode 100644
index 0000000000..6a103c0bfe
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/barding/naga_barding_blue.bmp
diff --git a/crawl-ref/source/rltiles/player/barding/naga_barding_magenta.bmp b/crawl-ref/source/rltiles/player/barding/naga_barding_magenta.bmp
new file mode 100644
index 0000000000..8e0f6241ee
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/barding/naga_barding_magenta.bmp
diff --git a/crawl-ref/source/rltiles/player/barding/naga_barding_metal.bmp b/crawl-ref/source/rltiles/player/barding/naga_barding_metal.bmp
new file mode 100644
index 0000000000..81ce8d0d39
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/barding/naga_barding_metal.bmp
diff --git a/crawl-ref/source/rltiles/player/barding/naga_barding_red.bmp b/crawl-ref/source/rltiles/player/barding/naga_barding_red.bmp
new file mode 100644
index 0000000000..177bdf982d
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/barding/naga_barding_red.bmp
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 1f75d29795..7f6d2b30b2 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -747,99 +747,144 @@ int tileidx_missile(const item_def &item)
 
 int tileidx_armour(const item_def &item)
 {
-  int ch = TILE_ERROR;
-  int race = item.flags & ISFLAG_RACIAL_MASK;
-  int type=item.sub_type;
-  int etype = get_etype(item);
+    int ch = TILE_ERROR;
+    int race = item.flags & ISFLAG_RACIAL_MASK;
+    int type = item.sub_type;
+    int etype = get_etype(item);
 
-  static const int etable[5][5] = {
-    {0, 0, 0, 0, 0}, // No ego tile
-    {0, 1, 1, 1, 1}, // One ego tile
-    {0, 1, 1, 1, 2}, // Two ego tile
-    {0, 1, 1, 2, 3},
-    {0, 1, 2, 3, 4}
-  };
+    static const int etable[5][5] = {
+        {0, 0, 0, 0, 0}, // No ego tile
+        {0, 1, 1, 1, 1}, // One ego tile
+        {0, 1, 1, 1, 2}, // Two ego tile
+        {0, 1, 1, 2, 3},
+        {0, 1, 2, 3, 4}
+    };
 
-  switch(type)
-  {
+    switch(type)
+    {
     case ARM_ROBE: 
-      ch= TILE_ARM_ROBE + etable[2][etype];
-      break;
+        ch = TILE_ARM_ROBE + etable[2][etype];
+        break;
     case ARM_LEATHER_ARMOUR:
-      ch=TILE_ARM_LEATHER_ARMOUR  + etable[2][etype];
-      if (race == ISFLAG_ORCISH) ch = TILE_ARM_LEATHER_ARMOUR_ORC;
-      if (race == ISFLAG_ELVEN ) ch = TILE_ARM_LEATHER_ARMOUR_ELF;
-      break;
+        ch = TILE_ARM_LEATHER_ARMOUR  + etable[2][etype];
+        if (race == ISFLAG_ORCISH) ch = TILE_ARM_LEATHER_ARMOUR_ORC;
+        if (race == ISFLAG_ELVEN ) ch = TILE_ARM_LEATHER_ARMOUR_ELF;
+        break;
     case ARM_RING_MAIL:
-      ch=TILE_ARM_RING_MAIL + etable[1][etype];
-      if (race == ISFLAG_ORCISH) ch = TILE_ARM_RING_MAIL_ORC;
-      if (race == ISFLAG_ELVEN ) ch = TILE_ARM_RING_MAIL_ELF;
-      if (race == ISFLAG_DWARVEN ) ch = TILE_ARM_RING_MAIL_DWA;
-      break;
+        ch = TILE_ARM_RING_MAIL + etable[1][etype];
+        if (race == ISFLAG_ORCISH) ch = TILE_ARM_RING_MAIL_ORC;
+        if (race == ISFLAG_ELVEN ) ch = TILE_ARM_RING_MAIL_ELF;
+        if (race == ISFLAG_DWARVEN ) ch = TILE_ARM_RING_MAIL_DWA;
+        break;
     case ARM_SCALE_MAIL:
-      ch=TILE_ARM_SCALE_MAIL + etable[1][etype];
-      if (race == ISFLAG_ELVEN ) ch = TILE_ARM_SCALE_MAIL_ELF;
-      break;
+        ch = TILE_ARM_SCALE_MAIL + etable[1][etype];
+        if (race == ISFLAG_ELVEN ) ch = TILE_ARM_SCALE_MAIL_ELF;
+        break;
     case ARM_CHAIN_MAIL:
-      ch=TILE_ARM_CHAIN_MAIL + etable[1][etype];
-      if (race == ISFLAG_ELVEN) ch = TILE_ARM_CHAIN_MAIL_ELF;
-      if (race == ISFLAG_ORCISH) ch = TILE_ARM_CHAIN_MAIL_ORC;
-      break;
-    case ARM_SPLINT_MAIL: ch=TILE_ARM_SPLINT_MAIL; break;
-    case ARM_BANDED_MAIL: ch=TILE_ARM_BANDED_MAIL; break;
+        ch = TILE_ARM_CHAIN_MAIL + etable[1][etype];
+        if (race == ISFLAG_ELVEN) ch = TILE_ARM_CHAIN_MAIL_ELF;
+        if (race == ISFLAG_ORCISH) ch = TILE_ARM_CHAIN_MAIL_ORC;
+        break;
+    case ARM_SPLINT_MAIL:
+        ch = TILE_ARM_SPLINT_MAIL;
+        break;
+    case ARM_BANDED_MAIL:
+        ch = TILE_ARM_BANDED_MAIL;
+        break;
     case ARM_PLATE_MAIL:
-      ch=TILE_ARM_PLATE_MAIL;
-      if (race == ISFLAG_ORCISH) ch = TILE_ARM_PLATE_MAIL_ORC;
-      break;
-
-    case ARM_CRYSTAL_PLATE_MAIL: ch=TILE_ARM_CRYSTAL_PLATE_MAIL; break;
-
-    case ARM_SHIELD: ch=TILE_ARM_SHIELD  + etable[2][etype]; break;
-
+        ch = TILE_ARM_PLATE_MAIL;
+        if (race == ISFLAG_ORCISH) ch = TILE_ARM_PLATE_MAIL_ORC;
+        break;
+    case ARM_CRYSTAL_PLATE_MAIL:
+        ch = TILE_ARM_CRYSTAL_PLATE_MAIL;
+        break;
+    case ARM_SHIELD:
+        ch = TILE_ARM_SHIELD  + etable[2][etype];
+        break;
     case ARM_CLOAK: 
-      ch=TILE_ARM_CLOAK + etable[3][etype];
-      break;
-
+        ch = TILE_ARM_CLOAK + etable[3][etype];
+        break;
     case ARM_WIZARD_HAT:
-      ch=TILE_THELM_WIZARD_HAT + etable[1][etype]; break;
+        ch = TILE_THELM_WIZARD_HAT + etable[1][etype];
+        break;
     case ARM_CAP:
-      ch=TILE_THELM_CAP; break;
+        ch = TILE_THELM_CAP;
+        break;
     case ARM_HELMET:
-      ch=TILE_THELM_HELM  + etable[3][etype]; break;
+        ch = TILE_THELM_HELM  + etable[3][etype];
+        break;
     case ARM_GLOVES:
-      ch=TILE_ARM_GLOVES  + etable[3][etype];
-      break;
+        ch = TILE_ARM_GLOVES  + etable[3][etype];
+        break;
     case ARM_BOOTS: 
-      ch=TILE_ARM_BOOTS + etable[3][etype];
-      break;
+        ch = TILE_ARM_BOOTS + etable[3][etype];
+        break;
     case ARM_BUCKLER: 
-      ch=TILE_ARM_BUCKLER + etable[1][etype]; 
-      break;
+        ch = TILE_ARM_BUCKLER + etable[1][etype]; 
+        break;
     case ARM_LARGE_SHIELD:
-      ch=TILE_ARM_LARGE_SHIELD + etable[2][etype];
-      break;
-    case ARM_CENTAUR_BARDING: ch=TILE_ARM_CENTAUR_BARDING; break;
-    case ARM_NAGA_BARDING: ch=TILE_ARM_NAGA_BARDING; break;
-
-    case ARM_ANIMAL_SKIN: ch=TILE_ARM_ANIMAL_SKIN + etable[1][etype]; break;
-    case ARM_TROLL_HIDE: ch=TILE_ARM_TROLL_HIDE; break;
-    case ARM_TROLL_LEATHER_ARMOUR: ch=TILE_ARM_TROLL_LEATHER_ARMOUR; break;
-    case ARM_DRAGON_HIDE: ch=TILE_ARM_DRAGON_HIDE; break;
-    case ARM_DRAGON_ARMOUR: ch=TILE_ARM_DRAGON_ARMOUR; break;
-    case ARM_ICE_DRAGON_HIDE: ch=TILE_ARM_ICE_DRAGON_HIDE; break;
-    case ARM_ICE_DRAGON_ARMOUR: ch=TILE_ARM_ICE_DRAGON_ARMOUR; break;
-    case ARM_STEAM_DRAGON_HIDE: ch=TILE_ARM_STEAM_DRAGON_HIDE; break;
-    case ARM_STEAM_DRAGON_ARMOUR: ch=TILE_ARM_STEAM_DRAGON_ARMOUR; break;
-    case ARM_MOTTLED_DRAGON_HIDE: ch=TILE_ARM_MOTTLED_DRAGON_HIDE; break;
-    case ARM_MOTTLED_DRAGON_ARMOUR: ch=TILE_ARM_MOTTLED_DRAGON_ARMOUR; break;
-    case ARM_STORM_DRAGON_HIDE: ch=TILE_ARM_STORM_DRAGON_HIDE; break;
-    case ARM_STORM_DRAGON_ARMOUR: ch=TILE_ARM_STORM_DRAGON_ARMOUR; break;
-    case ARM_GOLD_DRAGON_HIDE: ch=TILE_ARM_GOLD_DRAGON_HIDE; break;
-    case ARM_GOLD_DRAGON_ARMOUR: ch=TILE_ARM_GOLD_DRAGON_ARMOUR; break;
-    case ARM_SWAMP_DRAGON_HIDE: ch=TILE_ARM_SWAMP_DRAGON_HIDE; break;
-    case ARM_SWAMP_DRAGON_ARMOUR: ch=TILE_ARM_SWAMP_DRAGON_ARMOUR; break;
-  }
-  return ch;
+        ch = TILE_ARM_LARGE_SHIELD + etable[2][etype];
+        break;
+    case ARM_CENTAUR_BARDING:
+        ch = TILE_ARM_CENTAUR_BARDING + etable[3][etype];
+        break;
+    case ARM_NAGA_BARDING:
+        ch = TILE_ARM_NAGA_BARDING + etable[3][etype];
+        break;
+    case ARM_ANIMAL_SKIN:
+        ch = TILE_ARM_ANIMAL_SKIN + etable[1][etype];
+        break;
+    case ARM_TROLL_HIDE: 
+        ch = TILE_ARM_TROLL_HIDE;
+        break;
+    case ARM_TROLL_LEATHER_ARMOUR:
+        ch = TILE_ARM_TROLL_LEATHER_ARMOUR;
+        break;
+    case ARM_DRAGON_HIDE:
+        ch = TILE_ARM_DRAGON_HIDE;
+        break;
+    case ARM_DRAGON_ARMOUR:
+        ch = TILE_ARM_DRAGON_ARMOUR;
+        break;
+    case ARM_ICE_DRAGON_HIDE:
+        ch = TILE_ARM_ICE_DRAGON_HIDE;
+        break;
+    case ARM_ICE_DRAGON_ARMOUR:
+        ch = TILE_ARM_ICE_DRAGON_ARMOUR;
+        break;
+    case ARM_STEAM_DRAGON_HIDE:
+        ch = TILE_ARM_STEAM_DRAGON_HIDE;
+        break;
+    case ARM_STEAM_DRAGON_ARMOUR:
+        ch = TILE_ARM_STEAM_DRAGON_ARMOUR;
+        break;
+    case ARM_MOTTLED_DRAGON_HIDE:
+        ch = TILE_ARM_MOTTLED_DRAGON_HIDE;
+        break;
+    case ARM_MOTTLED_DRAGON_ARMOUR:
+        ch = TILE_ARM_MOTTLED_DRAGON_ARMOUR;
+        break;
+    case ARM_STORM_DRAGON_HIDE:
+        ch = TILE_ARM_STORM_DRAGON_HIDE;
+        break;
+    case ARM_STORM_DRAGON_ARMOUR:
+        ch = TILE_ARM_STORM_DRAGON_ARMOUR;
+        break;
+    case ARM_GOLD_DRAGON_HIDE:
+        ch = TILE_ARM_GOLD_DRAGON_HIDE;
+        break;
+    case ARM_GOLD_DRAGON_ARMOUR:
+        ch = TILE_ARM_GOLD_DRAGON_ARMOUR;
+        break;
+    case ARM_SWAMP_DRAGON_HIDE:
+        ch = TILE_ARM_SWAMP_DRAGON_HIDE;
+        break;
+    case ARM_SWAMP_DRAGON_ARMOUR:
+        ch = TILE_ARM_SWAMP_DRAGON_ARMOUR;
+        break;
+    }
+
+    return ch;
 }
 
 int tileidx_food(const item_def &item)
@@ -2765,10 +2810,12 @@ int tilep_equ_boots(const item_def &item)
     if (item.base_type != OBJ_ARMOUR)
         return 0;
 
+    int etype = get_etype(item);
+
     if (item.sub_type == ARM_NAGA_BARDING)
-        return TILEP_BOOTS_NAGA_BARDING;
+        return TILEP_BOOTS_NAGA_BARDING + std::min(etype, 3);
     if (item.sub_type == ARM_CENTAUR_BARDING)
-        return TILEP_BOOTS_CENTAUR_BARDING;
+        return TILEP_BOOTS_CENTAUR_BARDING + std::min(etype, 3);
 
     if (item.sub_type != ARM_BOOTS)
         return 0;
@@ -2783,7 +2830,6 @@ int tilep_equ_boots(const item_def &item)
         }
     }
 
-    int etype = get_etype(item);
     switch (etype)
     {
         default: