summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-data.h
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 20:24:07 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 20:24:07 +0530
commit43d86ff397acfe79b6699845ae4e2ec9a8e485d0 (patch)
tree72a76a5ed900aa4ab9465bef1cbd0d7807bbbccd /crawl-ref/source/spl-data.h
parent3f8334b021c123a371f0dfe8062c3a84eebba673 (diff)
parent8efdaf11a28299dda120a8afe78702686a6e2a47 (diff)
downloadcrawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.tar.gz
crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.zip
Merge branch 'shoals++'
Diffstat (limited to 'crawl-ref/source/spl-data.h')
-rw-r--r--crawl-ref/source/spl-data.h26
1 files changed, 26 insertions, 0 deletions
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 61b544f635..75f92737b3 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -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_NO_SPELL, "nonexistent spell",
0,
SPFLAG_TESTING,