Skip to content
Snippets Groups Projects
Commit 1b5058d0 authored by DarkGod's avatar DarkGod
Browse files

plop

parent b7b5d446
No related branches found
No related tags found
No related merge requests found
...@@ -399,6 +399,8 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr) ...@@ -399,6 +399,8 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
print("[PROJECTOR] final dam after static checks", dam) print("[PROJECTOR] final dam after static checks", dam)
local initial_dam = dam
local hd = {"DamageProjector:final", src=src, x=x, y=y, type=type, dam=dam, tmp=tmp, no_martyr=no_martyr} local hd = {"DamageProjector:final", src=src, x=x, y=y, type=type, dam=dam, tmp=tmp, no_martyr=no_martyr}
if src:triggerHook(hd) then dam = hd.dam if hd.stopped then return hd.stopped end end if src:triggerHook(hd) then dam = hd.dam if hd.stopped then return hd.stopped end end
if target.fireTalentCheck then if target.fireTalentCheck then
...@@ -414,7 +416,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr) ...@@ -414,7 +416,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
local source_talent = src.__projecting_for and src.__projecting_for.project_type and (src.__projecting_for.project_type.talent_id or src.__projecting_for.project_type.talent) and src.getTalentFromId and src:getTalentFromId(src.__projecting_for.project_type.talent or src.__projecting_for.project_type.talent_id) local source_talent = src.__projecting_for and src.__projecting_for.project_type and (src.__projecting_for.project_type.talent_id or src.__projecting_for.project_type.talent) and src.getTalentFromId and src:getTalentFromId(src.__projecting_for.project_type.talent or src.__projecting_for.project_type.talent_id)
local dead local dead
dead, dam = target:takeHit(dam, src, {damtype=type, source_talent=source_talent, initial_dam=dam}) dead, dam = target:takeHit(dam, src, {damtype=type, source_talent=source_talent, initial_dam=initial_dam})
-- Log damage for later -- Log damage for later
if not DamageType:get(type).hideMessage then if not DamageType:get(type).hideMessage 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