Add tile definitions into art-data.txt, though only for the item tiles.

(The doll definitions are too complicated.)


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

5 files changed, 182 insertions, 92 deletions

diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 75f0ee504a..66e64ad254 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -13,28 +13,8 @@
 # with respect to variations and will not share variations with the base

 # equipment.  See tilepick.cc for more details.

 

-#####OBJ_WEAPONS

-#####ARTIFACTS

-%sdir item/weapon/artefact

-spwpn_singing_sword SPWPN_SINGING_SWORD

-spwpn_wrath_of_trog SPWPN_WRATH_OF_TROG

-spwpn_scythe_of_curses SPWPN_SCYTHE_OF_CURSES

-spwpn_mace_of_variability SPWPN_MACE_OF_VARIABILITY

-spwpn_glaive_of_prune SPWPN_GLAIVE_OF_PRUNE

-%rim 1

-spwpn_sceptre_of_torment SPWPN_SCEPTRE_OF_TORMENT

-spwpn_sword_of_zonguldrok SPWPN_SWORD_OF_ZONGULDROK

-spwpn_sword_of_cerebov SPWPN_SWORD_OF_CEREBOV

-spwpn_staff_of_dispater SPWPN_STAFF_OF_DISPATER

-spwpn_sceptre_of_asmodeus SPWPN_SCEPTRE_OF_ASMODEUS

-spwpn_sword_of_power SPWPN_SWORD_OF_POWER

-%rim 0

-spwpn_staff_of_olgreb SPWPN_STAFF_OF_OLGREB

-spwpn_vampires_tooth SPWPN_VAMPIRES_TOOTH

-spwpn_wucad_mu SPWPN_STAFF_OF_WUCAD_MU

-

-##### Unrandom artifacts

-%include dc-urand.txt

+##### Artefacts (fixed and unrandart)

+%include dc-unrand.txt

 

 #####NORMAL

 %sdir item/weapon

