summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/rltiles/dc-spells.txt3
-rw-r--r--crawl-ref/source/rltiles/spells/earth/stonemail.pngbin0 -> 853 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/missing_spells.txt3
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/phase_shift.pngbin0 -> 336 bytes
-rw-r--r--crawl-ref/source/rltiles/spells/translocation/portal_projectile.pngbin0 -> 598 bytes
-rw-r--r--crawl-ref/source/tilepick.cc6
6 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt
index 917186a204..d609d32344 100644
--- a/crawl-ref/source/rltiles/dc-spells.txt
+++ b/crawl-ref/source/rltiles/dc-spells.txt
@@ -48,6 +48,7 @@ sandblast SANDBLAST
shatter SHATTER
statue_form STATUE_FORM
stone_arrow STONE_ARROW
+stonemail STONEMAIL
stoneskin STONESKIN
%sdir spells/enchantment
@@ -166,7 +167,9 @@ blink BLINK
controlled_blink CONTROLLED_BLINK
controlled_teleport CONTROLLED_TELEPORT
dispersal DISPERSAL
+phase_shift PHASE_SHIFT
portal PORTAL
+portal_projectile PORTAL_PROJECTILE
teleport TELEPORT
teleport_other TELEPORT_OTHER
diff --git a/crawl-ref/source/rltiles/spells/earth/stonemail.png b/crawl-ref/source/rltiles/spells/earth/stonemail.png
new file mode 100644
index 0000000000..769e206686
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/earth/stonemail.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/missing_spells.txt b/crawl-ref/source/rltiles/spells/missing_spells.txt
index 2e8cd08d8b..8e346ea25c 100644
--- a/crawl-ref/source/rltiles/spells/missing_spells.txt
+++ b/crawl-ref/source/rltiles/spells/missing_spells.txt
@@ -1,6 +1,3 @@
-Stonemail
-Portal Projectile
-Phase Shift
Warp Brand
Death's Door
Summon Ugly Thing
diff --git a/crawl-ref/source/rltiles/spells/translocation/phase_shift.png b/crawl-ref/source/rltiles/spells/translocation/phase_shift.png
new file mode 100644
index 0000000000..e150d79542
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/phase_shift.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/spells/translocation/portal_projectile.png b/crawl-ref/source/rltiles/spells/translocation/portal_projectile.png
new file mode 100644
index 0000000000..7e4797e4ed
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/portal_projectile.png
Binary files differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 76714ceae4..89e4ba97f8 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2748,6 +2748,7 @@ int tileidx_spell(spell_type spell)
case SPELL_BOLT_OF_MAGMA: return TILEG_BOLT_OF_MAGMA;
case SPELL_FRAGMENTATION: return TILEG_LEES_RAPID_DECONSTRUCTION;
case SPELL_BOLT_OF_IRON: return TILEG_BOLT_OF_IRON;
+ case SPELL_STONEMAIL: return TILEG_STONEMAIL
case SPELL_LEHUDIBS_CRYSTAL_SPEAR: return TILEG_LEHUDIBS_CRYSTAL_SPEAR;
case SPELL_SHATTER: return TILEG_SHATTER;
@@ -2815,11 +2816,13 @@ int tileidx_spell(spell_type spell)
// Translocation
case SPELL_APPORTATION: return TILEG_APPORTATION;
+ case SPELL_PORTAL_PROJECTILE: return TILEG_PORTAL_PROJECTILE;
case SPELL_BLINK: return TILEG_BLINK;
case SPELL_BANISHMENT: return TILEG_BANISHMENT;
case SPELL_CONTROL_TELEPORT: return TILEG_CONTROLLED_TELEPORT;
case SPELL_TELEPORT_OTHER: return TILEG_TELEPORT_OTHER;
case SPELL_TELEPORT_SELF: return TILEG_TELEPORT;
+ case SPELL_PHASE_SHIFT: return TILEG_PHASE_SHIFT;
case SPELL_CONTROLLED_BLINK: return TILEG_CONTROLLED_BLINK;
case SPELL_DISPERSAL: return TILEG_DISPERSAL;
case SPELL_PORTAL: return TILEG_PORTAL;
@@ -2885,12 +2888,9 @@ int tileidx_spell(spell_type spell)
case SPELL_DETECT_CREATURES: return TILEG_DETECT_CREATURES;
// Spells still missing tiles:
- case SPELL_PORTAL_PROJECTILE:
case SPELL_DEATHS_DOOR:
case SPELL_SUMMON_UGLY_THING:
- case SPELL_PHASE_SHIFT:
case SPELL_WARP_BRAND:
- case SPELL_STONEMAIL:
return TILEG_TODO;
// --------------------------------------------