From 3a6a935f7a2024f659796c2f088de768e05ae199 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 20 Jan 2011 13:18:05 +0000
Subject: [PATCH] Talents that can not be used will only grey out after the
cooldown has elpased
git-svn-id: http://svn.net-core.org/repos/t-engine4@2444 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/HotkeysDisplay.lua | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/game/engines/default/engine/HotkeysDisplay.lua b/game/engines/default/engine/HotkeysDisplay.lua
index 7cb41fe7c6..b1dde594a3 100644
--- a/game/engines/default/engine/HotkeysDisplay.lua
+++ b/game/engines/default/engine/HotkeysDisplay.lua
@@ -90,16 +90,15 @@ function _M:display()
if ts[3] == "talent" then
local tid = ts[1]
local t = a:getTalentFromId(tid)
- local can_use = a:preUseTalent(t, true, true)
- if not can_use then
- txt = t.name
- color = {190,190,190}
- elseif a:isTalentCoolingDown(t) then
+ if a:isTalentCoolingDown(t) then
txt = ("%s (%d)"):format(t.name, a:isTalentCoolingDown(t))
color = {255,0,0}
elseif a:isTalentActive(t.id) then
txt = t.name
color = {255,255,0}
+ elseif not a:preUseTalent(t, true, true) then
+ txt = t.name
+ color = {190,190,190}
else
txt = t.name
color = {0,255,0}
--
GitLab