Merge remote-tracking branch 'upstream/master' into misc174

@@ -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
@@ -2094,7 +2095,7 @@ function _M:setupCommands()
 			package.loaded["engine.Chat"] = nil
 			local Chat = require "engine.Chat"
 			Chat.chat_dialog = "mod.dialogs.Chat"
-			local chat = Chat.new("tareyal+test", engine.Entity.new{name=_t"Imperium courrier", image="npc/undead_risen_mistress_vira.png"}, game.player)
+			local chat = Chat.new("tareyal+test", engine.Entity.new{name=_t"Imperium courrier"}, game.player)
 			chat:invoke()
 do return end
 			DamageType:get(DamageType.ACID).projector(game.player, game.player.x, game.player.y, DamageType.ACID, 100)

@@ -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

@@ -17,13 +17,14 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-
-
 local Dialog = require "engine.ui.Dialog"
 local DamageType = require "engine.DamageType"
 local o = version
 local src = game.player
 
+-- If staff does not provide a portrait, use the talent
+if not npc.has_command_staff_portrait then cur_chat.npc_force_display_entity = src:getTalentFromId(src.T_COMMAND_STAFF) end
+
 if o.factory_settings then
 	print("Just started the chat, and we apparently have o.factory_settings.")
 else

@@ -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,
+		},
+	},
 }

@@ -59,7 +59,7 @@ on_status_change = function(self, who, status, sub)
 			end
 
 			local Chat = require"engine.Chat"
-			local chat = Chat.new("sorcerer-end", {name=_t"Endgame"}, game:getPlayer(true))
+			local chat = Chat.new("sorcerer-end", {name=_t"Endgame", image="portrait/win.png"}, game:getPlayer(true))
 			chat:invoke()
 
 			self:end_end_combat()

@@ -181,7 +181,7 @@ newTalent{
 			local Chat = require("engine.Chat")
 			local chat = Chat.new("command-staff", staff, self, {version=staff, state=state, co=coroutine.running()})
 			local d = chat:invoke()
-			if not coroutine.yield() then return nil end
+			self:talentDialog(d)
 			return true
 		else -- NPC picks a new element
 			local element, aspect = staff:getStaffPreferredElement(self)

@@ -945,7 +945,7 @@ newTalent{
 	end,
 	callbackOnTakeDamage = function(self, t, src, x, y, type, dam, state)
 		if self:isTalentCoolingDown(t) then return end
-		if (self.life / self.max_life) >= 0.3 then return end
+		if ((self.life-dam) / self.max_life) > 0.3 then return end
 
 		game.logSeen(self, "#RED#%s reacts immediately after taking severe wounds!#LAST#", self:getName():capitalize())
 		self.energy.value = self.energy.value + game.energy_to_act * 1.5
@@ -954,7 +954,7 @@ newTalent{
 	info = function(self, t)
 		return ([[Yeeks live fast, think fast, and sacrifice fast for the Way.
 		Your global speed is increased by %0.1f%%.
-		If your life drops below 30%% you gain 1.5 turns.  This effect can only happen once every %d turns.]]):tformat(100*t.speedup(self, t), self:getTalentCooldown(t))
+		If your life is below 30%% after taking damage you gain 1.5 turns.  This effect can only happen once every %d turns.]]):tformat(100*t.speedup(self, t), self:getTalentCooldown(t))
 	end,
 }
 

