Skip to content
Snippets Groups Projects
Commit 81014e86 authored by dg's avatar dg
Browse files

Fearscape and Flame of Urh'Rok correctly interact

Fearscape icon fixed


git-svn-id: http://svn.net-core.org/repos/t-engine4@4395 51575b47-30f0-44d4-a5cc-537603b46e54
parent 6d229423
No related branches found
No related tags found
No related merge requests found
......@@ -133,14 +133,14 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
target:setEffect(target.EFF_SMEARED, 6, {src=src, power=smear/6})
dam = 0
end
-- affinity healing, we store it to apply it after damage is resolved
local affinity_heal = 0
if target.damage_affinity then
local aff = (target.damage_affinity[type] or 0) / 100
affinity_heal = (dam * aff)
end
-- Reduce damage with resistance
if target.resists then
local pen = 0
......@@ -205,7 +205,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
target:setEffect(target.EFF_ELEMENTAL_HARMONY, 5 + math.ceil(target:attr("elemental_harmony")), {power=target:attr("elemental_harmony"), type=type})
end
end
-- damage affinity healing
if not target.dead and affinity_heal > 0 then
target:heal(affinity_heal)
......@@ -1129,7 +1129,7 @@ newDamageType{
name = "demonfire", type = "DEMONFIRE",
projector = function(src, x, y, type, dam)
local target = game.level.map(x, y, Map.ACTOR)
if target and target.demon then
if target and target:attr("demon") then
target:heal(dam)
return -dam
elseif target then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment