From 9c3cfd371082d2b98f27ae30b994ea0780b924fe Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 23 Mar 2012 00:11:41 +0000
Subject: [PATCH] Plot & Quest items are also auto-pickedup now
git-svn-id: http://svn.net-core.org/repos/t-engine4@4982 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/version.lua | 2 +-
game/modules/tome/class/Player.lua | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index a9e272b96e..ccd378ab3b 100644
--- a/game/engines/default/engine/version.lua
+++ b/game/engines/default/engine/version.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
-- Engine Version
-engine.version = {0,9,38,"te4",17}
+engine.version = {0,9,39,"te4",17}
engine.require_c_core = engine.version[5]
engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 0903fd6729..ace58da926 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -169,11 +169,11 @@ function _M:describeFloor(x, y)
while obj do
local desc = true
if obj.auto_pickup and self:pickupFloor(i, true) then desc = false end
- if desc and self:attr("has_transmo") and obj.__transmo == nil and (not obj.quest and not obj.plot) then
+ if desc and self:attr("has_transmo") and obj.__transmo == nil then
obj.__transmo_pre = true
if self:pickupFloor(i, true) then
desc = false
- obj.__transmo = true
+ if not obj.quest and not obj.plot then obj.__transmo = true end
end
obj.__transmo_pre = nil
end
--
GitLab