New chat dialog interface

@@ -2094,7 +2094,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)

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

@@ -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", image="winner.png"}, 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()

@@ -180,7 +180,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)

@@ -39,8 +39,8 @@ 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_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", 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 uis = {
 		{hcenter=0, top=-12, ui=self.c_desc},
@@ -69,23 +69,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

@@ -39,11 +39,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
@@ -63,7 +64,7 @@ function _M:generate()
 	self.back = self:getUITexture("ui/portrait_frame_back.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
@@ -76,7 +77,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)