From dcd61c83c294820ee0dac41b4f0a9501d0ff0e63 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Fri, 18 Nov 2016 23:49:25 +0100
Subject: [PATCH] Levelup dialog has a checkbox to hide unknown categories,
should help a lot Adventurers
---
game/engines/default/engine/ui/Dialog.lua | 11 +++
game/modules/tome/class/Actor.lua | 3 +
game/modules/tome/dialogs/LevelupDialog.lua | 98 ++++++++++++---------
3 files changed, 70 insertions(+), 42 deletions(-)
diff --git a/game/engines/default/engine/ui/Dialog.lua b/game/engines/default/engine/ui/Dialog.lua
index 08047e2a5e..9e9d01e117 100644
--- a/game/engines/default/engine/ui/Dialog.lua
+++ b/game/engines/default/engine/ui/Dialog.lua
@@ -662,6 +662,17 @@ function _M:setupUI(resizex, resizey, on_resize, addmw, addmh)
self.setuped = true
end
+function _M:replaceUI(oldui, newui)
+ for i, ui in ipairs(self.uis) do
+ if ui.ui == oldui then
+ ui.ui = newui
+ ui.ui.mouse.delegate_offset_x = ui.x
+ ui.ui.mouse.delegate_offset_y = ui.y
+ ui.ui:positioned(ui.x, ui.y, self.display_x + ui.x, self.display_y + ui.y)
+ end
+ end
+end
+
function _M:setFocus(id, how)
if type(id) == "table" then
for i = 1, #self.uis do
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 93ab444e1d..0361037cd8 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -1827,12 +1827,15 @@ function _M:tooltip(x, y, seen_by)
--if #resists > 0 then ts:add("Resists: ", table.concat(resists, ','), true) end
local resists = tstring{}
+ local first = true
ts:add({"color", "ANTIQUE_WHITE"}, "Resists: ")
for t, v in pairs(self.resists) do
if t == "all" or t == "absolute" then
+ if first then first = false else ts:add(", ") end
ts:add({"color", "LIGHT_BLUE"}, tostring(math.floor(v)) .. "%", " ", {"color", "LAST"}, t..", ")
elseif type(t) == "string" and math.abs(v) >= 20 then
local res = tostring ( math.floor(self:combatGetResist(t)) ) .. "%"
+ if first then first = false else ts:add(", ") end
if v > 0 then
ts:add({"color", "LIGHT_GREEN"}, res, " ", {"color", "LAST"}, DamageType:get(t).name, ", ")
else
diff --git a/game/modules/tome/dialogs/LevelupDialog.lua b/game/modules/tome/dialogs/LevelupDialog.lua
index e3b9f8aabf..cc3676400b 100644
--- a/game/modules/tome/dialogs/LevelupDialog.lua
+++ b/game/modules/tome/dialogs/LevelupDialog.lua
@@ -28,6 +28,7 @@ local UIContainer = require "engine.ui.UIContainer"
local TalentTrees = require "mod.dialogs.elements.TalentTrees"
local StatusBox = require "mod.dialogs.elements.StatusBox"
local Separator = require "engine.ui.Separator"
+local Checkbox = require "engine.ui.Checkbox"
local Empty = require "engine.ui.Empty"
local DamageType = require "engine.DamageType"
local FontPackage = require "engine.FontPackage"
@@ -459,9 +460,9 @@ function _M:generateList()
local gtree = {}
self.talents_deps = {}
for i, tt in ipairs(self.actor.talents_types_def) do
- if not tt.hide and not (self.actor.talents_types[tt.type] == nil) then
+ local ttknown = self.actor:knowTalentType(tt.type)
+ if (ttknown or not self.actor.levelup_hide_unknown_catgories) and not tt.hide and not (self.actor.talents_types[tt.type] == nil) then
local cat = tt.type:gsub("/.*", "")
- local ttknown = self.actor:knowTalentType(tt.type)
local isgeneric = self.actor.talents_types_def[tt.type].generic
local tshown = (self.actor.__hidden_talent_types[tt.type] == nil and ttknown) or (self.actor.__hidden_talent_types[tt.type] ~= nil and not self.actor.__hidden_talent_types[tt.type])
local node = {
@@ -663,46 +664,49 @@ function _M:createDisplay()
if self.actor.unused_prodigies > 0 then self.b_prodigies.glow = 0.6 end
if self.actor.unused_talents_types > 0 and self.b_inscriptions then self.b_inscriptions.glow = 0.6 end
- self.c_ctree = TalentTrees.new{
- font = core.display.newFont("/data/font/DroidSans.ttf", 14),
- tiles=game.uiset.hotkeys_display_icons,
- tree=self.ctree,
- width=320, height=self.ih-50,
- tooltip=function(item)
- local x = self.display_x + self.uis[5].x - game.tooltip.max
- if self.display_x + self.w + game.tooltip.max <= game.w then x = self.display_x + self.w end
- local ret = self:getTalentDesc(item), x, nil
- if self.no_tooltip then
- self.c_desc:erase()
- self.c_desc:switchItem(ret, ret)
- end
- return ret
- end,
- on_use = function(item, inc) self:onUseTalent(item, inc) end,
- on_expand = function(item) self.actor.__hidden_talent_types[item.type] = not item.shown end,
- scrollbar = true, no_tooltip = self.no_tooltip,
- message_box = self.t_
- }
-
- self.c_gtree = TalentTrees.new{
- font = core.display.newFont("/data/font/DroidSans.ttf", 14),
- tiles=game.uiset.hotkeys_display_icons,
- tree=self.gtree,
- width=320, height=(self.no_tooltip and self.ih - 50) or self.ih-50 - math.max((not self.b_prodigies and 0 or self.b_prodigies.h + 5), (not self.b_inscriptions and 0 or self.b_inscriptions.h + 5)),
- tooltip=function(item)
- local x = self.display_x + self.uis[8].x - game.tooltip.max
- if self.display_x + self.w + game.tooltip.max <= game.w then x = self.display_x + self.w end
- local ret = self:getTalentDesc(item), x, nil
- if self.no_tooltip then
- self.c_desc:erase()
- self.c_desc:switchItem(ret, ret)
- end
- return ret
- end,
- on_use = function(item, inc) self:onUseTalent(item, inc) end,
- on_expand = function(item) self.actor.__hidden_talent_types[item.type] = not item.shown end,
- scrollbar = true, no_tooltip = self.no_tooltip,
- }
+ local recreate_trees = function()
+ self.c_ctree = TalentTrees.new{
+ font = core.display.newFont("/data/font/DroidSans.ttf", 14),
+ tiles=game.uiset.hotkeys_display_icons,
+ tree=self.ctree,
+ width=320, height=self.ih-50,
+ tooltip=function(item)
+ local x = self.display_x + self.uis[5].x - game.tooltip.max
+ if self.display_x + self.w + game.tooltip.max <= game.w then x = self.display_x + self.w end
+ local ret = self:getTalentDesc(item), x, nil
+ if self.no_tooltip then
+ self.c_desc:erase()
+ self.c_desc:switchItem(ret, ret)
+ end
+ return ret
+ end,
+ on_use = function(item, inc) self:onUseTalent(item, inc) end,
+ on_expand = function(item) self.actor.__hidden_talent_types[item.type] = not item.shown end,
+ scrollbar = true, no_tooltip = self.no_tooltip,
+ message_box = self.t_
+ }
+
+ self.c_gtree = TalentTrees.new{
+ font = core.display.newFont("/data/font/DroidSans.ttf", 14),
+ tiles=game.uiset.hotkeys_display_icons,
+ tree=self.gtree,
+ width=320, height=(self.no_tooltip and self.ih - 50) or self.ih-50 - math.max((not self.b_prodigies and 0 or self.b_prodigies.h + 5), (not self.b_inscriptions and 0 or self.b_inscriptions.h + 5)),
+ tooltip=function(item)
+ local x = self.display_x + self.uis[8].x - game.tooltip.max
+ if self.display_x + self.w + game.tooltip.max <= game.w then x = self.display_x + self.w end
+ local ret = self:getTalentDesc(item), x, nil
+ if self.no_tooltip then
+ self.c_desc:erase()
+ self.c_desc:switchItem(ret, ret)
+ end
+ return ret
+ end,
+ on_use = function(item, inc) self:onUseTalent(item, inc) end,
+ on_expand = function(item) self.actor.__hidden_talent_types[item.type] = not item.shown end,
+ scrollbar = true, no_tooltip = self.no_tooltip,
+ }
+ end
+ recreate_trees()
self.c_stat = TalentTrees.new{
font = core.display.newFont("/data/font/DroidSans.ttf", 14),
@@ -761,6 +765,15 @@ function _M:createDisplay()
end
end}
+ self.c_hide_unknown = Checkbox.new{title="Hide unlearnt categories", default=self.actor.levelup_hide_unknown_catgories, fct=function() end, on_change=function(s)
+ self.actor.levelup_hide_unknown_catgories = s
+ self:generateList()
+ local oldctree, oldgtree = self.c_ctree, self.c_gtree
+ recreate_trees()
+ self:replaceUI(oldctree, self.c_ctree)
+ self:replaceUI(oldgtree, self.c_gtree)
+ end}
+
self.t_messages = StatusBox.new{
font = core.display.newFont("/data/font/DroidSans.ttf", 16),
width = math.floor(2 * self.iw / 3), delay = 1,
@@ -795,6 +808,7 @@ function _M:createDisplay()
{hcenter=self.b_types, top=-self.t_messages.h, ui=self.t_messages},
}
if self.b_inscriptions then table.insert(ret, {right=self.b_prodigies.w, bottom=0, ui=self.b_inscriptions}) end
+ table.insert(ret, {right=self.b_inscriptions or self.b_prodigies, bottom=0, ui=self.c_hide_unknown})
if self.no_tooltip then
local vsep3 = Separator.new{dir="horizontal", size=self.ih - self.b_stat.h - 10}
--
GitLab