Merge branch 'small_fixes' into 'master'

EVEN more fixes that are EVEN SMALLER

game/engines/default/engine/Zone.lua

@@ -506,6 +506,7 @@ end
 -- WARNING the thing may be in need of re-identifying after this
 local function reapplyEgos(self, e)
 	if not e.__original then return e end
+	local id = e.isIdentified and e:isIdentified()
 	local brandNew = e.__original -- it will be cloned upon first ego application
 	if e.ego_list and #e.ego_list > 0 then
 		for _, ego_args in ipairs(e.ego_list) do
@@ -513,6 +514,7 @@ local function reapplyEgos(self, e)
 		end
 	end
 	e:replaceWith(brandNew)
+	if e.identify then e:identify(id) end
 end
 
 -- Remove an ego

game/modules/tome/data/chats/eidolon-plane.lua

@@ -59,7 +59,13 @@ newChat{ id="die",
 I...had plans for you, but I cannot go against your free will. Know that you had a destiny waiting for you.
 Are you sure?]],
 	answers = {
-		{"Just let me go please.", action=function(npc, player) game:getPlayer(true):die(game.player, {special_death_msg=("asked the Eidolon to let %s die in peace"):format(game.player.female and "her" or "him")}) end},
+		{"Just let me go please.", action=function(npc, player)
+			local src = game.player
+			game:getPlayer(true):die(game.player, {special_death_msg=("asked the Eidolon to let %s die in peace"):format(game.player.female and "her" or "him")})
+			while game.party:findSuitablePlayer() do
+				game.player:die(src, {special_death_msg="brought down by Eidolon"})
+			end
+		end},
 		{"No actually, perhaps life is still worth it!"},
 	}
 }

game/modules/tome/data/talents/uber/str.lua

@@ -176,6 +176,9 @@ uberTalent{
 	-- _M:levelup function in mod.class.Actor.lua updates the talent levels with character level
 	bonusLevel = function(self, t) return math.ceil(self.level/10) end,
 	callbackOnLevelup = function(self, t, new_level)
+		return t.updateTalent(self, t)
+	end,
+	updateTalent = function(self, t)
 		local p = self.talents_learn_vals[t.id] or {}
 		if p.__tmpvals then
 			for i = 1, #p.__tmpvals do
@@ -201,7 +204,8 @@ uberTalent{
 	info = function(self, t)
 		local level = t.bonusLevel(self,t)
 		return ([[You have sided with Slasul and helped him vanquish Ukllmswwik. You are now able to breathe underwater with ease.
-		You have also learned to use tridents and other exotic weapons easily (talent level %d of Exotic Weapon Mastery), and can Spit Poison (talent level %d) as nagas do. These are bonus talent levels that increase with your character level. In addition, should Slasul still live, he may have a further reward for you as thanks...]])
+		You have also learned to use tridents and other exotic weapons easily (talent level %d of Exotic Weapon Mastery), and can Spit Poison (talent level %d) as nagas do. These are bonus talent levels that increase with your character level.
+		In addition, should Slasul still live, he may have a further reward for you as thanks...]])
 		:format(level, level)
 	end,
 }