From 7f7af998fb49cec016c9fb2a32ecec3193849f62 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 2 Jul 2012 22:49:30 +0000
Subject: [PATCH] Events can not happen on stairs
git-svn-id: http://svn.net-core.org/repos/t-engine4@5330 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/GameState.lua | 2 +-
game/modules/tome/data/general/events/meteor.lua | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index 146cd626db..1c03530751 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -1806,7 +1806,7 @@ function _M:doneEvent(id)
end
function _M:canEventGrid(level, x, y)
- return game.player:canMove(x, y) and not level.map.attrs(x, y, "no_teleport") and not level.map:checkAllEntities("change_level")
+ return game.player:canMove(x, y) and not level.map.attrs(x, y, "no_teleport") and not level.map:checkAllEntities(x, y, "change_level")
end
function _M:startEvents()
diff --git a/game/modules/tome/data/general/events/meteor.lua b/game/modules/tome/data/general/events/meteor.lua
index 7875b7b855..7392e6d7b5 100644
--- a/game/modules/tome/data/general/events/meteor.lua
+++ b/game/modules/tome/data/general/events/meteor.lua
@@ -17,7 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-local function canEventGrid(level,x,y) return not level.map.attrs(x, y, "no_teleport") and not level.map:checkAllEntities("change_level") end
+local function canEventGrid(level,x,y) return not level.map.attrs(x, y, "no_teleport") and not level.map:checkAllEntities(x, y, "change_level") end
local function check(x, y)
local list = {}
--
GitLab