summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-11 02:51:00 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-11 02:51:00 +0000
commit96c783237f95e5cec20eae826415a5ef39c28eff (patch)
treed4758ec1d942e9a8b4d2ae32254b0ad3c7e1df35
parent64c2a308e77ccbb06a3eb9b7ad76d99c1d3656a7 (diff)
downloadcrawl-ref-96c783237f95e5cec20eae826415a5ef39c28eff.tar.gz
crawl-ref-96c783237f95e5cec20eae826415a5ef39c28eff.zip
Adding spell images, rltiles build script, and a tileidx_spell function. There are quite a few spells that don't have images (marked as TODO in tileidx_spell) and about three images that are named "unknown" because I can't figure out what they map to.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10651 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/makefile_tiles.mgw5
-rw-r--r--crawl-ref/source/makefile_tiles.unix5
-rw-r--r--crawl-ref/source/rltiles/dc-gui.txt14
-rw-r--r--crawl-ref/source/rltiles/dc-spells.txt182
-rw-r--r--crawl-ref/source/rltiles/makefile.mgw2
-rw-r--r--crawl-ref/source/rltiles/makefile.unix2
-rw-r--r--crawl-ref/source/rltiles/spells/air/airstrike.pngbin0 -> 565 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/chain_lightning.pngbin0 -> 678 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/conjure_ball_lightning.pngbin0 -> 677 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/deflect_missiles.pngbin0 -> 521 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/flight.pngbin0 -> 664 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/insulation.pngbin0 -> 674 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/levitation.pngbin0 -> 481 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/lightning_bolt.pngbin0 -> 364 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/mephitic_cloud.pngbin0 -> 662 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/repel_missiles.pngbin0 -> 794 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/shock.pngbin0 -> 385 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/silence.pngbin0 -> 763 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/static_discharge.pngbin0 -> 595 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/air/swiftness.pngbin0 -> 641 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/conjuration/iskenderuns_mystic_blast.pngbin0 -> 743 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/conjuration/magic_dart.pngbin0 -> 320 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/air.pngbin0 -> 620 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/conjuration.pngbin0 -> 631 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/divination.pngbin0 -> 621 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/earth.pngbin0 -> 625 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/enchantment.pngbin0 -> 630 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/fire.pngbin0 -> 628 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/ice.pngbin0 -> 638 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/necromancy.pngbin0 -> 605 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/poison.pngbin0 -> 637 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/summoning.pngbin0 -> 642 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/translocation.pngbin0 -> 607 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/disciplines/transmigration.pngbin0 -> 631 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/detect_creatures.pngbin0 -> 518 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/detect_curse.pngbin0 -> 735 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/detect_items.pngbin0 -> 752 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/detect_secret_doors.pngbin0 -> 541 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/detect_traps.pngbin0 -> 637 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/forescry.pngbin0 -> 624 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/identify.pngbin0 -> 706 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/magic_mapping.pngbin0 -> 926 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/divination/see_invisible.pngbin0 -> 493 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/bolt_of_iron.pngbin0 -> 425 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/dig.pngbin0 -> 467 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/lees_rapid_deconstruction.pngbin0 -> 736 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/lehudibs_crystal_spear.pngbin0 -> 477 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/maxwells_silver_hammer.pngbin0 -> 577 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/passwall.pngbin0 -> 670 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/sandblast.pngbin0 -> 524 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/shatter.pngbin0 -> 898 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/statue_form.pngbin0 -> 559 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/stone_arrow.pngbin0 -> 261 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/stoneskin.pngbin0 -> 444 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.pngbin0 -> 647 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/berserker_rage.pngbin0 -> 873 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/cause_fear.pngbin0 -> 713 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/confuse.pngbin0 -> 808 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/confusing_touch.pngbin0 -> 485 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/corona.pngbin0 -> 509 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/enslavement.pngbin0 -> 600 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/haste.pngbin0 -> 636 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/invisibility.pngbin0 -> 306 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/mass_confusion.pngbin0 -> 541 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/paralyse.pngbin0 -> 369 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/projected_noise.pngbin0 -> 519 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/selective_amnesia.pngbin0 -> 726 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/slow.pngbin0 -> 609 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/sure_blade.pngbin0 -> 577 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/tame_beasts.pngbin0 -> 607 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/temp3
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/tukimas_dance.pngbin0 -> 497 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/tukimas_vorpal_blade.pngbin0 -> 417 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/unknown1.pngbin0 -> 566 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/enchantment/unknown2.pngbin0 -> 578 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/bolt_of_fire.pngbin0 -> 456 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/bolt_of_magma.pngbin0 -> 483 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/conjure_flame.pngbin0 -> 422 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/delayed_fireball.pngbin0 -> 600 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/dragon_form.pngbin0 -> 661 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/evaporate.pngbin0 -> 567 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/fire_brand.pngbin0 -> 478 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/fire_storm.pngbin0 -> 566 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/fireball.pngbin0 -> 490 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/flame_tongue.pngbin0 -> 379 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/ignite_poison.pngbin0 -> 634 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/ring_of_flames.pngbin0 -> 669 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/sticky_flame.pngbin0 -> 596 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/fire/throw_flame.pngbin0 -> 406 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/bolt_of_cold.pngbin0 -> 385 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/condensation_shield.pngbin0 -> 634 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/ensorcelled_hibernation.pngbin0 -> 623 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/freeze.pngbin0 -> 529 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/freezing_aura.pngbin0 -> 459 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/freezing_cloud.pngbin0 -> 636 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/ice_bolt.pngbin0 -> 581 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/ice_form.pngbin0 -> 498 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/ice_storm.pngbin0 -> 645 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/metabolic_englaciation.pngbin0 -> 639 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/ozocubus_armour.pngbin0 -> 476 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/ozocubus_refrigeration.pngbin0 -> 564 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/ice/throw_frost.pngbin0 -> 313 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/agony.pngbin0 -> 606 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/animate_dead.pngbin0 -> 567 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/animate_skeleton.pngbin0 -> 495 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/bolt_of_draining.pngbin0 -> 609 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/bone_shards.pngbin0 -> 740 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/borgnjors_revivification.pngbin0 -> 499 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/cigotuvis_degeneration.pngbin0 -> 581 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/control_undead.pngbin0 -> 591 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/corpse_rot.pngbin0 -> 614 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/deaths_door.pngbin0 -> 667 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/dispel_undead.pngbin0 -> 511 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/excruciating_wounds.pngbin0 -> 928 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/fulsome_distillation.pngbin0 -> 528 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/lethal_infusion.pngbin0 -> 619 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/necromutation.pngbin0 -> 768 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/pain.pngbin0 -> 781 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/regeneration.pngbin0 -> 511 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/simulacrum.pngbin0 -> 713 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/sublimation_of_blood.pngbin0 -> 623 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.pngbin0 -> 668 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/twisted_resurrection.pngbin0 -> 722 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/necromancy/vampiric_draining.pngbin0 -> 713 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/alistairs_intoxication.pngbin0 -> 723 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/cure_poison.pngbin0 -> 552 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/mephitic_cloud2.pngbin0 -> 544 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/olgrebs_toxic_radiance.pngbin0 -> 507 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/poison_ammunition.pngbin0 -> 388 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/poison_arrow.pngbin0 -> 600 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/poison_brand.pngbin0 -> 439 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/poisonous_cloud.pngbin0 -> 658 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/resist_poison.pngbin0 -> 590 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/spider_form.pngbin0 -> 485 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/sting.pngbin0 -> 359 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/summon_scorpions.pngbin0 -> 554 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/poison/venom_bolt.pngbin0 -> 404 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/abjuration.pngbin0 -> 571 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/call_canine_familiar.pngbin0 -> 824 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/call_imp.pngbin0 -> 551 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/demonic_horde.pngbin0 -> 652 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/recall.pngbin0 -> 440 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/sticks_to_snakes.pngbin0 -> 396 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_butterflies.pngbin0 -> 587 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_demon.pngbin0 -> 582 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_elemental.pngbin0 -> 559 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_greater_demon.pngbin0 -> 629 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_horrible_things.pngbin0 -> 513 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_ice_beast.pngbin0 -> 786 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_shadow_creatures.pngbin0 -> 570 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_small_mammals.pngbin0 -> 663 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/summoning/summon_wraiths.pngbin0 -> 583 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/apportation.pngbin0 -> 496 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/banishment.pngbin0 -> 558 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/blink.pngbin0 -> 653 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/controlled_blink.pngbin0 -> 639 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/controlled_teleport.pngbin0 -> 513 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/portal.pngbin0 -> 438 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/teleport.pngbin0 -> 368 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/teleport_other.pngbin0 -> 460 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/unknown.pngbin0 -> 551 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/transmigration/alter_self.pngbin0 -> 846 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/transmigration/blade_hands.pngbin0 -> 452 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/transmigration/polymorph_other.pngbin0 -> 707 bytes
-rw-r--r--crawl-ref/source/tilepick.cc194
-rw-r--r--crawl-ref/source/tilereg.cc3
-rw-r--r--crawl-ref/source/tiles.h1
-rw-r--r--crawl-ref/source/tiletex.h1
168 files changed, 406 insertions, 6 deletions
diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw
index 51afd6612a..93fe6eaeb0 100644
--- a/crawl-ref/source/makefile_tiles.mgw
+++ b/crawl-ref/source/makefile_tiles.mgw
@@ -48,7 +48,7 @@ PCRELIBA := lib$(PCRELIB).a
RLTILES = rltiles
EXTRA_INCLUDES += -I$(RLTILES)
-TILEDEFS = dngn main player unrand
+TILEDEFS = dngn main player gui unrand
TILEDEFPRES = $(TILEDEFS:%=$(RLTILES)/tiledef-%)
TILEDEFOBJS = $(TILEDEFPRES:%=%.o)
TILEDEFSRCS = $(TILEDEFPRES:%=%.cc)
@@ -59,7 +59,8 @@ OBJECTS += $(TILEDEFOBJS)
TILEFILES = \
main.png \
player.png \
- dngn.png
+ dngn.png \
+ gui.png
DESTTILEFILES = $(TILEFILES:%=dat/tiles/%)
diff --git a/crawl-ref/source/makefile_tiles.unix b/crawl-ref/source/makefile_tiles.unix
index 9ffd86d9d1..b7faaef21b 100644
--- a/crawl-ref/source/makefile_tiles.unix
+++ b/crawl-ref/source/makefile_tiles.unix
@@ -99,7 +99,7 @@ RLTILES = rltiles
EXTRA_INCLUDES += -I$(RLTILES)
-TILEDEFS = dngn main player unrand
+TILEDEFS = dngn main player gui unrand
TILEDEFPRES = $(TILEDEFS:%=$(RLTILES)/tiledef-%)
TILEDEFOBJS = $(TILEDEFPRES:%=%.o)
TILEDEFSRCS = $(TILEDEFPRES:%=%.cc)
@@ -110,7 +110,8 @@ OBJECTS += $(TILEDEFOBJS)
TILEFILES = \
main.png \
player.png \
- dngn.png
+ dngn.png \
+ gui.png
DESTTILEFILES = $(TILEFILES:%=dat/tiles/%)
EXTRA_DEPENDS += $(DESTTILEFILES)
diff --git a/crawl-ref/source/rltiles/dc-gui.txt b/crawl-ref/source/rltiles/dc-gui.txt
new file mode 100644
index 0000000000..bb33fb64a8
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-gui.txt
@@ -0,0 +1,14 @@
+%name gui
+%prefix TILEG
+%startvalue 0
+
+%back none
+%rim 0
+
+# idx == 0 must be invalid
+dc-dngn/dngn_unseen
+
+%include dc-spells.txt
+
+dc-misc/todo TODO
+dc-misc/error ERROR
diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt
new file mode 100644
index 0000000000..b6ea1f520c
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-spells.txt
@@ -0,0 +1,182 @@
+%sdir spells/disciplines
+air SPELL_AIR
+conjuration SPELL_CONJURATION
+divination SPELL_DIVINATION
+earth SPELL_EARTH
+enchantment SPELL_ENCHANTMENT
+fire SPELL_FIRE
+ice SPELL_ICE
+necromancy SPELL_NECROMANCY
+poison SPELL_POISON
+summoning SPELL_SUMMONING
+translocation SPELL_TRANSLOCATION
+transmigration SPELL_TRANSMIGRATION
+
+%sdir spells/air
+airstrike AIRSTRIKE
+chain_lightning CHAIN_LIGHTNING
+conjure_ball_lightning CONJURE_BALL_LIGHTNING
+deflect_missiles DEFLECT_MISSILES
+flight FLIGHT
+insulation INSULATION
+levitation LEVITATION
+lightning_bolt LIGHTNING_BOLT
+mephitic_cloud MEPHITIC_CLOUD
+repel_missiles REPEL_MISSILES
+shock SHOCK
+silence SILENCE
+static_discharge STATIC_DISCHARGE
+swiftness SWIFTNESS
+
+%sdir spells/conjuration
+iskenderuns_mystic_blast ISKENDERUNS_MYSTIC_BLAST
+magic_dart MAGIC_DART
+
+%sdir spells/divination
+detect_creatures DETECT_CREATURES
+detect_curse DETECT_CURSE
+detect_items DETECT_ITEMS
+detect_secret_doors DETECT_SECRET_DOORS
+detect_traps DETECT_TRAPS
+forescry FORESCRY
+identify IDENTIFY
+magic_mapping MAGIC_MAPPING
+see_invisible SEE_INVISIBLE
+
+%sdir spells/earth
+bolt_of_iron BOLT_OF_IRON
+dig DIG
+lees_rapid_deconstruction LEES_RAPID_DECONSTRUCTION
+lehudibs_crystal_spear LEHUDIBS_CRYSTAL_SPEAR
+maxwells_silver_hammer MAXWELLS_SILVER_HAMMER
+passwall PASSWALL
+sandblast SANDBLAST
+shatter SHATTER
+statue_form STATUE_FORM
+stone_arrow STONE_ARROW
+stoneskin STONESKIN
+tomb_of_doroklohe TOMB_OF_DOROKLOHE
+
+%sdir spells/enchantment
+berserker_rage BERSERKER_RAGE
+cause_fear CAUSE_FEAR
+confuse CONFUSE
+confusing_touch CONFUSING_TOUCH
+corona CORONA
+enslavement ENSLAVEMENT
+haste HASTE
+invisibility INVISIBILITY
+mass_confusion MASS_CONFUSION
+paralyse PARALYSE
+projected_noise PROJECTED_NOISE
+selective_amnesia SELECTIVE_AMNESIA
+slow SLOW
+sure_blade SURE_BLADE
+tame_beasts TAME_BEASTS
+tukimas_dance TUKIMAS_DANCE
+tukimas_vorpal_blade TUKIMAS_VORPAL_BLADE
+unknown1 UNKNOWN1
+unknown2 UNKNOWN2
+
+%sdir spells/fire
+bolt_of_fire BOLT_OF_FIRE
+bolt_of_magma BOLT_OF_MAGMA
+conjure_flame CONJURE_FLAME
+delayed_fireball DELAYED_FIREBALL
+dragon_form DRAGON_FORM
+evaporate EVAPORATE
+fire_brand FIRE_BRAND
+fire_storm FIRE_STORM
+fireball FIREBALL
+flame_tongue FLAME_TONGUE
+ignite_poison IGNITE_POISON
+ring_of_flames RING_OF_FLAMES
+sticky_flame STICKY_FLAME
+throw_flame THROW_FLAME
+
+%sdir spells/ice
+bolt_of_cold BOLT_OF_COLD
+condensation_shield CONDENSATION_SHIELD
+ensorcelled_hibernation ENSORCELLED_HIBERNATION
+freeze FREEZE
+freezing_aura FREEZING_AURA
+freezing_cloud FREEZING_CLOUD
+ice_bolt ICE_BOLT
+ice_form ICE_FORM
+ice_storm ICE_STORM
+metabolic_englaciation METABOLIC_ENGLACIATION
+ozocubus_armour OZOCUBUS_ARMOUR
+ozocubus_refrigeration OZOCUBUS_REFRIGERATION
+throw_frost THROW_FROST
+
+%sdir spells/necromancy
+agony AGONY
+animate_dead ANIMATE_DEAD
+animate_skeleton ANIMATE_SKELETON
+bolt_of_draining BOLT_OF_DRAINING
+bone_shards BONE_SHARDS
+borgnjors_revivification BORGNJORS_REVIVIFICATION
+cigotuvis_degeneration CIGOTUVIS_DEGENERATION
+control_undead CONTROL_UNDEAD
+corpse_rot CORPSE_ROT
+deaths_door DEATHS_DOOR
+dispel_undead DISPEL_UNDEAD
+excruciating_wounds EXCRUCIATING_WOUNDS
+fulsome_distillation FULSOME_DISTILLATION
+lethal_infusion LETHAL_INFUSION
+necromutation NECROMUTATION
+pain PAIN
+regeneration REGENERATION
+simulacrum SIMULACRUM
+sublimation_of_blood SUBLIMATION_OF_BLOOD
+symbol_of_torment SYMBOL_OF_TORMENT
+twisted_resurrection TWISTED_RESURRECTION
+vampiric_draining VAMPIRIC_DRAINING
+
+%sdir spells/poison
+alistairs_intoxication ALISTAIRS_INTOXICATION
+cure_poison CURE_POISON
+mephitic_cloud2 MEPHITIC_CLOUD2
+olgrebs_toxic_radiance OLGREBS_TOXIC_RADIANCE
+poison_ammunition POISON_AMMUNITION
+poison_arrow POISON_ARROW
+poison_brand POISON_BRAND
+poisonous_cloud POISONOUS_CLOUD
+resist_poison RESIST_POISON
+spider_form SPIDER_FORM
+sting STING
+summon_scorpions SUMMON_SCORPIONS
+venom_bolt VENOM_BOLT
+
+%sdir spells/summoning
+abjuration ABJURATION
+call_canine_familiar CALL_CANINE_FAMILIAR
+call_imp CALL_IMP
+demonic_horde DEMONIC_HORDE
+recall RECALL
+sticks_to_snakes STICKS_TO_SNAKES
+summon_butterflies SUMMON_BUTTERFLIES
+summon_demon SUMMON_DEMON
+summon_elemental SUMMON_ELEMENTAL
+summon_greater_demon SUMMON_GREATER_DEMON
+summon_horrible_things SUMMON_HORRIBLE_THINGS
+summon_ice_beast SUMMON_ICE_BEAST
+summon_shadow_creatures SUMMON_SHADOW_CREATURES
+summon_small_mammals SUMMON_SMALL_MAMMALS
+summon_wraiths SUMMON_WRAITHS
+
+%sdir spells/translocation
+apportation APPORTATION
+banishment BANISHMENT
+blink BLINK
+controlled_blink CONTROLLED_BLINK
+controlled_teleport CONTROLLED_TELEPORT
+portal PORTAL
+teleport TELEPORT
+teleport_other TELEPORT_OTHER
+unknown UNKNOWN
+
+%sdir spells/transmigration
+alter_self ALTER_SELF
+blade_hands BLADE_HANDS
+polymorph_other POLYMORPH_OTHER
diff --git a/crawl-ref/source/rltiles/makefile.mgw b/crawl-ref/source/rltiles/makefile.mgw
index edeeb30a56..a6f471dedf 100644
--- a/crawl-ref/source/rltiles/makefile.mgw
+++ b/crawl-ref/source/rltiles/makefile.mgw
@@ -20,7 +20,7 @@ DELETE = del /q
TOOLDIR := tool
TILEGEN := $(TOOLDIR)\\tilegen.elf
-INPUTS := main dngn player
+INPUTS := main dngn player gui
INPUTFILES := $(INPUTS:%=dc-%.txt)
HEADERS := $(INPUTS:%=tiledef-%.h)
SOURCE := $(INPUTS:%=tiledef-%.cc)
diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix
index f64bfe42d9..721c467410 100644
--- a/crawl-ref/source/rltiles/makefile.unix
+++ b/crawl-ref/source/rltiles/makefile.unix
@@ -19,7 +19,7 @@ DELETE = rm -f
TOOLDIR := tool
TILEGEN := $(TOOLDIR)/tilegen.elf
-INPUTS := main dngn player
+INPUTS := main dngn player gui
INPUTFILES := $(INPUTS:%=dc-%.txt)
HEADERS := $(INPUTS:%=tiledef-%.h)
SOURCE := $(INPUTS:%=tiledef-%.cc)
diff --git a/crawl-ref/source/rltiles/spells/air/airstrike.png b/crawl-ref/source/rltiles/spells/air/airstrike.png
new file mode 100644
index 0000000000..9155356498
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/airstrike.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/chain_lightning.png b/crawl-ref/source/rltiles/spells/air/chain_lightning.png
new file mode 100644
index 0000000000..4356e691b5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/chain_lightning.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/conjure_ball_lightning.png b/crawl-ref/source/rltiles/spells/air/conjure_ball_lightning.png
new file mode 100644
index 0000000000..e66cf6fcd5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/conjure_ball_lightning.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/deflect_missiles.png b/crawl-ref/source/rltiles/spells/air/deflect_missiles.png
new file mode 100644
index 0000000000..a738f7cbc7
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/deflect_missiles.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/flight.png b/crawl-ref/source/rltiles/spells/air/flight.png
new file mode 100644
index 0000000000..b7ff159d23
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/flight.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/insulation.png b/crawl-ref/source/rltiles/spells/air/insulation.png
new file mode 100644
index 0000000000..7ab90501dd
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/insulation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/levitation.png b/crawl-ref/source/rltiles/spells/air/levitation.png
new file mode 100644
index 0000000000..7b2e065dd4
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/levitation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/lightning_bolt.png b/crawl-ref/source/rltiles/spells/air/lightning_bolt.png
new file mode 100644
index 0000000000..49511b840a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/lightning_bolt.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/mephitic_cloud.png b/crawl-ref/source/rltiles/spells/air/mephitic_cloud.png
new file mode 100644
index 0000000000..1bcb7e5f44
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/mephitic_cloud.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/repel_missiles.png b/crawl-ref/source/rltiles/spells/air/repel_missiles.png
new file mode 100644
index 0000000000..025ef9165b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/repel_missiles.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/shock.png b/crawl-ref/source/rltiles/spells/air/shock.png
new file mode 100644
index 0000000000..a55ef57af0
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/shock.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/silence.png b/crawl-ref/source/rltiles/spells/air/silence.png
new file mode 100644
index 0000000000..b2dcfdb501
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/silence.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/static_discharge.png b/crawl-ref/source/rltiles/spells/air/static_discharge.png
new file mode 100644
index 0000000000..48b355ea3f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/static_discharge.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/air/swiftness.png b/crawl-ref/source/rltiles/spells/air/swiftness.png
new file mode 100644
index 0000000000..dd06684aee
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/air/swiftness.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/conjuration/iskenderuns_mystic_blast.png b/crawl-ref/source/rltiles/spells/conjuration/iskenderuns_mystic_blast.png
new file mode 100644
index 0000000000..1a6a2f8925
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/conjuration/iskenderuns_mystic_blast.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/conjuration/magic_dart.png b/crawl-ref/source/rltiles/spells/conjuration/magic_dart.png
new file mode 100644
index 0000000000..9a7ab8182f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/conjuration/magic_dart.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/air.png b/crawl-ref/source/rltiles/spells/disciplines/air.png
new file mode 100644
index 0000000000..fb8a69ad67
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/air.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/conjuration.png b/crawl-ref/source/rltiles/spells/disciplines/conjuration.png
new file mode 100644
index 0000000000..ce05d3ecca
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/conjuration.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/divination.png b/crawl-ref/source/rltiles/spells/disciplines/divination.png
new file mode 100644
index 0000000000..15eaa6137e
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/divination.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/earth.png b/crawl-ref/source/rltiles/spells/disciplines/earth.png
new file mode 100644
index 0000000000..1d8cdf68fd
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/earth.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/enchantment.png b/crawl-ref/source/rltiles/spells/disciplines/enchantment.png
new file mode 100644
index 0000000000..c893a8405d
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/enchantment.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/fire.png b/crawl-ref/source/rltiles/spells/disciplines/fire.png
new file mode 100644
index 0000000000..a07a176c67
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/fire.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/ice.png b/crawl-ref/source/rltiles/spells/disciplines/ice.png
new file mode 100644
index 0000000000..efe2759029
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/ice.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/necromancy.png b/crawl-ref/source/rltiles/spells/disciplines/necromancy.png
new file mode 100644
index 0000000000..dc340ff1f5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/necromancy.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/poison.png b/crawl-ref/source/rltiles/spells/disciplines/poison.png
new file mode 100644
index 0000000000..5316f9309f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/poison.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/summoning.png b/crawl-ref/source/rltiles/spells/disciplines/summoning.png
new file mode 100644
index 0000000000..fc400072a8
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/summoning.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/translocation.png b/crawl-ref/source/rltiles/spells/disciplines/translocation.png
new file mode 100644
index 0000000000..aca2139d14
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/translocation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/disciplines/transmigration.png b/crawl-ref/source/rltiles/spells/disciplines/transmigration.png
new file mode 100644
index 0000000000..623758f766
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/disciplines/transmigration.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/detect_creatures.png b/crawl-ref/source/rltiles/spells/divination/detect_creatures.png
new file mode 100644
index 0000000000..8e70580e25
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/detect_creatures.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/detect_curse.png b/crawl-ref/source/rltiles/spells/divination/detect_curse.png
new file mode 100644
index 0000000000..1eb9188cbe
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/detect_curse.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/detect_items.png b/crawl-ref/source/rltiles/spells/divination/detect_items.png
new file mode 100644
index 0000000000..7fd5c7350a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/detect_items.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/detect_secret_doors.png b/crawl-ref/source/rltiles/spells/divination/detect_secret_doors.png
new file mode 100644
index 0000000000..dcc0464bb9
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/detect_secret_doors.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/detect_traps.png b/crawl-ref/source/rltiles/spells/divination/detect_traps.png
new file mode 100644
index 0000000000..8d1502b6ed
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/detect_traps.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/forescry.png b/crawl-ref/source/rltiles/spells/divination/forescry.png
new file mode 100644
index 0000000000..cc50390c39
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/forescry.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/identify.png b/crawl-ref/source/rltiles/spells/divination/identify.png
new file mode 100644
index 0000000000..531cb8b956
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/identify.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/magic_mapping.png b/crawl-ref/source/rltiles/spells/divination/magic_mapping.png
new file mode 100644
index 0000000000..5a910b7535
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/magic_mapping.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/divination/see_invisible.png b/crawl-ref/source/rltiles/spells/divination/see_invisible.png
new file mode 100644
index 0000000000..f90e961f2a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/divination/see_invisible.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/bolt_of_iron.png b/crawl-ref/source/rltiles/spells/earth/bolt_of_iron.png
new file mode 100644
index 0000000000..151532277b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/bolt_of_iron.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/dig.png b/crawl-ref/source/rltiles/spells/earth/dig.png
new file mode 100644
index 0000000000..bb068f3ddd
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/dig.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/lees_rapid_deconstruction.png b/crawl-ref/source/rltiles/spells/earth/lees_rapid_deconstruction.png
new file mode 100644
index 0000000000..19f2f47d41
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/lees_rapid_deconstruction.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/lehudibs_crystal_spear.png b/crawl-ref/source/rltiles/spells/earth/lehudibs_crystal_spear.png
new file mode 100644
index 0000000000..8911c1dd62
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/lehudibs_crystal_spear.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/maxwells_silver_hammer.png b/crawl-ref/source/rltiles/spells/earth/maxwells_silver_hammer.png
new file mode 100644
index 0000000000..0a866acd87
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/maxwells_silver_hammer.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/passwall.png b/crawl-ref/source/rltiles/spells/earth/passwall.png
new file mode 100644
index 0000000000..4d68eca389
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/passwall.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/sandblast.png b/crawl-ref/source/rltiles/spells/earth/sandblast.png
new file mode 100644
index 0000000000..c742101aea
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/sandblast.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/shatter.png b/crawl-ref/source/rltiles/spells/earth/shatter.png
new file mode 100644
index 0000000000..e30ccd96bc
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/shatter.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/statue_form.png b/crawl-ref/source/rltiles/spells/earth/statue_form.png
new file mode 100644
index 0000000000..2ba674d7fd
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/statue_form.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/stone_arrow.png b/crawl-ref/source/rltiles/spells/earth/stone_arrow.png
new file mode 100644
index 0000000000..faab70651e
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/stone_arrow.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/stoneskin.png b/crawl-ref/source/rltiles/spells/earth/stoneskin.png
new file mode 100644
index 0000000000..1006436a91
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/stoneskin.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.png b/crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.png
new file mode 100644
index 0000000000..2c126a556a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/tomb_of_doroklohe.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/berserker_rage.png b/crawl-ref/source/rltiles/spells/enchantment/berserker_rage.png
new file mode 100644
index 0000000000..86db983799
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/berserker_rage.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/cause_fear.png b/crawl-ref/source/rltiles/spells/enchantment/cause_fear.png
new file mode 100644
index 0000000000..ec41ac3ec5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/cause_fear.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/confuse.png b/crawl-ref/source/rltiles/spells/enchantment/confuse.png
new file mode 100644
index 0000000000..015f83633f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/confuse.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/confusing_touch.png b/crawl-ref/source/rltiles/spells/enchantment/confusing_touch.png
new file mode 100644
index 0000000000..9ea2b7798b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/confusing_touch.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/corona.png b/crawl-ref/source/rltiles/spells/enchantment/corona.png
new file mode 100644
index 0000000000..aef2550ee8
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/corona.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/enslavement.png b/crawl-ref/source/rltiles/spells/enchantment/enslavement.png
new file mode 100644
index 0000000000..27b4ef7516
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/enslavement.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/haste.png b/crawl-ref/source/rltiles/spells/enchantment/haste.png
new file mode 100644
index 0000000000..12e04ef3fd
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/haste.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/invisibility.png b/crawl-ref/source/rltiles/spells/enchantment/invisibility.png
new file mode 100644
index 0000000000..f9ed813e03
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/invisibility.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/mass_confusion.png b/crawl-ref/source/rltiles/spells/enchantment/mass_confusion.png
new file mode 100644
index 0000000000..0025cf8f9a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/mass_confusion.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/paralyse.png b/crawl-ref/source/rltiles/spells/enchantment/paralyse.png
new file mode 100644
index 0000000000..559beced54
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/paralyse.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/projected_noise.png b/crawl-ref/source/rltiles/spells/enchantment/projected_noise.png
new file mode 100644
index 0000000000..f2cd96c498
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/projected_noise.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/selective_amnesia.png b/crawl-ref/source/rltiles/spells/enchantment/selective_amnesia.png
new file mode 100644
index 0000000000..65bd31ae9b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/selective_amnesia.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/slow.png b/crawl-ref/source/rltiles/spells/enchantment/slow.png
new file mode 100644
index 0000000000..36d4de6d85
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/slow.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/sure_blade.png b/crawl-ref/source/rltiles/spells/enchantment/sure_blade.png
new file mode 100644
index 0000000000..e7951827a8
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/sure_blade.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/tame_beasts.png b/crawl-ref/source/rltiles/spells/enchantment/tame_beasts.png
new file mode 100644
index 0000000000..af38a1efec
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/tame_beasts.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/temp b/crawl-ref/source/rltiles/spells/enchantment/temp
new file mode 100644
index 0000000000..782e9f009f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/temp
@@ -0,0 +1,3 @@
+control undead?
+extension?
+remove curse?
diff --git a/crawl-ref/source/rltiles/spells/enchantment/tukimas_dance.png b/crawl-ref/source/rltiles/spells/enchantment/tukimas_dance.png
new file mode 100644
index 0000000000..69266d04be
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/tukimas_dance.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/tukimas_vorpal_blade.png b/crawl-ref/source/rltiles/spells/enchantment/tukimas_vorpal_blade.png
new file mode 100644
index 0000000000..86f7faf3bb
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/tukimas_vorpal_blade.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/unknown1.png b/crawl-ref/source/rltiles/spells/enchantment/unknown1.png
new file mode 100644
index 0000000000..78f483b59a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/unknown1.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/enchantment/unknown2.png b/crawl-ref/source/rltiles/spells/enchantment/unknown2.png
new file mode 100644
index 0000000000..67cd2c4e8f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/enchantment/unknown2.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/bolt_of_fire.png b/crawl-ref/source/rltiles/spells/fire/bolt_of_fire.png
new file mode 100644
index 0000000000..dd8f567d20
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/bolt_of_fire.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/bolt_of_magma.png b/crawl-ref/source/rltiles/spells/fire/bolt_of_magma.png
new file mode 100644
index 0000000000..1ff37cd497
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/bolt_of_magma.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/conjure_flame.png b/crawl-ref/source/rltiles/spells/fire/conjure_flame.png
new file mode 100644
index 0000000000..8779e0200a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/conjure_flame.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/delayed_fireball.png b/crawl-ref/source/rltiles/spells/fire/delayed_fireball.png
new file mode 100644
index 0000000000..5c48425dba
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/delayed_fireball.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/dragon_form.png b/crawl-ref/source/rltiles/spells/fire/dragon_form.png
new file mode 100644
index 0000000000..8413edf1ac
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/dragon_form.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/evaporate.png b/crawl-ref/source/rltiles/spells/fire/evaporate.png
new file mode 100644
index 0000000000..fd68e2f01c
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/evaporate.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/fire_brand.png b/crawl-ref/source/rltiles/spells/fire/fire_brand.png
new file mode 100644
index 0000000000..3e399a23d6
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/fire_brand.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/fire_storm.png b/crawl-ref/source/rltiles/spells/fire/fire_storm.png
new file mode 100644
index 0000000000..02a2b96689
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/fire_storm.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/fireball.png b/crawl-ref/source/rltiles/spells/fire/fireball.png
new file mode 100644
index 0000000000..382afc680c
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/fireball.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/flame_tongue.png b/crawl-ref/source/rltiles/spells/fire/flame_tongue.png
new file mode 100644
index 0000000000..3c4473d704
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/flame_tongue.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/ignite_poison.png b/crawl-ref/source/rltiles/spells/fire/ignite_poison.png
new file mode 100644
index 0000000000..9e19932761
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/ignite_poison.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/ring_of_flames.png b/crawl-ref/source/rltiles/spells/fire/ring_of_flames.png
new file mode 100644
index 0000000000..02af60d729
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/ring_of_flames.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/sticky_flame.png b/crawl-ref/source/rltiles/spells/fire/sticky_flame.png
new file mode 100644
index 0000000000..b6fecab0a9
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/sticky_flame.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/fire/throw_flame.png b/crawl-ref/source/rltiles/spells/fire/throw_flame.png
new file mode 100644
index 0000000000..d28baa2ec2
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/fire/throw_flame.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/bolt_of_cold.png b/crawl-ref/source/rltiles/spells/ice/bolt_of_cold.png
new file mode 100644
index 0000000000..5a046460f7
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/bolt_of_cold.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/condensation_shield.png b/crawl-ref/source/rltiles/spells/ice/condensation_shield.png
new file mode 100644
index 0000000000..a7e96866f9
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/condensation_shield.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/ensorcelled_hibernation.png b/crawl-ref/source/rltiles/spells/ice/ensorcelled_hibernation.png
new file mode 100644
index 0000000000..56881d5e47
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/ensorcelled_hibernation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/freeze.png b/crawl-ref/source/rltiles/spells/ice/freeze.png
new file mode 100644
index 0000000000..611912b808
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/freeze.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/freezing_aura.png b/crawl-ref/source/rltiles/spells/ice/freezing_aura.png
new file mode 100644
index 0000000000..13fb9977b0
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/freezing_aura.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/freezing_cloud.png b/crawl-ref/source/rltiles/spells/ice/freezing_cloud.png
new file mode 100644
index 0000000000..efde076a96
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/freezing_cloud.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/ice_bolt.png b/crawl-ref/source/rltiles/spells/ice/ice_bolt.png
new file mode 100644
index 0000000000..ac5b432032
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/ice_bolt.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/ice_form.png b/crawl-ref/source/rltiles/spells/ice/ice_form.png
new file mode 100644
index 0000000000..01b684f2d2
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/ice_form.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/ice_storm.png b/crawl-ref/source/rltiles/spells/ice/ice_storm.png
new file mode 100644
index 0000000000..d4fb68dfe7
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/ice_storm.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/metabolic_englaciation.png b/crawl-ref/source/rltiles/spells/ice/metabolic_englaciation.png
new file mode 100644
index 0000000000..b4e8166c9c
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/metabolic_englaciation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/ozocubus_armour.png b/crawl-ref/source/rltiles/spells/ice/ozocubus_armour.png
new file mode 100644
index 0000000000..f1f45d83a5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/ozocubus_armour.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/ozocubus_refrigeration.png b/crawl-ref/source/rltiles/spells/ice/ozocubus_refrigeration.png
new file mode 100644
index 0000000000..ea0a1485e3
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/ozocubus_refrigeration.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/ice/throw_frost.png b/crawl-ref/source/rltiles/spells/ice/throw_frost.png
new file mode 100644
index 0000000000..e3f861e351
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/ice/throw_frost.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/agony.png b/crawl-ref/source/rltiles/spells/necromancy/agony.png
new file mode 100644
index 0000000000..24e73fb5f3
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/agony.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/animate_dead.png b/crawl-ref/source/rltiles/spells/necromancy/animate_dead.png
new file mode 100644
index 0000000000..1803bb1157
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/animate_dead.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/animate_skeleton.png b/crawl-ref/source/rltiles/spells/necromancy/animate_skeleton.png
new file mode 100644
index 0000000000..78ea575b6b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/animate_skeleton.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/bolt_of_draining.png b/crawl-ref/source/rltiles/spells/necromancy/bolt_of_draining.png
new file mode 100644
index 0000000000..1ada3474c0
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/bolt_of_draining.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/bone_shards.png b/crawl-ref/source/rltiles/spells/necromancy/bone_shards.png
new file mode 100644
index 0000000000..6f91f757c3
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/bone_shards.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/borgnjors_revivification.png b/crawl-ref/source/rltiles/spells/necromancy/borgnjors_revivification.png
new file mode 100644
index 0000000000..cc820c4a28
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/borgnjors_revivification.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/cigotuvis_degeneration.png b/crawl-ref/source/rltiles/spells/necromancy/cigotuvis_degeneration.png
new file mode 100644
index 0000000000..bc25d1470e
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/cigotuvis_degeneration.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/control_undead.png b/crawl-ref/source/rltiles/spells/necromancy/control_undead.png
new file mode 100644
index 0000000000..4108f1561b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/control_undead.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/corpse_rot.png b/crawl-ref/source/rltiles/spells/necromancy/corpse_rot.png
new file mode 100644
index 0000000000..a7dbb1c350
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/corpse_rot.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/deaths_door.png b/crawl-ref/source/rltiles/spells/necromancy/deaths_door.png
new file mode 100644
index 0000000000..22ff2ea5f5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/deaths_door.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/dispel_undead.png b/crawl-ref/source/rltiles/spells/necromancy/dispel_undead.png
new file mode 100644
index 0000000000..7f962a3834
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/dispel_undead.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/excruciating_wounds.png b/crawl-ref/source/rltiles/spells/necromancy/excruciating_wounds.png
new file mode 100644
index 0000000000..5ed1eda577
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/excruciating_wounds.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/fulsome_distillation.png b/crawl-ref/source/rltiles/spells/necromancy/fulsome_distillation.png
new file mode 100644
index 0000000000..0d3ca0bb32
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/fulsome_distillation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/lethal_infusion.png b/crawl-ref/source/rltiles/spells/necromancy/lethal_infusion.png
new file mode 100644
index 0000000000..0a97c70079
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/lethal_infusion.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/necromutation.png b/crawl-ref/source/rltiles/spells/necromancy/necromutation.png
new file mode 100644
index 0000000000..729d550638
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/necromutation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/pain.png b/crawl-ref/source/rltiles/spells/necromancy/pain.png
new file mode 100644
index 0000000000..f95289b92b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/pain.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/regeneration.png b/crawl-ref/source/rltiles/spells/necromancy/regeneration.png
new file mode 100644
index 0000000000..083e439d8b
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/regeneration.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/simulacrum.png b/crawl-ref/source/rltiles/spells/necromancy/simulacrum.png
new file mode 100644
index 0000000000..0b1028c2c1
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/simulacrum.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/sublimation_of_blood.png b/crawl-ref/source/rltiles/spells/necromancy/sublimation_of_blood.png
new file mode 100644
index 0000000000..6b4e3df88e
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/sublimation_of_blood.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png b/crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png
new file mode 100644
index 0000000000..d262aaec54
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/twisted_resurrection.png b/crawl-ref/source/rltiles/spells/necromancy/twisted_resurrection.png
new file mode 100644
index 0000000000..dd08f1c5a7
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/twisted_resurrection.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/necromancy/vampiric_draining.png b/crawl-ref/source/rltiles/spells/necromancy/vampiric_draining.png
new file mode 100644
index 0000000000..cd33789445
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/vampiric_draining.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/alistairs_intoxication.png b/crawl-ref/source/rltiles/spells/poison/alistairs_intoxication.png
new file mode 100644
index 0000000000..180b79504d
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/alistairs_intoxication.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/cure_poison.png b/crawl-ref/source/rltiles/spells/poison/cure_poison.png
new file mode 100644
index 0000000000..497105a121
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/cure_poison.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/mephitic_cloud2.png b/crawl-ref/source/rltiles/spells/poison/mephitic_cloud2.png
new file mode 100644
index 0000000000..6e65daf30f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/mephitic_cloud2.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/olgrebs_toxic_radiance.png b/crawl-ref/source/rltiles/spells/poison/olgrebs_toxic_radiance.png
new file mode 100644
index 0000000000..cec6dd136e
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/olgrebs_toxic_radiance.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/poison_ammunition.png b/crawl-ref/source/rltiles/spells/poison/poison_ammunition.png
new file mode 100644
index 0000000000..bd9c733fb6
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/poison_ammunition.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/poison_arrow.png b/crawl-ref/source/rltiles/spells/poison/poison_arrow.png
new file mode 100644
index 0000000000..88b99a8b59
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/poison_arrow.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/poison_brand.png b/crawl-ref/source/rltiles/spells/poison/poison_brand.png
new file mode 100644
index 0000000000..c43205872c
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/poison_brand.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/poisonous_cloud.png b/crawl-ref/source/rltiles/spells/poison/poisonous_cloud.png
new file mode 100644
index 0000000000..015a11a794
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/poisonous_cloud.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/resist_poison.png b/crawl-ref/source/rltiles/spells/poison/resist_poison.png
new file mode 100644
index 0000000000..a566d77979
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/resist_poison.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/spider_form.png b/crawl-ref/source/rltiles/spells/poison/spider_form.png
new file mode 100644
index 0000000000..570285c52d
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/spider_form.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/sting.png b/crawl-ref/source/rltiles/spells/poison/sting.png
new file mode 100644
index 0000000000..512fcc4944
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/sting.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/summon_scorpions.png b/crawl-ref/source/rltiles/spells/poison/summon_scorpions.png
new file mode 100644
index 0000000000..841f17ef5e
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/summon_scorpions.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/poison/venom_bolt.png b/crawl-ref/source/rltiles/spells/poison/venom_bolt.png
new file mode 100644
index 0000000000..ca6199d93c
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/poison/venom_bolt.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/abjuration.png b/crawl-ref/source/rltiles/spells/summoning/abjuration.png
new file mode 100644
index 0000000000..2ce07ebf19
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/abjuration.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/call_canine_familiar.png b/crawl-ref/source/rltiles/spells/summoning/call_canine_familiar.png
new file mode 100644
index 0000000000..e93a463ee5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/call_canine_familiar.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/call_imp.png b/crawl-ref/source/rltiles/spells/summoning/call_imp.png
new file mode 100644
index 0000000000..e3b19da05f
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/call_imp.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/demonic_horde.png b/crawl-ref/source/rltiles/spells/summoning/demonic_horde.png
new file mode 100644
index 0000000000..3ee5cee8d5
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/demonic_horde.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/recall.png b/crawl-ref/source/rltiles/spells/summoning/recall.png
new file mode 100644
index 0000000000..66e1069727
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/recall.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/sticks_to_snakes.png b/crawl-ref/source/rltiles/spells/summoning/sticks_to_snakes.png
new file mode 100644
index 0000000000..d2ed5bb80a
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/sticks_to_snakes.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_butterflies.png b/crawl-ref/source/rltiles/spells/summoning/summon_butterflies.png
new file mode 100644
index 0000000000..6834d97042
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_butterflies.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_demon.png b/crawl-ref/source/rltiles/spells/summoning/summon_demon.png
new file mode 100644
index 0000000000..ab369dff07
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_demon.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_elemental.png b/crawl-ref/source/rltiles/spells/summoning/summon_elemental.png
new file mode 100644
index 0000000000..f06d9eb1a6
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_elemental.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_greater_demon.png b/crawl-ref/source/rltiles/spells/summoning/summon_greater_demon.png
new file mode 100644
index 0000000000..6a08bb01af
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_greater_demon.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_horrible_things.png b/crawl-ref/source/rltiles/spells/summoning/summon_horrible_things.png
new file mode 100644
index 0000000000..d927420d37
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_horrible_things.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_ice_beast.png b/crawl-ref/source/rltiles/spells/summoning/summon_ice_beast.png
new file mode 100644
index 0000000000..063ab924e2
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_ice_beast.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_shadow_creatures.png b/crawl-ref/source/rltiles/spells/summoning/summon_shadow_creatures.png
new file mode 100644
index 0000000000..c5b77c81be
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_shadow_creatures.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_small_mammals.png b/crawl-ref/source/rltiles/spells/summoning/summon_small_mammals.png
new file mode 100644
index 0000000000..c9f26eebcb
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_small_mammals.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_wraiths.png b/crawl-ref/source/rltiles/spells/summoning/summon_wraiths.png
new file mode 100644
index 0000000000..65e71e714e
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_wraiths.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/apportation.png b/crawl-ref/source/rltiles/spells/translocation/apportation.png
new file mode 100644
index 0000000000..a10bedb3f9
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/apportation.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/banishment.png b/crawl-ref/source/rltiles/spells/translocation/banishment.png
new file mode 100644
index 0000000000..5ea26b40ef
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/banishment.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/blink.png b/crawl-ref/source/rltiles/spells/translocation/blink.png
new file mode 100644
index 0000000000..9729622f99
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/blink.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/controlled_blink.png b/crawl-ref/source/rltiles/spells/translocation/controlled_blink.png
new file mode 100644
index 0000000000..5f4bef6163
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/controlled_blink.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/controlled_teleport.png b/crawl-ref/source/rltiles/spells/translocation/controlled_teleport.png
new file mode 100644
index 0000000000..63944d4fee
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/controlled_teleport.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/portal.png b/crawl-ref/source/rltiles/spells/translocation/portal.png
new file mode 100644
index 0000000000..e59a7b89c0
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/portal.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/teleport.png b/crawl-ref/source/rltiles/spells/translocation/teleport.png
new file mode 100644
index 0000000000..2e6d0506fd
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/teleport.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/teleport_other.png b/crawl-ref/source/rltiles/spells/translocation/teleport_other.png
new file mode 100644
index 0000000000..12aae95796
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/teleport_other.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/unknown.png b/crawl-ref/source/rltiles/spells/translocation/unknown.png
new file mode 100644
index 0000000000..f4c5077d68
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/unknown.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/transmigration/alter_self.png b/crawl-ref/source/rltiles/spells/transmigration/alter_self.png
new file mode 100644
index 0000000000..179a0a5dea
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/transmigration/alter_self.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/transmigration/blade_hands.png b/crawl-ref/source/rltiles/spells/transmigration/blade_hands.png
new file mode 100644
index 0000000000..c2c8a3fde3
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/transmigration/blade_hands.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/transmigration/polymorph_other.png b/crawl-ref/source/rltiles/spells/transmigration/polymorph_other.png
new file mode 100644
index 0000000000..648f83c86c
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/transmigration/polymorph_other.png
Binary files differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 9a529e3aef..05bf12d264 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -31,6 +31,7 @@ REVISION("$Rev$");
#include "tilemcache.h"
#include "tiledef-dngn.h"
#include "tiledef-player.h"
+#include "tiledef-gui.h"
#include "tiledef-unrand.h"
#include "transfor.h"
#include "traps.h"
@@ -2710,6 +2711,199 @@ int tileidx_zap(int colour)
return (TILE_SYM_BOLT_OFS - 1 + col);
}
+int tileidx_spell(spell_type spell)
+{
+ switch (spell)
+ {
+ case SPELL_NO_SPELL: return TILEG_ERROR;
+ case SPELL_TELEPORT_SELF: return TILEG_TELEPORT;
+ case SPELL_CAUSE_FEAR: return TILEG_CAUSE_FEAR;
+ case SPELL_MAGIC_DART: return TILEG_MAGIC_DART;
+ case SPELL_FIREBALL: return TILEG_FIREBALL;
+ case SPELL_APPORTATION: return TILEG_APPORTATION;
+ case SPELL_DELAYED_FIREBALL: return TILEG_DELAYED_FIREBALL;
+ case SPELL_STRIKING: return TILEG_TODO;
+ case SPELL_CONJURE_FLAME: return TILEG_CONJURE_FLAME;
+ case SPELL_DIG: return TILEG_DIG;
+ case SPELL_BOLT_OF_FIRE: return TILEG_BOLT_OF_FIRE;
+ case SPELL_BOLT_OF_COLD: return TILEG_BOLT_OF_COLD;
+ case SPELL_LIGHTNING_BOLT: return TILEG_LIGHTNING_BOLT;
+ case SPELL_BOLT_OF_MAGMA: return TILEG_BOLT_OF_MAGMA;
+ case SPELL_POLYMORPH_OTHER: return TILEG_POLYMORPH_OTHER;
+ case SPELL_SLOW: return TILEG_SLOW;
+ case SPELL_HASTE: return TILEG_HASTE;
+ case SPELL_PARALYSE: return TILEG_PARALYSE;
+ case SPELL_CONFUSE: return TILEG_CONFUSE;
+ case SPELL_INVISIBILITY: return TILEG_INVISIBILITY;
+ case SPELL_THROW_FLAME: return TILEG_THROW_FLAME;
+ case SPELL_THROW_FROST: return TILEG_THROW_FROST;
+ case SPELL_CONTROLLED_BLINK: return TILEG_CONTROLLED_BLINK;
+ case SPELL_FREEZING_CLOUD: return TILEG_FREEZING_CLOUD;
+ case SPELL_MEPHITIC_CLOUD: return TILEG_MEPHITIC_CLOUD;
+ case SPELL_RING_OF_FLAMES: return TILEG_RING_OF_FLAMES;
+ case SPELL_VENOM_BOLT: return TILEG_VENOM_BOLT;
+ case SPELL_OLGREBS_TOXIC_RADIANCE: return TILEG_OLGREBS_TOXIC_RADIANCE;
+ case SPELL_TELEPORT_OTHER: return TILEG_TELEPORT_OTHER;
+ case SPELL_MINOR_HEALING: return TILEG_TODO;
+ case SPELL_MAJOR_HEALING: return TILEG_TODO;
+ case SPELL_DEATHS_DOOR: return TILEG_DEATHS_DOOR;
+ case SPELL_SELECTIVE_AMNESIA: return TILEG_SELECTIVE_AMNESIA;
+ case SPELL_MASS_CONFUSION: return TILEG_MASS_CONFUSION;
+ case SPELL_SMITING: return TILEG_TODO;
+ case SPELL_SUMMON_SMALL_MAMMALS: return TILEG_SUMMON_SMALL_MAMMALS;
+ case SPELL_ABJURATION: return TILEG_ABJURATION;
+ case SPELL_SUMMON_SCORPIONS: return TILEG_SUMMON_SCORPIONS;
+ case SPELL_LEVITATION: return TILEG_LEVITATION;
+ case SPELL_BOLT_OF_DRAINING: return TILEG_BOLT_OF_DRAINING;
+ case SPELL_LEHUDIBS_CRYSTAL_SPEAR: return TILEG_LEHUDIBS_CRYSTAL_SPEAR;
+ case SPELL_BOLT_OF_INACCURACY: return TILEG_TODO;
+ case SPELL_POISONOUS_CLOUD: return TILEG_POISONOUS_CLOUD;
+ case SPELL_FIRE_STORM: return TILEG_FIRE_STORM;
+ case SPELL_DETECT_TRAPS: return TILEG_DETECT_TRAPS;
+ case SPELL_BLINK: return TILEG_BLINK;
+ case SPELL_ISKENDERUNS_MYSTIC_BLAST: return TILEG_ISKENDERUNS_MYSTIC_BLAST;
+ case SPELL_SUMMON_SWARM: return TILEG_TODO;
+ case SPELL_SUMMON_HORRIBLE_THINGS: return TILEG_SUMMON_HORRIBLE_THINGS;
+ case SPELL_ENSLAVEMENT: return TILEG_ENSLAVEMENT;
+ case SPELL_ANIMATE_DEAD: return TILEG_ANIMATE_DEAD;
+ case SPELL_PAIN: return TILEG_PAIN;
+ case SPELL_EXTENSION: return TILEG_TODO;
+ case SPELL_CONTROL_UNDEAD: return TILEG_CONTROL_UNDEAD;
+ case SPELL_ANIMATE_SKELETON: return TILEG_ANIMATE_SKELETON;
+ case SPELL_VAMPIRIC_DRAINING: return TILEG_VAMPIRIC_DRAINING;
+ case SPELL_SUMMON_WRAITHS: return TILEG_SUMMON_WRAITHS;
+ case SPELL_DETECT_ITEMS: return TILEG_DETECT_ITEMS;
+ case SPELL_BORGNJORS_REVIVIFICATION: return TILEG_BORGNJORS_REVIVIFICATION;
+ case SPELL_FREEZE: return TILEG_FREEZE;
+ case SPELL_SUMMON_ELEMENTAL: return TILEG_SUMMON_ELEMENTAL;
+ case SPELL_OZOCUBUS_REFRIGERATION: return TILEG_OZOCUBUS_REFRIGERATION;
+ case SPELL_STICKY_FLAME: return TILEG_STICKY_FLAME;
+ case SPELL_SUMMON_ICE_BEAST: return TILEG_SUMMON_ICE_BEAST;
+ case SPELL_OZOCUBUS_ARMOUR: return TILEG_OZOCUBUS_ARMOUR;
+ case SPELL_CALL_IMP: return TILEG_CALL_IMP;
+ case SPELL_REPEL_MISSILES: return TILEG_REPEL_MISSILES;
+ case SPELL_BERSERKER_RAGE: return TILEG_BERSERKER_RAGE;
+ case SPELL_DISPEL_UNDEAD: return TILEG_DISPEL_UNDEAD;
+ case SPELL_FULSOME_DISTILLATION: return TILEG_FULSOME_DISTILLATION;
+ case SPELL_POISON_ARROW: return TILEG_POISON_ARROW;
+ case SPELL_TWISTED_RESURRECTION: return TILEG_TWISTED_RESURRECTION;
+ case SPELL_REGENERATION: return TILEG_REGENERATION;
+ case SPELL_BONE_SHARDS: return TILEG_BONE_SHARDS;
+ case SPELL_BANISHMENT: return TILEG_BANISHMENT;
+ case SPELL_CIGOTUVIS_DEGENERATION: return TILEG_CIGOTUVIS_DEGENERATION;
+ case SPELL_STING: return TILEG_STING;
+ case SPELL_SUBLIMATION_OF_BLOOD: return TILEG_SUBLIMATION_OF_BLOOD;
+ case SPELL_TUKIMAS_DANCE: return TILEG_TUKIMAS_DANCE;
+ case SPELL_HELLFIRE: return TILEG_TODO;
+ case SPELL_SUMMON_DEMON: return TILEG_SUMMON_DEMON;
+ case SPELL_DEMONIC_HORDE: return TILEG_DEMONIC_HORDE;
+ case SPELL_SUMMON_GREATER_DEMON: return TILEG_SUMMON_GREATER_DEMON;
+ case SPELL_CORPSE_ROT: return TILEG_CORPSE_ROT;
+ case SPELL_TUKIMAS_VORPAL_BLADE: return TILEG_TUKIMAS_VORPAL_BLADE;
+ case SPELL_FIRE_BRAND: return TILEG_FIRE_BRAND;
+ case SPELL_FREEZING_AURA: return TILEG_FREEZING_AURA;
+ case SPELL_LETHAL_INFUSION: return TILEG_LETHAL_INFUSION;
+ case SPELL_BOLT_OF_IRON: return TILEG_BOLT_OF_IRON;
+ case SPELL_STONE_ARROW: return TILEG_STONE_ARROW;
+ case SPELL_STONEMAIL: return TILEG_TODO;
+ case SPELL_SHOCK: return TILEG_SHOCK;
+ case SPELL_SWIFTNESS: return TILEG_SWIFTNESS;
+ case SPELL_FLY: return TILEG_FLIGHT;
+ case SPELL_INSULATION: return TILEG_INSULATION;
+ case SPELL_DETECT_CREATURES: return TILEG_DETECT_CREATURES;
+ case SPELL_CURE_POISON: return TILEG_CURE_POISON;
+ case SPELL_CONTROL_TELEPORT: return TILEG_CONTROLLED_TELEPORT;
+ case SPELL_POISON_AMMUNITION: return TILEG_POISON_AMMUNITION;
+ case SPELL_POISON_WEAPON: return TILEG_POISON_BRAND;
+ case SPELL_RESIST_POISON: return TILEG_RESIST_POISON;
+ case SPELL_PROJECTED_NOISE: return TILEG_PROJECTED_NOISE;
+ case SPELL_ALTER_SELF: return TILEG_ALTER_SELF;
+ case SPELL_DEBUGGING_RAY: return TILEG_TODO;
+ case SPELL_RECALL: return TILEG_RECALL;
+ case SPELL_PORTAL: return TILEG_PORTAL;
+ case SPELL_AGONY: return TILEG_AGONY;
+ case SPELL_SPIDER_FORM: return TILEG_SPIDER_FORM;
+ case SPELL_DISRUPT: return TILEG_TODO;
+ case SPELL_DISINTEGRATE: return TILEG_TODO;
+ case SPELL_BLADE_HANDS: return TILEG_BLADE_HANDS;
+ case SPELL_STATUE_FORM: return TILEG_STATUE_FORM;
+ case SPELL_ICE_FORM: return TILEG_ICE_FORM;
+ case SPELL_DRAGON_FORM: return TILEG_DRAGON_FORM;
+ case SPELL_NECROMUTATION: return TILEG_NECROMUTATION;
+ case SPELL_DEATH_CHANNEL: return TILEG_TODO;
+ case SPELL_SYMBOL_OF_TORMENT: return TILEG_SYMBOL_OF_TORMENT;
+ case SPELL_DEFLECT_MISSILES: return TILEG_DEFLECT_MISSILES;
+ case SPELL_ICE_BOLT: return TILEG_ICE_BOLT;
+ case SPELL_ICE_STORM: return TILEG_ICE_STORM;
+ case SPELL_AIRSTRIKE: return TILEG_AIRSTRIKE;
+ case SPELL_SHADOW_CREATURES: return TILEG_SUMMON_SHADOW_CREATURES;
+ case SPELL_CONFUSING_TOUCH: return TILEG_CONFUSING_TOUCH;
+ case SPELL_SURE_BLADE: return TILEG_SURE_BLADE;
+ case SPELL_FLAME_TONGUE: return TILEG_FLAME_TONGUE;
+ case SPELL_PASSWALL: return TILEG_PASSWALL;
+ case SPELL_IGNITE_POISON: return TILEG_IGNITE_POISON;
+ case SPELL_STICKS_TO_SNAKES: return TILEG_STICKS_TO_SNAKES;
+ case SPELL_CALL_CANINE_FAMILIAR: return TILEG_CALL_CANINE_FAMILIAR;
+ case SPELL_SUMMON_DRAGON: return TILEG_TODO;
+ case SPELL_TAME_BEASTS: return TILEG_TAME_BEASTS;
+ case SPELL_SLEEP: return TILEG_TODO;
+ case SPELL_MASS_SLEEP: return TILEG_TODO;
+ case SPELL_DETECT_SECRET_DOORS: return TILEG_DETECT_SECRET_DOORS;
+ case SPELL_SEE_INVISIBLE: return TILEG_SEE_INVISIBLE;
+ case SPELL_PHASE_SHIFT: return TILEG_TODO;
+ case SPELL_SUMMON_BUTTERFLIES: return TILEG_SUMMON_BUTTERFLIES;
+ case SPELL_WARP_BRAND: return TILEG_TODO;
+ case SPELL_SILENCE: return TILEG_SILENCE;
+ case SPELL_SHATTER: return TILEG_TODO;
+ case SPELL_DISPERSAL: return TILEG_TODO;
+ case SPELL_DISCHARGE: return TILEG_TODO;
+ case SPELL_BACKLIGHT: return TILEG_TODO;
+ case SPELL_INTOXICATE: return TILEG_ALISTAIRS_INTOXICATION;
+ case SPELL_EVAPORATE: return TILEG_EVAPORATE;
+ case SPELL_FRAGMENTATION: return TILEG_TODO;
+ case SPELL_SANDBLAST: return TILEG_SANDBLAST;
+ case SPELL_MAXWELLS_SILVER_HAMMER: return TILEG_MAXWELLS_SILVER_HAMMER;
+ case SPELL_CONDENSATION_SHIELD: return TILEG_CONDENSATION_SHIELD;
+ case SPELL_STONESKIN: return TILEG_STONESKIN;
+ case SPELL_SIMULACRUM: return TILEG_SIMULACRUM;
+ case SPELL_CONJURE_BALL_LIGHTNING: return TILEG_CONJURE_BALL_LIGHTNING;
+ case SPELL_CHAIN_LIGHTNING: return TILEG_CHAIN_LIGHTNING;
+ case SPELL_EXCRUCIATING_WOUNDS: return TILEG_EXCRUCIATING_WOUNDS;
+ case SPELL_PORTAL_PROJECTILE: return TILEG_TODO;
+ case SPELL_SUMMON_UGLY_THING: return TILEG_TODO;
+ case SPELL_PETRIFY: return TILEG_TODO;
+
+ // Monster spells (mostly?)
+ case SPELL_HELLFIRE_BURST:
+ case SPELL_VAMPIRE_SUMMON:
+ case SPELL_BRAIN_FEED:
+ case SPELL_FAKE_RAKSHASA_SUMMON:
+ case SPELL_STEAM_BALL:
+ case SPELL_SUMMON_UFETUBUS:
+ case SPELL_SUMMON_BEAST:
+ case SPELL_ENERGY_BOLT:
+ case SPELL_POISON_SPLASH:
+ case SPELL_SUMMON_UNDEAD:
+ case SPELL_CANTRIP:
+ case SPELL_QUICKSILVER_BOLT:
+ case SPELL_METAL_SPLINTERS:
+ case SPELL_MIASMA:
+ case SPELL_SUMMON_DRAKES:
+ case SPELL_BLINK_OTHER:
+ case SPELL_SUMMON_MUSHROOMS:
+ case SPELL_ACID_SPLASH:
+ case SPELL_STICKY_FLAME_SPLASH:
+ case SPELL_FIRE_BREATH:
+ case SPELL_COLD_BREATH:
+ case SPELL_DRACONIAN_BREATH:
+ case SPELL_WATER_ELEMENTALS:
+ case SPELL_PORKALATOR:
+ case NUM_SPELLS:
+ default:
+ return TILE_ERROR;
+ }
+}
+
// Modify wall tile index depending on floor/wall flavour.
static inline void _finalize_tile(unsigned int *tile,
unsigned char wall_flv,
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 51a55d9074..d6ab155493 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -3842,6 +3842,9 @@ bool ImageManager::load_textures(bool need_mips)
if (!m_textures[TEX_PLAYER].load_texture("player.png", mip))
return (false);
+ if (!m_textures[TEX_GUI].load_texture("gui.png", mip))
+ return (false);
+
m_textures[TEX_DUNGEON].set_info(TILE_DNGN_MAX, &tile_dngn_info);
m_textures[TEX_PLAYER].set_info(TILEP_PLAYER_MAX, &tile_player_info);
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index d1fdfc3f23..9d2929ee16 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -48,6 +48,7 @@ int tile_idx_unseen_terrain(int x, int y, int what);
int tile_unseen_flag(const coord_def& gc);
int tileidx_monster_base(const monsters *mon, bool detected = false);
int tileidx_monster(const monsters *mon, bool detected = false);
+int tileidx_spell(spell_type spell);
// Player tile related
int get_gender_from_tile(int parts[]);
diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h
index ed5e48da26..a50b85dc26 100644
--- a/crawl-ref/source/tiletex.h
+++ b/crawl-ref/source/tiletex.h
@@ -15,6 +15,7 @@ enum TextureID
TEX_DUNGEON, // dngn.png
TEX_PLAYER, // player.png
TEX_DEFAULT, // main.png
+ TEX_GUI, // gui.png
TEX_MAX
};