Skip to content
Snippets Groups Projects
Commit a6f7f061 authored by Zireael07's avatar Zireael07
Browse files

add the ability to grab load tips from zone files

parent 0fd1e4b4
No related branches found
No related tags found
1 merge request!256Zone load tips
......@@ -498,7 +498,7 @@ function _M:applyEgo(e, ego, type, no_name_change)
ego.level_range = nil
-- Merge according to Object's ego rules.
table.ruleMergeAppendAdd(e, ego, self.ego_rules[type] or {})
e.name = newname
if not ego.fake_ego then
e.egoed = true
......@@ -819,6 +819,15 @@ function _M:leaveLevel(no_close, lev, old_lev)
end
end
function _M:getLoadTips()
if self.load_tips then
local l = rng.table(self.load_tips)
return l.text
else
return ""
end
end
--- Asks the zone to generate a level of level "lev"
-- @param game which `Game`?
-- @param lev the level (from 1 to zone.max_level)
......@@ -836,7 +845,7 @@ function _M:getLevel(game, lev, old_lev, no_close)
-- Load persistent level?
if type(level_data.persistent) == "string" and level_data.persistent == "zone_temporary" then
forceprint("Loading zone temporary level", self.short_name, lev)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level...", nil, 10000)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level... "..self:getLoadTips(), nil, 10000)
core.display.forceRedraw()
self.temp_memory_levels = self.temp_memory_levels or {}
......@@ -852,7 +861,7 @@ function _M:getLevel(game, lev, old_lev, no_close)
popup:done()
elseif type(level_data.persistent) == "string" and level_data.persistent == "zone" and not self.save_per_level then
forceprint("Loading zone persistance level", self.short_name, lev)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level...", nil, 10000)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level... "..self:getLoadTips(), nil, 10000)
core.display.forceRedraw()
self.memory_levels = self.memory_levels or {}
......@@ -868,7 +877,7 @@ function _M:getLevel(game, lev, old_lev, no_close)
popup:done()
elseif type(level_data.persistent) == "string" and level_data.persistent == "memory" then
forceprint("Loading memory persistance level", self.short_name, lev)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level...", nil, 10000)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level... "..self:getLoadTips(), nil, 10000)
core.display.forceRedraw()
game.memory_levels = game.memory_levels or {}
......@@ -884,7 +893,7 @@ function _M:getLevel(game, lev, old_lev, no_close)
popup:done()
elseif level_data.persistent then
forceprint("Loading level persistance level", self.short_name, lev)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level...", nil, 10000)
local popup = Dialog:simpleWaiter("Loading level", "Please wait while loading the level... "..self:getLoadTips(), nil, 10000)
core.display.forceRedraw()
-- Try to load from a savefile
......@@ -900,7 +909,7 @@ function _M:getLevel(game, lev, old_lev, no_close)
-- In any cases, make one if none was found
if not level then
forceprint("Creating level", self.short_name, lev)
local popup = Dialog:simpleWaiter("Generating level", "Please wait while generating the level...", nil, 10000)
local popup = Dialog:simpleWaiter("Generating level", "Please wait while generating the level... "..self:getLoadTips(), nil, 10000)
core.display.forceRedraw()
level = self:newLevel(level_data, lev, old_lev, game)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment