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

@@ -133,8 +133,8 @@ function _M:trigger(x, y, who)
 	else
 		local tname = who:getName()
 		local str =self.message
-		str = str:gsub("@target@", tname)
-		str = str:gsub("@Target@", tname:capitalize())
+		str = str:noun_sub("@target@", tname)
+		str = str:noun_sub("@Target@", tname:capitalize())
 		game.logSeen(who, "%s", str)
 	end
 	local known, del = false, false

@@ -1179,6 +1179,10 @@ function _M:getCurrentTalentMode()
 	return self._temp_data and self._temp_data.current_talent_mode and self._temp_data.current_talent_mode[1] or "none"
 end
 
+function _M:getCurrentTalentModeLast()
+	return self._temp_data and self._temp_data.current_talent_mode and self._temp_data.current_talent_mode[#self._temp_data.current_talent_mode] or "none"
+end
+
 function _M:setCurrentTalentMode(mode, tid)
 	if not self._temp_data then self._temp_data = {} end
 	if not self._temp_data.current_talent_mode then self._temp_data.current_talent_mode = {} end

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

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

@@ -76,6 +76,20 @@ function math.triangle_area(p1, p2, p3)
 	return math.abs(0.5 * lu * lv * math.sin(av - au))
 end
 
+function math.find_closest_lower(x, list)
+	table.sort(list)
+	for i in ripairs_value(list) do
+		if x >= i then return i end
+	end
+end
+
+function math.find_closest_higher(x, list)
+	table.sort(list)
+	for i in ipairs_value(list) do
+		if x <= i then return i end
+	end
+end
+
 function lpeg.anywhere (p)
 	return lpeg.P{ p + 1 * lpeg.V(1) }
 end
@@ -134,6 +148,16 @@ function ipairs_value(t)
 	end
 end
 
+function ripairs_value(t)
+	local i = #t
+	return function()
+		if i == 0 then return nil end
+		local oi = i
+		i = i - 1
+		return t[oi], oi
+	end
+end
+
 function table.weak_keys(t)
 	t = t or {}
 	setmetatable(t, {__mode="k"})

@@ -627,7 +627,7 @@ end
 function _M:createProfile(loginItem)
 	if not loginItem.create then
 		self.auth_tried = nil
-		local d = Dialog:simpleWaiter(_t"Login in...", _t"Please wait...") core.display.forceRedraw()
+		local d = Dialog:simpleWaiter(_t"Logging in...", _t"Please wait...") core.display.forceRedraw()
 		profile:performlogin(loginItem.login, loginItem.pass)
 		profile:waitFirstAuth()
 		d:done()

@@ -274,7 +274,7 @@ function _M:login()
 end
 
 function _M:loginSteam()
-	local d = self:simpleWaiter(_t"Login...", _t"Login in your account, please wait...") core.display.forceRedraw()
+	local d = self:simpleWaiter(_t"Login...", _t"Logging in your account, please wait...") core.display.forceRedraw()
 	d:timeout(10, function() Dialog:simplePopup("Steam", _t"Steam client not found.")	end)
 	core.steam.sessionTicket(function(ticket)
 		if not ticket then

@@ -579,6 +579,18 @@ function _M:actBase()
 		end
 	end
 
+	for _, defs in pairs(self._applied_resources_inconstant_drain or {}) do
+		local new_cost = util.getval(defs.cost, self, defs.ab) or 0
+		new_cost = self:alterTalentCost(defs.ab, defs.res_def.drain_prop, new_cost)
+		if not defs.res_def.invert_values then
+			new_cost = - new_cost
+		end
+		if defs.old_cost ~= new_cost then
+			self:removeTemporaryValue(defs.res_def.regen_prop, defs.temporary_value)
+			defs.temporary_value = self:addTemporaryValue(defs.res_def.regen_prop, new_cost)
+			defs.old_cost = new_cost
+		end
+	end
 	self:regenResources()
 
 	-- update psionic feedback
@@ -1881,6 +1893,7 @@ function _M:textRank(use_rank)
 	elseif use_rank == 3.5 then rank, color = _t"unique", "#SANDY_BROWN#"
 	elseif use_rank == 4 then rank, color = _t"boss", "#ORANGE#"
 	elseif use_rank == 5 then rank, color = _t"elite boss", "#GOLD#"
+	elseif use_rank == 11 then rank, color = _t"godslayer", "#FF4000#"
 	elseif use_rank >= 10 then rank, color = _t"god", "#FF4000#"
 	end
 	return rank, color
@@ -4817,6 +4830,7 @@ end
 function _M:checkTwoHandedPenalty()
 	self:removeEffect(self.EFF_2H_PENALTY, true, true)
 	if not self:attr("allow_mainhand_2h_in_1h") then return end
+	if self:attr("allow_mainhand_2h_in_1h_no_penalty") then return end
 	local mi, oi = self:getInven(self.INVEN_MAINHAND), self:getInven(self.INVEN_OFFHAND)
 	if not mi or not oi then return end
 	local mh, oh = mi[1], oi[1]
@@ -5918,7 +5932,7 @@ function _M:preUseTalent(ab, silent, fake, ignore_ressources)
 	end
 	if self:fireTalentCheck("callbackOnTalentPre", ab, silent, fake, ignore_ressources) then return false end
 
-	if not ab.never_fail then
+	if self:getCurrentTalentModeLast() ~= "forced" and not ab.never_fail then
 		-- Confused ? lose a turn!
 		if self:attr("confused") and (ab.mode ~= "sustained" or not self:isTalentActive(ab.id)) and util.getval(ab.no_energy, self, ab) ~= true and not fake and not self:attr("force_talent_ignore_ressources") then
 			if rng.percent(util.bound(self:attr("confused"), 0, 50)) then
@@ -6071,6 +6085,7 @@ local sustainCallbackCheck = {
 	callbackOnPartyRemove = "talents_on_party_remove",
 	callbackOnTargeted = "talents_on_targeted",
 	callbackOnCloned = "talents_on_cloned",
+	callbackOnAITalentTactics = "talents_on_ai_talent_tactics",
 }
 _M.sustainCallbackCheck = sustainCallbackCheck
 
@@ -6347,7 +6362,7 @@ function _M:postUseTalent(ab, ret, silent)
 				trigger = true; self:incMaxFeedback(-util.getval(ab.sustain_feedback, self, ab))
 			end
 			local cost
-			ret._applied_costs,	ret._applied_drains = {}, {} -- to store the resource effects
+			ret._applied_costs,	ret._applied_drains, ret._applied_inconstant_drains = {}, {}, {} -- to store the resource effects
 			for res, res_def in ipairs(_M.resources_def) do
 				-- apply sustain costs
 				cost = ab[res_def.sustain_prop]
@@ -6366,7 +6381,19 @@ function _M:postUseTalent(ab, ret, silent)
 				end
 				-- apply drain costs
 				cost = ab[res_def.drain_prop]
-				if cost then
+				if type(cost) == "function" then -- non-constant resource drain
+					local init_cost = util.getval(cost, self, ab) or 0
+					init_cost = self:alterTalentCost(ab, res_def.drain_prop, init_cost)
+					if not res_def.invert_values then
+						init_cost = - init_cost
+					end
+					local temporary_value = self:addTemporaryValue(res_def.regen_prop, init_cost)
+					local tid_res = ab.id .. "_" .. res_def.drain_prop
+					self._applied_resources_inconstant_drain = self._applied_resources_inconstant_drain or {}
+					self._applied_resources_inconstant_drain[tid_res] = {ab = ab, res_def = res_def, cost = cost, old_cost = init_cost, temporary_value = temporary_value}
+					ret._applied_inconstant_drains[res_def.short_name] = tid_res
+					trigger = true
+				elseif cost then
 					cost = util.getval(cost, self, ab) or 0
 					cost = self:alterTalentCost(ab, res_def.drain_prop, cost)
 					if cost ~= 0 then
@@ -6409,6 +6436,14 @@ function _M:postUseTalent(ab, ret, silent)
 					end
 				end
 			end
+			-- reverse non-constant resource drain
+			if ret._applied_inconstant_drains then
+				for _, tid_res in pairs(ret._applied_inconstant_drains) do
+					local defs = self._applied_resources_inconstant_drain[tid_res]
+					self:removeTemporaryValue(defs.res_def.regen_prop, defs.temporary_value)
+					self._applied_resources_inconstant_drain[tid_res] = nil
+				end
+			end
 			-- reverse resource drains
 			if ret._applied_drains then
 				local res_def
@@ -6479,7 +6514,7 @@ function _M:postUseTalent(ab, ret, silent)
 	end
 
 	-- break stealth, channels, etc...
-	if not self.turn_procs.resetting_talents then
+	if self:getCurrentTalentModeLast() ~= "forced" and not self.turn_procs.resetting_talents then
 		-- Cancel stealth!
 		if not util.getval(ab.no_break_stealth, self, ab) and util.getval(ab.no_energy, self, ab) ~= true then self:breakStealth() end
 
@@ -6499,11 +6534,11 @@ function _M:postUseTalent(ab, ret, silent)
 				end)
 			end
 		end
-	end
 
-	if not ab.innate and self:hasEffect(self.EFF_RAMPAGE) and ab.id ~= self.T_RAMPAGE and ab.id ~= self.T_SLAM then
-		local eff = self:hasEffect(self.EFF_RAMPAGE)
-		value = self.tempeffect_def[self.EFF_RAMPAGE].do_postUseTalent(self, eff, value)
+		if not ab.innate and self:hasEffect(self.EFF_RAMPAGE) and ab.id ~= self.T_RAMPAGE and ab.id ~= self.T_SLAM then
+			local eff = self:hasEffect(self.EFF_RAMPAGE)
+			value = self.tempeffect_def[self.EFF_RAMPAGE].do_postUseTalent(self, eff, value)
+		end	
 	end
 
 	if ab.is_summon and ab.is_nature and self:attr("heal_on_nature_summon") then

@@ -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", 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)
@@ -2222,7 +2223,7 @@ do return end
 
 			if config.settings.tome.rest_before_explore then
 				local ok = false
-				self.player:restInit(nil, nil, nil, function() ok = self.player.resting.rested_fully end, function() if ok then self:onTickEnd(ae) self.tick_loopback = true end end)
+				self.player:restInit(nil, nil, nil, function() ok = self.player.resting and self.player.resting.rested_fully end, function() if ok then self:onTickEnd(ae) self.tick_loopback = true end end)
 			else
 				ae()
 			end

@@ -203,7 +203,8 @@ function _M:tooltip(x, y)
 				if p.level <= data.level_range[1] - 10 then color = "CRIMSON"
 				elseif p.level <= data.level_range[1] - 4 then color = "ORANGE"
 				end
-				tstr:add(true, {"font","bold"}, {"color", color}, _t"Min.level: "..data.level_range[1], {"color", "LAST"}, {"font","normal"}, true)
+				tstr:add(true, {"font","bold"}, {"color", color}, _t"Min.level: "..math.floor((data.level_range[1]+(game.state.birth.difficulty_level_add or 0))*(game.state.birth.difficulty_level_mult or 1)), {"color", "LAST"}, {"font","normal"})
+				tstr:add(true, {"font","bold"}, {"color", color}, _t"Max.level: "..math.ceil((data.level_range[2]+(game.state.birth.difficulty_level_add or 0))*(game.state.birth.difficulty_level_mult or 1)), {"color", "LAST"}, {"font","normal"}, true)
 			end
 		end
 	end

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

@@ -1386,6 +1386,10 @@ function _M:aiTalentTactics(t, aitarget, target_list, tactic, tg, wt_mod)
 			end --(DEBUGGING transitional)
 			if type(tactical) == "function" then tactical = tactical(self, t, aitarget) end
 		end
+		local hd = {"ActorAI:aiTalentTactics", tactical=table.clone(tactical, true), t=t, ai_target=ai_target}
+		self:triggerHook(hd)
+		self:fireTalentCheck("callbackOnAITalentTactics", hd)
+		tactical = hd.tactical
 		if log_detail >= 2 then print("[aiTalentTactics]__ using talent tactical table for", t.id) table.print(tactical, "\t___") end
 		if not tactical then return false end
 
@@ -1568,7 +1572,7 @@ function _M:aiTalentTactics(t, aitarget, target_list, tactic, tg, wt_mod)
 							else
 								val_type, val_wt = next(val, val_type) if not val_wt then break end
 							end
-							if act == self and self:attr("encased_in_ice") and tact == "attack" or tact == "attackarea" then
+							if act == self and self:attr("encased_in_ice") and (tact == "attack" or tact == "attackarea") then
 								weight = s_mult * math.abs(benefit) -- Frozen status ignores selffire and allows self-fire
 							elseif act == self then -- hit self
 								weight = selffire*friendlyfire*s_mult*benefit -- matches actor:project

@@ -612,14 +612,10 @@ local function archery_projectile(tx, ty, tg, self, tmp)
 	end
 	
 	-- Siege Arrows
-	if hitted and ammo and ammo.siege_impact and (not self.shattering_impact_last_turn or self.shattering_impact_last_turn < game.turn) then
+	if hitted and ammo and ammo.siege_impact then
 		local dam = dam * ammo.siege_impact
-		local invuln = target.invulnerable
-		game.logSeen(target, "The shattering blow creates a shockwave!")
-		target.invulnerable = 1 -- Target already hit, don't damage it twice
-		self:project({type="ball", radius=1, friendlyfire=false}, target.x, target.y, DamageType.PHYSICAL, dam)
-		target.invulnerable = invuln
-		self.shattering_impact_last_turn = game.turn
+		game.logSeen(target, "The siege arrow creates a shockwave!")
+		self:project({type="ball", radius=1, friendlyfire=false, act_exclude={[target.uid]=true}}, target.x, target.y, DamageType.PHYSICAL, dam)
 	end
 
 	if self ~= target then

@@ -127,7 +127,7 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed)
 --		if ret then return false end
 --	end
 
