update some chat stuff

Probability Travel mana cost reduced

@@ -434,7 +434,7 @@ end
 -- @string text @playername@, @npcname@, @playerdescriptor.(.-)@
 function _M:replace(text)
 	local Birther = require "engine.Birther"
-	text = text:noun_sub("@playername@", self.player:getName()):noun_sub("@npcname@", self.npc.getName and self.npc:getName() or _t(self.npc.name, "entity name"))
+	text = text:noun_sub("@playername@", self.player:getName()):noun_sub("@npcname@", self.npc.getName and self.npc:getName() or _t(self.npc.name, "entity name") or _t"???")
 	text = text:gsub("@playerdescriptor.(.-)@", function(what)
 		if not self.player.descriptor then return _t"???" end
 		if self.player.descriptor["fake_"..what] then return _t(self.player.descriptor["fake_"..what]) end

@@ -57,7 +57,7 @@ function _M:setInscription(id, name, data, cooldown, vocal, src, bypass_max_same
 			src.iname = name
 			src.idata = data
 			src.replace_same = name
-			local chat = Chat.new("player-inscription", {name=t.name}, self, src)
+			local chat = Chat.new("player-inscription", {name=t.name, image=t.image}, self, src)
 			chat:invoke()
 		end
 		return
@@ -79,7 +79,7 @@ function _M:setInscription(id, name, data, cooldown, vocal, src, bypass_max_same
 			src.player = self
 			src.iname = name
 			src.idata = data
-			local chat = Chat.new("player-inscription", {name=t.name}, self, src)
+			local chat = Chat.new("player-inscription", {name=t.name, image=t.image}, self, src)
 			chat:invoke()
 		end
 		return

@@ -100,7 +100,7 @@ start_ambush = function(self, who)
 	end
 
 	local Chat = require("engine.Chat")
-	local chat = Chat.new("dreadfell-ambush", {name=_t"Ukruk the Fierce"}, who)
+	local chat = Chat.new("dreadfell-ambush", {name=_t"Ukruk the Fierce", image="npc/humanoid_orc_ukruk_the_fierce.png"}, who)
 	chat:invoke()
 end
 

@@ -127,7 +127,7 @@ newTalent{
 	tactical = {BUFF = 2},
 	on_pre_use_ai = artifice_tools_npc_select, -- NPC's automatically pick a tool
 	action = function(self, t)
-		local chat = Chat.new("artifice", self, self, {player=self, slot=1, chat_tid=t.id, tool_ids=artifice_tool_tids})
+		local chat = Chat.new("artifice", {}, self, {player=self, slot=1, chat_tid=t.id, tool_ids=artifice_tool_tids})
 		local d = chat:invoke()
 		d.key:addBinds{ EXIT = function()
 			game:unregisterDialog(d)

@@ -789,7 +789,7 @@ newTalent{
 		return false -- NPC's don't actually use the action function
 	end,
 	action = function(self, t)
-		local chat = Chat.new("trap-priming", self, self, {player=self, trapping_tids=traps_getunlocked(self, t), chat_talent=t})
+		local chat = Chat.new("trap-priming", t, self, {player=self, trapping_tids=traps_getunlocked(self, t), chat_talent=t})
 		local d = chat:invoke()
 		d.key:addBinds{ EXIT = function()
 			self:talentDialogReturn(self.trap_primed, self.trap_primed)

@@ -178,7 +178,7 @@ newTalent{
 		if self.player then -- prompt the player to pick a new element
 			local state = {}
 			local Chat = require("engine.Chat")
-			local chat = Chat.new("command-staff", {name=_t"Command Staff: "..staff:getName{do_color=true, no_add_name=true}}, self, {version=staff, state=state, co=coroutine.running()})
+			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
 			return true

@@ -328,7 +328,7 @@ newTalent{
 	require = spells_req4,
 	points = 5,
 	cooldown = 40,
-	sustain_mana = 200,
+	sustain_mana = 100,
 	no_npc_use = true,
 	tactical = { ESCAPE = 1, CLOSEIN = 1 },
 	getRange = function(self, t) return math.floor(self:combatScale(self:combatSpellpower(0.06) * self:getTalentLevel(t), 4, 0, 20, 16)) end,

@@ -678,7 +678,7 @@ newEffect{
 				return
 		else
 				game._chronoworlds.see_threads_base = nil
-				local chat = Chat.new("chronomancy-see-threads", {name=_t"See the Threads"}, self, {turns=eff.max_dur})
+				local chat = Chat.new("chronomancy-see-threads", {name=_t"See the Threads", image = "talents/see_the_threads.png"}, self, {turns=eff.max_dur})
 				chat:invoke()
 			end
 		end)

@@ -63,6 +63,21 @@ function _M:getActorPortrait(actor)
 	-- Moddable tiles are already portrait sized
 	if actor.moddable_tile and Map.tiles.no_moddable_tiles then return actor end
 
+	-- No image at all ?
+	if not actor.image then
+		-- By any chance are we running a talent ?
+		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"}
+			else
+				return Entity.new{name=actor.name, image="talents/default.png"}
+			end
+		else
+			return Entity.new{name=actor.name, image="talents/default.png"}
+		end
+	end
+
 	-- No need for anything special
 	if actor.image:find("^portrait/") then return actor end
 

@@ -29,7 +29,7 @@ module(..., package.seeall, class.inherit(Base))
 function _M:init(t)
 	assert(t.actor, "no ChatPortrait actor")
 	
-	self.name = t.actor.getName and t.actor:getName() or _t(t.actor.name)
+	self.name = t.actor.getName and t.actor:getName() or _t(t.actor.name) or _t"???"
 	if t.actor.moddable_tile then
 		self.actor_frame = ActorFrame.new{actor=t.actor, w=128, h=128, allow_cb=false, allow_shader=false}
 	elseif t.actor.image == "invis.png" and t.actor.add_mos and t.actor.add_mos[1] and t.actor.add_mos[1].image then
@@ -83,7 +83,7 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 
 	core.display.glScissor(true, screen_x + 4, screen_y + 229, 152, 23)
 	-- Center if it fits, left align is not
-	if self.name_tex.w <= 229 then
+	if self.name_tex.w <= 153 then
 		self:textureToScreen(self.name_tex, x + 80 - self.name_tex.w / 2, y + 240 - self.name_tex.h / 2)
 	else
 		self:textureToScreen(self.name_tex, x + 4, y + 240 - self.name_tex.h / 2)

@@ -596,8 +596,13 @@ function resolvers.calc.chatfeature(t, e)
 	e.chat_faction = t[2]
 	t = t[1]
 
-	if e.chat_faction then
-		e.chat_display_entity = engine.Entity.new{image="faction/"..e.chat_faction..".png"}
+	if e.chat_display then
+		e.chat_display_entity = engine.Entity.new(e.chat_display)
+		if e.chat_faction and not e.chat_display_entity.image then
+			e.chat_display_entity.image = "faction/"..e.chat_faction..".png"
+		end
+	elseif e.chat_faction then
+		e.chat_display_entity = engine.Entity.new{image="faction/"..e.chat_faction..".png", name=e.name}
 	end
 
 	e.block_move = function(self, x, y, who, act, couldpass)