Commit d2c1810bd45887bf212300a5407f3c6f45a6d7a2

Authored by DarkGod
1 parent 1e39768a

Fixed Aura of Undeath, Surge of Undeath and Chill of the Tomb to work even if Th…

…rough The Crowd is active
@@ -80,7 +80,7 @@ newTalent{ @@ -80,7 +80,7 @@ newTalent{
80 direct_hit = true, 80 direct_hit = true,
81 requires_target = true, 81 requires_target = true,
82 target = function(self, t) 82 target = function(self, t)
83 - return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=self:spellFriendlyFire(), talent=t, display={particle="bolt_ice", trail="icetrail"}} 83 + return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), ignore_nullify_all_friendlyfire=true, selffire=self:spellFriendlyFire(), talent=t, display={particle="bolt_ice", trail="icetrail"}}
84 end, 84 end,
85 getDamage = function(self, t) return self:combatTalentSpellDamage(t, 28, 280) end, 85 getDamage = function(self, t) return self:combatTalentSpellDamage(t, 28, 280) end,
86 getFlatResist = function(self, t) return math.floor(self:combatTalentScale(t, 5, 25)) end, 86 getFlatResist = function(self, t) return math.floor(self:combatTalentScale(t, 5, 25)) end,
@@ -30,7 +30,7 @@ newTalent{ @@ -30,7 +30,7 @@ newTalent{
30 getResists = function(self, t) return math.floor(self:combatTalentScale(t, 8, 18)) end, 30 getResists = function(self, t) return math.floor(self:combatTalentScale(t, 8, 18)) end,
31 getInherit = function(self, t) return math.floor(self:combatTalentLimit(t, 75, 20, 40)) end, 31 getInherit = function(self, t) return math.floor(self:combatTalentLimit(t, 75, 20, 40)) end,
32 callbackOnActBase = function(self, t) 32 callbackOnActBase = function(self, t)
33 - self:projectApply({type="ball", radius=self:getTalentRadius(t)}, self.x, self.y, Map.ACTOR, function(target) 33 + self:projectApply({type="ball", radius=self:getTalentRadius(t), ignore_nullify_all_friendlyfire=true}, self.x, self.y, Map.ACTOR, function(target)
34 if target.summoner == self and target.necrotic_minion and not target:hasEffect(target.EFF_NECROTIC_AURA) then 34 if target.summoner == self and target.necrotic_minion and not target:hasEffect(target.EFF_NECROTIC_AURA) then
35 target:setEffect(target.EFF_NECROTIC_AURA, 1, {power=t:_getResists(self)}) 35 target:setEffect(target.EFF_NECROTIC_AURA, 1, {power=t:_getResists(self)})
36 end 36 end
@@ -64,7 +64,7 @@ newTalent{ @@ -64,7 +64,7 @@ newTalent{
64 tactical = { BUFF=function(self) return necroArmyStats(self).nb / 2 end, DISABLE = {daze=2} }, 64 tactical = { BUFF=function(self) return necroArmyStats(self).nb / 2 end, DISABLE = {daze=2} },
65 range = 0, 65 range = 0,
66 radius = function(self, t) return self:callTalent(self.T_NECROTIC_AURA, "radius") end, 66 radius = function(self, t) return self:callTalent(self.T_NECROTIC_AURA, "radius") end,
67 - target = function(self, t) return {type="ball", range=0, radius=self:getTalentRadius(t)} end, 67 + target = function(self, t) return {type="ball", range=0, radius=self:getTalentRadius(t), ignore_nullify_all_friendlyfire=true} end,
68 requires_target = true, 68 requires_target = true,
69 getSpeed = function(self, t) return math.floor(self:combatTalentScale(t, 2, 5)) end, 69 getSpeed = function(self, t) return math.floor(self:combatTalentScale(t, 2, 5)) end,
70 getHeal = function(self, t) return math.floor(self:combatTalentScale(t, 12, 22)) end, 70 getHeal = function(self, t) return math.floor(self:combatTalentScale(t, 12, 22)) end,
@@ -300,7 +300,7 @@ newTalent{ @@ -300,7 +300,7 @@ newTalent{
300 callbackOnSummonDeath = function(self, t, summon, killer, death_note) 300 callbackOnSummonDeath = function(self, t, summon, killer, death_note)
301 if not summon.is_bone_giant and not summon.skeleton_minion then return end 301 if not summon.is_bone_giant and not summon.skeleton_minion then return end
302 -- if killer and killer.reactionToward and killer:reactionToward(summon) >= 0 then return end 302 -- if killer and killer.reactionToward and killer:reactionToward(summon) >= 0 then return end
303 - summon:projectApply({type="ball", radius=self:getTalentRadius(t)}, summon.x, summon.y, Map.ACTOR, function(target) 303 + summon:projectApply({type="ball", radius=self:getTalentRadius(t), ignore_nullify_all_friendlyfire=true}, summon.x, summon.y, Map.ACTOR, function(target)
304 if target.summoner == self and (target.is_bone_giant or target.skeleton_minion) then 304 if target.summoner == self and (target.is_bone_giant or target.skeleton_minion) then
305 target:setEffect(target.EFF_SHATTERED_REMAINS, 20, {health=t:_getHealth(self), armor=t:_getArmor(self), retaliation=t:_getRetaliation(self)}) 305 target:setEffect(target.EFF_SHATTERED_REMAINS, 20, {health=t:_getHealth(self), armor=t:_getArmor(self), retaliation=t:_getRetaliation(self)})
306 elseif self:reactionToward(target) < 0 and target:canBe("bleed") then 306 elseif self:reactionToward(target) < 0 and target:canBe("bleed") then