From a5b3fdeafb616046590f05c893577c1ddc6eb7e2 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Sun, 20 Oct 2019 01:18:56 +0200
Subject: [PATCH] plop
---
game/modules/tome/dialogs/CharacterSheet.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/game/modules/tome/dialogs/CharacterSheet.lua b/game/modules/tome/dialogs/CharacterSheet.lua
index aa4a2dad24..19c8cdda1c 100644
--- a/game/modules/tome/dialogs/CharacterSheet.lua
+++ b/game/modules/tome/dialogs/CharacterSheet.lua
@@ -942,7 +942,7 @@ The amount of %s automatically gained or lost each turn.]]):format(res_def.name,
"%3d", "%+.0f", 1, false, false, dam)
self:mouseTooltip(self.TOOLTIP_COMBAT_DAMAGE, s:drawColorStringBlended(self.font, ("Damage : #00ff00#%s"):format(text), w, h, 255, 255, 255, true))
if combat.block then -- or combatc and combatc.block then
- text = compare_fields(player, actor_to_compare, function(actor, ...) return actor == actor_to_compare and combatc.block or combat.block end, "%3d", "%+.0f", 1, false, false, dam)
+ text = compare_fields(player, actor_to_compare, function(actor, ...) return actor == actor_to_compare and ((combatc.block or 0) + (actor:attr("block_bonus") or 0)) or ((combat.block or 0) + (actor:attr("block_bonus") or 0)) end, "%3d", "%+.0f", 1, false, false, dam)
self:mouseTooltip(self.TOOLTIP_COMBAT_BLOCK, s:drawColorStringBlended(self.font, ("Block : #00ff00#%s"):format(text), self.w*.14, h, 255, 255, 255, true))-- h = h + self.font_h
end
h = h + self.font_h
--
GitLab