diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua index c17a57d181a8cbc0873233370ab3a612dfebd655..1954672c28cf6f8313e87628e7faa0afeb33f653 100644 --- a/game/modules/tome/class/interface/Combat.lua +++ b/game/modules/tome/class/interface/Combat.lua @@ -170,6 +170,8 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed) break_stealth = true end + local totaldam = 0 + if not speed and not self:attr("disarmed") and not self:isUnarmed() and not force_unarmed then local double_weapon -- All weapons in main hands @@ -179,7 +181,8 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed) if combat and not o.archery then if o.double_weapon and not double_weapon then double_weapon = o end print("[ATTACK] attacking with (mainhand)", o.name) - local s, h = self:attackTargetWith(target, combat, damtype, mult) + local s, h, _curdam = self:attackTargetWith(target, combat, damtype, mult) + if _curdam then totaldam = totaldam + _curdam end speed = math.max(speed or 0, s) hit = hit or h if hit and not sound then sound = combat.sound @@ -205,7 +208,8 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed) else offhand = true print("[ATTACK] attacking with (offhand)", o.name) - local s, h = self:attackTargetWith(target, combat, damtype, offmult) + local s, h, _curdam = self:attackTargetWith(target, combat, damtype, offmult) + if _curdam then totaldam = totaldam + _curdam end speed = math.max(speed or 0, s) hit = hit or h if hit and not sound then sound = combat.sound @@ -220,7 +224,8 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed) if not speed and self.combat then print("[ATTACK] attacking with innate combat") local combat = self:getObjectCombat(nil, "barehand") - local s, h = self:attackTargetWith(target, combat, damtype, mult) + local s, h, _curdam = self:attackTargetWith(target, combat, damtype, mult) + if _curdam then totaldam = totaldam + _curdam end speed = math.max(speed or 0, s) hit = hit or h if hit and not sound then sound = combat.sound @@ -249,7 +254,7 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed) -- Cancel stealth! if break_stealth then self:breakStealth() end self:breakLightningSpeed() - return hit + return hit, totaldam end --- Determines the combat field to use for this item diff --git a/game/modules/tome/data/gfx/shockbolt/stars/eyal.png b/game/modules/tome/data/gfx/shockbolt/stars/eyal.png index 88c6b0348303c9060157d835d61b2b62350c63b3..4fe68f5ed7e0b6ede24b7b6d90dd83d178423912 100644 Binary files a/game/modules/tome/data/gfx/shockbolt/stars/eyal.png and b/game/modules/tome/data/gfx/shockbolt/stars/eyal.png differ