Gave more unrandarts elemental (shimmering/changing/etc) colours. 44

now have elemental colours, with 30 having normal, unchanging colours.


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

2 files changed, 86 insertions, 86 deletions

diff --git a/crawl-ref/source/art-data.h b/crawl-ref/source/art-data.h
index 06a0e26b99..fd7fd31f71 100644
--- a/crawl-ref/source/art-data.h
+++ b/crawl-ref/source/art-data.h
@@ -48,7 +48,7 @@
 /* 2: UNRAND_SINGING_SWORD */
 {
     "Singing Sword", "golden long sword", 
-    OBJ_WEAPONS, WPN_LONG_SWORD, +7, +7, YELLOW, 1200, 
+    OBJ_WEAPONS, WPN_LONG_SWORD, +7, +7, ETC_GOLD, 1200, 
     UNRAND_FLAG_SPECIAL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -67,7 +67,7 @@
 /* 3: UNRAND_TROG */
 {
     "Wrath of Trog", "bloodstained battleaxe", 
-    OBJ_WEAPONS, WPN_BATTLEAXE, +3, +11, RED, 1000, 
+    OBJ_WEAPONS, WPN_BATTLEAXE, +3, +11, ETC_BLOOD, 1000, 
     UNRAND_FLAG_SPECIAL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -143,7 +143,7 @@
 /* 7: UNRAND_OLGREB */
 {
     "Staff of Olgreb", "green glowing staff", 
-    OBJ_WEAPONS, WPN_QUARTERSTAFF, 0, 0, GREEN, 1000, 
+    OBJ_WEAPONS, WPN_QUARTERSTAFF, 0, 0, ETC_POISON, 1000, 
     UNRAND_FLAG_SPECIAL, 
     {
         SPWPN_VENOM, 0, 0, 0, 0, 0, 
@@ -162,7 +162,7 @@
 /* 8: UNRAND_WUCAD_MU */
 {
     "Staff of Wucad Mu", "ephemeral quarterstaff", 
-    OBJ_WEAPONS, WPN_QUARTERSTAFF, 0, 0, BROWN, 1000, 
+    OBJ_WEAPONS, WPN_QUARTERSTAFF, 0, 0, ETC_MAGIC, 1000, 
     UNRAND_FLAG_SPECIAL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -181,7 +181,7 @@
 /* 9: UNRAND_VAMPIRES_TOOTH */
 {
     "Vampire's Tooth", "ivory dagger", 
-    OBJ_WEAPONS, WPN_DAGGER, +3, +4, WHITE, 1000, 
+    OBJ_WEAPONS, WPN_DAGGER, +3, +4, ETC_BONE, 1000, 
     UNRAND_FLAG_SPECIAL, 
     {
         SPWPN_VAMPIRICISM, 0, 0, 0, 0, 0, 
@@ -200,7 +200,7 @@
 /* 10: UNRAND_CURSES */
 {
     "Scythe of Curses", "warped scythe", 
-    OBJ_WEAPONS, WPN_SCYTHE, +13, +13, DARKGREY, 800, 
+    OBJ_WEAPONS, WPN_SCYTHE, +13, +13, ETC_NECRO, 800, 
     UNRAND_FLAG_SPECIAL | UNRAND_FLAG_EVIL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -219,7 +219,7 @@
 /* 11: UNRAND_TORMENT */
 {
     "Sceptre of Torment", "jewelled golden mace", 
-    OBJ_WEAPONS, WPN_MACE, +7, +6, YELLOW, 1200, 
+    OBJ_WEAPONS, WPN_MACE, +7, +6, ETC_GOLD, 1200, 
     UNRAND_FLAG_SPECIAL | UNRAND_FLAG_EVIL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -238,7 +238,7 @@
 /* 12: UNRAND_ZONGULDROK */
 {
     "Sword of Zonguldrok", "bone long sword", 
-    OBJ_WEAPONS, WPN_LONG_SWORD, +9, +9, LIGHTGREY, 1250, 
+    OBJ_WEAPONS, WPN_LONG_SWORD, +9, +9, ETC_BONE, 1250, 
     UNRAND_FLAG_SPECIAL | UNRAND_FLAG_EVIL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -257,7 +257,7 @@
 /* 13: UNRAND_CEREBOV */
 {
     "Sword of Cerebov", "great serpentine sword", 
-    OBJ_WEAPONS, WPN_GREAT_SWORD, +6, +6, YELLOW, 2000, 
+    OBJ_WEAPONS, WPN_GREAT_SWORD, +6, +6, ETC_FIRE, 2000, 
     UNRAND_FLAG_SPECIAL | UNRAND_FLAG_EVIL, 
     {
         SPWPN_FLAMING, 0, 0, 0, 0, 0, 
@@ -276,7 +276,7 @@
 /* 14: UNRAND_DISPATER */
 {
     "Staff of Dispater", "golden staff", 
-    OBJ_WEAPONS, WPN_QUARTERSTAFF, +4, +4, YELLOW, 1200, 
+    OBJ_WEAPONS, WPN_QUARTERSTAFF, +4, +4, ETC_GOLD, 1200, 
     UNRAND_FLAG_SPECIAL | UNRAND_FLAG_EVIL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -295,7 +295,7 @@
 /* 15: UNRAND_ASMODEUS */
 {
     "Sceptre of Asmodeus", "ruby sceptre", 
-    OBJ_WEAPONS, WPN_QUARTERSTAFF, +7, +7, RED, 1500, 
+    OBJ_WEAPONS, WPN_QUARTERSTAFF, +7, +7, ETC_BLOOD, 1500, 
     UNRAND_FLAG_SPECIAL | UNRAND_FLAG_EVIL, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -314,7 +314,7 @@
 /* 16: UNRAND_BLOODBANE */
 {
     "long sword \"Bloodbane\"", "blackened long sword", 
-    OBJ_WEAPONS, WPN_LONG_SWORD, +7, +8, DARKGREY, 0, 
+    OBJ_WEAPONS, WPN_LONG_SWORD, +7, +8, ETC_DARK, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_VORPAL, 0, 0, 0, 0, 0, 
@@ -333,7 +333,7 @@
 /* 17: UNRAND_FLAMING_DEATH */
 {
     "scimitar of Flaming Death", "smoking scimitar", 
-    OBJ_WEAPONS, WPN_SCIMITAR, +7, +5, RED, 0, 
+    OBJ_WEAPONS, WPN_SCIMITAR, +7, +5, ETC_FIRE, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_FLAMING, 0, 0, 0, 0, 0, 
@@ -352,7 +352,7 @@
 /* 18: UNRAND_BRILLIANCE */
 {
     "mace of Brilliance", "brightly glowing mace", 
-    OBJ_WEAPONS, WPN_MACE, +5, +5, WHITE, 0, 
+    OBJ_WEAPONS, WPN_MACE, +5, +5, ETC_HOLY, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_HOLY_WRATH, 5, 0, 0, 5, 0, 
@@ -390,7 +390,7 @@
 /* 20: UNRAND_CHILLY_DEATH */
 {
     "dagger of Chilly Death", "sapphire dagger", 
-    OBJ_WEAPONS, WPN_DAGGER, +5, +7, LIGHTBLUE, 0, 
+    OBJ_WEAPONS, WPN_DAGGER, +5, +7, ETC_ICE, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_FREEZING, 0, 0, 0, 0, 0, 
@@ -428,7 +428,7 @@
 /* 22: UNRAND_FINISHER */
 {
     "scythe \"Finisher\"", "blackened scythe", 
-    OBJ_WEAPONS, WPN_SCYTHE, +3, +5, DARKGREY, 0, 
+    OBJ_WEAPONS, WPN_SCYTHE, +3, +5, ETC_DARK, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_SPEED, 0, 0, 3, 0, 0, 
@@ -447,7 +447,7 @@
 /* 23: UNRAND_PUNK */
 {
     "sling \"Punk\"", "blue sling", 
-    OBJ_WEAPONS, WPN_SLING, +9, +12, LIGHTBLUE, 0, 
+    OBJ_WEAPONS, WPN_SLING, +9, +12, ETC_ICE, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_FROST, 0, 0, 0, 0, 0, 
@@ -466,7 +466,7 @@
 /* 24: UNRAND_KRISHNA */
 {
     "bow of Krishna \"Sharnga\"", "golden bow", 
-    OBJ_WEAPONS, WPN_BOW, +8, +8, YELLOW, 0, 
+    OBJ_WEAPONS, WPN_BOW, +8, +8, ETC_GOLD, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_SPEED, 0, 0, 0, 0, 3, 
@@ -504,7 +504,7 @@
 /* 26: UNRAND_GUARD */
 {
     "glaive of the Guard", "polished glaive", 
-    OBJ_WEAPONS, WPN_GLAIVE, +5, +8, LIGHTCYAN, 0, 
+    OBJ_WEAPONS, WPN_GLAIVE, +5, +8, ETC_ELECTRICITY, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_ELECTROCUTION, 5, 0, 0, 0, 0, 
@@ -523,7 +523,7 @@
 /* 27: UNRAND_JIHAD */
 {
     "sword of Jihad", "crystal sword", 
-    OBJ_WEAPONS, WPN_LONG_SWORD, +12, +10, WHITE, 0, 
+    OBJ_WEAPONS, WPN_LONG_SWORD, +12, +10, ETC_HOLY, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_HOLY_WRATH, 0, 3, 0, 0, 0, 
@@ -542,7 +542,7 @@
 /* 28: UNRAND_HELLFIRE */
 {
     "crossbow \"Hellfire\"", "flaming crossbow", 
-    OBJ_WEAPONS, WPN_CROSSBOW, +6, +9, LIGHTRED, 0, 
+    OBJ_WEAPONS, WPN_CROSSBOW, +6, +9, ETC_FIRE, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_FLAME, 0, 0, 0, 0, 0, 
@@ -580,7 +580,7 @@
 /* 30: UNRAND_EOS */
 {
     "\"Eos\"", "encrusted morningstar", 
-    OBJ_WEAPONS, WPN_MORNINGSTAR, +5, +5, LIGHTCYAN, 0, 
+    OBJ_WEAPONS, WPN_MORNINGSTAR, +5, +5, ETC_JEWEL, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_ELECTROCUTION, 0, 0, 0, 0, 0, 
@@ -599,7 +599,7 @@
 /* 31: UNRAND_BOTONO */
 {
     "spear of the Botono", "ebony spear", 
-    OBJ_WEAPONS, WPN_SPEAR, +2, +10, DARKGREY, 0, 
+    OBJ_WEAPONS, WPN_SPEAR, +2, +10, ETC_UNHOLY, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_VAMPIRICISM, 0, 0, 0, 0, 0, 
@@ -618,7 +618,7 @@
 /* 32: UNRAND_OCTOPUS_KING */
 {
     "trident of the Octopus King", "mangy trident", 
-    OBJ_WEAPONS, WPN_TRIDENT, +10, +4, CYAN, 0, 
+    OBJ_WEAPONS, WPN_TRIDENT, +10, +4, ETC_WATER, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_VENOM, 0, 0, 0, 0, 0, 
@@ -675,7 +675,7 @@
 /* 35: UNRAND_SNIPER */
 {
     "hand crossbow \"Sniper\"", "black crossbow", 
-    OBJ_WEAPONS, WPN_HAND_CROSSBOW, +10, +0, DARKGREY, 0, 
+    OBJ_WEAPONS, WPN_HAND_CROSSBOW, +10, +0, ETC_DARK, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_VENOM, 0, 0, 0, 0, 0, 
@@ -770,7 +770,7 @@
 /* 40: UNRAND_PLUTONIUM_SWORD */
 {
     "plutonium sword", "glowing long sword", 
-    OBJ_WEAPONS, WPN_LONG_SWORD, +12, +16, LIGHTGREEN, 0, 
+    OBJ_WEAPONS, WPN_LONG_SWORD, +12, +16, ETC_RANDOM, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
@@ -903,7 +903,7 @@
 /* 47: UNRAND_THIEF */
 {
     "cloak of the Thief", "tattered cloak", 
-    OBJ_ARMOUR, ARM_CLOAK, +1, 0, DARKGREY, 0, 
+    OBJ_ARMOUR, ARM_CLOAK, +1, 0, ETC_DARK, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 2, 0, 0, 2, 
@@ -941,7 +941,7 @@
 /* 49: UNRAND_DYROVEPREVA */
 {
     "crown of Dyrovepreva", "jewelled bronze crown", 
-    OBJ_ARMOUR, ARM_CAP, +3, 0, BROWN, 0, 
+    OBJ_ARMOUR, ARM_CAP, +3, 0, ETC_JEWEL, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 0, 0, 2, 0, 
@@ -979,7 +979,7 @@
 /* 51: UNRAND_FLASH */
 {
     "cloak of Flash", "vibrating cloak", 
-    OBJ_ARMOUR, ARM_CLOAK, +3, 0, RED, 0, 
+    OBJ_ARMOUR, ARM_CLOAK, +3, 0, ETC_GILA, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 4, 0, 0, 0, 
@@ -1017,7 +1017,7 @@
 /* 53: UNRAND_LEAR */
 {
     "Lear's chain mail", "golden chain mail", 
-    OBJ_ARMOUR, ARM_CHAIN_MAIL, -1, 0, YELLOW, 0, 
+    OBJ_ARMOUR, ARM_CHAIN_MAIL, -1, 0, ETC_GOLD, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 0, 0, 0, -3, 
@@ -1055,7 +1055,7 @@
 /* 55: UNRAND_SALAMANDER */
 {
     "salamander hide armour", "red leather armour", 
-    OBJ_ARMOUR, ARM_LEATHER_ARMOUR, +3, 0, RED, 0, 
+    OBJ_ARMOUR, ARM_LEATHER_ARMOUR, +3, 0, ETC_FIRE, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
@@ -1150,7 +1150,7 @@
 /* 60: UNRAND_DRAGONMASK */
 {
     "mask of the Dragon", "blue mask", 
-    OBJ_ARMOUR, ARM_CAP, 0, 0, BLUE, 0, 
+    OBJ_ARMOUR, ARM_CAP, 0, 0, ETC_SHIMMER_BLUE, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
@@ -1169,7 +1169,7 @@
 /* 61: UNRAND_NIGHT */
 {
     "robe of Night", "black robe", 
-    OBJ_ARMOUR, ARM_ROBE, +4, 0, DARKGREY, 0, 
+    OBJ_ARMOUR, ARM_ROBE, +4, 0, ETC_DARK, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
@@ -1188,7 +1188,7 @@
 /* 62: UNRAND_DRAGON_KING */
 {
     "armour of the Dragon King", "shiny dragon armour", 
-    OBJ_ARMOUR, ARM_GOLD_DRAGON_ARMOUR, +5, 0, YELLOW, 0, 
+    OBJ_ARMOUR, ARM_GOLD_DRAGON_ARMOUR, +5, 0, ETC_GOLD, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
@@ -1245,7 +1245,7 @@
 /* 65: UNRAND_STARLIGHT */
 {
     "cloak of Starlight", "phosphorescent cloak", 
-    OBJ_ARMOUR, ARM_CLOAK, 0, 0, WHITE, 0, 
+    OBJ_ARMOUR, ARM_CLOAK, 0, 0, ETC_ICE, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 4, 0, 0, 0, 
@@ -1264,7 +1264,7 @@
 /* 66: UNRAND_RATSKIN_CLOAK */
 {
     "ratskin cloak", "motley cloak", 
-    OBJ_ARMOUR, ARM_CLOAK, +1, 0, LIGHTRED, 0, 
+    OBJ_ARMOUR, ARM_CLOAK, +1, 0, ETC_BEOGH, 0, 
     UNRAND_FLAG_NONE, 
     {
         SPARM_NORMAL, 0, 0, 0, -1, -1, 
@@ -1283,7 +1283,7 @@
 /* 67: UNRAND_AIR */
 {
     "amulet of the Air", "sky-blue amulet", 
-    OBJ_JEWELLERY, AMU_CONTROLLED_FLIGHT, 0, 0, LIGHTCYAN, 0, 
+    OBJ_JEWELLERY, AMU_CONTROLLED_FLIGHT, 0, 0, ETC_ELECTRICITY, 0, 
     UNRAND_FLAG_NONE, 
     {
         0, 0, 3, 0, 0, 0, 
@@ -1302,7 +1302,7 @@
 /* 68: UNRAND_SHADOWS */
 {
     "ring of Shadows", "black ring", 
-    OBJ_JEWELLERY, RING_INVISIBILITY, 0, 0, DARKGREY, 0, 
+    OBJ_JEWELLERY, RING_INVISIBILITY, 0, 0, ETC_DARK, 0, 
     UNRAND_FLAG_NONE, 
     {
         0, 0, 4, 0, 0, 0, 
@@ -1340,7 +1340,7 @@
 /* 70: UNRAND_FOUR_WINDS */
 {
     "amulet of the Four Winds", "jade amulet", 
-    OBJ_JEWELLERY, AMU_CLARITY, 0, 0, LIGHTGREEN, 0, 
+    OBJ_JEWELLERY, AMU_CLARITY, 0, 0, ETC_POISON, 0, 
     UNRAND_FLAG_NONE, 
     {
         0, 0, 0, 0, 0, 0, 
@@ -1359,7 +1359,7 @@
 /* 71: UNRAND_BLOODLUST */
 {
     "necklace of Bloodlust", "blood-stained necklace", 
-    OBJ_JEWELLERY, AMU_RAGE, 0, 0, RED, 0, 
+    OBJ_JEWELLERY, AMU_RAGE, 0, 0, ETC_BLOOD, 0, 
     UNRAND_FLAG_NONE, 
     {
         0, 0, 0, 2, -2, 0, 
@@ -1378,7 +1378,7 @@
 /* 72: UNRAND_SHAOLIN */
 {
     "ring of Shaolin", "jade ring", 
-    OBJ_JEWELLERY, RING_EVASION, +8, 0, LIGHTGREEN, 0, 
+    OBJ_JEWELLERY, RING_EVASION, +8, 0, ETC_POISON, 0, 
     UNRAND_FLAG_NONE, 
     {
         0, 0, 0, 0, 0, 0, 
@@ -1416,7 +1416,7 @@
 /* 74: UNRAND_MAGE */
 {
     "ring of the Mage", "sapphire ring", 
-    OBJ_JEWELLERY, RING_WIZARDRY, 0, 0, LIGHTBLUE, 0, 
+    OBJ_JEWELLERY, RING_WIZARDRY, 0, 0, ETC_ENCHANT, 0, 
     UNRAND_FLAG_NONE, 
     {
         0, 0, 0, 0, 3, 0, 
@@ -1435,7 +1435,7 @@
 /* 75: UNRAND_SHIELDING */
 {
     "brooch of Shielding", "shield-shaped amulet", 
-    OBJ_JEWELLERY, AMU_WARDING, 0, 0, LIGHTBLUE, 0, 
+    OBJ_JEWELLERY, AMU_WARDING, 0, 0, ETC_MAGIC, 0, 
     UNRAND_FLAG_NONE, 
     {
         0, 4, 4, 0, 0, 0, 
diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index 7583b01c6d..346b282dc6 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -168,7 +168,7 @@ NAME:    Singing Sword
 APPEAR:  golden long sword
 OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +7/+7
-COLOUR:  YELLOW
+COLOUR:  ETC_GOLD
 TILE:    spwpn_singing_sword
 TILE_EQ: singing_sword
 VALUE:   1200
@@ -180,7 +180,7 @@ NAME:    Wrath of Trog
 APPEAR:  bloodstained battleaxe
 OBJ:     OBJ_WEAPONS/WPN_BATTLEAXE
 PLUS:    +3/+11
-COLOUR:  RED
+COLOUR:  ETC_BLOOD
 TILE:    spwpn_wrath_of_trog
 TILE_EQ: axe_trog
 VALUE:   1000
@@ -229,7 +229,7 @@ NAME:    Staff of Olgreb
 APPEAR:  green glowing staff
 OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    0/0 # Set on wield
-COLOUR:  GREEN
+COLOUR:  ETC_POISON
 TILE:    spwpn_staff_of_olgreb
 TILE_EQ: olgreb
 VALUE:   1000
@@ -244,7 +244,7 @@ NAME:    Staff of Wucad Mu
 APPEAR:  ephemeral quarterstaff
 OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    0/0 # Set on wield
-COLOUR:  BROWN
+COLOUR:  ETC_MAGIC
 TILE:    spwpn_wucad_mu
 TILE_EQ: wucad_mu
 VALUE:   1000
@@ -256,7 +256,7 @@ NAME:    Vampire's Tooth
 APPEAR:  ivory dagger
 OBJ:     OBJ_WEAPONS/WPN_DAGGER
 PLUS:    +3/+4
-COLOUR:  WHITE
+COLOUR:  ETC_BONE
 TILE:    spwpn_vampires_tooth
 TILE_EQ: vampires_tooth
 BRAND:   SPWPN_VAMPIRICISM
@@ -268,7 +268,7 @@ NAME:    Scythe of Curses
 APPEAR:  warped scythe
 OBJ:     OBJ_WEAPONS/WPN_SCYTHE
 PLUS:    +13/+13
-COLOUR:  DARKGREY
+COLOUR:  ETC_NECRO
 TILE:    spwpn_scythe_of_curses
 TILE_EQ: finisher
 VALUE:   800
@@ -280,7 +280,7 @@ NAME:    Sceptre of Torment
 APPEAR:  jewelled golden mace
 OBJ:     OBJ_WEAPONS/WPN_MACE
 PLUS:    +7/+6
-COLOUR:  YELLOW
+COLOUR:  ETC_GOLD
 TILE:    spwpn_sceptre_of_torment
 TILE_EQ: mace_ruby
 VALUE:   1200
@@ -291,7 +291,7 @@ NAME:    Sword of Zonguldrok
 APPEAR:  bone long sword
 OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +9/+9
-COLOUR:  LIGHTGREY
+COLOUR:  ETC_BONE
 TILE:    spwpn_sword_of_zonguldrok
 TILE_EQ: zonguldrok
 VALUE:   1250
@@ -302,7 +302,7 @@ NAME:    Sword of Cerebov
 APPEAR:  great serpentine sword
 OBJ:     OBJ_WEAPONS/WPN_GREAT_SWORD
 PLUS:    +6/+6
-COLOUR:  YELLOW
+COLOUR:  ETC_FIRE
 TILE:    spwpn_sword_of_cerebov
 TILE_EQ: sword_twist
 VALUE:   2000
@@ -314,7 +314,7 @@ NAME:    Staff of Dispater
 APPEAR:  golden staff
 OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    +4/+4
-COLOUR:  YELLOW
+COLOUR:  ETC_GOLD
 TILE:    spwpn_staff_of_dispater
 TILE_EQ: dispater
 VALUE:   1200
@@ -325,7 +325,7 @@ NAME:    Sceptre of Asmodeus
 APPEAR:  ruby sceptre
 OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
 PLUS:    +7/+7
-COLOUR:  RED
+COLOUR:  ETC_BLOOD
 TILE:    spwpn_sceptre_of_asmodeus
 TILE_EQ: asmodeus
 VALUE:   1500
@@ -338,7 +338,7 @@ NAME:    long sword "Bloodbane"
 APPEAR:  blackened long sword
 OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +7/+8
-COLOUR:  DARKGREY
+COLOUR:  ETC_DARK
 TILE:    urand_bloodbane
 TILE_EQ: bloodbane
 BRAND:   SPWPN_VORPAL
@@ -350,7 +350,7 @@ NAME:    scimitar of Flaming Death
 APPEAR:  smoking scimitar
 OBJ:     OBJ_WEAPONS/WPN_SCIMITAR
 PLUS:    +7/+5
-COLOUR:  RED
+COLOUR:  ETC_FIRE
 TILE:    urand_flaming_death
 TILE_EQ: flaming_death
 BRAND:   SPWPN_FLAMING
@@ -363,7 +363,7 @@ NAME:    mace of Brilliance
 APPEAR:  brightly glowing mace
 OBJ:     OBJ_WEAPONS/WPN_MACE
 PLUS:    +5/+5
-COLOUR:  WHITE
+COLOUR:  ETC_HOLY
 TILE:    urand_brilliance
 TILE_EQ: mace_of_brilliance
 BRAND:   SPWPN_HOLY_WRATH
@@ -391,7 +391,7 @@ NAME:    dagger of Chilly Death
 APPEAR:  sapphire dagger
 OBJ:     OBJ_WEAPONS/WPN_DAGGER
 PLUS:    +5/+7
-COLOUR:  LIGHTBLUE
+COLOUR:  ETC_ICE
 TILE:    urand_chilly_death
 TILE_EQ: chilly_death
 BRAND:   SPWPN_FREEZING
@@ -419,7 +419,7 @@ NAME:    scythe "Finisher"
 APPEAR:  blackened scythe
 OBJ:     OBJ_WEAPONS/WPN_SCYTHE
 PLUS:    +3/+5
-COLOUR:  DARKGREY
+COLOUR:  ETC_DARK
 TILE:    urand_finisher
 TILE_EQ: finisher
 BRAND:   SPWPN_SPEED
@@ -431,7 +431,7 @@ NAME:    sling "Punk"
 APPEAR:  blue sling
 OBJ:     OBJ_WEAPONS/WPN_SLING
 PLUS:    +9/+12
-COLOUR:  LIGHTBLUE
+COLOUR:  ETC_ICE
 TILE:    urand_punk
 TILE_EQ: punk
 BRAND:   SPWPN_FROST
@@ -443,7 +443,7 @@ NAME:     bow of Krishna "Sharnga"
 APPEAR:   golden bow
 OBJ:      OBJ_WEAPONS/WPN_BOW
 PLUS:     +8/+8
-COLOUR:   YELLOW
+COLOUR:   ETC_GOLD
 TILE:     urand_krishna
 TILE_EQ:  krishna
 BRAND:    SPWPN_SPEED
@@ -467,7 +467,7 @@ NAME:     glaive of the Guard
 APPEAR:   polished glaive
 OBJ:      OBJ_WEAPONS/WPN_GLAIVE
 PLUS:     +5/+8
-COLOUR:   LIGHTCYAN
+COLOUR:   ETC_ELECTRICITY
 TILE:     urand_guard
 TILE_EQ:  glaive_of_the_guard
 BRAND:    SPWPN_ELECTROCUTION
@@ -480,7 +480,7 @@ NAME:     sword of Jihad
 APPEAR:   crystal sword
 OBJ:      OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:     +12/+10
-COLOUR:   WHITE
+COLOUR:   ETC_HOLY
 TILE:     urand_jihad
 TILE_EQ:  jihad
 BRAND:    SPWPN_HOLY_WRATH
@@ -496,7 +496,7 @@ NAME:    crossbow "Hellfire"
 APPEAR:  flaming crossbow
 OBJ:     OBJ_WEAPONS/WPN_CROSSBOW
 PLUS:    +6/+9
-COLOUR:  LIGHTRED
+COLOUR:  ETC_FIRE
 TILE:    urand_hellfire
 TILE_EQ: crossbow_fire
 BRAND:   SPWPN_FLAME
@@ -521,7 +521,7 @@ NAME:    "Eos"
 APPEAR:  encrusted morningstar
 OBJ:     OBJ_WEAPONS/WPN_MORNINGSTAR
 PLUS:    +5/+5
-COLOUR:  LIGHTCYAN
+COLOUR:  ETC_JEWEL
 TILE:    urand_eos
 TILE_EQ: eos
 BRAND:   SPWPN_ELECTROCUTION
@@ -535,7 +535,7 @@ NAME:     spear of the Botono
 APPEAR:   ebony spear
 OBJ:      OBJ_WEAPONS/WPN_SPEAR
 PLUS:     +2/+10
-COLOUR:   DARKGREY
+COLOUR:   ETC_UNHOLY
 TILE:     urand_botono
 TILE_EQ:  botono
 BRAND:    SPWPN_VAMPIRICISM
@@ -547,7 +547,7 @@ NAME:     trident of the Octopus King
 APPEAR:   mangy trident
 OBJ:      OBJ_WEAPONS/WPN_TRIDENT
 PLUS:     +10/+4
-COLOUR:   CYAN
+COLOUR:   ETC_WATER
 TILE:     urand_octopus_king
 TILE_EQ:  trident_octopus_king
 BRAND:    SPWPN_VENOM
@@ -589,7 +589,7 @@ NAME:    hand crossbow "Sniper"
 APPEAR:  black crossbow
 OBJ:     OBJ_WEAPONS/WPN_HAND_CROSSBOW
 PLUS:    +10/+0
-COLOUR:  DARKGREY
+COLOUR:  ETC_DARK
 TILE:    urand_sniper
 TILE_EQ: sniper
 BRAND:   SPWPN_VENOM
@@ -652,7 +652,7 @@ NAME:    plutonium sword
 APPEAR:  glowing long sword
 OBJ:     OBJ_WEAPONS/WPN_LONG_SWORD
 PLUS:    +12/+16
-COLOUR:  LIGHTGREEN
+COLOUR:  ETC_RANDOM
 TILE:    urand_plutonium
 TILE_EQ: plutonium_sword
 MUTATE:  6
@@ -733,7 +733,7 @@ NAME:     cloak of the Thief
 APPEAR:   tattered cloak
 OBJ:      OBJ_ARMOUR/ARM_CLOAK
 PLUS:     +1
-COLOUR:   DARKGREY
+COLOUR:   ETC_DARK
 TILE:     urand_thief
 TILE_EQ:  black
 EV:       2
@@ -756,7 +756,7 @@ NAME:    crown of Dyrovepreva
 APPEAR:  jewelled bronze crown
 OBJ:     OBJ_ARMOUR/ARM_CAP
 PLUS:    +3
-COLOUR:  BROWN
+COLOUR:  ETC_JEWEL
 TILE:    urand_dyrovepreva
 TILE_EQ: dyrovepreva
 INT:     2
@@ -785,7 +785,7 @@ NAME:     cloak of Flash
 APPEAR:   vibrating cloak
 OBJ:      OBJ_ARMOUR/ARM_CLOAK
 PLUS:     +3
-COLOUR:   RED
+COLOUR:   ETC_GILA
 TILE:     urand_flash
 TILE_EQ:  red
 EV:       4
@@ -811,7 +811,7 @@ NAME:    Lear's chain mail
 APPEAR:  golden chain mail
 OBJ:     OBJ_ARMOUR/ARM_CHAIN_MAIL
 PLUS:    -1
-COLOUR:  YELLOW
+COLOUR:  ETC_GOLD
 TILE:    urand_lear
 TILE_EQ: lears_chain_mail
 DEX:     -3
@@ -833,7 +833,7 @@ NAME:    salamander hide armour
 APPEAR:  red leather armour
 OBJ:     OBJ_ARMOUR/ARM_LEATHER_ARMOUR
 PLUS:    +3
-COLOUR:  RED
+COLOUR:  ETC_FIRE
 TILE:    urand_salamander
 TILE_EQ: leather_red
 FIRE:    2
@@ -889,7 +889,7 @@ ENUM:    DRAGONMASK
 NAME:    mask of the Dragon
 APPEAR:  blue mask
 OBJ:     OBJ_ARMOUR/ARM_CAP
-COLOUR:  BLUE
+COLOUR:  ETC_SHIMMER_BLUE
 TILE:    urand_dragonmask
 TILE_EQ: art_dragonhelm
 MAGIC:   40
@@ -902,7 +902,7 @@ NAME:     robe of Night
 APPEAR:   black robe
 OBJ:      OBJ_ARMOUR/ARM_ROBE
 PLUS:     +4
-COLOUR:   DARKGREY
+COLOUR:   ETC_DARK
 TILE:     urand_night
 TILE_EQ:  robe_of_night
 MAGIC:    30
@@ -916,7 +916,7 @@ NAME:    armour of the Dragon King
 APPEAR:  shiny dragon armour
 OBJ:     OBJ_ARMOUR/ARM_GOLD_DRAGON_ARMOUR
 PLUS:    +5
-COLOUR:  YELLOW
+COLOUR:  ETC_GOLD
 TILE:    urand_dragon_king
 TILE_EQ: dragonarm_gold
 MAGIC:   50
@@ -949,7 +949,7 @@ DESC:    A pair of gloves made of white silk.
 NAME:     cloak of Starlight
 APPEAR:   phosphorescent cloak
 OBJ:      OBJ_ARMOUR/ARM_CLOAK
-COLOUR:   WHITE
+COLOUR:   ETC_ICE
 TILE:     urand_starlight
 TILE_EQ:  white
 EV:       4
@@ -963,7 +963,7 @@ NAME:     ratskin cloak
 APPEAR:   motley cloak
 OBJ:      OBJ_ARMOUR/ARM_CLOAK
 PLUS:     +1
-COLOUR:   LIGHTRED
+COLOUR:   ETC_BEOGH
 TILE:     urand_ratskin_cloak
 TILE_EQ:  ratskin
 INT:      -1
@@ -978,7 +978,7 @@ DESC_END: An enchantress with a magic loom and way too much time on
 NAME:    amulet of the Air
 APPEAR:  sky-blue amulet
 OBJ:     OBJ_JEWELLERY/AMU_CONTROLLED_FLIGHT
-COLOUR:  LIGHTCYAN
+COLOUR:  ETC_ELECTRICITY
 TILE:    urand_air
 EV:      3
 STEALTH: 50
@@ -988,7 +988,7 @@ DESC:    A sky-blue amulet.
 NAME:    ring of Shadows
 APPEAR:  black ring
 OBJ:     OBJ_JEWELLERY/RING_INVISIBILITY
-COLOUR:  DARKGREY
+COLOUR:  ETC_DARK
 TILE:    urand_shadows
 EV:      4
 ACC:     -3
@@ -1008,7 +1008,7 @@ METAB:   2
 NAME:    amulet of the Four Winds
 APPEAR:  jade amulet
 OBJ:     OBJ_JEWELLERY/AMU_CLARITY
-COLOUR:  LIGHTGREEN
+COLOUR:  ETC_POISON
 TILE:    urand_four_winds
 BOOL:    life
 MAGIC:   100
@@ -1016,7 +1016,7 @@ MAGIC:   100
 NAME:    necklace of Bloodlust
 APPEAR:  blood-stained necklace
 OBJ:     OBJ_JEWELLERY/AMU_RAGE
-COLOUR:  RED
+COLOUR:  ETC_BLOOD
 TILE:    urand_bloodlust
 STR:     2
 INT:     -2
@@ -1030,7 +1030,7 @@ NAME:    ring of Shaolin
 APPEAR:  jade ring
 OBJ:     OBJ_JEWELLERY/RING_EVASION
 PLUS:    +8
-COLOUR:  LIGHTGREEN
+COLOUR:  ETC_POISON
 TILE:    urand_shaolin
 
 NAME:    ring of Robustness
@@ -1043,7 +1043,7 @@ TILE:    urand_robustness
 NAME:    ring of the Mage
 APPEAR:  sapphire ring
 OBJ:     OBJ_JEWELLERY/RING_WIZARDRY
-COLOUR:  LIGHTBLUE
+COLOUR:  ETC_ENCHANT
 TILE:    urand_mage
 INT:     3
 MAGIC:   50
@@ -1051,7 +1051,7 @@ MAGIC:   50
 NAME:     brooch of Shielding
 APPEAR:   shield-shaped amulet
 OBJ:      OBJ_JEWELLERY/AMU_WARDING
-COLOUR:   LIGHTBLUE
+COLOUR:   ETC_MAGIC
 TILE:     urand_brooch_of_shielding
 AC:       4
 EV:       4