diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-30 14:31:12 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-30 14:31:12 +0100 |
| commit | d8190f4c633d2c4065e92c61894f85f506d5246a (patch) | |
| tree | 887402a9869486e5a23386bc41dec9fae1987d39 /crawl-ref/source/spl-data.h | |
| parent | 1d0cbf5f8be4dcb3d78167d3a1f29691779298f8 (diff) | |
| parent | 30ad58ea18d6e4e2132d235e60f66f11131e17dc (diff) | |
| download | crawl-ref-d8190f4c633d2c4065e92c61894f85f506d5246a.tar.gz crawl-ref-d8190f4c633d2c4065e92c61894f85f506d5246a.zip | |
Merge branch 'master' into iood
Diffstat (limited to 'crawl-ref/source/spl-data.h')
| -rw-r--r-- | crawl-ref/source/spl-data.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index d1f567d942..9de226af2e 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -927,7 +927,7 @@ SPTYP_TRANSMUTATION | SPTYP_NECROMANCY, SPFLAG_NONE, 1, - 50, + 0, -1, -1, 0, NULL, @@ -2642,6 +2642,32 @@ }, { + SPELL_PRIMAL_WAVE, "Primal Wave", + SPTYP_CONJURATION | SPTYP_ICE, + SPFLAG_DIR_OR_TARGET, + 6, + 200, + 7, 7, + 0, + NULL, + true, + false +}, + +{ + SPELL_CALL_TIDE, "Call Tide", + SPTYP_TRANSLOCATION, + SPFLAG_MONSTER, + 7, + 0, + -1, -1, + 0, + NULL, + false, + false +}, + +{ SPELL_IOOD, "Orb of Destruction", SPTYP_CONJURATION, SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF, |