From e5fe37ef43359e3444f08c32f9f666646aab6a02 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 21 Dec 2011 14:00:32 +0000
Subject: [PATCH] The transmo chest will only start to provide energy once you
have talked to the butler
git-svn-id: http://svn.net-core.org/repos/t-engine4@4748 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 2 +-
game/modules/tome/data/chats/shertul-fortress-butler.lua | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index bf11c68006..d6544f39e6 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -3282,7 +3282,7 @@ function _M:transmoInven(inven, idx, o)
self:removeObject(self:getInven("INVEN"), idx, true)
self:sortInven()
self:incMoney(price)
- if self.hasQuest and self:hasQuest("shertul-fortress") then self:hasQuest("shertul-fortress"):gain_energy(price/10) end
+ if self.hasQuest and self:hasQuest("shertul-fortress") and self:isQuestStatus("shertul-fortress", engine.Quest.COMPLETED, "transmo-chest") then self:hasQuest("shertul-fortress"):gain_energy(price/10) end
game.log("You gain %0.2f gold from the transmogrification of %s.", price, o:getName{do_count=true, do_color=true})
end
diff --git a/game/modules/tome/data/chats/shertul-fortress-butler.lua b/game/modules/tome/data/chats/shertul-fortress-butler.lua
index 8925fa7407..16c6fc3ff4 100644
--- a/game/modules/tome/data/chats/shertul-fortress-butler.lua
+++ b/game/modules/tome/data/chats/shertul-fortress-butler.lua
@@ -100,7 +100,7 @@ Take this Transmogrification Chest. It is linked by a permanent farportal to the
There are, however, unwanted byproducts to this operation: the generation of a metal known as gold. It is of no use to the Fortress and thus will be sent back to you.]],
answers = {
{"I will, thanks.", jump="welcome", action=function() q:spawn_transmo_chest() end, cond=function(npc, player) return not player:attr("has_transmo") end},
- {"I have already found such a chest in my travel, will it work?", jump="alreadychest", cond=function(npc, player) return player:attr("has_transmo") end},
+ {"I have already found such a chest in my travel, will it work?", jump="alreadychest", action=function() q:setStatus(q.COMPLETED, "transmo-chest") end, cond=function(npc, player) return player:attr("has_transmo") end},
}
}
--
GitLab