From 70102548b01799cff1325d8f8da772a1584d2dbe Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 16 Dec 2012 18:14:28 +0000
Subject: [PATCH] Meteor will not destroy recall portal
git-svn-id: http://svn.net-core.org/repos/t-engine4@6106 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 4 +---
game/modules/tome/data/general/events/meteor.lua | 3 ++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 15f96a60ed..524454178a 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -1269,9 +1269,7 @@ function _M:setupCommands()
print("===============")
end end,
[{"_g","ctrl"}] = function() if config.settings.cheat then
- game.log("Toto foo http://te4.org/ toto")
-do return end
- local f, err = loadfile("/data/general/events/rat-lich.lua")
+ local f, err = loadfile("/data/general/events/meteor.lua")
print(f, err)
setfenv(f, setmetatable({level=self.level, zone=self.zone}, {__index=_G}))
print(pcall(f))
diff --git a/game/modules/tome/data/general/events/meteor.lua b/game/modules/tome/data/general/events/meteor.lua
index 5d2e2fa110..7681615013 100644
--- a/game/modules/tome/data/general/events/meteor.lua
+++ b/game/modules/tome/data/general/events/meteor.lua
@@ -65,7 +65,8 @@ game.zone.on_turn = function()
local npcs = mod.class.NPC:loadList("/data/general/npcs/losgoroth.lua")
for i = x-2, x+2 do for j = y-2, y+2 do
- if core.fov.distance(x, y, i, j) <= 1 or rng.percent(40) then
+ local og = game.level.map(i, j, engine.Map.TERRAIN)
+ if (core.fov.distance(x, y, i, j) <= 1 or rng.percent(40)) and og and not og.escort_portal then
local g = terrains.LAVA_FLOOR:clone()
g:resolve() g:resolve(nil, true)
game.zone:addEntity(game.level, g, "terrain", i, j)
--
GitLab