From 5eaa66af1688174658df9245bac5e1f0ab88f011 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Thu, 9 Jan 2014 22:29:10 +0100
Subject: [PATCH] Fixed unarmed display of combat speed on gloves/gauntlets
---
game/modules/tome/class/Object.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 0d04bb7aa7..b2454e6acb 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -484,7 +484,7 @@ function _M:getTextualDesc(compare_with, use_actor)
end
end
- local desc_combat = function(combat, compare_with, field, add_table)
+ local desc_combat = function(combat, compare_with, field, add_table, is_fake_add)
add_table = add_table or {}
add_table.dammod = add_table.dammod or {}
combat = combat[field] or {}
@@ -539,7 +539,7 @@ function _M:getTextualDesc(compare_with, use_actor)
compare_fields(combat, compare_with, field, "atk", "%+d", "Accuracy: ", 1, false, false, add_table)
compare_fields(combat, compare_with, field, "apr", "%+d", "Armour Penetration: ", 1, false, false, add_table)
compare_fields(combat, compare_with, field, "physcrit", "%+.1f%%", "Physical crit. chance: ", 1, false, false, add_table)
- compare_fields(combat, compare_with, field, "physspeed", function() return ("%.0f%%"):format(100/(combat.physspeed or 1)) end, "Attack speed: ", 100, false, true, add_table)
+ compare_fields(combat, compare_with, field, "physspeed", function() return ("%.0f%%"):format(100/((is_fake_add and 1 or 0) + (combat.physspeed or 1))) end, "Attack speed: ", 100, false, true, add_table)
compare_fields(combat, compare_with, field, "block", "%+d", "Block value: ", 1, false, false, add_table)
@@ -1140,7 +1140,7 @@ function _M:getTextualDesc(compare_with, use_actor)
if (w and w.combat or can_combat_unarmed) and (use_actor:knowTalent(use_actor.T_EMPTY_HAND) or use_actor:attr("show_gloves_combat")) then
desc:add({"color","YELLOW"}, "When used to modify unarmed attacks:", {"color", "LAST"}, true)
compare_tab = { dam=1, atk=1, apr=0, physcrit=0, physspeed =0.6, dammod={str=1}, damrange=1.1 }
- desc_combat(w, compare_unarmed, "combat", compare_tab)
+ desc_combat(w, compare_unarmed, "combat", compare_tab, true)
end
end
local can_combat = false
--
GitLab