From 9fcc7c41761ea968d0da075f2974a8908a2ef19b Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Thu, 24 Dec 2009 20:34:29 +1000 Subject: New (rakshasa) unique: Mara, Lord of Ilusions. This re-uses several ideas from the Emerald Eye FR, and implements the spell "Mislead": this grants the "Misled" status effect to the player, and causes on-level monsters to appear (glyph, name and tile) to be other monsters. Only their appearance is changed. Healing potions and rain remove this status effect. Mara also has a beefed-up version of the Rakshasa clone spell: it instead creates an "exact" clone (slightly altered spells list, and non-unique status for his clones). Only two will ever be created at once. Finally, he has the spell "Summon Player Ghost". This spell creates a ghost of the player (though marked as a summon, meaning that it (shouldn't) register a milestone, though it will be treated as a self-ghost kill) that is hostile. Only one of these should be existant at any one point in time. I'm pretty sure that I haven't broken anything, but would definitely appreciate someone sanity-checking this commit. Known minor issue: Kirke's summon ugly things being cast while having the Misled status causes them to show up with no glyph. --- crawl-ref/source/spl-data.h | 178 ++++++++++++++++++++++++++++---------------- 1 file changed, 115 insertions(+), 63 deletions(-) (limited to 'crawl-ref/source/spl-data.h') diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 27f1ea2632..3adc30d1d3 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 }, { -- cgit v1.2.3-54-g00ecf