New Webs of Fate visual effect

@@ -30,6 +30,7 @@ function _M:init(t)
 	self.w = assert(t.width, "no entity width")
 	self.h = assert(t.height, "no entity height")
 	self.back_color = t.back_color
+	self.back_image = t.back_image
 
 	Base.init(self, t)
 end
@@ -37,6 +38,10 @@ end
 function _M:generate()
 	self.mouse:reset()
 	self.key:reset()
+
+	if self.back_image then
+		self.back_texture = self:getUITexture(self.back_image)
+	end
 end
 
 function _M:display(x, y)
@@ -45,6 +50,9 @@ function _M:display(x, y)
 	if self.back_color then
 		core.display.drawQuad(x, y, self.w, self.h, unpack(self.back_color))
 	end
+	if self.back_texture then
+		self.back_texture.t:toScreenFull(x + (self.w - self.back_texture.w) / 2, y + (self.h - self.back_texture.h) / 2, self.back_texture.w, self.back_texture.h, self.back_texture.tw, self.back_texture.th)
+	end
 
 	self.entity:toScreen(nil, x, y, self.w, self.h)
 end

@@ -2095,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"}, game.player)
+			local chat = Chat.new("tareyal+test", engine.Entity.new{name=_t"Imperium courrier", image="talents/arcane_power.png"}, game.player)
 			chat:invoke()
 do return end
 			DamageType:get(DamageType.ACID).projector(game.player, game.player.x, game.player.y, DamageType.ACID, 100)

@@ -2482,7 +2482,7 @@ function _M:on_prepickup(who, idx)
 	end
 	if who.player and self.force_lore_artifact then
 		game.party:additionalLore(self.unique, self:getName(), "artifacts", self.desc)
-		game.party:learnLore(self.unique)
+		game.party:learnLore(self.unique, false, false, false, nil, self)
 	end
 end
 
@@ -2501,7 +2501,7 @@ function _M:on_identify()
 		end
 		if self.unique and self.desc and not self.no_unique_lore then
 			game.party:additionalLore(self.unique, self:getName{no_add_name=true, do_color=false, no_count=true}, "artifacts", self.desc)
-			game.party:learnLore(self.unique, false, false, true)
+			game.party:learnLore(self.unique, false, false, true, nil, self)
 		end
 	end)
 end

@@ -108,7 +108,7 @@ function _M:relearningLore(v)
 	self.relearning_lore = v
 end
 
-function _M:learnLore(lore, nopopup, silent, nostop, after_learn_cb)
+function _M:learnLore(lore, nopopup, silent, nostop, after_learn_cb, display_entity)
 	print("[LORE] learning..", lore)
 	local l = self:getLore(lore, silent)
 	if not l then return end
@@ -124,7 +124,7 @@ function _M:learnLore(lore, nopopup, silent, nostop, after_learn_cb)
 	if not self:knownLore(lore) or l.always_pop then
 		game.logPlayer(self, "Lore found: #0080FF#%s", l.name)
 		if not nopopup then
-			LorePopup.new(l, game.w * 0.6, 0.8, after_learn_cb)
+			LorePopup.new(l, game.w * 0.6, 0.8, after_learn_cb, display_entity)
 			game.logPlayer(self, "You can read all your collected lore in the game menu, by pressing Escape.")
 		end
 		learnt = true

@@ -19,6 +19,8 @@
 local q = game.player:hasQuest("lost-merchant")
 if q and q:isStatus(q.COMPLETED, "saved") then
 
+npc.chat_display_entity = engine.Entity.new{name=_t"Urthol's Wondrous Emporium", image="portrait/shop_urthol_s_wondrous_emporium.png"}
+
 local p = game:getPlayer(true)
 
 local trap = p:knowTalentType("cunning/trapping") and not game.state:unlockTalentCheck(player.T_AMBUSH_TRAP, player)

