Reassign some of the spell tiles.

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

14 files changed, 6 insertions, 17 deletions

diff --git a/crawl-ref/source/rltiles/spells/air/mephitic_cloud.png b/crawl-ref/source/rltiles/UNUSED/spells/mephitic_cloud2.png
index 1bcb7e5f44..1bcb7e5f44 100644
--- a/crawl-ref/source/rltiles/spells/air/mephitic_cloud.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/mephitic_cloud2.png
diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt
index 161fe1f89c..917186a204 100644
--- a/crawl-ref/source/rltiles/dc-spells.txt
+++ b/crawl-ref/source/rltiles/dc-spells.txt
@@ -21,7 +21,6 @@ flight FLIGHT
 insulation INSULATION
 levitation LEVITATION
 lightning_bolt LIGHTNING_BOLT
-mephitic_cloud MEPHITIC_CLOUD
 repel_missiles REPEL_MISSILES
 shock SHOCK
 silence SILENCE
@@ -58,6 +57,7 @@ confuse CONFUSE
 confusing_touch CONFUSING_TOUCH
 corona CORONA
 enslavement ENSLAVEMENT
+extension EXTENSION
 haste HASTE
 invisibility INVISIBILITY
 mass_confusion MASS_CONFUSION
@@ -70,8 +70,7 @@ sure_blade SURE_BLADE
 tame_beasts TAME_BEASTS
 tukimas_dance TUKIMAS_DANCE
 tukimas_vorpal_blade TUKIMAS_VORPAL_BLADE
-unknown1 UNKNOWN1
-unknown2 UNKNOWN2
+unknown UNKNOWN
 
 %sdir spells/fire
 bolt_of_fire BOLT_OF_FIRE
@@ -131,7 +130,7 @@ vampiric_draining VAMPIRIC_DRAINING
 %sdir spells/poison
 alistairs_intoxication ALISTAIRS_INTOXICATION
 cure_poison CURE_POISON
-mephitic_cloud2 MEPHITIC_CLOUD2
+mephitic_cloud MEPHITIC_CLOUD
 olgrebs_toxic_radiance OLGREBS_TOXIC_RADIANCE
 poison_ammunition POISON_AMMUNITION
 poison_arrow POISON_ARROW
@@ -166,10 +165,10 @@ banishment BANISHMENT
 blink BLINK
 controlled_blink CONTROLLED_BLINK
 controlled_teleport CONTROLLED_TELEPORT
+dispersal DISPERSAL
 portal PORTAL
 teleport TELEPORT
 teleport_other TELEPORT_OTHER
-unknown UNKNOWN
 
 %sdir spells/transmigration
 alter_self ALTER_SELF
