From fc10f56f28ba5340ad3f7f120ceff7c3a117df3f Mon Sep 17 00:00:00 2001
From: otowakotori <806682153@qq.com>
Date: Sat, 21 Mar 2020 22:44:32 +0800
Subject: [PATCH] Make using item respect preUseTalent Currently, using item
talent will not check talent's on_pre_use. For example, Threads of Fate can
use See the Threads infinite times on a same map, which is contrary to talent
description. This patch will make it check actor:preUseTalent, with
force_talent_ignore_ressources=1 The HotkeysIconsDisplay is also modified to
check preUseTalent. This would need some tests to see if it would break any
item talents.
---
game/engines/default/engine/HotkeysIconsDisplay.lua | 10 +++++++++-
game/modules/tome/class/Object.lua | 12 +++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/game/engines/default/engine/HotkeysIconsDisplay.lua b/game/engines/default/engine/HotkeysIconsDisplay.lua
index 5acfab8376..ebf12af75f 100644
--- a/game/engines/default/engine/HotkeysIconsDisplay.lua
+++ b/game/engines/default/engine/HotkeysIconsDisplay.lua
@@ -232,6 +232,14 @@ function _M:display()
if o and o.wielded then
frame = "sustain"
end
+ if o and o.wielded and o.use_talent and o.use_talent.id then
+ local t = a:getTalentFromId(o.use_talent.id)
+ if not a:preUseTalent(t, true, true) then
+ angle = 0
+ color = {190,190,190}
+ frame = "disabled"
+ end
+ end
end
self.font:setStyle("bold")
@@ -407,7 +415,7 @@ function _M:onMouse(button, mx, my, click, on_over, on_click)
if t then
text = tstring{{"color","GOLD"}, {"font", "bold"}, t.name .. (config.settings.cheat and " ("..t.id..")" or ""), {"font", "normal"}, {"color", "LAST"}, true}
text:merge(self.actor:getTalentFullDescription(t))
- else text = "Unknown!" end
+ else text = _t"Unknown!" end
elseif a.hotkey[i] and a.hotkey[i][1] == "inventory" then
local o = a:findInAllInventories(a.hotkey[i][2], {no_add_name=true, force_id=true, no_count=true})
if o then
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index c92055cb10..4908e43a94 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -239,7 +239,17 @@ function _M:useObject(who, ...)
local id = self.use_talent.id
local ab = self:getTalentFromId(id)
local old_level = who.talents[id]; who.talents[id] = self.use_talent.level
- local ret = ab.action(who, ab)
+
+ who:attr("force_talent_ignore_ressources", 1)
+ local ret = false
+ if not who:preUseTalent(ab) then
+ ret = false
+ else
+ local ok, special
+ ok, ret, special = xpcall(function() return ab.action(who, ab) end, debug.traceback)
+ if not ok then who:onTalentLuaError(ab, ret) error(ret) end
+ end
+ who:attr("force_talent_ignore_ressources", -1)
who.talents[id] = old_level
if ret then
--
GitLab