From b29447d22e7e8405e65940a762f7dbbd3aae23af Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sat, 11 Jun 2011 11:29:50 +0000
Subject: [PATCH] Ruined dungeon orbs cannot be trapped
git-svn-id: http://svn.net-core.org/repos/t-engine4@3625 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/zones/ruined-dungeon/grids.lua | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/data/zones/ruined-dungeon/grids.lua b/game/modules/tome/data/zones/ruined-dungeon/grids.lua
index 70684ee5ff..b6373ca4f9 100644
--- a/game/modules/tome/data/zones/ruined-dungeon/grids.lua
+++ b/game/modules/tome/data/zones/ruined-dungeon/grids.lua
@@ -75,9 +75,9 @@ newEntity{
force_clone=true,
always_remember = true,
notice = true,
- on_move = function(self, x, y, who)
- if not who.player then return end
- if not game.level.data.touch_orb then return end
+ block_move = function(self, x, y, who, act, couldpass)
+ if not who or not who.player or not act then return true end
+ if not game.level.data.touch_orb then return true end
local text = "???"
if self.portal_type == "water" then text = "The orb seems to drip water."
elseif self.portal_type == "earth" then text = "The orb is covered in dust."
@@ -91,5 +91,6 @@ newEntity{
game.level.data.touch_orb(self.portal_type, x, y)
end
end)
+ return true
end,
}
--
GitLab