diff --git a/crawl-ref/source/rltiles/dc-unrand.txt b/crawl-ref/source/rltiles/dc-unrand.txt
new file mode 100644
index 0000000000..62df756cc5
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-unrand.txt
@@ -0,0 +1,84 @@
+%sdir item/armour/artefact
+urand_ignorance UNRAND_IGNORANCE
+urand_augmentation UNRAND_AUGMENTATION
+urand_thief UNRAND_THIEF
+urand_bullseye UNRAND_BULLSEYE
+urand_dyrovepreva UNRAND_DYROVEPREVA
+urand_misfortune UNRAND_MISFORTUNE
+urand_flash UNRAND_FLASH
+urand_assassin UNRAND_BOOTS_ASSASSIN
+urand_lear UNRAND_LEAR
+urand_zhor UNRAND_ZHOR
+urand_salamander UNRAND_SALAMANDER
+urand_war UNRAND_WAR
+urand_resistance UNRAND_RESISTANCE
+urand_folly UNRAND_FOLLY
+urand_maxwell UNRAND_MAXWELL
+urand_dragonmask UNRAND_DRAGONMASK
+urand_night UNRAND_NIGHT
+urand_dragon_king UNRAND_DRAGON_KING
+urand_alchemist UNRAND_ALCHEMIST
+urand_fencer UNRAND_FENCERS_GLOVES
+urand_starlight UNRAND_STARLIGHT
+urand_ratskin_cloak UNRAND_RATSKIN_CLOAK
+
+%sdir item/weapon/artefact
+spwpn_singing_sword UNRAND_SINGING_SWORD
+spwpn_wrath_of_trog UNRAND_TROG
+spwpn_mace_of_variability UNRAND_VARIABILITY
+spwpn_glaive_of_prune UNRAND_PRUNE
+spwpn_staff_of_olgreb UNRAND_OLGREB
+spwpn_wucad_mu UNRAND_WUCAD_MU
+spwpn_vampires_tooth UNRAND_VAMPIRES_TOOTH
+spwpn_scythe_of_curses UNRAND_CURSES
+urand_bloodbane UNRAND_BLOODBANE
+urand_flaming_death UNRAND_FLAMING_DEATH
+urand_brilliance UNRAND_BRILLIANCE
+urand_leech UNRAND_LEECH
+urand_chilly_death UNRAND_CHILLY_DEATH
+urand_morg UNRAND_MORG
+urand_finisher UNRAND_FINISHER
+urand_punk UNRAND_PUNK
+urand_krishna UNRAND_KRISHNA
+urand_skullcrusher UNRAND_SKULLCRUSHER
+urand_guard UNRAND_GUARD
+urand_jihad UNRAND_JIHAD
+urand_fiery_devil UNRAND_HELLFIRE
+urand_doom_knight UNRAND_DOOM_KNIGHT
+urand_eos UNRAND_EOS
+urand_botono UNRAND_BOTONO
+urand_octopus_king UNRAND_OCTOPUS_KING
+urand_arga UNRAND_ARGA
+urand_elemental UNRAND_ELEMENTAL_STAFF
+urand_sniper UNRAND_SNIPER
+urand_piercer UNRAND_PIERCER
+urand_plutonium UNRAND_PLUTONIUM_SWORD
+urand_undeadhunter UNRAND_UNDEADHUNTER
+urand_crystal_spear UNRAND_CRYSTAL_SPEAR
+%rim 1
+spwpn_sword_of_power UNRAND_POWER
+spwpn_sceptre_of_torment UNRAND_TORMENT
+spwpn_sword_of_zonguldrok UNRAND_ZONGULDROK
+spwpn_sword_of_cerebov UNRAND_CEREBOV
+spwpn_staff_of_dispater UNRAND_DISPATER
+spwpn_sceptre_of_asmodeus UNRAND_ASMODEUS
+urand_blowgun UNRAND_BLOWGUN_ASSASSIN
+urand_wyrmbane UNRAND_WYRMBANE
+urand_spriggans_knife UNRAND_SPRIGGANS_KNIFE
+urand_serpent_scourge UNRAND_SERPENT_SCOURGE
+urand_knife_of_accuracy UNRAND_ACCURACY
+%rim 0
+
+%sdir item/amulet/artefact
+urand_air UNRAND_AIR
+urand_cekugob UNRAND_CEKUGOB
+urand_four_winds UNRAND_FOUR_WINDS
+urand_bloodlust UNRAND_BLOODLUST
+urand_brooch_of_shielding UNRAND_SHIELDING
+
+%sdir item/ring/artefact
+urand_shadows UNRAND_SHADOWS
+urand_shaolin UNRAND_SHAOLIN
+urand_robustness UNRAND_ROBUSTNESS
+urand_mage UNRAND_MAGE
+
diff --git a/crawl-ref/source/rltiles/dc-urand.txt b/crawl-ref/source/rltiles/dc-urand.txt
deleted file mode 100644
index 83f15f1585..0000000000
--- a/crawl-ref/source/rltiles/dc-urand.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-%sdir item/weapon/artefact
-urand_bloodbane URAND_BLOODBANE
-urand_flaming_death URAND_FLAMING_DEATH
-urand_brilliance URAND_BRILLIANCE
-urand_leech URAND_LEECH
-urand_chilly_death URAND_CHILLY_DEATH
-urand_morg URAND_MORG
-urand_finisher URAND_FINISHER
-urand_punk URAND_PUNK
-urand_krishna URAND_KRISHNA
-urand_skullcrusher URAND_SKULLCRUSHER
-urand_guard URAND_GUARD
-urand_jihad URAND_JIHAD
-urand_fiery_devil URAND_FIERY_DEVIL
-urand_doom_knight URAND_DOOM_KNIGHT
-urand_eos URAND_EOS
-urand_botono URAND_BOTONO
-urand_octopus_king URAND_OCTOPUS_KING
-urand_arga URAND_ARGA
-urand_elemental URAND_ELEMENTAL
-urand_sniper URAND_SNIPER
-urand_piercer URAND_PIERCER
-urand_plutonium URAND_PLUTONIUM
-urand_undeadhunter URAND_UNDEADHUNTER
-urand_crystal_spear URAND_CRYSTAL_SPEAR
-%rim 1
-urand_blowgun URAND_BLOWGUN_ASSASSIN
-urand_serpent_scourge URAND_SERPENT_SCOURGE
-urand_wyrmbane URAND_WYRMBANE
-urand_spriggans_knife URAND_SPRIGGANS_KNIFE
-urand_knife_of_accuracy URAND_KNIFE_OF_ACCURACY
-%rim 0
-
-%sdir item/armour/artefact
-urand_ignorance URAND_IGNORANCE
-urand_augmentation URAND_AUGMENTATION
-urand_thief URAND_THIEF
-urand_bullseye URAND_BULLSEYE
-urand_dyrovepreva URAND_DYROVEPREVA
-urand_misfortune URAND_MISFORTUNE
-urand_flash URAND_FLASH
-urand_assassin URAND_BOOTS_ASSASSIN
-urand_lear URAND_LEAR
-urand_zhor URAND_ZHOR
-urand_salamander URAND_SALAMANDER
-urand_war URAND_WAR
-urand_resistance URAND_RESISTANCE
-urand_folly URAND_FOLLY
-urand_maxwell URAND_MAXWELL
-urand_dragonmask URAND_DRAGONMASK
-urand_night URAND_NIGHT
-urand_dragon_king URAND_DRAGON_KING
-urand_alchemist URAND_ALCHEMIST
-urand_fencer URAND_FENCER
-urand_starlight URAND_STARLIGHT
-urand_ratskin_cloak URAND_RATSKIN_CLOAK
-
-%sdir item/ring/artefact
-urand_shadows URAND_SHADOWS
-urand_shaolin URAND_SHAOLIN
-urand_robustness URAND_ROBUSTNESS
-urand_mage URAND_MAGE
-
-%sdir item/amulet/artefact
-urand_cekugob URAND_CEKUGOB
-urand_four_winds URAND_FOUR_WINDS
-urand_bloodlust URAND_BLOODLUST
-urand_brooch_of_shielding URAND_BROOCH_OF_SHIELDING
-urand_air URAND_AIR
-
diff --git a/crawl-ref/source/rltiles/tiledef-unrand.cc b/crawl-ref/source/rltiles/tiledef-unrand.cc
new file mode 100644
index 0000000000..177e996618
--- /dev/null
+++ b/crawl-ref/source/rltiles/tiledef-unrand.cc
@@ -0,0 +1,90 @@
+// This file has been automatically generated.
+
+#include "AppHdr.h"
+#include "tiledef-unrand.h"
+
+#include "artefact.h"
+#include "tiledef-main.h"
+
+int unrandart_to_tile(int unrand)
+{
+    switch (unrand)
+    {
+    case UNRAND_SINGING_SWORD:     return TILE_UNRAND_SINGING_SWORD;
+    case UNRAND_TROG:              return TILE_UNRAND_TROG;
+    case UNRAND_VARIABILITY:       return TILE_UNRAND_VARIABILITY;
+    case UNRAND_PRUNE:             return TILE_UNRAND_PRUNE;
+    case UNRAND_POWER:             return TILE_UNRAND_POWER;
+    case UNRAND_OLGREB:            return TILE_UNRAND_OLGREB;
+    case UNRAND_WUCAD_MU:          return TILE_UNRAND_WUCAD_MU;
+    case UNRAND_VAMPIRES_TOOTH:    return TILE_UNRAND_VAMPIRES_TOOTH;
+    case UNRAND_CURSES:            return TILE_UNRAND_CURSES;
+    case UNRAND_TORMENT:           return TILE_UNRAND_TORMENT;
+    case UNRAND_ZONGULDROK:        return TILE_UNRAND_ZONGULDROK;
+    case UNRAND_CEREBOV:           return TILE_UNRAND_CEREBOV;
+    case UNRAND_DISPATER:          return TILE_UNRAND_DISPATER;
+    case UNRAND_ASMODEUS:          return TILE_UNRAND_ASMODEUS;
+    case UNRAND_BLOODBANE:         return TILE_UNRAND_BLOODBANE;
+    case UNRAND_FLAMING_DEATH:     return TILE_UNRAND_FLAMING_DEATH;
+    case UNRAND_BRILLIANCE:        return TILE_UNRAND_BRILLIANCE;
+    case UNRAND_LEECH:             return TILE_UNRAND_LEECH;
+    case UNRAND_CHILLY_DEATH:      return TILE_UNRAND_CHILLY_DEATH;
+    case UNRAND_MORG:              return TILE_UNRAND_MORG;
+    case UNRAND_FINISHER:          return TILE_UNRAND_FINISHER;
+    case UNRAND_PUNK:              return TILE_UNRAND_PUNK;
+    case UNRAND_KRISHNA:           return TILE_UNRAND_KRISHNA;
+    case UNRAND_SKULLCRUSHER:      return TILE_UNRAND_SKULLCRUSHER;
+    case UNRAND_GUARD:             return TILE_UNRAND_GUARD;
+    case UNRAND_JIHAD:             return TILE_UNRAND_JIHAD;
+    case UNRAND_HELLFIRE:          return TILE_UNRAND_HELLFIRE;
+    case UNRAND_DOOM_KNIGHT:       return TILE_UNRAND_DOOM_KNIGHT;
+    case UNRAND_EOS:               return TILE_UNRAND_EOS;
+    case UNRAND_BOTONO:            return TILE_UNRAND_BOTONO;
+    case UNRAND_OCTOPUS_KING:      return TILE_UNRAND_OCTOPUS_KING;
+    case UNRAND_ARGA:              return TILE_UNRAND_ARGA;
+    case UNRAND_ELEMENTAL_STAFF:   return TILE_UNRAND_ELEMENTAL_STAFF;
+    case UNRAND_SNIPER:            return TILE_UNRAND_SNIPER;
+    case UNRAND_PIERCER:           return TILE_UNRAND_PIERCER;
+    case UNRAND_BLOWGUN_ASSASSIN:  return TILE_UNRAND_BLOWGUN_ASSASSIN;
+    case UNRAND_WYRMBANE:          return TILE_UNRAND_WYRMBANE;
+    case UNRAND_SPRIGGANS_KNIFE:   return TILE_UNRAND_SPRIGGANS_KNIFE;
+    case UNRAND_PLUTONIUM_SWORD:   return TILE_UNRAND_PLUTONIUM_SWORD;
+    case UNRAND_UNDEADHUNTER:      return TILE_UNRAND_UNDEADHUNTER;
+    case UNRAND_SERPENT_SCOURGE:   return TILE_UNRAND_SERPENT_SCOURGE;
+    case UNRAND_ACCURACY:          return TILE_UNRAND_ACCURACY;
+    case UNRAND_CRYSTAL_SPEAR:     return TILE_UNRAND_CRYSTAL_SPEAR;
+    case UNRAND_IGNORANCE:         return TILE_UNRAND_IGNORANCE;
+    case UNRAND_AUGMENTATION:      return TILE_UNRAND_AUGMENTATION;
+    case UNRAND_THIEF:             return TILE_UNRAND_THIEF;
+    case UNRAND_BULLSEYE:          return TILE_UNRAND_BULLSEYE;
+    case UNRAND_DYROVEPREVA:       return TILE_UNRAND_DYROVEPREVA;
+    case UNRAND_MISFORTUNE:        return TILE_UNRAND_MISFORTUNE;
+    case UNRAND_FLASH:             return TILE_UNRAND_FLASH;
+    case UNRAND_BOOTS_ASSASSIN:    return TILE_UNRAND_BOOTS_ASSASSIN;
+    case UNRAND_LEAR:              return TILE_UNRAND_LEAR;
+    case UNRAND_ZHOR:              return TILE_UNRAND_ZHOR;
+    case UNRAND_SALAMANDER:        return TILE_UNRAND_SALAMANDER;
+    case UNRAND_WAR:               return TILE_UNRAND_WAR;
+    case UNRAND_RESISTANCE:        return TILE_UNRAND_RESISTANCE;
+    case UNRAND_FOLLY:             return TILE_UNRAND_FOLLY;
+    case UNRAND_MAXWELL:           return TILE_UNRAND_MAXWELL;
+    case UNRAND_DRAGONMASK:        return TILE_UNRAND_DRAGONMASK;
+    case UNRAND_NIGHT:             return TILE_UNRAND_NIGHT;
+    case UNRAND_DRAGON_KING:       return TILE_UNRAND_DRAGON_KING;
+    case UNRAND_ALCHEMIST:         return TILE_UNRAND_ALCHEMIST;
+    case UNRAND_FENCERS_GLOVES:    return TILE_UNRAND_FENCERS_GLOVES;
+    case UNRAND_STARLIGHT:         return TILE_UNRAND_STARLIGHT;
+    case UNRAND_RATSKIN_CLOAK:     return TILE_UNRAND_RATSKIN_CLOAK;
+    case UNRAND_AIR:               return TILE_UNRAND_AIR;
+    case UNRAND_SHADOWS:           return TILE_UNRAND_SHADOWS;
+    case UNRAND_CEKUGOB:           return TILE_UNRAND_CEKUGOB;
+    case UNRAND_FOUR_WINDS:        return TILE_UNRAND_FOUR_WINDS;
+    case UNRAND_BLOODLUST:         return TILE_UNRAND_BLOODLUST;
+    case UNRAND_SHAOLIN:           return TILE_UNRAND_SHAOLIN;
+    case UNRAND_ROBUSTNESS:        return TILE_UNRAND_ROBUSTNESS;
+    case UNRAND_MAGE:              return TILE_UNRAND_MAGE;
+    case UNRAND_SHIELDING:         return TILE_UNRAND_SHIELDING;
+    default: return -1;
+    }
+}
+
diff --git a/crawl-ref/source/rltiles/tiledef-unrand.h b/crawl-ref/source/rltiles/tiledef-unrand.h
new file mode 100644
index 0000000000..866135ab1d
--- /dev/null
+++ b/crawl-ref/source/rltiles/tiledef-unrand.h
@@ -0,0 +1,6 @@
+#ifndef TILEDEF_UNRAND_H
+#define TILEDEF_UNRAND_H
+
+int unrandart_to_tile(int unrand);
+
+#endif