Add the last missing spell tiles.

Update change log.


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

13 files changed, 24 insertions, 27 deletions

diff --git a/crawl-ref/docs/changelog.txt b/crawl-ref/docs/changelog.txt
index 5a7c1e730a..fd1034a06f 100644
--- a/crawl-ref/docs/changelog.txt
+++ b/crawl-ref/docs/changelog.txt
@@ -1,9 +1,12 @@
 Stone Soup 0.6
 --------------
 * Two new gods: Jiyva, god of slime, and Feawn, god of plants.
+* Shorten Lair to eight levels.
 * Added scroll of silence.
 * Several new uniques.
+* Overhaul Wanderers.
 * Round all aptitudes to multiples of 10.
+* New memorisation interface.
 * Armour acquirement is more likely to fill secondary slots.
 * Book acquirement doesn't give manuals to spellcasting specialists anymore.
 * Added wands as an acquirement option.
diff --git a/crawl-ref/source/dat/descript/branches.txt b/crawl-ref/source/dat/descript/branches.txt
index d51bbfc38f..e28b5a23df 100644
--- a/crawl-ref/source/dat/descript/branches.txt
+++ b/crawl-ref/source/dat/descript/branches.txt
@@ -37,7 +37,7 @@ Most adventurers find the Lair of Beasts to be an exciting change of
 climate. And indeed, there is something to be said about getting gored,
 mauled and eaten rather than sliced, burnt or stabbed.
 
-The Lair is ten levels deep and contains the stairs to three more branches.
+The Lair is eight levels deep and contains the stairs to three more branches.
 %%%%
 Swamp
 
diff --git a/crawl-ref/source/rltiles/spells/earth/stonemail.png b/crawl-ref/source/rltiles/UNUSED/spells/stonemail.png
index 769e206686..769e206686 100644
--- a/crawl-ref/source/rltiles/spells/earth/stonemail.png
+++ b/crawl-ref/source/rltiles/UNUSED/spells/stonemail.png
diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt
index d609d32344..db3df935b2 100644
--- a/crawl-ref/source/rltiles/dc-spells.txt
+++ b/crawl-ref/source/rltiles/dc-spells.txt
@@ -48,7 +48,6 @@ sandblast SANDBLAST
 shatter SHATTER
 statue_form STATUE_FORM
 stone_arrow STONE_ARROW
-stonemail STONEMAIL
 stoneskin STONESKIN
 
 %sdir spells/enchantment
@@ -115,6 +114,7 @@ cigotuvis_degeneration CIGOTUVIS_DEGENERATION
 control_undead CONTROL_UNDEAD
 corpse_rot CORPSE_ROT
 death_channel DEATH_CHANNEL
+deaths_door DEATHS_DOOR
 dispel_undead DISPEL_UNDEAD
 excruciating_wounds EXCRUCIATING_WOUNDS
 fulsome_distillation FULSOME_DISTILLATION
@@ -158,6 +158,7 @@ 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_ugly_thing SUMMON_UGLY_THING
 summon_wraiths SUMMON_WRAITHS
 
 %sdir spells/translocation
@@ -172,6 +173,7 @@ portal PORTAL
 portal_projectile PORTAL_PROJECTILE
 teleport TELEPORT
 teleport_other TELEPORT_OTHER
+warp_weapon WARP_WEAPON
 
 %sdir spells/transmigration
 alter_self ALTER_SELF
diff --git a/crawl-ref/source/rltiles/spells/missing_spells.txt b/crawl-ref/source/rltiles/spells/missing_spells.txt
deleted file mode 100644
index 8e346ea25c..0000000000
--- a/crawl-ref/source/rltiles/spells/missing_spells.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Warp Brand
-Death's Door
-Summon Ugly Thing
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..b60e4e786c
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/necromancy/deaths_door.png
diff --git a/crawl-ref/source/rltiles/spells/summoning/summon_ugly_thing.png b/crawl-ref/source/rltiles/spells/summoning/summon_ugly_thing.png
new file mode 100644
index 0000000000..53d9c50647
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/summoning/summon_ugly_thing.png
diff --git a/crawl-ref/source/rltiles/spells/translocation/phase_shift.png b/crawl-ref/source/rltiles/spells/translocation/phase_shift.png
index e150d79542..c80bd86cb4 100644
--- a/crawl-ref/source/rltiles/spells/translocation/phase_shift.png
+++ b/crawl-ref/source/rltiles/spells/translocation/phase_shift.png
diff --git a/crawl-ref/source/rltiles/spells/translocation/portal_projectile.png b/crawl-ref/source/rltiles/spells/translocation/portal_projectile.png
index 7e4797e4ed..6de9b0f716 100644
--- a/crawl-ref/source/rltiles/spells/translocation/portal_projectile.png
+++ b/crawl-ref/source/rltiles/spells/translocation/portal_projectile.png
diff --git a/crawl-ref/source/rltiles/spells/translocation/temp.txt b/crawl-ref/source/rltiles/spells/translocation/temp.txt
deleted file mode 100644
index bbf04284dc..0000000000
--- a/crawl-ref/source/rltiles/spells/translocation/temp.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-portal projectile?
-warp brand?
-phase shift?
diff --git a/crawl-ref/source/rltiles/spells/translocation/warp_weapon.png b/crawl-ref/source/rltiles/spells/translocation/warp_weapon.png
new file mode 100644
index 0000000000..0fe4fd55ba
--- /dev/null
+++ b/crawl-ref/source/rltiles/spells/translocation/warp_weapon.png
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index a1c83caa89..6023dece43 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1485,6 +1485,16 @@ bool has_spells_to_memorise()
     return _get_mem_list(mem_spells, book_hash, num_unreadable, num_race, true);
 }
 
