From d7bd2f7cf7f972ebc23b5e7fafff77841c205bf5 Mon Sep 17 00:00:00 2001
From: Alexander Sedov <alex0player@gmail.com>
Date: Fri, 27 Feb 2015 23:04:27 +0300
Subject: [PATCH] Caldera fix w/ dead party members
---
game/modules/tome/data/zones/dreams/zone.lua | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/game/modules/tome/data/zones/dreams/zone.lua b/game/modules/tome/data/zones/dreams/zone.lua
index 1829d45264..06db0b6015 100644
--- a/game/modules/tome/data/zones/dreams/zone.lua
+++ b/game/modules/tome/data/zones/dreams/zone.lua
@@ -286,7 +286,7 @@ You feel good!]],
f.y = game.player.y
for pmem, def in pairs(game.party.members) do
game.level.map:remove(pmem.x, pmem.y, engine.Map.ACTOR)
- game.level:removeEntity(pmem)
+ if game.level:hasEntity(pmem) then game.level:removeEntity(pmem) end
end
game.party:addMember(f, {temporary_level=1, control="full"})
game.party:setPlayer(f, true)
@@ -301,11 +301,6 @@ You feel good!]],
local danger = game.level.data.danger
game.level:addEntity(self.summoner)
game:onTickEnd(function()
- for pmem, def in pairs(game.party.members) do
- if pmem ~= self then
- game.level:addEntity(pmem, nil, true)
- end
- end
game:changeLevel(game.level.data.caldera_lev, "noxious-caldera", {direct_switch=true})
for pmem, def in pairs(game.party.members) do
if pmem.caldera_x and pmem.caldera_y then
--
GitLab