fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@1615 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Player.lua

@@ -113,7 +113,7 @@ end
 function _M:onLeaveLevel(zone, level)
 	-- Fail past escort quests
 	local eid = "escort-duty-"..zone.short_name.."-"..level.level
-	if self.quests and self.quests[eid] then
+	if self.quests and self.quests[eid] and not self:hasQuest(eid):isEnded() then
 		local q = self.quests[eid]
 		q.abandoned = true
 		self:setQuestStatus(eid, q.FAILED)

game/modules/tome/data/quests/escort-duty.lua

@@ -260,6 +260,7 @@ end
 
 on_status_change = function(self, who, status, sub)
 	if status == self.FAILED then
+		-- Remove the actor is we failed
 		for uid, e in pairs(game.level.entities) do
 			if e.quest_id and e.quest_id == self.id then
 				e:disappear()

game/modules/tome/resolvers.lua

@@ -218,7 +218,6 @@ end
 function resolvers.calc.charges(tt, e)
 	e.max_power = rng.range(tt[1], tt[2])
 	e.power = e.max_power
-	print("creatin wand", e.name, e.egoed, e.max_power, e.cost_per_charge)
 	e.recharge_cost = (e.cost_per_charge or 0) * 4
 	e.cost = e.cost + (e.cost_per_charge or 0) * e.max_power
 	e.show_charges = true