From 4f28b8d761a71a7091eaa65f6610e0194fc5afcd Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Mon, 21 Dec 2015 20:01:24 +0100
Subject: [PATCH] things
---
game/modules/tome/class/Actor.lua | 2 +-
game/modules/tome/class/interface/Archery.lua | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 8ad7d44eab..721cba05b9 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -2074,7 +2074,7 @@ function _M:onTakeHit(value, src, death_note)
end
-- Un-daze
- if self:hasEffect(self.EFF_DAZED) then
+ if self:hasEffect(self.EFF_DAZED) and not self:attr("damage_dont_undaze") then
self:removeEffect(self.EFF_DAZED)
end
diff --git a/game/modules/tome/class/interface/Archery.lua b/game/modules/tome/class/interface/Archery.lua
index 17e43f387a..430a7c88a9 100644
--- a/game/modules/tome/class/interface/Archery.lua
+++ b/game/modules/tome/class/interface/Archery.lua
@@ -587,7 +587,7 @@ local function archery_projectile(tx, ty, tg, self, tmp)
end
end
- self:fireTalentCheck("callbackOnArcheryAttack", target, hitted, crit, weapon, ammo, damtype, mult, dam)
+ self:fireTalentCheck("callbackOnArcheryAttack", target, hitted, crit, weapon, ammo, damtype, mult, dam, talent)
-- hook to resolve after archery damage has been applied
local hd = {"Combat:archeryHit", hitted=hitted, crit=crit, tg=tg, target=target, weapon=weapon, ammo=ammo, damtype=damtype, mult=mult, dam=dam}
if self:triggerHook(hd) then hitted = hd.hitted end
--
GitLab