+static bool _sort_mem_spells(spell_type a, spell_type b)
+{
+    if (spell_fail(a) != spell_fail(b))
+        return (spell_fail(a) < spell_fail(b));
+    if (spell_difficulty(a) != spell_difficulty(b))
+        return (spell_difficulty(a) < spell_difficulty(b));
+
+    return (stricmp(spell_title(a), spell_title(b)) < 0);
+}
+
 std::vector<spell_type> get_mem_spell_list()
 {
     std::vector<spell_type> spells;
@@ -1497,22 +1507,14 @@ std::vector<spell_type> get_mem_spell_list()
     if (!_get_mem_list(mem_spells, book_hash, num_unreadable, num_race))
         return (spells);
 
+    std::sort(mem_spells.begin(), mem_spells.end(), _sort_mem_spells);
+
     for (unsigned int i = 0; i < mem_spells.size(); i++)
         spells.push_back(mem_spells[i]);
 
     return (spells);
 }
 
-static bool _sort_mem_spells(spell_type a, spell_type b)
-{
-    if (spell_fail(a) != spell_fail(b))
-        return (spell_fail(a) < spell_fail(b));
-    if (spell_difficulty(a) != spell_difficulty(b))
-        return (spell_difficulty(a) < spell_difficulty(b));
-
-    return (stricmp(spell_title(a), spell_title(b)) < 0);
-}
-
 static spell_type _choose_mem_spell(spell_list &spells,
                                     spells_to_books &book_hash,
                                     unsigned long num_unreadable,
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 89e4ba97f8..ab5dc9a7f7 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2748,7 +2748,6 @@ 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;
 
@@ -2824,6 +2823,7 @@ int tileidx_spell(spell_type spell)
     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_WARP_BRAND:               return TILEG_WARP_WEAPON;
     case SPELL_DISPERSAL:                return TILEG_DISPERSAL;
     case SPELL_PORTAL:                   return TILEG_PORTAL;
 
@@ -2837,6 +2837,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_SUMMON_SCORPIONS:         return TILEG_SUMMON_SCORPIONS;
     case SPELL_SUMMON_ELEMENTAL:         return TILEG_SUMMON_ELEMENTAL;
     case SPELL_SUMMON_DEMON:             return TILEG_SUMMON_DEMON;
+    case SPELL_SUMMON_UGLY_THING:        return TILEG_SUMMON_UGLY_THING;
     case SPELL_SHADOW_CREATURES:         return TILEG_SUMMON_SHADOW_CREATURES;
     case SPELL_SUMMON_ICE_BEAST:         return TILEG_SUMMON_ICE_BEAST;
     case SPELL_DEMONIC_HORDE:            return TILEG_DEMONIC_HORDE;
@@ -2864,6 +2865,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_CONTROL_UNDEAD:           return TILEG_CONTROL_UNDEAD;
     case SPELL_BOLT_OF_DRAINING:         return TILEG_BOLT_OF_DRAINING;
     case SPELL_SYMBOL_OF_TORMENT:        return TILEG_SYMBOL_OF_TORMENT;
+    case SPELL_DEATHS_DOOR:              return TILEG_DEATHS_DOOR;
     case SPELL_DEATH_CHANNEL:            return TILEG_DEATH_CHANNEL;
 
     // Transformation
@@ -2887,12 +2889,6 @@ int tileidx_spell(spell_type spell)
     case SPELL_DETECT_ITEMS:             return TILEG_DETECT_ITEMS;
     case SPELL_DETECT_CREATURES:         return TILEG_DETECT_CREATURES;
 
-    // Spells still missing tiles:
-    case SPELL_DEATHS_DOOR:
-    case SPELL_SUMMON_UGLY_THING:
-    case SPELL_WARP_BRAND:
-        return TILEG_TODO;
-
     // --------------------------------------------
     // Rods and abilities (tiles needed for later)
     // Abilities
@@ -2902,8 +2898,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_HELLFIRE:      // Demonspawn ability
 
     // Rod-only spells
-    case SPELL_PARALYSE:
-        return TILEG_PETRIFY; // similar effect
+    case SPELL_PARALYSE:      // we could reuse Petrify for this
     case SPELL_STRIKING:
     case SPELL_BOLT_OF_INACCURACY:
     case SPELL_SUMMON_SWARM:
@@ -2911,6 +2906,7 @@ int tileidx_spell(spell_type spell)
 
     // --------------------------------------------
     // Spells that don't need icons:
+    case SPELL_STONEMAIL:     // Xom only?
     case SPELL_SUMMON_DRAGON: // Xom
     case SPELL_DISRUPT:       // in development?
     case SPELL_DISINTEGRATE:  // wand and card