From 5c8ae4dd0b5e2e91e5fb7b0ba2e275a94143f23f Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 19 Apr 2011 16:59:42 +0000
Subject: [PATCH] The hidden trollmire level now has a correct entrance spot
git-svn-id: http://svn.net-core.org/repos/t-engine4@3245 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/Zone.lua | 4 +++-
game/modules/tome/data/maps/zones/trollmire-treasure.lua | 3 +++
game/modules/tome/data/quests/trollmire-treasure.lua | 6 ++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/game/engines/default/engine/Zone.lua b/game/engines/default/engine/Zone.lua
index a707f74824..c1f66a448a 100644
--- a/game/engines/default/engine/Zone.lua
+++ b/game/engines/default/engine/Zone.lua
@@ -499,7 +499,9 @@ end
--- If we are loaded we need a new uid
function _M:loaded()
- if self.reload_lists then self:loadBaseLists() end
+ if type(self.reload_lists) ~= "boolean" or self.reload_lists then
+ self:loadBaseLists()
+ end
end
function _M:load(dynamic)
diff --git a/game/modules/tome/data/maps/zones/trollmire-treasure.lua b/game/modules/tome/data/maps/zones/trollmire-treasure.lua
index 35427add5d..61bc56ac52 100644
--- a/game/modules/tome/data/maps/zones/trollmire-treasure.lua
+++ b/game/modules/tome/data/maps/zones/trollmire-treasure.lua
@@ -27,6 +27,9 @@ defineTile("t", {"HARDTREE","HARDTREE2","HARDTREE3","HARDTREE4","HARDTREE5","HAR
defineTile("T", "GRASS", nil, {random_filter={type="giant", subtype="troll"}})
defineTile("!", "ROCK_VAULT")
+startx = 0
+starty = 9
+
-- addSpot section
-- addZone section
diff --git a/game/modules/tome/data/quests/trollmire-treasure.lua b/game/modules/tome/data/quests/trollmire-treasure.lua
index cceefcb334..a43af4296f 100644
--- a/game/modules/tome/data/quests/trollmire-treasure.lua
+++ b/game/modules/tome/data/quests/trollmire-treasure.lua
@@ -47,6 +47,12 @@ enter_level3 = function(self)
local g = game.zone:makeEntityByName(game.level, "terrain", "GRASS_DOWN6"):clone()
g.name = "way to the hidden trollmire treasure"
g.desc = "Beware!"
+ g.change_level_check = function()
+ require("engine.ui.Dialog"):yesnoPopup("Danger...", "This way lead to the lair of a mighty troll, traces of blood are everywhere. Are you sure?", function(ret)
+ if ret then game:changeLevel(4, "trollmire") end
+ end)
+ return true
+ end
local level = game.level
local spot = level.default_down
game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
--
GitLab