diff --git a/crawl-ref/source/rltiles/spells/enchantment/enslavement.png b/crawl-ref/source/rltiles/spells/enchantment/enslavement.png
index 27b4ef7516..67cd2c4e8f 100644
--- a/crawl-ref/source/rltiles/spells/enchantment/enslavement.png
+++ b/crawl-ref/source/rltiles/spells/enchantment/enslavement.png
diff --git a/crawl-ref/source/rltiles/spells/enchantment/extension.png b/crawl-ref/source/rltiles/spells/enchantment/extension.png
new file mode 100644
index 0000000000..36d4de6d85
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/extension.png
diff --git a/crawl-ref/source/rltiles/spells/enchantment/slow.png b/crawl-ref/source/rltiles/spells/enchantment/slow.png
index 36d4de6d85..27b4ef7516 100644
--- a/crawl-ref/source/rltiles/spells/enchantment/slow.png
+++ b/crawl-ref/source/rltiles/spells/enchantment/slow.png
diff --git a/crawl-ref/source/rltiles/spells/enchantment/temp b/crawl-ref/source/rltiles/spells/enchantment/temp
deleted file mode 100644
index e4c2e9785f..0000000000
--- a/crawl-ref/source/rltiles/spells/enchantment/temp
+++ /dev/null
@@ -1,5 +0,0 @@
-alternative suggestions:
-
-slow        -> extension
-enslavement -> slow
-unknown2    -> enslavement
diff --git a/crawl-ref/source/rltiles/spells/enchantment/unknown1.png b/crawl-ref/source/rltiles/spells/enchantment/unknown.png
index 78f483b59a..78f483b59a 100644
--- a/crawl-ref/source/rltiles/spells/enchantment/unknown1.png
+++ b/crawl-ref/source/rltiles/spells/enchantment/unknown.png
diff --git a/crawl-ref/source/rltiles/spells/enchantment/unknown2.png b/crawl-ref/source/rltiles/spells/enchantment/unknown2.png
deleted file mode 100644
index 67cd2c4e8f..0000000000
--- a/crawl-ref/source/rltiles/spells/enchantment/unknown2.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/spells/poison/mephitic_cloud2.png b/crawl-ref/source/rltiles/spells/poison/mephitic_cloud.png
index 6e65daf30f..6e65daf30f 100644
--- a/crawl-ref/source/rltiles/spells/poison/mephitic_cloud2.png
+++ b/crawl-ref/source/rltiles/spells/poison/mephitic_cloud.png
diff --git a/crawl-ref/source/rltiles/spells/translocation/banishment.png b/crawl-ref/source/rltiles/spells/translocation/banishment.png
index 5ea26b40ef..f4c5077d68 100644
--- a/crawl-ref/source/rltiles/spells/translocation/banishment.png
+++ b/crawl-ref/source/rltiles/spells/translocation/banishment.png
diff --git a/crawl-ref/source/rltiles/spells/translocation/dispersal.png b/crawl-ref/source/rltiles/spells/translocation/dispersal.png
new file mode 100644
index 0000000000..5ea26b40ef
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/dispersal.png
diff --git a/crawl-ref/source/rltiles/spells/translocation/temp.txt b/crawl-ref/source/rltiles/spells/translocation/temp.txt
index 36337acdab..bbf04284dc 100644
--- a/crawl-ref/source/rltiles/spells/translocation/temp.txt
+++ b/crawl-ref/source/rltiles/spells/translocation/temp.txt
@@ -1,7 +1,3 @@
 portal projectile?
 warp brand?
 phase shift?
-
-alternative suggestions:
-banishment -> dispersal
-unknown    -> banishment
diff --git a/crawl-ref/source/rltiles/spells/translocation/unknown.png b/crawl-ref/source/rltiles/spells/translocation/unknown.png
deleted file mode 100644
index f4c5077d68..0000000000
--- a/crawl-ref/source/rltiles/spells/translocation/unknown.png
+++ /dev/null
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index ee553a3361..76714ceae4 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2808,6 +2808,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_PETRIFY:                  return TILEG_PETRIFY;
     case SPELL_CAUSE_FEAR:               return TILEG_CAUSE_FEAR;
     case SPELL_TAME_BEASTS:              return TILEG_TAME_BEASTS;
+    case SPELL_EXTENSION:                return TILEG_EXTENSION;
     case SPELL_HASTE:                    return TILEG_HASTE;
     case SPELL_INVISIBILITY:             return TILEG_INVISIBILITY;
     case SPELL_MASS_CONFUSION:           return TILEG_MASS_CONFUSION;
@@ -2820,6 +2821,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_TELEPORT_OTHER:           return TILEG_TELEPORT_OTHER;
     case SPELL_TELEPORT_SELF:            return TILEG_TELEPORT;
     case SPELL_CONTROLLED_BLINK:         return TILEG_CONTROLLED_BLINK;
+    case SPELL_DISPERSAL:                return TILEG_DISPERSAL;
     case SPELL_PORTAL:                   return TILEG_PORTAL;
 
     // Summoning
@@ -2889,9 +2891,6 @@ int tileidx_spell(spell_type spell)
     case SPELL_PHASE_SHIFT:
     case SPELL_WARP_BRAND:
     case SPELL_STONEMAIL:
-    // These two may already have tiles.
-    case SPELL_DISPERSAL:
-    case SPELL_EXTENSION:
         return TILEG_TODO;
 
     // --------------------------------------------