Skip to content
Snippets Groups Projects
Commit d35697c9 authored by dg's avatar dg
Browse files

Display talent icons in use/gain talent screens 

git-svn-id: http://svn.net-core.org/repos/t-engine4@3972 51575b47-30f0-44d4-a5cc-537603b46e54
parent c54df930
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/engines/default/engine/ui/TreeList.lua
+ 58
− 52
View file @ d35697c9
......@@ -90,62 +90,64 @@ function _M:drawItem(item, nb_keyframes)
nb_keyframes = (nb_keyframes or 0) / 2
item.cols = {}
for i, col in ipairs(self.columns) do
local fw = col.width
local level = item.level
local color = util.getval(item.color, item) or {255,255,255}
local text
if type(col.display_prop) == "function" then
text = col.display_prop(item):toTString()
else
text = item[col.display_prop or col.sort]
if type(text) ~= "table" or not text.is_tstring then
text = util.getval(text, item)
if type(text) ~= "table" then text = tstring.from(tostring(text)) end
if not col.direct_draw then
local fw = col.width
local level = item.level
local color = util.getval(item.color, item) or {255,255,255}
local text
if type(col.display_prop) == "function" then
text = col.display_prop(item):toTString()
else
text = item[col.display_prop or col.sort]
if type(text) ~= "table" or not text.is_tstring then
text = util.getval(text, item)
if type(text) ~= "table" then text = tstring.from(tostring(text)) end
end
end
end
local s = col.surface
local offset = 0
if i == 1 then
offset = level * self.level_offset
if item.nodes then offset = offset + self.plus.w end
end
local startx = col.frame_sel.b4.w + offset
item.cols[i] = {}
s:erase(0, 0, 0, 0)
local test_text = text:toString()
local font_w, _ = self.font:size(test_text)
font_w = font_w + startx
local s = col.surface
if font_w > fw then
item.displayx_offset = item.displayx_offset or {}
item.displayx_offset[i] = item.displayx_offset[i] or 0
item.dir = item.dir or {}
item.dir[i] = item.dir[i] or 0
if item.dir[i] == 0 then
item.displayx_offset[i] = item.displayx_offset[i] - nb_keyframes
if -item.displayx_offset[i] >= font_w - fw + 15 then
item.dir[i] = 1
end
elseif item.dir[i] == 1 then
item.displayx_offset[i] = item.displayx_offset[i] + nb_keyframes
if item.displayx_offset[i] >= 0 then
item.dir[i] = 0
local offset = 0
if i == 1 then
offset = level * self.level_offset
if item.nodes then offset = offset + self.plus.w end
end
local startx = col.frame_sel.b4.w + offset
item.cols[i] = {}
s:erase(0, 0, 0, 0)
local test_text = text:toString()
local font_w, _ = self.font:size(test_text)
font_w = font_w + startx
if font_w > fw then
item.displayx_offset = item.displayx_offset or {}
item.displayx_offset[i] = item.displayx_offset[i] or 0
item.dir = item.dir or {}
item.dir[i] = item.dir[i] or 0
if item.dir[i] == 0 then
item.displayx_offset[i] = item.displayx_offset[i] - nb_keyframes
if -item.displayx_offset[i] >= font_w - fw + 15 then
item.dir[i] = 1
end
elseif item.dir[i] == 1 then
item.displayx_offset[i] = item.displayx_offset[i] + nb_keyframes
if item.displayx_offset[i] >= 0 then
item.dir[i] = 0
end
end
-- We use 1000 and do not cut lines to make sure it draws as much as possible
text:drawOnSurface(s, 10000, nil, self.font, startx + item.displayx_offset[i], (self.fh - self.font_h) / 2, color[1], color[2], color[3])
item.autoscroll = true
else
text:drawOnSurface(s, 10000, nil, self.font, startx, (self.fh - self.font_h) / 2, color[1], color[2], color[3])
end
-- We use 1000 and do not cut lines to make sure it draws as much as possible
text:drawOnSurface(s, 10000, nil, self.font, startx + item.displayx_offset[i], (self.fh - self.font_h) / 2, color[1], color[2], color[3])
item.autoscroll = true
else
text:drawOnSurface(s, 10000, nil, self.font, startx, (self.fh - self.font_h) / 2, color[1], color[2], color[3])
--text:drawOnSurface(s, col.width - startx - col.frame_sel.b6.w, 1, self.font, startx, (self.fh - self.font_h) / 2, color[1], color[2], color[3])
item.cols[i]._tex, item.cols[i]._tex_w, item.cols[i]._tex_h = s:glTexture()
end
--text:drawOnSurface(s, col.width - startx - col.frame_sel.b6.w, 1, self.font, startx, (self.fh - self.font_h) / 2, color[1], color[2], color[3])
item.cols[i]._tex, item.cols[i]._tex_w, item.cols[i]._tex_h = s:glTexture()
end
if self.on_drawitem then self.on_drawitem(item) end
end
......@@ -335,8 +337,12 @@ function _M:display(x, y, nb_keyframes)
end
end
if self.text_shadow then item.cols[j]._tex:toScreenFull(x+1, y+1, col.width, self.fh, item.cols[j]._tex_w, item.cols[j]._tex_h, 0, 0, 0, self.text_shadow) end
item.cols[j]._tex:toScreenFull(x, y, col.width, self.fh, item.cols[j]._tex_w, item.cols[j]._tex_h)
if col.direct_draw then
col.direct_draw(item, x, y, col.width, self.fh)
else
if self.text_shadow then item.cols[j]._tex:toScreenFull(x+1, y+1, col.width, self.fh, item.cols[j]._tex_w, item.cols[j]._tex_h, 0, 0, 0, self.text_shadow) end
item.cols[j]._tex:toScreenFull(x, y, col.width, self.fh, item.cols[j]._tex_w, item.cols[j]._tex_h)
end
if item.nodes and j == 1 then
local s = item.shown and self.minus or self.plus
......
game/modules/tome/dialogs/LevelupDialog.lua
+ 10
− 1
View file @ d35697c9
......@@ -582,6 +582,7 @@ function _M:select(item)
self:onDrawItem(item)
self.c_t_desc:switchItem(item)
end
self.cur_item = item
end
function _M:treeSelect(item, sel, v)
......@@ -833,6 +834,13 @@ function _M:onDrawItem(item)
self.c_t_desc:createItem(item, text)
end
-- Display the player tile
function _M:innerDisplay(x, y, nb_keyframes)
if self.cur_item and self.cur_item.entity then
self.cur_item.entity:toScreen(nil, x + self.iw - 64, y + self.iy + self.ui_by_ui[self.c_t_desc].y, 64, 64)
end
end
function _M:generateList()
self.actor.__show_special_talents = self.actor.__show_special_talents or {}
self.talent_stats_req = {}
......@@ -871,8 +879,9 @@ function _M:generateList()
local isgeneric = self.actor.talents_types_def[tt.type].generic
list[#list+1] = {
__id=t.id,
name=t.name,
name=((t.display_entity and t.display_entity:getDisplayString() or "")..t.name):toTString(),
rawname=t.name..(isgeneric and " (generic talent)" or " (class talent)"),
entity=t.display_entity,
talent=t.id,
_type=tt.type,
color=function(item) return ((self.actor.talents[item.talent] or 0) ~= (self.actor_dup.talents[item.talent] or 0)) and {255, 215, 0} or self.actor:knowTalentType(item._type) and {255,255,255} or {175,175,175} end,
......
game/modules/tome/dialogs/UseTalents.lua
+ 14
− 5
View file @ d35697c9
......@@ -186,6 +186,13 @@ function _M:use(item, button)
self.actor:useTalent(item.talent)
end
-- Display the player tile
function _M:innerDisplay(x, y, nb_keyframes)
if self.cur_item and self.cur_item.entity then
self.cur_item.entity:toScreen(nil, x + self.iw - 64, y + self.iy + self.c_tut.h + 10, 64, 64)
end
end
function _M:generateList()
-- Makes up the list
local list = {}
......@@ -258,8 +265,10 @@ function _M:generateList()
status = self.actor:isTalentActive(t.id) and tstring{{"color", "YELLOW"}, "Sustaining"} or tstring{{"color", "LIGHT_GREEN"}, "Sustain"}
end
nodes[#nodes+1] = {
name=t.name.." ("..typename..")",
name=((t.display_entity and t.display_entity:getDisplayString() or "")..t.name.." ("..typename..")"):toTString(),
cname=t.name,
status=status,
entity=t.display_entity,
talent=t.id,
desc=self.actor:getTalentFullDescription(t),
color=function() return {0xFF, 0xFF, 0xFF} end,
......@@ -272,10 +281,10 @@ function _M:generateList()
}
end
end
table.sort(actives, function(a,b) return a.name < b.name end)
table.sort(sustains, function(a,b) return a.name < b.name end)
table.sort(sustained, function(a,b) return a.name < b.name end)
table.sort(cooldowns, function(a,b) return a.name < b.name end)
table.sort(actives, function(a,b) return a.cname < b.cname end)
table.sort(sustains, function(a,b) return a.cname < b.cname end)
table.sort(sustained, function(a,b) return a.cname < b.cname end)
table.sort(cooldowns, function(a,b) return a.cname < b.cname end)
for i, node in ipairs(actives) do node.char = self:makeKeyChar(letter) chars[node.char] = node letter = letter + 1 end
for i, node in ipairs(sustains) do node.char = self:makeKeyChar(letter) chars[node.char] = node letter = letter + 1 end
for i, node in ipairs(sustained) do node.char = self:makeKeyChar(letter) chars[node.char] = node letter = letter + 1 end
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment