diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-27 17:48:37 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-27 17:48:37 +0100 |
| commit | 42d227a273a1334b60ca7574a8127d1a4b2744a1 (patch) | |
| tree | 2655bcdeab4c1e157906b88ccefdda7645ee580a /crawl-ref/source/spl-data.h | |
| parent | 5b7701dc9d19fdad4de1a64b41995d65c03b7df6 (diff) | |
| parent | dc3e12a4da48363a7cadb77f30b8e784d5f82acf (diff) | |
| download | crawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.tar.gz crawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.zip | |
Merge branch 'master' into iood
Diffstat (limited to 'crawl-ref/source/spl-data.h')
| -rw-r--r-- | crawl-ref/source/spl-data.h | 178 |
1 files changed, 115 insertions, 63 deletions
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 52a94a8786..215d28a2b8 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -2500,93 +2500,145 @@ { SPELL_FLAME_AMMUNITION, "Flame Ammunition", - SPTYP_ENCHANTMENT | SPTYP_FIRE, - SPFLAG_HELPFUL | SPFLAG_BATTLE, - 3, - 0, - -1,-1, - 0, - NULL, - false, - true + SPTYP_ENCHANTMENT | SPTYP_FIRE, + SPFLAG_HELPFUL | SPFLAG_BATTLE, + 3, + 0, + -1,-1, + 0, + NULL, + false, + true }, { SPELL_FROST_AMMUNITION, "Frost Ammunition", - SPTYP_ENCHANTMENT | SPTYP_ICE, - SPFLAG_HELPFUL | SPFLAG_BATTLE, - 3, - 0, - -1,-1, - 0, - NULL, - false, - true + SPTYP_ENCHANTMENT | SPTYP_ICE, + SPFLAG_HELPFUL | SPFLAG_BATTLE, + 3, + 0, + -1,-1, + 0, + NULL, + false, + true }, { SPELL_SHOCKING_AMMUNITION, "Shocking Ammunition", - SPTYP_ENCHANTMENT | SPTYP_AIR, - SPFLAG_HELPFUL | SPFLAG_BATTLE, - 5, - 0, - -1,-1, - 0, - NULL, - false, - true + SPTYP_ENCHANTMENT | SPTYP_AIR, + SPFLAG_HELPFUL | SPFLAG_BATTLE, + 5, + 0, + -1,-1, + 0, + NULL, + false, + true }, { SPELL_EXPLODING_AMMUNITION, "Exploding Ammunition", - SPTYP_ENCHANTMENT | SPTYP_FIRE | SPTYP_AIR, - SPFLAG_HELPFUL | SPFLAG_BATTLE, - 5, - 0, - -1,-1, - 0, - NULL, - false, - true + SPTYP_ENCHANTMENT | SPTYP_FIRE | SPTYP_AIR, + SPFLAG_HELPFUL | SPFLAG_BATTLE, + 5, + 0, + -1,-1, + 0, + NULL, + false, + true }, { SPELL_WARP_AMMUNITION, "Warp Ammunition", - SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION, - SPFLAG_HELPFUL | SPFLAG_BATTLE, - 5, - 0, - -1,-1, - 0, - NULL, - false, - true + SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION, + SPFLAG_HELPFUL | SPFLAG_BATTLE, + 5, + 0, + -1,-1, + 0, + NULL, + false, + true }, { SPELL_REAPING_AMMUNITION, "Reaping Ammunition", - SPTYP_ENCHANTMENT | SPTYP_NECROMANCY, - SPFLAG_HELPFUL | SPFLAG_BATTLE, - 7, - 0, - -1,-1, - 0, - NULL, - false, - true + SPTYP_ENCHANTMENT | SPTYP_NECROMANCY, + SPFLAG_HELPFUL | SPFLAG_BATTLE, + 7, + 0, + -1,-1, + 0, + NULL, + false, + true }, { SPELL_RETURNING_AMMUNITION, "Returning Ammunition", - SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION, - SPFLAG_HELPFUL | SPFLAG_BATTLE, - 3, - 0, - -1,-1, - 0, - NULL, - false, - true + SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION, + SPFLAG_HELPFUL | SPFLAG_BATTLE, + 3, + 0, + -1,-1, + 0, + NULL, + false, + true +}, + +{ + SPELL_FAKE_MARA_SUMMON, "Mara Summon", + SPTYP_SUMMONING, + SPFLAG_MONSTER, + 5, + 0, + -1, -1, + 0, + NULL, + false, + false +}, + +{ + SPELL_SUMMON_RAKSHASA, "Summon Rakshasa", + SPTYP_SUMMONING, + SPFLAG_MONSTER, + 5, + 0, + -1, -1, + 0, + NULL, + false, + false +}, + +{ + SPELL_MISLEAD, "Mislead", + SPTYP_ENCHANTMENT, + SPFLAG_TARGET | SPFLAG_NOT_SELF, + 5, + 200, + LOS_RADIUS, LOS_RADIUS, + 0, + NULL, + false, + false +}, + +{ + SPELL_SUMMON_PLAYER_GHOST, "Summon Player Ghost", + SPTYP_SUMMONING, + SPFLAG_MONSTER, + 5, + 0, + -1, -1, + 0, + NULL, + false, + false }, { |