From 1493e19e613d414d32d2a718899cf43d35d82049 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 6 Oct 2010 15:58:51 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@1434 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../engine/dialogs/ShowAchievements.lua | 11 +++++------
.../default/engine/dialogs/ShowEquipInven.lua | 18 ++++++++----------
.../default/engine/dialogs/ShowEquipment.lua | 11 +++++------
.../default/engine/dialogs/ShowInventory.lua | 11 +++++------
.../default/engine/dialogs/ShowPickupFloor.lua | 10 +++++-----
.../default/engine/dialogs/ShowQuests.lua | 11 +++++------
.../default/engine/dialogs/ShowStore.lua | 13 ++++++-------
.../default/engine/dialogs/UseTalents.lua | 8 +++-----
.../engines/default/engine/ui/TextzoneList.lua | 3 ++-
.../tome/dialogs/LevelupStatsDialog.lua | 17 +++++++++--------
game/modules/tome/dialogs/ShowLore.lua | 9 ++++-----
11 files changed, 57 insertions(+), 65 deletions(-)
diff --git a/game/engines/default/engine/dialogs/ShowAchievements.lua b/game/engines/default/engine/dialogs/ShowAchievements.lua
index 8e7b2576cc..b809992e79 100644
--- a/game/engines/default/engine/dialogs/ShowAchievements.lua
+++ b/game/engines/default/engine/dialogs/ShowAchievements.lua
@@ -20,7 +20,7 @@
require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
-local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -32,7 +32,7 @@ function _M:init(title)
Dialog.init(self, (title or "Achievements").." ("..nb.."/"..total..")", game.w * 0.8, game.h * 0.8)
- self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih, text=""}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih}
self:generateList()
@@ -56,8 +56,8 @@ function _M:init(title)
end
function _M:select(item)
- if item and self.uis[2] then
- self.uis[2].ui = item.zone
+ if item then
+ self.c_desc:switchItem(item, ("#GOLD#Achieved on:#LAST# %s\n#GOLD#Achieved by:#LAST# %s\n\n#GOLD#Description:#LAST# %s"):format(item.when, item.who, item.desc))
end
end
@@ -67,8 +67,7 @@ function _M:generateList()
local i = 0
for id, data in pairs(world.achieved) do
local a = world:getAchievementFromId(id)
- local zone = self.c_desc:spawn{text=("#GOLD#Achieved on:#LAST# %s\n#GOLD#Achieved by:#LAST# %s\n\n#GOLD#Description:#LAST# %s"):format(data.when, data.who, a.desc)}
- list[#list+1] = { zone=zone, name=a.name, desc=a.desc, when=data.when, who=data.who, order=a.order }
+ list[#list+1] = { name=a.name, desc=a.desc, when=data.when, who=data.who, order=a.order }
i = i + 1
end
table.sort(list, function(a, b) return a.name < b.name end)
diff --git a/game/engines/default/engine/dialogs/ShowEquipInven.lua b/game/engines/default/engine/dialogs/ShowEquipInven.lua
index caa156fb52..b515e001e4 100644
--- a/game/engines/default/engine/dialogs/ShowEquipInven.lua
+++ b/game/engines/default/engine/dialogs/ShowEquipInven.lua
@@ -21,6 +21,7 @@ require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -34,6 +35,8 @@ function _M:init(title, actor, filter, action)
self:generateList()
+ self.c_desc = TextzoneList.new{width=self.iw, height=self.max_h*self.font_h, no_color_bleed=true}
+
self.c_inven = ListColumns.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.max_h*self.font_h - 10, sortable=true, scrollbar=true, columns={
{name="", width={20,"fixed"}, display_prop="char", sort="id"},
{name="Inventory", width=72, display_prop="name", sort="name"},
@@ -48,8 +51,6 @@ function _M:init(title, actor, filter, action)
{name="Enc.", width=8, display_prop="encumberance"},
}, list=self.equip_list, fct=function(item) self:use(item) end, select=function(item, sel) self:select(item) end}
- self.c_desc = Textzone.new{width=self.iw, height=self.max_h*self.font_h, no_color_bleed=true, text=""}
-
self:loadUI{
{left=0, top=0, ui=self.c_equip},
{right=0, top=0, ui=self.c_inven},
@@ -132,8 +133,8 @@ function _M:defineHotkey(id)
end
function _M:select(item)
- if item and self.uis[3] then
- self.uis[3].ui = item.zone
+ if item then
+ self.c_desc:switchItem(item, item.desc)
end
end
@@ -154,15 +155,13 @@ function _M:generateList()
self.max_h = 0
for inven_id = 1, #self.actor.inven_def do
if self.actor.inven[inven_id] and self.actor.inven_def[inven_id].is_worn then
- local zone = Textzone.new{width=self.iw, height=self.ih, text=self.actor.inven_def[inven_id].description}
- list[#list+1] = { zone=zone, id=#list+1, char="", name="#{bold}#"..self.actor.inven_def[inven_id].name.."#{normal}#", color={0x90, 0x90, 0x90}, inven=inven_id, cat="", encumberance="" }
+ list[#list+1] = { id=#list+1, char="", name="#{bold}#"..self.actor.inven_def[inven_id].name.."#{normal}#", color={0x90, 0x90, 0x90}, inven=inven_id, cat="", encumberance="", desc=self.actor.inven_def[inven_id].description }
self.max_h = math.max(self.max_h, #self.actor.inven_def[inven_id].description:splitLines(self.iw - 10, self.font))
for item, o in ipairs(self.actor.inven[inven_id]) do
if not self.filter or self.filter(o) then
local char = self:makeKeyChar(i)
- local zone = self.c_desc:spawn{text=o:getDesc()}
- list[#list+1] = { zone=zone, id=#list+1, char=char, name=o:getName{do_color=true}, object=o, inven=inven_id, item=item, cat=o.subtype, encumberance=o.encumber }
+ list[#list+1] = { id=#list+1, char=char, name=o:getName{do_color=true}, object=o, inven=inven_id, item=item, cat=o.subtype, encumberance=o.encumber, desc=o:getDesc() }
self.max_h = math.max(self.max_h, #o:getDesc():splitLines(self.iw - 10, self.font))
chars[char] = #list
i = i + 1
@@ -181,8 +180,7 @@ function _M:generateList()
for item, o in ipairs(self.actor:getInven("INVEN")) do
if not self.filter or self.filter(o) then
local char = self:makeKeyChar(i)
- local zone = self.c_desc:spawn{text=o:getDesc()}
- list[#list+1] = { zone=zone, id=#list+1, char=char, name=o:getName{do_color=true}, object=o, inven=self.actor.INVEN_INVEN, item=item, cat=o.subtype, encumberance=o.encumber }
+ list[#list+1] = { id=#list+1, char=char, name=o:getName{do_color=true}, object=o, inven=self.actor.INVEN_INVEN, item=item, cat=o.subtype, encumberance=o.encumber, desc=o:getDesc() }
self.max_h = math.max(self.max_h, #o:getDesc():splitLines(self.iw - 10, self.font))
chars[char] = #list
i = i + 1
diff --git a/game/engines/default/engine/dialogs/ShowEquipment.lua b/game/engines/default/engine/dialogs/ShowEquipment.lua
index 844167eda1..ad353c3007 100644
--- a/game/engines/default/engine/dialogs/ShowEquipment.lua
+++ b/game/engines/default/engine/dialogs/ShowEquipment.lua
@@ -21,6 +21,7 @@ require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -31,7 +32,7 @@ function _M:init(title, actor, filter, action)
self.action = action
Dialog.init(self, title or "Equipment", game.w * 0.8, game.h * 0.8)
- self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih, no_color_bleed=true, text=""}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih, no_color_bleed=true}
self:generateList()
@@ -67,7 +68,7 @@ end
function _M:select(item)
if item and self.uis[2] then
- self.uis[2].ui = item.zone
+ self.c_desc:switchItem(item, item.desc)
end
end
function _M:use(item)
@@ -85,14 +86,12 @@ function _M:generateList()
local i = 1
for inven_id = 1, #self.actor.inven_def do
if self.actor.inven[inven_id] and self.actor.inven_def[inven_id].is_worn then
- local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=self.actor.inven_def[inven_id].description}
- list[#list+1] = { zone=zone, id=#list+1, char="", name="#{bold}#"..self.actor.inven_def[inven_id].name.."#{normal}#", color={0x90, 0x90, 0x90}, inven=inven_id, cat="", encumberance="" }
+ list[#list+1] = { id=#list+1, char="", name="#{bold}#"..self.actor.inven_def[inven_id].name.."#{normal}#", color={0x90, 0x90, 0x90}, inven=inven_id, cat="", encumberance="", desc=self.actor.inven_def[inven_id].description }
for item, o in ipairs(self.actor.inven[inven_id]) do
if not self.filter or self.filter(o) then
local char = self:makeKeyChar(i)
- local zone = self.c_desc:spawn{text=o:getDesc()}
- list[#list+1] = { zone=zone, id=#list+1, char=char, name=o:getName{do_color=true}, object=o, inven=inven_id, item=item, cat=o.subtype, encumberance=o.encumber }
+ list[#list+1] = { id=#list+1, char=char, name=o:getName{do_color=true}, object=o, inven=inven_id, item=item, cat=o.subtype, encumberance=o.encumber, desc=o:getDesc() }
chars[char] = #list
i = i + 1
end
diff --git a/game/engines/default/engine/dialogs/ShowInventory.lua b/game/engines/default/engine/dialogs/ShowInventory.lua
index a22144da5e..3338b458b3 100644
--- a/game/engines/default/engine/dialogs/ShowInventory.lua
+++ b/game/engines/default/engine/dialogs/ShowInventory.lua
@@ -21,6 +21,7 @@ require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -32,7 +33,7 @@ function _M:init(title, inven, filter, action, actor)
self.actor = actor
Dialog.init(self, title or "Inventory", game.w * 0.8, game.h * 0.8)
- self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih, no_color_bleed=true, text=""}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih, no_color_bleed=true}
self:generateList()
@@ -64,8 +65,8 @@ function _M:init(title, inven, filter, action, actor)
end
function _M:select(item)
- if item and self.uis[2] then
- self.uis[2].ui = item.zone
+ if item then
+ self.c_desc:switchItem(item, item.desc)
end
end
function _M:use(item)
@@ -83,9 +84,7 @@ function _M:generateList()
if not self.filter or self.filter(o) then
local char = self:makeKeyChar(item)
list.chars[char] = item
- local zone = self.c_desc:spawn{text=o:getDesc()}
- list[#list+1] = { char=char, zone=zone, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=item, cat=o.subtype, encumberance=o.encumber }
- i = i + 1
+ list[#list+1] = { char=char, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=item, cat=o.subtype, encumberance=o.encumber, desc=o:getDesc() }
end
end
self.list = list
diff --git a/game/engines/default/engine/dialogs/ShowPickupFloor.lua b/game/engines/default/engine/dialogs/ShowPickupFloor.lua
index 7cd63413c0..667b8a5b05 100644
--- a/game/engines/default/engine/dialogs/ShowPickupFloor.lua
+++ b/game/engines/default/engine/dialogs/ShowPickupFloor.lua
@@ -22,6 +22,7 @@ local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
local Button = require "engine.ui.Button"
local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -34,7 +35,7 @@ function _M:init(title, x, y, filter, action)
local takeall = Button.new{text="(*) Take all", width=self.iw - 40, fct=function() self:takeAll() end}
- self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih - takeall.h, no_color_bleed=true, text=""}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih - takeall.h, no_color_bleed=true}
self:generateList()
@@ -80,8 +81,8 @@ function _M:used()
end
function _M:select(item)
- if item and self.uis[2] then
- self.uis[2].ui = item.zone
+ if item then
+ self.c_desc:switchItem(item, item.desc)
end
end
@@ -109,8 +110,7 @@ function _M:generateList()
if not self.filter or self.filter(o) then
local char = self:makeKeyChar(i)
list.chars[char] = i
- local zone = self.c_desc:spawn{text=o:getDesc()}
- list[#list+1] = { char=char, zone=zone, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=i, cat=o.subtype, encumberance=o.encumber }
+ list[#list+1] = { char=char, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=i, cat=o.subtype, encumberance=o.encumber, desc=o:getDesc() }
i = i + 1
end
idx = idx + 1
diff --git a/game/engines/default/engine/dialogs/ShowQuests.lua b/game/engines/default/engine/dialogs/ShowQuests.lua
index 12c67e9063..91c1bed42d 100644
--- a/game/engines/default/engine/dialogs/ShowQuests.lua
+++ b/game/engines/default/engine/dialogs/ShowQuests.lua
@@ -20,7 +20,7 @@
require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
-local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -29,7 +29,7 @@ function _M:init(actor)
self.actor = actor
Dialog.init(self, "Quest Log for "..actor.name, game.w, game.h)
- self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih, text=""}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih}
self:generateList()
@@ -54,8 +54,8 @@ function _M:init(actor)
end
function _M:select(item)
- if item and self.uis[2] then
- self.uis[2].ui = item.zone
+ if item then
+ self.c_desc:switchItem(item, item.desc)
end
end
@@ -64,14 +64,13 @@ function _M:generateList()
local list = {}
for id, q in pairs(self.actor.quests or {}) do
if true then
- local zone = self.c_desc:spawn{text=q:desc(self.actor)}
local color = nil
if q:isStatus(q.COMPLETED) then color = colors.simple(colors.LIGHT_GREEN)
elseif q:isStatus(q.DONE) then color = colors.simple(colors.GREEN)
elseif q:isStatus(q.FAILED) then color = colors.simple(colors.RED)
end
- list[#list+1] = { zone=zone, name=q.name, quest=q, color = color, status=q.status_text[q.status], status_order=q.status }
+ list[#list+1] = { name=q.name, quest=q, color = color, status=q.status_text[q.status], status_order=q.status, desc=q:desc(self.actor) }
end
end
if game.turn then
diff --git a/game/engines/default/engine/dialogs/ShowStore.lua b/game/engines/default/engine/dialogs/ShowStore.lua
index c2b080f159..ae5c557f30 100644
--- a/game/engines/default/engine/dialogs/ShowStore.lua
+++ b/game/engines/default/engine/dialogs/ShowStore.lua
@@ -21,6 +21,7 @@ require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -50,7 +51,7 @@ function _M:init(title, store_inven, actor_inven, store_filter, actor_filter, ac
{name="Price", width=8, display_prop="cost", sort="cost"},
}, list=self.store_list, fct=function(item) self:use(item) end, select=function(item, sel) self:select(item) end}
- self.c_desc = Textzone.new{width=self.iw, height=self.max_h*self.font_h, no_color_bleed=true, text=""}
+ self.c_desc = TextzoneList.new{width=self.iw, height=self.max_h*self.font_h, no_color_bleed=true}
self:loadUI{
{left=0, top=0, ui=self.c_store},
@@ -83,8 +84,8 @@ function _M:updateStore()
end
function _M:select(item)
- if item and self.uis[3] then
- self.uis[3].ui = item.zone
+ if item then
+ self.c_desc:switchItem(item, item.desc)
end
end
@@ -109,8 +110,7 @@ function _M:generateList()
for item, o in ipairs(self.store_inven) do
if not self.store_filter or self.store_filter(o) then
local char = self:makeKeyChar(i)
- local zone = self.c_desc:spawn{text=o:getDesc()}
- list[#list+1] = { zone=zone, id=#list+1, char=char, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=item, cat=o.subtype, cost=o.cost }
+ list[#list+1] = { id=#list+1, char=char, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=item, cat=o.subtype, cost=o.cost, desc=o:getDesc() }
self.max_h = math.max(self.max_h, #o:getDesc():splitLines(self.iw - 10, self.font))
list.chars[char] = #list
i = i + 1
@@ -125,8 +125,7 @@ function _M:generateList()
for item, o in ipairs(self.actor_inven) do
if not self.actor_filter or self.actor_filter(o) then
local char = self:makeKeyChar(i)
- local zone = self.c_desc:spawn{text=o:getDesc()}
- list[#list+1] = { zone=zone, id=#list+1, char=char, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=item, cat=o.subtype, cost=o.cost }
+ list[#list+1] = { id=#list+1, char=char, name=o:getDisplayString()..o:getName(), color=o:getDisplayColor(), object=o, item=item, cat=o.subtype, cost=o.cost, desc=o:getDesc() }
self.max_h = math.max(self.max_h, #o:getDesc():splitLines(self.iw - 10, self.font))
list.chars[char] = #list
i = i + 1
diff --git a/game/engines/default/engine/dialogs/UseTalents.lua b/game/engines/default/engine/dialogs/UseTalents.lua
index 4980384b84..aed5d6a4f1 100644
--- a/game/engines/default/engine/dialogs/UseTalents.lua
+++ b/game/engines/default/engine/dialogs/UseTalents.lua
@@ -114,7 +114,7 @@ end
function _M:select(item)
if item then
- self.c_desc:switchItem(item)
+ self.c_desc:switchItem(item, item.desc)
end
end
@@ -141,9 +141,8 @@ function _M:generateList()
local typename = "talent"
local status = "#LIGHT_GREEN#Active#WHITE#"
if t.mode == "sustained" then status = self.actor:isTalentActive(t.id) and "#YELLOW#Sustaining#WHITE#" or "#LIGHT_GREEN#Sustain#WHITE#" end
- list[#list+1] = { zone=zone, char=self:makeKeyChar(letter), name=t.name.." ("..typename..")", status=status, talent=t.id }
+ list[#list+1] = { char=self:makeKeyChar(letter), name=t.name.." ("..typename..")", status=status, talent=t.id, desc=self.actor:getTalentFullDescription(t) }
list.chars[self:makeKeyChar(letter)] = list[#list]
- self.c_desc:createItem(list[#list], self.actor:getTalentFullDescription(t))
if not self.sel then self.sel = #list + 1 end
letter = letter + 1
added = true
@@ -151,8 +150,7 @@ function _M:generateList()
end
if added then
- table.insert(list, where+1, { zone=zone, char="", name="#{bold}#"..cat:capitalize().." / "..tt.name:capitalize().."#{normal}#", type=tt.type, color={0x80, 0x80, 0x80}, status="" })
- self.c_desc:createItem(list[where+1], tt.description)
+ table.insert(list, where+1, { char="", name="#{bold}#"..cat:capitalize().." / "..tt.name:capitalize().."#{normal}#", type=tt.type, color={0x80, 0x80, 0x80}, status="", desc=tt.description })
end
end
for i = 1, #list do list[i].id = i end
diff --git a/game/engines/default/engine/ui/TextzoneList.lua b/game/engines/default/engine/ui/TextzoneList.lua
index a1c856b706..2bc73c8991 100644
--- a/game/engines/default/engine/ui/TextzoneList.lua
+++ b/game/engines/default/engine/ui/TextzoneList.lua
@@ -99,8 +99,9 @@ function _M:createItem(item, text)
}
end
-function _M:switchItem(item)
+function _M:switchItem(item, create_if_needed)
self.cur_item = item
+ if create_if_needed then if not self.items[item] then self:createItem(item, create_if_needed) end end
if not self.items[item] then self.list = nil return false end
local d = self.items[item]
diff --git a/game/modules/tome/dialogs/LevelupStatsDialog.lua b/game/modules/tome/dialogs/LevelupStatsDialog.lua
index c3d06eb9cf..3bd82492bb 100644
--- a/game/modules/tome/dialogs/LevelupStatsDialog.lua
+++ b/game/modules/tome/dialogs/LevelupStatsDialog.lua
@@ -22,6 +22,7 @@ require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
local LevelupTalentsDialog = require "mod.dialogs.LevelupTalentsDialog"
@@ -42,22 +43,22 @@ function _M:init(actor, on_finish)
Keyboard: #00FF00#up key/down key#FFFFFF# to select a stat; #00FF00#right key#FFFFFF# to increase stat; #00FF00#left key#FFFFFF# to decrease a stat.
Mouse: #00FF00#Left click#FFFFFF# to increase a stat; #00FF00#right click#FFFFFF# to decrease a stat.
]]}
- self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.c_tut.h - 20, no_color_bleed=true, text=""}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.c_tut.h - 20, no_color_bleed=true}
self.c_points = Textzone.new{width=math.floor(self.iw / 2 - 10), auto_height=true, no_color_bleed=true, text=_points_text:format(self.actor.unused_stats)}
self.c_list = ListColumns.new{width=math.floor(self.iw / 2 - 10), height=self.ih - 10, all_clicks=true, columns={
{name="Stat", width=70, display_prop="name"},
{name="Value", width=30, display_prop="val"},
}, list={
- {name="Strength", val=self.actor:getStr(), zone=Textzone.new{width=self.c_desc.w, height=self.c_desc.h, no_color_bleed=true, text=self.actor.stats_def[self.actor.STAT_STR].description}},
- {name="Dexterity", val=self.actor:getDex(), zone=Textzone.new{width=self.c_desc.w, height=self.c_desc.h, no_color_bleed=true, text=self.actor.stats_def[self.actor.STAT_DEX].description}},
- {name="Magic", val=self.actor:getMag(), zone=Textzone.new{width=self.c_desc.w, height=self.c_desc.h, no_color_bleed=true, text=self.actor.stats_def[self.actor.STAT_MAG].description}},
- {name="Willpower", val=self.actor:getWil(), zone=Textzone.new{width=self.c_desc.w, height=self.c_desc.h, no_color_bleed=true, text=self.actor.stats_def[self.actor.STAT_WIL].description}},
- {name="Cunning", val=self.actor:getCun(), zone=Textzone.new{width=self.c_desc.w, height=self.c_desc.h, no_color_bleed=true, text=self.actor.stats_def[self.actor.STAT_CUN].description}},
- {name="Constitution", val=self.actor:getCon(), zone=Textzone.new{width=self.c_desc.w, height=self.c_desc.h, no_color_bleed=true, text=self.actor.stats_def[self.actor.STAT_CON].description}},
+ {name="Strength", val=self.actor:getStr(), stat_id=self.actor.STAT_STR},
+ {name="Dexterity", val=self.actor:getDex(), stat_id=self.actor.STAT_DEX},
+ {name="Magic", val=self.actor:getMag(), stat_id=self.actor.STAT_MAG},
+ {name="Willpower", val=self.actor:getWil(), stat_id=self.actor.STAT_WIL},
+ {name="Cunning", val=self.actor:getCun(), stat_id=self.actor.STAT_CUN},
+ {name="Constitution", val=self.actor:getCon(), stat_id=self.actor.STAT_CON},
}, fct=function(item, _, v)
self:incStat(v == "left" and 1 or -1)
- end, select=function(item, sel) self.sel = sel if self.uis[5] then self.uis[5].ui = item.zone end end}
+ end, select=function(item, sel) self.sel = sel self.c_desc:switchItem(item, self.actor.stats_def[item.stat_id].description) end}
self:loadUI{
{left=0, top=0, ui=self.c_points},
diff --git a/game/modules/tome/dialogs/ShowLore.lua b/game/modules/tome/dialogs/ShowLore.lua
index 1ca7a6d37c..fc9e0b0708 100644
--- a/game/modules/tome/dialogs/ShowLore.lua
+++ b/game/modules/tome/dialogs/ShowLore.lua
@@ -20,7 +20,7 @@
require "engine.class"
local Dialog = require "engine.ui.Dialog"
local ListColumns = require "engine.ui.ListColumns"
-local Textzone = require "engine.ui.Textzone"
+local TextzoneList = require "engine.ui.TextzoneList"
local Separator = require "engine.ui.Separator"
module(..., package.seeall, class.inherit(Dialog))
@@ -33,7 +33,7 @@ function _M:init(title, actor)
Dialog.init(self, (title or "Lore").." ("..nb.."/"..total..")", game.w * 0.8, game.h * 0.8)
- self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih, text=""}
+ self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih}
self:generateList()
@@ -71,8 +71,7 @@ function _M:generateList()
end
function _M:select(item)
- if item and self.uis[2] then
- if not item.zone then item.zone = self.c_desc:spawn{text=("#GOLD#Category:#AQUAMARINE# %s\n#GOLD#Found as:#0080FF# %s\n#GOLD#Text:#ANTIQUE_WHITE# %s"):format(item.cat, item.name, item.desc)} end
- self.uis[2].ui = item.zone
+ if item then
+ self.c_desc:switchItem(item, ("#GOLD#Category:#AQUAMARINE# %s\n#GOLD#Found as:#0080FF# %s\n#GOLD#Text:#ANTIQUE_WHITE# %s"):format(item.cat, item.name, item.desc))
end
end
--
GitLab