@@ -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.npc.chat_display_entity or self.npc)}
-	local player_frame = ChatPortrait.new{ui="chat", actor=self:getActorPortrait(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)
@@ -69,23 +81,35 @@ function _M:getActorPortrait(actor)
 		if self.player.getCurrentTalent and self.player:getCurrentTalent() then
 			local t = self.player:getTalentFromId(self.player:getCurrentTalent())
 			if t then
-				return Entity.new{name=t.name, image=t.image or "talents/default.png"}
+				local image = t.image or "portrait/unknown.png"
+				if image:find("^talents/") and fs.exists("/data/gfx/shockbolt/"..image:gsub("^talents/", "portrait/")) then
+					image = image:gsub("^talents/", "portrait/")
+				end
+				return Entity.new{name=t.name, image=image, chat_ignore_margins=true}
 			else
-				return Entity.new{name=actor.name, image="talents/default.png"}
+				return Entity.new{name=actor.name, image="portrait/unknown.png", chat_ignore_margins=true}
 			end
 		else
-			return Entity.new{name=actor.name, image="talents/default.png"}
+			return Entity.new{name=actor.name, image="portrait/unknown.png", chat_ignore_margins=true}
 		end
 	end
 
 	-- No need for anything special
 	if actor.image:find("^portrait/") then return actor end
 
-	-- Find the npc portrait
+	-- Find the portrait
 	if actor.image == "invis.png" and actor.add_mos and actor.add_mos[1] and actor.add_mos[1].image and actor.add_mos[1].image:find("^npc/") and fs.exists("/data/gfx/shockbolt/"..actor.add_mos[1].image:gsub("^npc/", "portrait/")) then
 		return Entity.new{name=actor.name, image=actor.add_mos[1].image:gsub("^npc/", "portrait/")}
 	elseif actor.image:find("^npc/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^npc/", "portrait/")) then
 		return Entity.new{name=actor.name, image=actor.image:gsub("^npc/", "portrait/")}
+	elseif actor.image:find("^npc/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^npc/", "portrait/")) then
+		return Entity.new{name=actor.name, image=actor.image:gsub("^npc/", "portrait/")}
+	elseif actor.image:find("^object/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^object/", "portrait/")) then
+		return Entity.new{name=actor.name, image=actor.image:gsub("^object/", "portrait/")}
+	elseif actor.image:find("^object/artifact/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^object/artifact/", "portrait/")) then
+		return Entity.new{name=actor.name, image=actor.image:gsub("^object/artifact/", "portrait/")}
+	elseif actor.image:find("^talents/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^talents/", "portrait/")) then
+		return Entity.new{name=actor.name, image=actor.image:gsub("^talents/", "portrait/")}
 	end
 
 	-- Last resort, use it as it is

@@ -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"???"
@@ -39,11 +40,12 @@ function _M:init(t)
 	end
 	if self.image then
 		local iw, ih = self.image:getSize()
+		self.oiw, self.oih = iw, ih
 		if iw <= 64 then iw, ih = iw * 2, ih * 2 end
 		self.iw, self.ih = iw, ih
-		if self.image.getEmptyMargins then
+		if self.image.getEmptyMargins and not t.actor.ignore_margins then
 			local x1, x2, y1, y2 = self.image:getEmptyMargins()
-			self.iy = y1
+			self.iy = 0
 		else
 			self.iy = 0
 		end
@@ -51,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
@@ -61,14 +64,33 @@ 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(Tiles.sharp_scaling)} end
+	if self.image then self.item = {self.image:glTexture(false, true)} end
 
 	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
@@ -76,7 +98,7 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 	if self.actor_frame then
 		self.actor_frame:display(dx, dy - self.iy)
 	elseif self.item then
-		self.item[1]:toScreen(dx, dy - self.iy, self.iw, self.ih)
+		self.item[1]:toScreenFull(dx, dy - self.iy, self.iw, self.ih, self.item[2] * self.iw / self.oiw, self.item[3] * self.ih / self.oih)
 	end
 	core.display.glScissor(false)
 	self.front.t:toScreenFull(x, y, self.front.w, self.front.h, self.front.tw, self.front.th)

@@ -243,7 +243,7 @@ Store:loadStores("/data/general/stores/basic.lua")
 
 -- Configure chat dialogs
 require("engine.dialogs.Chat").show_portraits = true
--- require("engine.Chat").chat_dialog = "mod.dialogs.Chat"
+require("engine.Chat").chat_dialog = "mod.dialogs.Chat"
 
 -- Inventory tabs
 InventoryUI.default_tabslist = function(self)