Upscaled the size of many lore pictures

@@ -165,6 +165,13 @@ function _M:makeFrame(base, w, h, iw, ih)
 		f.b5 = self:getUITexture(base.."5.png")
 		if not w then w = iw + f.b4.w + f.b6.w end
 		if not h then h = ih + f.b8.h + f.b2.h end
+		if self.ui_conf[self.ui].specifics and self.ui_conf[self.ui].specifics[base] then
+			local conf = self.ui_conf[self.ui].specifics[base]
+			w = w + (conf.offset_w or 0)
+			h = h + (conf.offset_h or 0)
+			f.ox = conf.offset_x or 0
+			f.oy = conf.offset_y or 0
+		end
 	end
 	f.w = math.floor(w)
 	f.h = math.floor(h)
@@ -179,8 +186,8 @@ function _M:drawFrame(f, x, y, r, g, b, a, w, h, total_w, total_h, loffset_x, lo
 	total_w = total_w or 0
 	total_h = total_h or 0
 	
-	x = math.floor(x)
-	y = math.floor(y)
+	x = math.floor(x) + (f.ox or 0)
+	y = math.floor(y) + (f.oy or 0)
 	
 	f.w = math.floor(w or f.w)
 	f.h = math.floor(h or f.h)

@@ -602,10 +602,16 @@ function _M:setupUI(resizex, resizey, on_resize, addmw, addmh)
 			mw = mw + self.frame.ox1 - self.frame.ox2
 		end
 
-		if on_resize then on_resize(resizex and mw or self.w, resizey and mh or self.h) end
+		if on_resize then
+			local rw, rh = on_resize(resizex and mw or self.w, resizey and mh or self.h)
+			if rw and rh then resizex, resizey = true, true mw, mh = rw, rh end
+		end
 		nw, nh = resizex and mw or self.w, resizey and mh or self.h
 	else
-		if on_resize then on_resize(self.w, self.h) end
+		if on_resize then
+			local rw, rh = on_resize(self.w, self.h)
+			if rw and rh then self.w, self.h = rw, rh end
+		end
 		nw, nh = self.w, self.h
 	end
 

@@ -2087,6 +2087,7 @@ function _M:setupCommands()
 			print("===============")
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
+			package.loaded["engine.ui.Textzone"] = nil
 			package.loaded["engine.ui.Dialog"] = nil
 			package.loaded["engine.dialogs.Chat"] = nil
 			package.loaded["mod.dialogs.Chat"] = nil

@@ -109,6 +109,7 @@ function _M:relearningLore(v)
 end
 
 function _M:learnLore(lore, nopopup, silent, nostop, after_learn_cb)
+	print("[LORE] learning..", lore)
 	local l = self:getLore(lore, silent)
 	if not l then return end
 	local learnt = false

@@ -20,10 +20,16 @@
 chat = {
 	frame_alpha = 1,
 	frame_darkness = 0.6,
-	frame_ox1 = -64,
-	frame_ox2 = 64,
+	frame_ox1 = -14,
+	frame_ox2 = 14,
 	frame_oy1 = -5,
 	frame_oy2 = 10,
 	-- force_min_w = 64 * 4,
 	-- force_min_h = 64 * 4,
+	specifics = {
+		["ui/textbox"] = {
+			offset_w = -(64 - 30) * 2,
+			offset_x = 64 - 30,
+		},
+	},
 }

@@ -37,24 +37,36 @@ function _M:init(chat, id, width)
 end
 
 function _M:makeUI()
-	self.c_desc = Textzone.new{has_box=true, ui="chat", font=self.chat.dialog_text_font, width=self.iw, height=1, auto_height=true, text=self.text, can_focus=false}
+	self.c_desc = Textzone.new{has_box=true, ui="chat", font=self.chat.dialog_text_font, width=self.iw - 30, height=1, auto_height=true, text=self.text, can_focus=false}
 	self.c_list = VariableList.new{font=self.chat.dialog_answer_font, width=self.iw, max_height=game.h * 0.70 - self.c_desc.h, list=self.list, fct=function(item) self:use(item) end, select=function(item) self:select(item) end}
-	local npc_frame = ChatPortrait.new{ui="chat", actor=self:getActorPortrait(self.chat.npc_force_display_entity or self.npc.chat_display_entity or self.npc)}
-	local player_frame = ChatPortrait.new{ui="chat", actor=self:getActorPortrait(self.chat.player_force_display_entity or self.player.chat_display_entity or self.player)}
+	local npc_frame = ChatPortrait.new{ui="chat", side="right", actor=self:getActorPortrait(self.chat.npc_force_display_entity or self.npc.chat_display_entity or self.npc)}
+	local player_frame = ChatPortrait.new{ui="chat", side="left", actor=self:getActorPortrait(self.chat.player_force_display_entity or self.player.chat_display_entity or self.player)}
 
 	local uis = {
 		{hcenter=0, top=-12, ui=self.c_desc},
 		{right=0, bottom=0, ui=self.c_list},
-		{left=-player_frame.w+self.frame.ox1-5, vcenter=-self.ix-4, ui=player_frame, ignore_size=true},
-		{right=-npc_frame.w-self.frame.ox2-5, vcenter=-self.ix-4, ui=npc_frame, ignore_size=true},
+		{left=-player_frame.w+self.frame.ox1-5, top=self.frame.oy1-self.iy, ui=player_frame, ignore_size=true},
+		{right=-npc_frame.w-self.frame.ox2-5, top=self.frame.oy1-self.iy, ui=npc_frame, ignore_size=true},
 	}
 
+	-- Only for size info
+	local back = self:getUITexture("ui/portrait_frame_back.png")
+	local deco_down = self:getUITexture("ui/chat_ui_deco_padding_left_down.png")
+
 	self:loadUI(uis)
 	self:setFocus(self.c_list)
 	self:setupUI(false, true, function(w, h)
+		local frameh = -self.frame.oy1 + self.frame.oy2
+		-- Ensure minimal height
+		if h + frameh < back.h then h = back.h - frameh end
+		-- Ensure if it's too big but too small to not have the down deco, to increase it a it
+		if h + frameh > back.h and h + frameh < back.h + deco_down.h / 2 then h = back.h - frameh + deco_down.h / 2 end
 		self.force_x = game.w / 2 - w / 2
 		self.force_y = game.h - h - 20
+		return w, h
 	end)
+	npc_frame:adjustHeight(self.h)
+	player_frame:adjustHeight(self.h)
 end
 
 function _M:getActorPortrait(actor)

@@ -27,6 +27,7 @@ local ActorFrame = require "engine.ui.ActorFrame"
 module(..., package.seeall, class.inherit(Base))
 
 function _M:init(t)
+	self.side = assert(t.side, "no ChatPortrait side")
 	assert(t.actor, "no ChatPortrait actor")
 	
 	self.name = t.actor.getName and t.actor:getName() or _t(t.actor.name) or _t"???"
@@ -52,6 +53,7 @@ function _M:init(t)
 		self.iy = 0
 		self.iw, self.ih = 128, 128
 	end
+	self.h_deco = 0
 
 	Base.init(self, t)
 end
@@ -62,6 +64,8 @@ function _M:generate()
 
 	self.front = self:getUITexture("ui/portrait_frame_front.png")
 	self.back = self:getUITexture("ui/portrait_frame_back.png")
+	self.deco_down = self:getUITexture("ui/chat_ui_deco_padding_"..self.side.."_down.png")
+	self.deco_up = self:getUITexture("ui/chat_ui_deco_padding_"..self.side.."_up.png")
 	self.w, self.h = self.front.w, self.front.h
 
 	if self.image then self.item = {self.image:glTexture(false, true)} end
@@ -69,7 +73,24 @@ function _M:generate()
 	self.name_tex = self:drawFontLine(self.font, self.name, nil, 0xff, 0xee, 0xcb)
 end
 
+function _M:adjustHeight(h)
+	self.h_deco = h - self.back.h
+end
+
 function _M:display(x, y, nb_keyframes, screen_x, screen_y)
+	local deco_x
+	if self.h_deco >= self.deco_up.h + self.deco_down.h then
+		if self.side == "left" then deco_x = x + self.back.w - self.deco_up.w else deco_x = x end
+		self.deco_up.t:toScreenFull(deco_x, y, self.deco_up.w, self.deco_up.h, self.deco_up.tw, self.deco_up.th)
+		y = y + self.deco_up.h
+		screen_y = screen_y + self.deco_up.h
+	end
+	if self.h_deco >= 1 then
+		if self.side == "left" then deco_x = x + self.back.w - self.deco_down.w else deco_x = x end
+		local deco_h = math.min(self.deco_down.h, self.h_deco)
+		self.deco_down.t:toScreenFull(deco_x, y + self.back.h, self.deco_down.w, deco_h, self.deco_down.tw, deco_h * self.deco_down.th / self.deco_down.h)
+	end
+
 	self.back.t:toScreenFull(x, y, self.back.w, self.back.h, self.back.tw, self.back.th)
 	core.display.glScissor(true, screen_x + 15, screen_y + 15, 128, 192)
 	local dx, dy = x + 15 + (128 - self.iw) / 2, y + 15 + (192 - self.ih) / 2