From e3a34cb0ad22556724c24d01284272952f85b00c Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 6 Mar 2013 22:03:44 +0000
Subject: [PATCH] New icon in the "main bar" to access talents

git-svn-id: http://svn.net-core.org/repos/t-engine4@6506 51575b47-30f0-44d4-a5cc-537603b46e54
---
 game/modules/tome/class/uiset/Minimalist.lua    |  16 +++++++++++++++-
 .../tome/data/gfx/ui/hotkeys/talents.png        | Bin 0 -> 6206 bytes
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 game/modules/tome/data/gfx/ui/hotkeys/talents.png

diff --git a/game/modules/tome/class/uiset/Minimalist.lua b/game/modules/tome/class/uiset/Minimalist.lua
index 34a9c69fdc..ac5a8ec42d 100644
--- a/game/modules/tome/class/uiset/Minimalist.lua
+++ b/game/modules/tome/class/uiset/Minimalist.lua
@@ -159,6 +159,7 @@ local mm_shadow = {core.display.loadImage("/data/gfx/ui/minimap/shadow.png"):glT
 local mm_transp = {core.display.loadImage("/data/gfx/ui/minimap/transp.png"):glTexture()}
 
 local tb_bg = {core.display.loadImage("/data/gfx/ui/hotkeys/icons_bg.png"):glTexture()}
+local tb_talents = {core.display.loadImage("/data/gfx/ui/hotkeys/talents.png"):glTexture()}
 local tb_inven = {core.display.loadImage("/data/gfx/ui/hotkeys/inventory.png"):glTexture()}
 local tb_lore = {core.display.loadImage("/data/gfx/ui/hotkeys/lore.png"):glTexture()}
 local tb_quest = {core.display.loadImage("/data/gfx/ui/hotkeys/quest.png"):glTexture()}
@@ -265,7 +266,7 @@ function _M:resetPlaces()
 		party = {x=pf_bg[6], y=0, scale=1, a=1},
 		gamelog = {x=0, y=hup - 210, w=math.floor(w/2), h=200, scale=1, a=1},
 		chatlog = {x=math.floor(w/2), y=hup - 210, w=math.floor(w/2), h=200, scale=1, a=1},
-		mainicons = {x=w - tb_bg[6] * 0.5, y=h - tb_bg[7] * 5 * 0.5 - 5, scale=1, a=1},
+		mainicons = {x=w - tb_bg[6] * 0.5, y=h - tb_bg[7] * 6 * 0.5 - 5, scale=1, a=1},
 		hotkeys = {x=10, y=h - th, w=w-60, h=th, scale=1, a=1},
 	}
 end
@@ -1822,6 +1823,19 @@ function _M:displayToolbar(scale, bx, by)
 	end
 	x, y = self:toolbarOrientStep(orient, bx, by, scale, x, y, tb_bg[6], tb_bg[7])
 
+	tb_bg[1]:toScreenFull		(x, y, tb_bg[6], tb_bg[7], tb_bg[2], tb_bg[3], 1, 1, 1, 1)
+	tb_talents[1]:toScreenFull	(x, y, tb_talents[6], tb_talents[7], tb_talents[2], tb_talents[3], self.tbbuttons.inven, self.tbbuttons.inven, self.tbbuttons.inven, 1)
+	if not game.mouse:updateZone("tb_talents", bx + x * scale, by +y*scale, tb_talents[6], tb_talents[7], nil, scale) then
+		game.mouse:unregisterZone("tb_talents")
+		local desc_fct = function(button, mx, my, xrel, yrel, bx, by, event)
+			if event == "out" then self.tbbuttons.inven = 0.6 return else self.tbbuttons.inven = 1 end
+			game.tooltip_x, game.tooltip_y = 1, 1; game:tooltipDisplayAtMap(game.w, game.h, "Left mouse to show known talents")
+			if button == "left" and not xrel and not yrel and event == "button" then game.key:triggerVirtual("USE_TALENTS") end
+		end
+		game.mouse:registerZone(bx + x * scale, by +y*scale, tb_talents[6], tb_talents[7], desc_fct, nil, "tb_talents", true, scale)
+	end
+	x, y = self:toolbarOrientStep(orient, bx, by, scale, x, y, tb_bg[6], tb_bg[7])
+
 	tb_bg[1]:toScreenFull		(x, y, tb_bg[6], tb_bg[7], tb_bg[2], tb_bg[3], 1, 1, 1, 1)
 	tb_quest[1]:toScreenFull	(x, y, tb_quest[6], tb_quest[7], tb_quest[2], tb_quest[3], self.tbbuttons.quest, self.tbbuttons.quest, self.tbbuttons.quest, 1)
 	if not game.mouse:updateZone("tb_quest", bx + x * scale, by +y*scale, tb_quest[6], tb_quest[7], nil, scale) then
diff --git a/game/modules/tome/data/gfx/ui/hotkeys/talents.png b/game/modules/tome/data/gfx/ui/hotkeys/talents.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e140d2764615870c924810d475587231bf2362b
GIT binary patch
literal 6206
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

literal 0
HcmV?d00001

-- 
GitLab