diff options
| author | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
|---|---|---|
| committer | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
| commit | 8b692751aca0bde2d58bdba056c6b94661c3011b (patch) | |
| tree | d1bc81cf4af2cd5462fc563525b7d9da8a620e87 /crawl-ref/source/spl-data.h | |
| parent | 230ef3e62244bdff6adcb585676b0469e80f8b10 (diff) | |
| parent | b78098f4675f43661c4eadc0437d3c15462a63e2 (diff) | |
| download | crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.tar.gz crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.zip | |
Merge branch 'master' into summon_spells
Conflicts:
crawl-ref/source/enum.h
crawl-ref/source/spl-data.h
crawl-ref/source/spl-summoning.cc
Diffstat (limited to 'crawl-ref/source/spl-data.h')
| -rw-r--r-- | crawl-ref/source/spl-data.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index c50b3364e8..8eb9c57730 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -1612,7 +1612,7 @@ struct spell_desc SPELL_ENGLACIATION, "Metabolic Englaciation", SPTYP_HEXES | SPTYP_ICE, SPFLAG_AREA, - 6, + 5, 200, -1, -1, 0, @@ -3598,6 +3598,30 @@ struct spell_desc 0, NULL, false, +}, + +{ + SPELL_SHADOW_SHARD, "Shadow Shard", + SPTYP_CONJURATION, + SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER, + 5, + 200, + LOS_RADIUS, LOS_RADIUS, + 0, + NULL, + true, +}, + +{ + SPELL_SHADOW_BOLT, "Shadow Bolt", + SPTYP_CONJURATION, + SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER, + 5, + 200, + LOS_RADIUS, LOS_RADIUS, + 0, + NULL, + true, false }, |