@@ -3622,9 +3622,7 @@ newEffect{
 		return {dam=dam}
 	end,
 	activate = function(self, eff)
-		if core.shader.allow("adv") then
-			eff.particle1, eff.particle2 = self:addParticles3D("volumetric", {kind="fast_sphere", shininess=40, density=40, radius=1.4, scrollingSpeed=0.001, growSpeed=0.004, img="squares_x3_01"})
-		end
+		eff.particle1 = self:addParticles(Particles.new("circle", 1, {shader=true, toback=true, oversize=1.4, a=155, appear=8, speed=0, img="webs_of_fate_aura", radius=0}))
 	end,
 	deactivate = function(self, eff)
 		self:removeParticles(eff.particle1)

@@ -70,9 +70,10 @@ function _M:makeUI()
 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)
+	if e.image and (e.image:find("talents/") or e.image:find("effects/")) then
+		e = Entity.new{name=e.name, image=e.image, chat_portrait_background="ui/chat_talents_bg.png", chat_portrait_size=0.75}
+	end
 	return e
 end
 

@@ -21,12 +21,13 @@ require "engine.class"
 local Dialog = require "engine.ui.Dialog"
 local ListColumns = require "engine.ui.ListColumns"
 local TextzoneList = require "engine.ui.TextzoneList"
+local EntityDisplay = require "engine.ui.EntityDisplay"
 local Image = require "engine.ui.Image"
 local Separator = require "engine.ui.Separator"
 
 module(..., package.seeall, class.inherit(Dialog))
 
-function _M:init(l, w, force_height, after_learn_cb)
+function _M:init(l, w, force_height, after_learn_cb, display_entity)
 	self.after_learn_cb = after_learn_cb
 	self.title_shadow = false
 	self.color = l.text_color or {r=0x3a, g=0x35, b=0x33}
@@ -62,7 +63,7 @@ function _M:init(l, w, force_height, after_learn_cb)
 	local required_h = self.font:height() + self.font_h * (#list - 1)
 	local h = math.min(force_height and (force_height * game.h) or 999999999, required_h)
 	local c_text = require("engine.ui.Textzone").new{
-		width=w+10, height=h, scrollbar=(h < required_h) and true or false, text=text, color=self.color,
+		width=(display_entity and (w - 90) or w)+10, height=h, scrollbar=(h < required_h) and true or false, text=text, color=self.color,
 	}
 	c_text:setTextShadow(false)
 
@@ -86,6 +87,12 @@ function _M:init(l, w, force_height, after_learn_cb)
 				{left = 3, top = 3 + image.h, ui=c_text},
 			}
 		end
+	elseif display_entity then
+		local frame = EntityDisplay.new{ui="parchment", width=64, height=64, entity=display_entity, back_image="ui/lore_frame_entity.png"}
+		uis = {
+			{left = 13, top = 3, ui=c_text},
+			{right = 13, top = 3, ui=frame},
+		}
 	end
 	
 	local on_end = function() 

@@ -28,7 +28,7 @@ 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.actor = assert(t.actor, "no ChatPortrait actor")
 	
 	self.name = t.actor.getName and t.actor:getName() or _t(t.actor.name) or _t"???"
 	if t.actor.moddable_tile then
@@ -53,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)
@@ -68,6 +69,13 @@ function _M:generate()
 	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.actor.chat_portrait_background then
+		self.back_texture = self:getUITexture(self.actor.chat_portrait_background)
+		if self.actor.chat_portrait_size then
+			self.iw, self.ih = self.iw * self.actor.chat_portrait_size, self.ih * self.actor.chat_portrait_size
+		end
+	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)
@@ -92,6 +100,11 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 	end
 
 	self.back.t:toScreenFull(x, y, self.back.w, self.back.h, self.back.tw, self.back.th)
+
+	if self.back_texture then
+		self.back_texture.t:toScreenFull(x + 15, y + 15, self.back_texture.w, self.back_texture.h, self.back_texture.tw, self.back_texture.th)
+	end
+
 	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
 	if self.ih > 192 then dy = y + 15 end
@@ -101,6 +114,7 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 		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)
 
 	core.display.glScissor(true, screen_x + 4, screen_y + 229, 152, 23)