diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-10 19:17:56 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-10 19:17:56 +0000 |
commit | a3b90b35f219a194ac3a060f8ceb397244b1a11b (patch) | |
tree | 4ae2b73ae703237ed1dfdf2d61def44ea3ae9ee1 | |
parent | 0d2414a4c6a3ca8e5a5b1a01177bfac18f0457f4 (diff) | |
download | crawl-ref-a3b90b35f219a194ac3a060f8ceb397244b1a11b.tar.gz crawl-ref-a3b90b35f219a194ac3a060f8ceb397244b1a11b.zip |
Fix a few cases where spellbooks didn't have spells in ascending order
by level.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7435 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/itemname.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-book.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index c8dee0bc45..83f4b58792 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1618,7 +1618,7 @@ std::string item_def::name_aux( description_level_type desc, buff << " [ice]"; break; case STAFF_DESTRUCTION_III: - buff << " [iron,fireball,lightning]"; + buff << " [lightning,iron,fireball]"; break; case STAFF_DESTRUCTION_IV: buff << " [inacc,magma,cold]"; diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index f492d951af..1bcbbabc7a 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -265,10 +265,10 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] = SPELL_NO_SPELL, }, // 22 - Book of Healing -- XXX: not used - {SPELL_CURE_POISON_I, - SPELL_LESSER_HEALING, - SPELL_GREATER_HEALING, + {SPELL_LESSER_HEALING, + SPELL_CURE_POISON_I, SPELL_PURIFICATION, + SPELL_GREATER_HEALING, SPELL_NO_SPELL, SPELL_NO_SPELL, SPELL_NO_SPELL, @@ -614,17 +614,17 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] = SPELL_NO_SPELL, SPELL_NO_SPELL, }, - // 54 - Rod of destruction (iron, fireball, lightning) - {SPELL_BOLT_OF_IRON, + // 54 - Rod of destruction (lightning, iron, fireball) + {SPELL_LIGHTNING_BOLT, + SPELL_BOLT_OF_IRON, SPELL_FIREBALL, - SPELL_LIGHTNING_BOLT, SPELL_NO_SPELL, SPELL_NO_SPELL, SPELL_NO_SPELL, SPELL_NO_SPELL, SPELL_NO_SPELL, }, - // 55 - Rod of destruction (bolts) + // 55 - Rod of destruction (inaccuracy, magma, cold) {SPELL_BOLT_OF_INACCURACY, SPELL_BOLT_OF_MAGMA, SPELL_BOLT_OF_COLD, |