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/spl-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/spl-data.h')
| -rw-r--r-- | crawl-ref/source/spl-data.h | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 695da8f2b3..da876959ca 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -478,6 +478,7 @@ struct spell_desc false }, +#if TAG_MAJOR_VERSION == 34 { SPELL_SUMMON_SCORPIONS, "Summon Scorpions", SPTYP_SUMMONING | SPTYP_POISON, @@ -490,6 +491,7 @@ struct spell_desc false, false }, +#endif { SPELL_BOLT_OF_DRAINING, "Bolt of Draining", @@ -3561,6 +3563,45 @@ struct spell_desc }, { + SPELL_SUMMON_FOREST, "Summon Forest", + SPTYP_SUMMONING | SPTYP_TRANSLOCATION, + SPFLAG_NONE, + 5, + 200, + -1, -1, + 0, + NULL, + false, + false +}, + +{ + SPELL_SUMMON_LIGHTNING_SPIRE, "Summon Lightning Spire", + SPTYP_SUMMONING | SPTYP_AIR, + SPFLAG_GRID | SPFLAG_NOT_SELF | SPFLAG_NEUTRAL, + 4, + 200, + 2, 2, + 0, + NULL, + false, + false +}, + +{ + SPELL_SUMMON_GUARDIAN_GOLEM, "Summon Guardian Golem", + SPTYP_SUMMONING | SPTYP_HEXES, + SPFLAG_NONE, + 4, + 100, + -1, -1, + 0, + NULL, + false, + false, +}, + +{ SPELL_SHADOW_SHARD, "Shadow Shard", SPTYP_CONJURATION, SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER, @@ -3570,7 +3611,7 @@ struct spell_desc 0, NULL, true, - false + false, }, { |