-	if not target.turn_procs.warding_weapon and target:knowTalent(target.T_WARDING_WEAPON) and target:getTalentLevelRaw(target.T_WARDING_WEAPON) >= 5
+	if not target.turn_procs.warding_weapon and target:knowTalent(target.T_WARDING_WEAPON) and target:getTalentLevel(target.T_WARDING_WEAPON) >= 5
 		and rng.percent(target:callTalent(target.T_WARDING_WEAPON, "getChance")) then
 		local t = self:getTalentFromId(self.T_WARDING_WEAPON)
 		if target:getPsi() >= t.psi then
@@ -1389,6 +1389,7 @@ function _M:combatAttackRanged(weapon, ammo)
 	local stats
 	if self:attr("use_psi_combat") then stats = (self:getCun(100, true) - 10) * (0.6 + self:callTalent(self.T_RESONANT_FOCUS, "bonus")/100)
 	elseif weapon and weapon.wil_attack then stats = self:getWil(100, true) - 10
+	elseif weapon and weapon.mag_attack then stats = self:getMag(100, true) - 10
 	else stats = self:getDex(100, true) - 10
 	end
 	local d = self:combatAttackBase(weapon, ammo) + stats + (self.combat_atk_ranged or 0)

@@ -108,7 +108,8 @@ 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
 	local learnt = false
