From 467ea5c7d29d8bca133cc29e71afd99497c6b37e Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 10 Jan 2013 00:23:08 +0000
Subject: [PATCH] Trapped! quest fails if you somehow escape without killing
 the assassin or siding with him

git-svn-id: http://svn.net-core.org/repos/t-engine4@6339 51575b47-30f0-44d4-a5cc-537603b46e54
---
 game/modules/tome/data/quests/lost-merchant.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/game/modules/tome/data/quests/lost-merchant.lua b/game/modules/tome/data/quests/lost-merchant.lua
index c58b87750f..6d16e274db 100644
--- a/game/modules/tome/data/quests/lost-merchant.lua
+++ b/game/modules/tome/data/quests/lost-merchant.lua
@@ -38,6 +38,7 @@ end
 
 leave_zone = function(self, who)
 	if self:isStatus(self.COMPLETED, "evil") then return end
+	if game.level.level == 1 or self:is_assassin_alive() then who:setQuestStatus(self.id, engine.Quest.FAILED) return end
 	local merchant_alive = false
 	for uid, e in pairs(game.level.entities) do
 		if e.is_merchant and not e.dead then
-- 
GitLab