From 6ed9e8a02dc7cfacf908f8a2c5c87e8fc513814d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 12 Oct 2010 12:24:33 +0000
Subject: [PATCH] Self-target warning will now show which talent is responsible
git-svn-id: http://svn.net-core.org/repos/t-engine4@1504 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/interface/GameTargeting.lua | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/game/engines/default/engine/interface/GameTargeting.lua b/game/engines/default/engine/interface/GameTargeting.lua
index acc8be2e72..cb8787e0c9 100644
--- a/game/engines/default/engine/interface/GameTargeting.lua
+++ b/game/engines/default/engine/interface/GameTargeting.lua
@@ -90,7 +90,7 @@ function _M:targetMode(v, msg, co, typ)
end
end
if self.target_warning and self.target.target.x == self.player.x and self.target.target.y == self.player.y then
- Dialog:yesnoPopup("Target yourself?", "Are you sure you want to target yourself?", fct)
+ Dialog:yesnoPopup(self.target_warning or "Target yourself?", "Are you sure you want to target yourself?", fct)
else
fct(true)
end
@@ -102,6 +102,11 @@ function _M:targetMode(v, msg, co, typ)
self.target:setActive(true, typ)
self.target_style = "lock"
self.target_warning = true
+ if type(typ) == "table" and typ.talent then
+ self.target_warning = typ.talent.name
+ elseif type(typ) == "table" and typ.__name then
+ self.target_warning = typ.__name
+ end
-- Exclusive mode means we disable the current key handler and use a specific one
-- that only allows targetting and resumes talent coroutine when done
--
GitLab