diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-02-18 05:15:31 +0000 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-02-18 05:15:31 +0000 |
| commit | eee48f0d9395d0c654d6bde57d7ee194b4af79b2 (patch) | |
| tree | e3684559fb61af3370c208b26ca9b8c57eb55e4e /crawl-ref/source/book-data.h | |
| parent | a726785d79ffb50c0de99ec9a377efda8a11bcba (diff) | |
| parent | 7bb2d9cc7836f2801166a53ab5447280cc8411ce (diff) | |
| download | crawl-ref-eee48f0d9395d0c654d6bde57d7ee194b4af79b2.tar.gz crawl-ref-eee48f0d9395d0c654d6bde57d7ee194b4af79b2.zip | |
Merge branch 'summon_spells'
Diffstat (limited to 'crawl-ref/source/book-data.h')
| -rw-r--r-- | crawl-ref/source/book-data.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/book-data.h b/crawl-ref/source/book-data.h index 81957654ba..fcc83aa170 100644 --- a/crawl-ref/source/book-data.h +++ b/crawl-ref/source/book-data.h @@ -211,10 +211,10 @@ SPELL_SUMMON_SMALL_MAMMAL, SPELL_CALL_IMP, SPELL_CALL_CANINE_FAMILIAR, - SPELL_SUMMON_SCORPIONS, + SPELL_SUMMON_GUARDIAN_GOLEM, + SPELL_SUMMON_LIGHTNING_SPIRE, SPELL_SUMMON_ICE_BEAST, - SPELL_NO_SPELL, - SPELL_NO_SPELL, + SPELL_SUMMON_FOREST, SPELL_NO_SPELL, }, @@ -252,10 +252,10 @@ }, { // Book of the Warp - SPELL_RECALL, SPELL_CONTROL_TELEPORT, SPELL_PHASE_SHIFT, SPELL_WARP_BRAND, + SPELL_SUMMON_FOREST, SPELL_DISPERSAL, SPELL_CONTROLLED_BLINK, SPELL_DISJUNCTION, @@ -265,7 +265,7 @@ { // Book of Envenomations SPELL_SPIDER_FORM, SPELL_POISON_WEAPON, - SPELL_SUMMON_SCORPIONS, + SPELL_INTOXICATE, SPELL_OLGREBS_TOXIC_RADIANCE, SPELL_POISONOUS_CLOUD, SPELL_NO_SPELL, @@ -435,11 +435,11 @@ SPELL_LETHAL_INFUSION, SPELL_SUBLIMATION_OF_BLOOD, SPELL_CONDENSATION_SHIELD, - SPELL_INTOXICATE, SPELL_PETRIFY, SPELL_IGNITE_POISON, SPELL_NO_SPELL, SPELL_NO_SPELL, + SPELL_NO_SPELL, }, { // Book of Beasts |