@@ -123,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

@@ -117,6 +117,21 @@ newAchievement{
 	desc = _t[[Won ToME by closing the Void portal and letting yourself be killed by Aeryn to prevent the Way to enslave every sentient being on Eyal.]],
 }
 newAchievement{
+	name = "This is how the world ends: swallowed in fire, but not in darkness.", id = "AOADS_BURN",
+	show = "name", huge=true,
+	desc = _t[["Won" ToME by sacrificing yourself for your patron Distant Sun, opening a portal for it to burn and consume the world.]],
+}
+newAchievement{
+	name = "Last Instant of Sanity", id = "AOADS_SELFLESS",
+	show = "name", huge=true,
+	desc = _t[[Won ToME by closing the Void portal and letting yourself be killed by Aeryn to prevent your mad patron sun from burning the world in a searing flash.]],
+}
+newAchievement{
+	name = "They Came Back For Eyal", id = "AOADS_SHERTUL",
+	show = "name", huge=true,
+	desc = _t[[Won ToME thanks to a Sher'tul stopping you at the last moment from opening a portal to your mad patron sun.]],
+}
+newAchievement{
 	name = "Tactical master", id = "SORCERER_NO_PORTAL",
 	show = "name", huge=true,
 	desc = _t[[Fought the two Sorcerers without closing any invocation portals.]],

@@ -123,7 +123,11 @@ newBirthDescriptor{
 		resolvers.inventorybirth{ id=true,
 			{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance= -1000},
 		},
-
+		resolvers.generic(function(self)
+			if not profile.mod.allow_build.paladin_avatar then
+				self:learnTalent(self.T_AVATAR_DISTANT_SUN_UNLOCK_CHECKER, true)
+			end
+		end),
 	},
 	copy_add = {
 		life_rating = 2,

@@ -161,6 +161,7 @@ newBirthDescriptor
 		confusion_immune = 0.35,
 		max_air = 200,
 		moddable_tile = "yeek",
+		moddable_tile_nude = 1,
 		random_name_def = "yeek_#sex#",
 	},
 	experience = 0.85,

+{
+    "24": {
+        "id": 24,
+        "name": "lua-code",
+        "data": {
+            "code": "player:callTalent(player.T_AVATAR_DISTANT_SUN_UNLOCK_CHECKER, \"doUnlock\")"
+        },
+        "class": "lua-code",
+        "html": "lua-code",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "26",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "32",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": []
+            }
+        },
+        "pos_x": 2440,
+        "pos_y": 549.1111111111111
+    },
+    "25": {
+        "id": 25,
+        "name": "chat",
+        "data": {
+            "chatid": "welcome",
+            "chat": "<<<You feel a gentle warmth in your mind. Something speaks directly to your mind!>>>\n#YELLOW#HELLO FRIEND. I AM A STAR FROM FAR AWAY. I HAVE HEARD YOU PRAISING YOUR SUN. WHY NOT PRAISE ME INSTEAD? I AM A MUCH BETTER SUN THAN THAT DULL, LIFELESS GAS ORB IN YOUR VICINITY. PLEASE, ALLOW ME TO DEMONSTRATE MY GOOD INTENTIONS.",
+            "answer1": "Uhh, okay. Sure. Mind showing me?",
+            "answer2": "I don't take unsolicited messages from... stars."
+        },
+        "class": "chat",
+        "html": "chat2",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": []
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "26",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 23,
+        "pos_y": 167
+    },
+    "26": {
+        "id": 26,
+        "name": "chat",
+        "data": {
+            "chatid": "chat2",
+            "chat": "#YELLOW#YOU ONLY HAD TO ASK, MY FRIEND.",
+            "answer1": "#CRIMSON#[The area around you erupts in flames, burning your foes]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "25",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "30",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "31",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "24",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 2084.3333333333335,
+        "pos_y": 265
+    },
+    "29": {
+        "id": 29,
+        "name": "chat",
+        "data": {
+            "chatid": "chat3",
+            "chat": "#YELLOW#DON'T BE LIKE THAT. I KNOW YOU ARE ON A NOBLE QUEST.",
+            "answer1": "Look, I appreciate the offer, but I don't know you.",
+            "answer2": "I'm busy at the moment, so maybe call back another time?",
+            "answer3": "If you say so."
+        },
+        "class": "chat",
+        "html": "chat3",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "25",
+                        "input": "output_2"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "30",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "31",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_3": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 670,
+        "pos_y": 631
+    },
+    "30": {
+        "id": 30,
+        "name": "chat",
+        "data": {
+            "chatid": "chat4",
+            "chat": "#YELLOW#I AM YOUR FRIEND. NOW YOU KNOW ME. LET US BEGIN A LONG AND FRUITFUL FRIENDSHIP.",
+            "answer1": "Uhh, okay. Sure. Mind showing me?"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "26",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1431,
+        "pos_y": 388
+    },
+    "31": {
+        "id": 31,
+        "name": "chat",
+        "data": {
+            "chatid": "chat5",
+            "chat": "#YELLOW#BUSY, YOU SAY? I CAN FIX THAT, LIKE ANY GOOD FRIEND WOULD.",
+            "answer1": "Uhh, okay. Sure. Mind showing me?"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "input": "output_2"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "26",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1429,
+        "pos_y": 640
+    },
+    "32": {
+        "id": 32,
+        "name": "chat",
+        "data": {
+            "chatid": "chat6",
+            "chat": "#YELLOW#YOU DON'T BELIEVE ME? THEN PLEASE, ALLOW ME TO SHOW YOU A MERE FRACTION OF MY POWER.",
+            "answer1": "#CRIMSON#[The area around you erupts in flames, burning your foes]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "input": "output_3"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "24",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1420,
+        "pos_y": 903
+    }
+}
\ No newline at end of file

+{
+    "25": {
+        "id": 25,
+        "name": "chat",
+        "data": {
+            "chatid": "chat4",
+            "chat": "#YELLOW#YOU ARE A CURIOUS ONE.",
+            "answer1": "[...]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1564,
+        "pos_y": 207
+    },
+    "27": {
+        "id": 27,
+        "name": "chat",
+        "data": {
+            "chatid": "chat6",
+            "chat": "#YELLOW#YOU HAVE MADE THE RIGHT CHOICE. TOGETHER, WE SHALL BRING ABOUT THE DESTRUCTION OF OUR ENEMIES.",
+            "answer1": "#GOLD#[you are now an Avatar of a Distant Sun]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "36",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "39",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 2507,
+        "pos_y": -110
+    },
+    "29": {
+        "id": 29,
+        "name": "chat",
+        "data": {
+            "chatid": "welcome",
+            "chat": "<<<You feel the gentle warmth of your Distant Sun patron. It speaks directly to your mind!>>>\n#YELLOW#I AM HERE. DO YOU DESIRE TO SMITE EVIL, DESTROY THE DARKNESS AND SCOUR THE EARTH? I SHALL AID YOU IN THIS QUEST. TOGETHER, WE WILL BE UNSTOPPABLE. ALL DARKNESS SHALL BE CONSUMED BY OUR LIGHT.\n#LAST#",
+            "answer1": "Yes, give me your power!",
+            "answer2": "Who... Who are you?"
+        },
+        "class": "chat",
+        "html": "chat2",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": []
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "27",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 92,
+        "pos_y": 131
+    },
+    "32": {
+        "id": 32,
+        "name": "chat",
+        "data": {
+            "chatid": "chat7",
+            "chat": "#YELLOW#I AM YOUR FRIEND. IT IS GOOD TO HAVE FRIENDS, ISN'T IT?",
+            "answer1": "But how are you speaking to me?",
+            "answer2": "You still haven't told me who or what you are.",
+            "answer3": "But what are you getting out of this?",
+            "answer4": "That doesn't tell me anything."
+        },
+        "class": "chat",
+        "html": "chat4",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "input": "output_2"
+                    },
+                    {
+                        "node": "25",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "33",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "34",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "25",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "33",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_3": {
+                "connections": [
+                    {
+                        "node": "34",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_4": {
+                "connections": [
+                    {
+                        "node": "36",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 721,
+        "pos_y": 330
+    },
+    "33": {
+        "id": 33,
+        "name": "chat",
+        "data": {
+            "chatid": "chat8",
+            "chat": "#YELLOW#YOU NEED NOT CONCERN YOURSELF WITH SUCH THINGS. I KNOW YOU CRAVE POWER. I KNOW THE WEIGHT OF THE WORLD IS ON YOUR SHOULDERS. SO, ACCEPT MY BOONS. ALLOW ME TO HELP YOU.\n",
+            "answer1": "[...]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_2"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1558,
+        "pos_y": 415
+    },
+    "34": {
+        "id": 34,
+        "name": "chat",
+        "data": {
+            "chatid": "chat9",
+            "chat": "#YELLOW#I AM GETTING PLENTY OUT OF THIS.",
+            "answer1": "[...]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_3"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1559,
+        "pos_y": 776
+    },
+    "36": {
+        "id": 36,
+        "name": "chat",
+        "data": {
+            "chatid": "chat10",
+            "chat": "#YELLOW#I TIRE OF YOUR NAGGING QUESTIONS. TALK, TALK, TALK. YOU HAVE A SIMPLE CHOICE BEFORE YOU. WILL YOU BECOME POWERFUL? OR WILL YOU BE WEAK AND ALONE?",
+            "answer1": "Yes, give me your power!",
+            "answer2": "I don't trust you. Please go away."
+        },
+        "class": "chat",
+        "html": "chat2",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_4"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "27",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "37",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1557,
+        "pos_y": 1046
+    },
+    "37": {
+        "id": 37,
+        "name": "chat",
+        "data": {
+            "chatid": "chat11",
+            "chat": "#YELLOW#I HAVE LITTLE PATIENCE FOR TIME WASTERS. THIS SHALL BE THE LAST TIME WE SPEAK.",
+            "answer1": "#GRAY#[prodigy point refunded]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "36",
+                        "input": "output_2"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "40",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 2017,
+        "pos_y": 1318
+    },
+    "39": {
+        "id": 39,
+        "name": "lua-code",
+        "data": {
+            "code": "player:callTalent(player.T_AVATAR_OF_A_DISTANT_SUN, \"becomeAvatar\")"
+        },
+        "class": "lua-code",
+        "html": "lua-code",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "27",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": []
+            }
+        },
+        "pos_x": 2859.4285714285716,
+        "pos_y": -43.42857142857143
+    },
+    "40": {
+        "id": 40,
+        "name": "lua-code",
+        "data": {
+            "code": "player:unlearnTalent(player.T_AVATAR_OF_A_DISTANT_SUN)\nplayer.unused_prodigies = player.unused_prodigies + 1\nplayer:attr(\"pissed_of_distant_sun\", 1)"
+        },
+        "class": "lua-code",
+        "html": "lua-code",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "37",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": []
+            }
+        },
+        "pos_x": 2477,
+        "pos_y": 1329
+    }
+}
\ No newline at end of file

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

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

@@ -21,6 +21,7 @@ local p = game.party:findMember{main=true}
 
 local function void_portal_open(npc, player)
 	-- Charred scar was successful
+	-- do return false end
 	if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return false end
 	return true
 end
@@ -32,6 +33,100 @@ end
 
 
 --------------------------------------------------------
+-- Distant Sun is not exactly benevolent after all