Add chat portraits to many things

@@ -81,7 +81,7 @@ He who felt great sorrow for this world. He who shall now shatter the barriers o
 The staff has allowed us to drain enough energy from this world to open the portal to the Void and summon Him through!
 It is already too late. He is coming through as we speak -- it is only a matter of hours!]],
 	answers = {
-		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn"}, action=aeryn_comes, cond=aeryn_alive},
+		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn", image="npc/humanoid_human_high_sun_paladin_aeryn.png"}, action=aeryn_comes, cond=aeryn_alive},
 		{_t"I *WILL* stop you! The world will not end today!", cond=aeryn_dead},
 	}
 }
@@ -92,7 +92,7 @@ He who felt great sorrow for this world. He who shall now shatter the barriers o
 The staff will allow us to drain enough energy from this world to open the portal to the Void and summon Him through!
 You cannot stop us now!]],
 	answers = {
-		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn"}, action=aeryn_comes, cond=aeryn_alive},
+		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn", image="npc/humanoid_human_high_sun_paladin_aeryn.png"}, action=aeryn_comes, cond=aeryn_alive},
 		{_t"I *WILL* stop you! The world will not end today!", cond=aeryn_dead},
 	}
 }

@@ -74,7 +74,7 @@ next_combat = function(self)
 
 		if not self:isEnded() then
 			local Chat = require "engine.Chat"
-			local chat = Chat.new("antimagic-end", {name=_t"Grim-looking fighter"}, game.player)
+			local chat = Chat.new("antimagic-end", {name=_t"Grim-looking fighter", image="portrait/antimagic.png"}, game.player)
 			chat:invoke()
 		end
 	end

@@ -77,7 +77,7 @@ kill_one = function(self)
 
 	if self.kill_count >= self.max_count then
 		local Chat = require "engine.Chat"
-		local chat = Chat.new("derth-attack-over", {name=_t"Scared Halfling"}, game.player)
+		local chat = Chat.new("derth-attack-over", {name=_t"Scared Halfling", image="portrait/derth_attack_over.png"}, game.player)
 		chat:invoke()
 
 		if not game.zone.unclean_derth_savior then

@@ -67,7 +67,7 @@ newEntity{ define_as = "UNGOLE", base = "BASE_NPC_SPIDER",
 
 	on_die = function(self, who)
 		local Chat = require"engine.Chat"
-		local chat = Chat.new("ardhungol-end", {name=_t"Sun Paladin Rashim"}, game.player:resolveSource())
+		local chat = Chat.new("ardhungol-end", {name=_t"Sun Paladin Rashim", image="portrait/ardhungol_end.png"}, game.player:resolveSource())
 		chat:invoke()
 	end,
 }

@@ -198,7 +198,7 @@ newEntity{
 			game:changeLevel(11, nil, {direct_switch=true}) -- Special level, can not get to it any other way
 			if game.player:hasQuest("high-peak"):isCompleted("sanctum-chat") then return end
 			local Chat = require "engine.Chat"
-			local chat = Chat.new("sorcerer-fight", {name=_t"Elandar"}, game.player)
+			local chat = Chat.new("sorcerer-fight", {name=_t"Elandar", image="npc/humanoid_shalore_elandar.png"}, game.player)
 			chat:invoke()
 			game.player:hasQuest("high-peak"):setStatus(engine.Quest.COMPLETED, "sanctum-chat")
 			game.player:hasQuest("high-peak"):start_end_combat()

@@ -71,6 +71,7 @@ newEntity{ base = "BASE_STORE", define_as = "LIBRARY",
 newEntity{ base = "BASE_STORE", define_as = "TRAINER",
 	name="Trainer",
 	display='1', color=colors.UMBER, image = "store/shop_door2.png", add_mos={{display_x=0.6, image="store/shop_sign_trainer.png"}},
+	chat_display = {name=_t"Grim-looking fighter", image="portrait/antimagic.png"},
 	resolvers.chatfeature("zigur-trainer", "zigur"),
 }
 

@@ -66,6 +66,10 @@ for i = 1, 20 do
 		{"small_willow_moss", {"shadow", "trunk", "foliage_spring"}},
 		{"willow", {tall=-1, "shadow", "trunk", "foliage_spring"}},
 		{"willow_moss", {tall=-1, "shadow", "trunk", "foliage_spring"}},
+		-- {"small_willow_02", {"shadow", "trunk", "foliage_bare"}},
+		-- {"willow_02", {tall=-1, "shadow", "trunk", "foliage_bare"}},
+		-- {"small_willow_02", {"shadow", "trunk", "foliage_spring"}},
+		-- {"willow_02", {tall=-1, "shadow", "trunk", "foliage_spring"}},
 	}, 1))
 end
 

@@ -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 - 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", 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 npc_frame = ChatPortrait.new{ui="chat", side="right", actor=self:getActorPortraitFull(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:getActorPortraitFull(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,6 +69,13 @@ function _M:makeUI()
 	player_frame:adjustHeight(self.h)
 end
 
+function _M:getActorPortraitFull(actor)
+	print("[ToME:CHAT] Grabbing portrait for ", actor.name, actor.image)
+	local e = self:getActorPortrait(actor)
+	print("[ToME:CHAT] Grabed portrait => ", e.image)
+	return e
+end
+
 function _M:getActorPortrait(actor)
 	local actor = actor.replace_display or actor
 	
@@ -98,12 +105,35 @@ function _M:getActorPortrait(actor)
 	if actor.image:find("^portrait/") then return actor end
 
 	-- 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
+	if actor.isClassName and actor:isClassName("engine.Grid") and (actor.add_mos or actor.add_displays) then
+		-- First one to have a portrait
+		for i, mo in ripairs(actor.add_displays or {}) do
+			if mo.image:find("^terrain/") and fs.exists("/data/gfx/shockbolt/"..mo.image:gsub("^terrain/", "portrait/")) then
+				return Entity.new{name=actor.name, image=mo.image:gsub("^terrain/", "portrait/")}
+			end
+		end
+		for i, mo in ripairs(actor.add_mos or {}) do
+			if mo.image:find("^terrain/") and fs.exists("/data/gfx/shockbolt/"..mo.image:gsub("^terrain/", "portrait/")) then
+				return Entity.new{name=actor.name, image=mo.image:gsub("^terrain/", "portrait/")}
+			end
+		end
+		-- If not, first one
+		if actor.add_displays then local mo = actor.add_displays[#actor.add_displays]
+			if mo then return Entity.new{name=actor.name, image=mo.image} end
+		end
+		if actor.add_mos then local mo = actor.add_mos[#actor.add_mos]
+			if mo then return Entity.new{name=actor.name, image=mo.image} end
+		end
+		-- If not, the terrain itself (how? we checked for one of add_mos & add_displays but heh)
+		if actor.image:find("^terrain/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^terrain/", "portrait/")) then
+			return Entity.new{name=actor.name, image=actor.image:gsub("^terrain/", "portrait/")}
+		end
+	elseif 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("^player/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^player/", "portrait/")) then
+		return Entity.new{name=actor.name, image=actor.image:gsub("^player/", "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

@@ -45,7 +45,7 @@ function _M:init(t)
 		self.iw, self.ih = iw, ih
 		if self.image.getEmptyMargins and not t.actor.ignore_margins then
 			local x1, x2, y1, y2 = self.image:getEmptyMargins()
-			self.iy = 0
+			self.iy = y1
 		else
 			self.iy = 0
 		end