diff --git a/game/engines/default/engine/Key.lua b/game/engines/default/engine/Key.lua
index 412e3365b91b558b314a109f3d8b4dfb388ab9ec..4ac6ea772646e12a074b0588fd152e7ea68ec622 100644
--- a/game/engines/default/engine/Key.lua
+++ b/game/engines/default/engine/Key.lua
@@ -276,7 +276,7 @@ _F15 = 296
-- Key state modifier keys
_NUMLOCK = 300
_CAPSLOCK = 301
-_SCROLLOCK = 302
+_SCROLLLOCK = 302
_RSHIFT = 303
_LSHIFT = 304
_RCTRL = 305
diff --git a/game/engines/default/engine/KeyCommand.lua b/game/engines/default/engine/KeyCommand.lua
index abb380a00343257e544df75536f505eef08788b7..74402642633c23677de4e46ce92d21fcfca1b697 100644
--- a/game/engines/default/engine/KeyCommand.lua
+++ b/game/engines/default/engine/KeyCommand.lua
@@ -154,7 +154,7 @@ end
--- Loads a locale converter
-- WARNING: This only converts the "sym" key, *NOT* the unicode key
-- @param file the locale conversion file to load
-function _M:loadLocaleConvertion(file)
+function _M:loadLocaleConversion(file)
local f, err = loadfile(file)
if not f and err then error(err) end
setfenv(f, setmetatable({
diff --git a/game/engines/default/engine/NumberBox.lua b/game/engines/default/engine/NumberBox.lua
index ca546c0c080169a6fc68a0f28575149124265e21..e7d1bee223d93356e186927f20abc002848d7932 100644
--- a/game/engines/default/engine/NumberBox.lua
+++ b/game/engines/default/engine/NumberBox.lua
@@ -62,9 +62,9 @@ function _M:backSpace()
--[[
if (self.cursorPosition==0) then return end
local temptext = self.text:sub(1, self.cursorPosition - 1)
- if self.cursorPosition < self.maximumCurosrPosition then temptext = temptext..self.text:sub(self.cursorPosition + 1, self.text:len()) end
+ if self.cursorPosition < self.maximumCursorPosition then temptext = temptext..self.text:sub(self.cursorPosition + 1, self.text:len()) end
self.text = temptext
- self.maximumCurosrPosition = self.maximumCurosrPosition - 1
+ self.maximumCursorPosition = self.maximumCursorPosition - 1
self.cursorPosition = self.cursorPosition - 1
]]
local b = tostring(self.text)
@@ -91,7 +91,7 @@ function _M:textInput(c)
--[[
if self.text:len() < self.max then
local temp=nil
- if self.cursorPosition < self.maximumCurosrPosition then temp=self.text:sub(self.cursorPosition + 1, self.text:len()) end
+ if self.cursorPosition < self.maximumCursorPosition then temp=self.text:sub(self.cursorPosition + 1, self.text:len()) end
self.text = self.text:sub(1,self.cursorPosition) .. c
if temp then self.text=self.text..temp end
self.owner.changed = true
diff --git a/game/engines/default/engine/TextBox.lua b/game/engines/default/engine/TextBox.lua
index a1fdab75cb39cf4c99e1555ac9e4f3e6e4a5f153..bfe3e6b0bd2ae24607579a5a9f33a52f98836b4e 100644
--- a/game/engines/default/engine/TextBox.lua
+++ b/game/engines/default/engine/TextBox.lua
@@ -57,26 +57,26 @@ function _M:init(dialogdef, owner, font, mask, fct)
end
function _M:delete()
- if (self.cursorPosition>=self.maximumCurosrPosition) then return end
+ if (self.cursorPosition>=self.maximumCursorPosition) then return end
local temptext = self.text:sub(1, self.cursorPosition)
- if self.cursorPosition < self.maximumCurosrPosition - 1 then temptext = temptext..self.text:sub(self.cursorPosition + 2, self.text:len()) end
+ if self.cursorPosition < self.maximumCursorPosition - 1 then temptext = temptext..self.text:sub(self.cursorPosition + 2, self.text:len()) end
self.text = temptext
- self.maximumCurosrPosition = self.maximumCurosrPosition - 1
+ self.maximumCursorPosition = self.maximumCursorPosition - 1
end
function _M:backSpace()
if (self.cursorPosition==0) then return end
local temptext = self.text:sub(1, self.cursorPosition - 1)
- if self.cursorPosition < self.maximumCurosrPosition then temptext = temptext..self.text:sub(self.cursorPosition + 1, self.text:len()) end
+ if self.cursorPosition < self.maximumCursorPosition then temptext = temptext..self.text:sub(self.cursorPosition + 1, self.text:len()) end
self.text = temptext
- self.maximumCurosrPosition = self.maximumCurosrPosition - 1
+ self.maximumCursorPosition = self.maximumCursorPosition - 1
self.cursorPosition = self.cursorPosition - 1
end
function _M:textInput(c)
if self.text:len() < self.max then
local temp=nil
- if self.cursorPosition < self.maximumCurosrPosition then temp=self.text:sub(self.cursorPosition + 1, self.text:len()) end
+ if self.cursorPosition < self.maximumCursorPosition then temp=self.text:sub(self.cursorPosition + 1, self.text:len()) end
self.text = self.text:sub(1,self.cursorPosition) .. c
if temp then self.text=self.text..temp end
self.owner.changed = true
diff --git a/game/engines/default/engine/Zone.lua b/game/engines/default/engine/Zone.lua
index 7270e13e9269d0f18d7f3731726792256dcd6dd0..247719c428f982279d7a4e823f98a611e768c356 100644
--- a/game/engines/default/engine/Zone.lua
+++ b/game/engines/default/engine/Zone.lua
@@ -77,9 +77,9 @@ function _M:init(short_name, dynamic)
end
--- Leaves a zone
--- Saves the zone to a .teaz file if requested with persistant="zone" flag
+-- Saves the zone to a .teaz file if requested with persistent="zone" flag
function _M:leave()
- if type(self.persistant) == "string" and self.persistant == "zone" then
+ if type(self.persistent) == "string" and self.persistent == "zone" then
savefile_pipe:push(game.save_name, "zone", self)
-- local save = Savefile.new(game.save_name)
-- save:saveZone(self)
@@ -463,15 +463,15 @@ function _M:leaveLevel(no_close, lev, old_lev)
if not no_close and game.level and game.level.map then
game:leaveLevel(game.level, lev, old_lev)
- if type(game.level.data.persistant) == "string" and game.level.data.persistant == "zone" and not self.save_per_level then
+ if type(game.level.data.persistent) == "string" and game.level.data.persistent == "zone" and not self.save_per_level then
print("[LEVEL] persisting to zone memory", game.level.id)
self.memory_levels = self.memory_levels or {}
self.memory_levels[game.level.level] = game.level
- elseif type(game.level.data.persistant) == "string" and game.level.data.persistant == "memory" then
+ elseif type(game.level.data.persistent) == "string" and game.level.data.persistent == "memory" then
print("[LEVEL] persisting to memory", game.level.id)
game.memory_levels = game.memory_levels or {}
game.memory_levels[game.level.id] = game.level
- elseif game.level.data.persistant then
+ elseif game.level.data.persistent then
print("[LEVEL] persisting to disk file", game.level.id)
savefile_pipe:push(game.save_name, "level", game.level)
else
@@ -491,8 +491,8 @@ function _M:getLevel(game, lev, old_lev, no_close)
local level_data = self:getLevelData(lev)
local level
- -- Load persistant level?
- if type(level_data.persistant) == "string" and level_data.persistant == "zone" and not self.save_per_level then
+ -- Load persistent level?
+ if type(level_data.persistent) == "string" and level_data.persistent == "zone" and not self.save_per_level then
self.memory_levels = self.memory_levels or {}
level = self.memory_levels[lev]
@@ -503,7 +503,7 @@ function _M:getLevel(game, lev, old_lev, no_close)
-- This is not needed in case of a direct to file persistance becuase the map IS recreated each time anyway
level.map:recreate()
end
- elseif type(level_data.persistant) == "string" and level_data.persistant == "memory" then
+ elseif type(level_data.persistent) == "string" and level_data.persistent == "memory" then
game.memory_levels = game.memory_levels or {}
level = game.memory_levels[self.short_name.."-"..lev]
@@ -514,7 +514,7 @@ function _M:getLevel(game, lev, old_lev, no_close)
-- This is not needed in case of a direct to file persistance becuase the map IS recreated each time anyway
level.map:recreate()
end
- elseif level_data.persistant then
+ elseif level_data.persistent then
-- Try to load from a savefile
level = savefile_pipe:doLoad(game.save_name, "level", nil, self.short_name, lev)
diff --git a/game/engines/default/engine/generator/map/TileSet.lua b/game/engines/default/engine/generator/map/TileSet.lua
index d87a7fb172e24803a6488013cdeb61b1fc9705cf..97499dcd8c1b576bbf858c69f82c3ed5647e76fc 100644
--- a/game/engines/default/engine/generator/map/TileSet.lua
+++ b/game/engines/default/engine/generator/map/TileSet.lua
@@ -84,7 +84,7 @@ function _M:loadTiles(tileset)
if ts.define_as then tiles[ts.define_as] = t end
-- X symmetric tile definition
- if ts.base and ts.symetric and ts.symetric == "x" then
+ if ts.base and ts.symmetric and ts.symmetric == "x" then
local ts = tiles[ts.base]
local mx, my = #ts, #ts[1]
for j = 1, my do for ri = 1, mx do
@@ -96,7 +96,7 @@ function _M:loadTiles(tileset)
t.sizew, t.sizeh = mx / d.base.w, my / d.base.h
-- Y symmetric tile definition
- elseif ts.base and ts.symetric and ts.symetric == "y" then
+ elseif ts.base and ts.symmetric and ts.symmetric == "y" then
local ts = tiles[ts.base]
local mx, my = #ts, #ts[1]
for rj = 1, my do for i = 1, mx do
diff --git a/game/engines/default/engine/interface/ActorTalents.lua b/game/engines/default/engine/interface/ActorTalents.lua
index 4170c78c0cfa919d83d988d2ed63c61bd3d57983..9cfc10dd8ec7b775a7331a25a3c730a81f6f6f3c 100644
--- a/game/engines/default/engine/interface/ActorTalents.lua
+++ b/game/engines/default/engine/interface/ActorTalents.lua
@@ -203,12 +203,12 @@ end
--- Returns how many talents of this type the actor knows
-- @param type the talent type to count
--- @param exlude_id if not nil the count will ignore this talent id
-function _M:numberKnownTalent(type, exlude_id)
+-- @param exclude_id if not nil the count will ignore this talent id
+function _M:numberKnownTalent(type, exclude_id)
local nb = 0
for id, _ in pairs(self.talents) do
local t = _M.talents_def[id]
- if t.type[1] == type and (not exlude_id or exlude_id ~= id) then nb = nb + 1 end
+ if t.type[1] == type and (not exclude_id or exclude_id ~= id) then nb = nb + 1 end
end
return nb
end
diff --git a/game/engines/default/engine/interface/ControlCursorSupport.lua b/game/engines/default/engine/interface/ControlCursorSupport.lua
index c2bbc128521f48bd55b4959d14cbb98afe6c922d..ed621e026353f074173484df000dc8c68cdb93bf 100644
--- a/game/engines/default/engine/interface/ControlCursorSupport.lua
+++ b/game/engines/default/engine/interface/ControlCursorSupport.lua
@@ -30,13 +30,13 @@ module(..., package.seeall, class.make)
function _M:startCursor()
self.cursorPosition = 0
- self.maximumCurosrPosition = 0
+ self.maximumCursorPosition = 0
self.focused = false
end
function _M:moveRight(x, add)
- if add and self.cursorPosition + x > self.maximumCurosrPosition then self.maximumCurosrPosition = self.cursorPosition + x end
- if self.cursorPosition + x <= self.maximumCurosrPosition then
+ if add and self.cursorPosition + x > self.maximumCursorPosition then self.maximumCursorPosition = self.cursorPosition + x end
+ if self.cursorPosition + x <= self.maximumCursorPosition then
self.cursorPosition = self.cursorPosition + x
end
end
diff --git a/game/modules/example/data/zones/dungeon/zone.lua b/game/modules/example/data/zones/dungeon/zone.lua
index ec08a4a8c4bc602ee00caa53ccbf2ed99d13c31b..4600e3572959e889dc3a887a7f10469a3e6f62c9 100644
--- a/game/modules/example/data/zones/dungeon/zone.lua
+++ b/game/modules/example/data/zones/dungeon/zone.lua
@@ -23,7 +23,7 @@ return {
max_level = 10,
decay = {300, 800},
width = 50, height = 50,
- persistant = "zone",
+ persistent = "zone",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/example/dialogs/DeathDialog.lua b/game/modules/example/dialogs/DeathDialog.lua
index 6f04045da823c1287ed772fa751178ca519be395..3d2a246ac203f90a49544f3b22bfcf94c68d1b13 100644
--- a/game/modules/example/dialogs/DeathDialog.lua
+++ b/game/modules/example/dialogs/DeathDialog.lua
@@ -81,7 +81,7 @@ function _M:cleanActor()
end
--- Restore resources
-function _M:restoreRessources()
+function _M:restoreResources()
self.actor.life = self.actor.max_life
self.actor.power = self.actor.max_power
@@ -116,7 +116,7 @@ function _M:use(item)
game.logPlayer(self.actor, "#LIGHT_BLUE#You resurrect! CHEATER !")
self:cleanActor()
- self:restoreRessources()
+ self:restoreResources()
self:resurrectBasic()
end
end
diff --git a/game/modules/example_realtime/data/zones/dungeon/zone.lua b/game/modules/example_realtime/data/zones/dungeon/zone.lua
index ec08a4a8c4bc602ee00caa53ccbf2ed99d13c31b..4600e3572959e889dc3a887a7f10469a3e6f62c9 100644
--- a/game/modules/example_realtime/data/zones/dungeon/zone.lua
+++ b/game/modules/example_realtime/data/zones/dungeon/zone.lua
@@ -23,7 +23,7 @@ return {
max_level = 10,
decay = {300, 800},
width = 50, height = 50,
- persistant = "zone",
+ persistent = "zone",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/example_realtime/dialogs/DeathDialog.lua b/game/modules/example_realtime/dialogs/DeathDialog.lua
index 6f04045da823c1287ed772fa751178ca519be395..3d2a246ac203f90a49544f3b22bfcf94c68d1b13 100644
--- a/game/modules/example_realtime/dialogs/DeathDialog.lua
+++ b/game/modules/example_realtime/dialogs/DeathDialog.lua
@@ -81,7 +81,7 @@ function _M:cleanActor()
end
--- Restore resources
-function _M:restoreRessources()
+function _M:restoreResources()
self.actor.life = self.actor.max_life
self.actor.power = self.actor.max_power
@@ -116,7 +116,7 @@ function _M:use(item)
game.logPlayer(self.actor, "#LIGHT_BLUE#You resurrect! CHEATER !")
self:cleanActor()
- self:restoreRessources()
+ self:restoreResources()
self:resurrectBasic()
end
end
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 69682138f41f8b78ff46b7e7cb5f88d865cd32e8..100f5a35c6ddd63119026fe7d95f4611fce39a7e 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -73,7 +73,7 @@ function _M:init()
engine.interface.GameMusic.init(self)
engine.interface.GameSound.init(self)
- self.persistant_actors = {}
+ self.persistent_actors = {}
-- Pause at birth
self.paused = true
@@ -353,7 +353,7 @@ function _M:setupMiniMap()
end
function _M:save()
- return class.save(self, self:defaultSavedFields{difficulty=true, persistant_actors=true, to_re_add_actors=true}, true)
+ return class.save(self, self:defaultSavedFields{difficulty=true, persistent_actors=true, to_re_add_actors=true}, true)
end
function _M:getSaveDescription()
@@ -386,7 +386,7 @@ function _M:leaveLevel(level, lev, old_lev)
level.exited.up = {x=self.player.x, y=self.player.y}
end
level.last_turn = self.turn
- for act, _ in pairs(self.persistant_actors) do
+ for act, _ in pairs(self.persistent_actors) do
if level:hasEntity(act) then
level:removeEntity(act)
self.to_re_add_actors[act] = true
@@ -503,9 +503,9 @@ function _M:changeLevel(lev, zone, keep_old_lev, force_down)
self.player:onEnterLevel(self.zone, self.level)
- if self.level.data.ambiant_music then
- if self.level.data.ambiant_music ~= "last" then
- self:playMusic(self.level.data.ambiant_music)
+ if self.level.data.ambient_music then
+ if self.level.data.ambient_music ~= "last" then
+ self:playMusic(self.level.data.ambient_music)
end
else
self:stopMusic()
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index 23d4894f350229eb1f276c73925487e0bf0e5d5d..d9fa4aec7e1d7770f6909b69309f4c71a4048555 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -347,7 +347,7 @@ function _M:spawnWorldAmbush(enc)
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = enc.width or 20, height = enc.height or 20,
all_lited = true,
- ambiant_music = "last",
+ ambient_music = "last",
generator = {
map = gen,
actor = { class = "engine.generator.actor.Random", nb_npc = enc.nb or {1,1}, filters=enc.filters },
diff --git a/game/modules/tome/class/generator/map/CharredScar.lua b/game/modules/tome/class/generator/map/CharredScar.lua
index 4165fe77f7f46dbb989935060d5d1df754f9214e..c5ed74e306fc06abe39fc697ed763dc78424b0f0 100644
--- a/game/modules/tome/class/generator/map/CharredScar.lua
+++ b/game/modules/tome/class/generator/map/CharredScar.lua
@@ -35,12 +35,12 @@ function _M:generate(lev, old_lev)
local ln = 0
local path = core.noise.new(1)
- local widness = core.noise.new(1)
+ local wideness = core.noise.new(1)
local i = self.data.start
local dir = true
for j = 0, self.map.h - 1 do
- local wd = widness:fbm_perlin(20 * j / self.map.h, 4)
+ local wd = wideness:fbm_perlin(20 * j / self.map.h, 4)
wd = math.ceil(((wd + 1) / 2) * 4)
for ii = i - wd, i + wd do if self.map:isBound(ii, j) then self.map(ii, j, Map.TERRAIN, self:resolve(".")) end end
diff --git a/game/modules/tome/class/generator/map/SlimeTunnels.lua b/game/modules/tome/class/generator/map/SlimeTunnels.lua
index 9a74517a95b5f975d7986e579a87e72d794fd86c..951785982c1b32436f940a68f6344114522112e0 100644
--- a/game/modules/tome/class/generator/map/SlimeTunnels.lua
+++ b/game/modules/tome/class/generator/map/SlimeTunnels.lua
@@ -70,7 +70,7 @@ function _M:generate(lev, old_lev)
self:makePath(sp.x, sp.y, ep.x, ep.y, 0, 0.25, points)
end
- -- Place pedestrals
+ -- Place pedestals
local orbs = {"ORB_UNDEATH", "ORB_DRAGON", "ORB_ELEMENTS", "ORB_DESTRUCTION"}
for i = 1, 4 do
local orb = rng.tableRemove(orbs)
diff --git a/game/modules/tome/data/general/encounters/maj-eyal.lua b/game/modules/tome/data/general/encounters/maj-eyal.lua
index 1baa8b7c813bd7f2bf4c6fa53d617d840f5d8964..53dc860068865d7ec09057ebdc412e7688046dc3 100644
--- a/game/modules/tome/data/general/encounters/maj-eyal.lua
+++ b/game/modules/tome/data/general/encounters/maj-eyal.lua
@@ -62,7 +62,7 @@ newEntity{
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 30, height = 30,
no_worldport = true,
- ambiant_music = "a_lomos_del_dragon_blanco.ogg",
+ ambient_music = "a_lomos_del_dragon_blanco.ogg",
generator = {
map = {
class = "engine.generator.map.TileSet",
diff --git a/game/modules/tome/data/talents/spells/golemancy.lua b/game/modules/tome/data/talents/spells/golemancy.lua
index a7516f1f2ec765aaface021cd5798c7bc2fb4f05..c8a2164e513ad1dcdada45cc6823f0caf478122c 100644
--- a/game/modules/tome/data/talents/spells/golemancy.lua
+++ b/game/modules/tome/data/talents/spells/golemancy.lua
@@ -89,7 +89,7 @@ newTalent{
action = function(self, t)
if not self.alchemy_golem then
self.alchemy_golem = game.zone:finishEntity(game.level, "actor", makeGolem())
- game.persistant_actors[self.alchemy_golem] = 1
+ game.persistent_actors[self.alchemy_golem] = 1
if not self.alchemy_golem then return end
self.alchemy_golem.faction = self.faction
self.alchemy_golem.name = "golem (servant of "..self.name..")"
diff --git a/game/modules/tome/data/tilesets/5x5/crypt.lua b/game/modules/tome/data/tilesets/5x5/crypt.lua
index 0f2985a21153af91d19a0e5df88341e745d57273..0f916f93b1ca914b80a3b55d971a273886e591aa 100644
--- a/game/modules/tome/data/tilesets/5x5/crypt.lua
+++ b/game/modules/tome/data/tilesets/5x5/crypt.lua
@@ -94,7 +94,7 @@ tiles =
[[###.....##]],
[[#######'##]],
},
-{type="room", base="BIG_CRYPT", symetric="x"},
+{type="room", base="BIG_CRYPT", symmetric="x"},
{type="room", base="BIG_CRYPT", rotation="90"},
{type="room", base="BIG_CRYPT", rotation="270"},
diff --git a/game/modules/tome/data/zones/ancient-elven-ruins/zone.lua b/game/modules/tome/data/zones/ancient-elven-ruins/zone.lua
index 649773a37f450d807b34fa9b2dd8251b978fd645..ac7ced6e786e9d7bfcfef14af859fa4029d9a105 100644
--- a/game/modules/tome/data/zones/ancient-elven-ruins/zone.lua
+++ b/game/modules/tome/data/zones/ancient-elven-ruins/zone.lua
@@ -27,8 +27,8 @@ return {
width = 30, height = 30,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "Anne_van_Schothorst_-_Passed_Tense.ogg",
+ persistent = "zone",
+ ambient_music = "Anne_van_Schothorst_-_Passed_Tense.ogg",
generator = {
map = {
class = "engine.generator.map.TileSet",
diff --git a/game/modules/tome/data/zones/ardhungol/zone.lua b/game/modules/tome/data/zones/ardhungol/zone.lua
index aa560d6ee18c2e8c080c135139adf786fe679a28..c30ceb21c45d9eff54d121d8335b549470f8f12b 100644
--- a/game/modules/tome/data/zones/ardhungol/zone.lua
+++ b/game/modules/tome/data/zones/ardhungol/zone.lua
@@ -27,11 +27,11 @@ return {
width = 70, height = 70,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
-- Apply a greenish tint to all the map
color_shown = {0.3, 1, 0.5, 1},
color_obscure = {0.3*0.6, 1*0.6, 0.5*0.6, 1},
- ambiant_music = "The Ancients.ogg",
+ ambient_music = "The Ancients.ogg",
generator = {
map = {
class = "engine.generator.map.Cavern",
diff --git a/game/modules/tome/data/zones/blighted-ruins/zone.lua b/game/modules/tome/data/zones/blighted-ruins/zone.lua
index b464056d232469b5a08db0c9cf34f46265278150..65bc5b5961df65e8cbe5f33cd3a84a24231000b8 100644
--- a/game/modules/tome/data/zones/blighted-ruins/zone.lua
+++ b/game/modules/tome/data/zones/blighted-ruins/zone.lua
@@ -29,8 +29,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "Dark Secrets.ogg",
+ persistent = "zone",
+ ambient_music = "Dark Secrets.ogg",
no_worldport = true,
generator = {
map = {
diff --git a/game/modules/tome/data/zones/briagh-lair/zone.lua b/game/modules/tome/data/zones/briagh-lair/zone.lua
index 2b11663fb541818e6a0ca47e8ad6c4a0df6b2003..667728367826d7e8b3a7c8809d62c19008779682 100644
--- a/game/modules/tome/data/zones/briagh-lair/zone.lua
+++ b/game/modules/tome/data/zones/briagh-lair/zone.lua
@@ -27,7 +27,7 @@ return {
width = 140, height = 140,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
generator = {
map = {
class = "engine.generator.map.Cavern",
diff --git a/game/modules/tome/data/zones/charred-scar/zone.lua b/game/modules/tome/data/zones/charred-scar/zone.lua
index 93bd33b8bef2c4e2304013841e94601984773835..7a00f3236b23b7d000d281cf6dbfaf8579577896 100644
--- a/game/modules/tome/data/zones/charred-scar/zone.lua
+++ b/game/modules/tome/data/zones/charred-scar/zone.lua
@@ -27,11 +27,11 @@ return {
width = 12, height = 500,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
+ persistent = "zone",
no_level_connectivity = true,
no_worldport = true,
no_teleport_south = true,
- ambiant_music = "Hold the Line.ogg",
+ ambient_music = "Hold the Line.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/crypt-kryl-feijan/zone.lua b/game/modules/tome/data/zones/crypt-kryl-feijan/zone.lua
index 3424b49f79c6040d30d6247f1a7acb54add24198..c894b258816804d1037a6c0e4b1bb9ed0af12697 100644
--- a/game/modules/tome/data/zones/crypt-kryl-feijan/zone.lua
+++ b/game/modules/tome/data/zones/crypt-kryl-feijan/zone.lua
@@ -27,10 +27,10 @@ return {
width = 30, height = 30,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
color_shown = {0.6, 0.6, 0.6, 1},
color_obscure = {0.6*0.6, 0.6*0.6, 0.6*0.6, 1},
- ambiant_music = "Dark Secrets.ogg",
+ ambient_music = "Dark Secrets.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/daikara/zone.lua b/game/modules/tome/data/zones/daikara/zone.lua
index af1a6a3faa8f9038b1db213f5bcb3bfd6070914d..5f6729c046122fb4bc74b214a5b50584eea47370 100644
--- a/game/modules/tome/data/zones/daikara/zone.lua
+++ b/game/modules/tome/data/zones/daikara/zone.lua
@@ -27,8 +27,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "World of Ice.ogg",
+ persistent = "zone",
+ ambient_music = "World of Ice.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/demon-plane-spell/zone.lua b/game/modules/tome/data/zones/demon-plane-spell/zone.lua
index 08fdae8ace6febaf2b303f5c81bc0fb03b268796..43908da5721514c31a94a6b02e36e0079da488ac 100644
--- a/game/modules/tome/data/zones/demon-plane-spell/zone.lua
+++ b/game/modules/tome/data/zones/demon-plane-spell/zone.lua
@@ -28,7 +28,7 @@ return {
all_lited = true,
no_worldport = true,
is_demon_plane = true,
- ambiant_music = "Straight Into Ambush.ogg",
+ ambient_music = "Straight Into Ambush.ogg",
generator = {
map = {
class = "engine.generator.map.Forest",
diff --git a/game/modules/tome/data/zones/demon-plane/zone.lua b/game/modules/tome/data/zones/demon-plane/zone.lua
index 4a702bbc52dfe30747f2ccfb1d6d4d12925009a3..a78be75ec4cb721a88a44d0a5631684d967031e0 100644
--- a/game/modules/tome/data/zones/demon-plane/zone.lua
+++ b/game/modules/tome/data/zones/demon-plane/zone.lua
@@ -27,10 +27,10 @@ return {
width = 65, height = 65,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
no_worldport = true,
is_demon_plane = true,
- ambiant_music = "Straight Into Ambush.ogg",
+ ambient_music = "Straight Into Ambush.ogg",
generator = {
map = {
class = "engine.generator.map.Forest",
diff --git a/game/modules/tome/data/zones/dreadfell-ambush/zone.lua b/game/modules/tome/data/zones/dreadfell-ambush/zone.lua
index c9a215c71423a45535535952913cc57edabbd896..97279cdc04bbba15bc14f45df05149a66f930ee7 100644
--- a/game/modules/tome/data/zones/dreadfell-ambush/zone.lua
+++ b/game/modules/tome/data/zones/dreadfell-ambush/zone.lua
@@ -27,8 +27,8 @@ return {
no_worldport = true,
-- all_remembered = true,
all_lited = true,
--- persistant = true,
- ambiant_music = "Hold the Line.ogg",
+-- persistent = true,
+ ambient_music = "Hold the Line.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/dreadfell/zone.lua b/game/modules/tome/data/zones/dreadfell/zone.lua
index d03a31e52126b1505d96bca79aa5f685677f426b..5052e5e2aa7416035e3108dc0ea04b6c312c63aa 100644
--- a/game/modules/tome/data/zones/dreadfell/zone.lua
+++ b/game/modules/tome/data/zones/dreadfell/zone.lua
@@ -27,8 +27,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "Dark Secrets.ogg",
+ persistent = "zone",
+ ambient_music = "Dark Secrets.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/eruan/zone.lua b/game/modules/tome/data/zones/eruan/zone.lua
index c1f77e7ba5f9dc6678cc56dfc15d13e86e5d80a6..706ff46b45591ac99197a2ed75177abddd0f4cea 100644
--- a/game/modules/tome/data/zones/eruan/zone.lua
+++ b/game/modules/tome/data/zones/eruan/zone.lua
@@ -27,8 +27,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Bazaar of Tal-Mashad.ogg",
+ persistent = "zone",
+ ambient_music = "Bazaar of Tal-Mashad.ogg",
generator = {
map = {
class = "engine.generator.map.Forest",
diff --git a/game/modules/tome/data/zones/flooded-cave/zone.lua b/game/modules/tome/data/zones/flooded-cave/zone.lua
index 1060ac5b384072c78ee86a8d85cefda417c3b92c..340aa26d6554dd9511dc8b3701cf527a4914ef8b 100644
--- a/game/modules/tome/data/zones/flooded-cave/zone.lua
+++ b/game/modules/tome/data/zones/flooded-cave/zone.lua
@@ -27,8 +27,8 @@ return {
width = 70, height = 70,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "elven_town.ogg",
+ persistent = "zone",
+ ambient_music = "elven_town.ogg",
-- Apply a bluish tint to all the map
color_shown = {0.5, 1, 0.8, 1},
color_obscure = {0.5*0.6, 1*0.6, 0.8*0.6, 0.6},
diff --git a/game/modules/tome/data/zones/gorbat-pride/zone.lua b/game/modules/tome/data/zones/gorbat-pride/zone.lua
index b1f56134878e4a9a8dd9dad80e7b697a84d35f28..58867277f132049dcf3f30149146a8e654e4eb3d 100644
--- a/game/modules/tome/data/zones/gorbat-pride/zone.lua
+++ b/game/modules/tome/data/zones/gorbat-pride/zone.lua
@@ -25,10 +25,10 @@ return {
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 50, height = 50,
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
all_lited = true,
- ambiant_music = "Breaking the siege.ogg",
+ ambient_music = "Breaking the siege.ogg",
generator = {
map = {
class = "engine.generator.map.Town",
diff --git a/game/modules/tome/data/zones/grushnak-pride/zone.lua b/game/modules/tome/data/zones/grushnak-pride/zone.lua
index 2dce05cc0fc6447fe443b726682547235088ba88..64655cf33e53fed7e7e816b8a1aa83215ec3c18f 100644
--- a/game/modules/tome/data/zones/grushnak-pride/zone.lua
+++ b/game/modules/tome/data/zones/grushnak-pride/zone.lua
@@ -25,10 +25,10 @@ return {
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 50, height = 50,
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
-- all_lited = true,
- ambiant_music = "Thrall's Theme.ogg",
+ ambient_music = "Thrall's Theme.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/high-peak/zone.lua b/game/modules/tome/data/zones/high-peak/zone.lua
index 11d541e17f0cae5af0b6e6f5ec4e09c5fb640e89..6159e528942de44cc6b81d06bf9a7809bd475097 100644
--- a/game/modules/tome/data/zones/high-peak/zone.lua
+++ b/game/modules/tome/data/zones/high-peak/zone.lua
@@ -27,9 +27,9 @@ return {
width = 50, height = 75,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
no_worldport = true,
- ambiant_music = "Through the Dark Portal.ogg",
+ ambient_music = "Through the Dark Portal.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/illusory-castle/zone.lua b/game/modules/tome/data/zones/illusory-castle/zone.lua
index b457b3d0d4bd4e0bc43952bb0bb42765d527d1ca..96e26f0b4e5adc099145a5730930801e1cd1ecb0 100644
--- a/game/modules/tome/data/zones/illusory-castle/zone.lua
+++ b/game/modules/tome/data/zones/illusory-castle/zone.lua
@@ -27,7 +27,7 @@ return {
width = 120, height = 120,
all_remembered = true,
all_lited = true,
--- persistant = "zone",
+-- persistent = "zone",
generator = {
map = {
-- class = "engine.generator.map.Rooms",
diff --git a/game/modules/tome/data/zones/infinite-dungeon/zone.lua b/game/modules/tome/data/zones/infinite-dungeon/zone.lua
index 272e6bf99ef802fac36063b44def201e2af36e65..219977c1bcb34ec738fc78cd0ab612fb1fffec57 100644
--- a/game/modules/tome/data/zones/infinite-dungeon/zone.lua
+++ b/game/modules/tome/data/zones/infinite-dungeon/zone.lua
@@ -28,7 +28,7 @@ return {
-- all_lited = true,
no_worldport = true,
infinite_dungeon = true,
- ambiant_music = "Swashing the buck.ogg",
+ ambient_music = "Swashing the buck.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/lake-nur/zone.lua b/game/modules/tome/data/zones/lake-nur/zone.lua
index 973af08fd30beb6ec2ea4169829ee0f2e05491bf..41f0af2c265db6c15e83c563e337da9761f0e2b1 100644
--- a/game/modules/tome/data/zones/lake-nur/zone.lua
+++ b/game/modules/tome/data/zones/lake-nur/zone.lua
@@ -27,10 +27,10 @@ return {
width = 50, height = 50,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
color_shown = {0.5, 0.5, 0.5, 1},
color_obscure = {0.5*0.6, 0.5*0.6, 0.5*0.6, 1},
- ambiant_music = "Woods of Eremae.ogg",
+ ambient_music = "Woods of Eremae.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/mark-spellblaze/zone.lua b/game/modules/tome/data/zones/mark-spellblaze/zone.lua
index 85a200369fcde241d529f38e1f7e92b048c4e22b..8fd5b0b8bdddfd9df8efddc6039235b75ba9d4a3 100644
--- a/game/modules/tome/data/zones/mark-spellblaze/zone.lua
+++ b/game/modules/tome/data/zones/mark-spellblaze/zone.lua
@@ -27,8 +27,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Rainy Day.ogg",
+ persistent = "zone",
+ ambient_music = "Rainy Day.ogg",
generator = {
map = {
class = "engine.generator.map.Forest",
diff --git a/game/modules/tome/data/zones/maze/zone.lua b/game/modules/tome/data/zones/maze/zone.lua
index 890a0b43b638d89d24399751553f27c99d8c8c32..029fb9ac8a4c3db4adcf244601f45e41572b0425 100644
--- a/game/modules/tome/data/zones/maze/zone.lua
+++ b/game/modules/tome/data/zones/maze/zone.lua
@@ -27,8 +27,8 @@ return {
width = 40, height = 40,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "The Ancients.ogg",
+ persistent = "zone",
+ ambient_music = "The Ancients.ogg",
generator = {
map = {
class = "engine.generator.map.Maze",
diff --git a/game/modules/tome/data/zones/old-forest/zone.lua b/game/modules/tome/data/zones/old-forest/zone.lua
index 27320a2a4d7d7f014aa0cd664fcb4c5e177b054a..632bed63b8677b069e102728763169e4c1474747 100644
--- a/game/modules/tome/data/zones/old-forest/zone.lua
+++ b/game/modules/tome/data/zones/old-forest/zone.lua
@@ -27,10 +27,10 @@ return {
width = 50, height = 50,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
+ persistent = "zone",
color_shown = {0.5, 0.5, 0.5, 1},
color_obscure = {0.5*0.6, 0.5*0.6, 0.5*0.6, 1},
- ambiant_music = "Woods of Eremae.ogg",
+ ambient_music = "Woods of Eremae.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/rak-shor-pride/zone.lua b/game/modules/tome/data/zones/rak-shor-pride/zone.lua
index 0421f3d3c7ebac5bc00260bd50e6c51e995b6038..8aec3d5561c51062bbcd080aab1ad2f5eb6c582f 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/zone.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/zone.lua
@@ -25,10 +25,10 @@ return {
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 50, height = 50,
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
all_lited = true,
- ambiant_music = "Bazaar of Tal-Mashad.ogg",
+ ambient_music = "Bazaar of Tal-Mashad.ogg",
generator = {
map = {
class = "engine.generator.map.Town",
diff --git a/game/modules/tome/data/zones/reknor/zone.lua b/game/modules/tome/data/zones/reknor/zone.lua
index 6a3b84b76af5292bd3c123e96fb389f882b69be2..c17169fdc5d39fd6b8f9301e64df05419cdb51a3 100644
--- a/game/modules/tome/data/zones/reknor/zone.lua
+++ b/game/modules/tome/data/zones/reknor/zone.lua
@@ -27,8 +27,8 @@ return {
width = 70, height = 70,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "a_lomos_del_dragon_blanco.ogg",
+ persistent = "zone",
+ ambient_music = "a_lomos_del_dragon_blanco.ogg",
generator = {
map = {
class = "engine.generator.map.TileSet",
diff --git a/game/modules/tome/data/zones/ruined-dungeon/zone.lua b/game/modules/tome/data/zones/ruined-dungeon/zone.lua
index 035fa9e7e868ff71f350d9008c365498bcadc18e..dc7a5c07a97aaba5d90708ef4dd5bc138271240d 100644
--- a/game/modules/tome/data/zones/ruined-dungeon/zone.lua
+++ b/game/modules/tome/data/zones/ruined-dungeon/zone.lua
@@ -26,8 +26,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "Far Away.ogg",
+ persistent = "zone",
+ ambient_music = "Far Away.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/ruins-kor-pul/zone.lua b/game/modules/tome/data/zones/ruins-kor-pul/zone.lua
index 08d1fac91f2d55ec1dc81fb6cc78c6fd47ebfb80..0383dbc753236a58357f82aaea294efe8c60f192 100644
--- a/game/modules/tome/data/zones/ruins-kor-pul/zone.lua
+++ b/game/modules/tome/data/zones/ruins-kor-pul/zone.lua
@@ -27,8 +27,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "Swashing the buck.ogg",
+ persistent = "zone",
+ ambient_music = "Swashing the buck.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/sandworm-lair/zone.lua b/game/modules/tome/data/zones/sandworm-lair/zone.lua
index 4ebccd4022cac2074a041703398f200f21d8d0ed..26dc32e5217af862f85afec8b3888b15a9a6dede 100644
--- a/game/modules/tome/data/zones/sandworm-lair/zone.lua
+++ b/game/modules/tome/data/zones/sandworm-lair/zone.lua
@@ -28,8 +28,8 @@ return {
no_level_connectivity = true,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "6_19.ogg",
+ persistent = "zone",
+ ambient_music = "6_19.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/shadow-crypt/zone.lua b/game/modules/tome/data/zones/shadow-crypt/zone.lua
index 63a7b6f4a394f28f043afbc4e0589f38c0269f92..64896bba831b972b2619ba5e89ee612825ea23a3 100644
--- a/game/modules/tome/data/zones/shadow-crypt/zone.lua
+++ b/game/modules/tome/data/zones/shadow-crypt/zone.lua
@@ -27,10 +27,10 @@ return {
width = 50, height = 50,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
color_shown = {0.6, 0.6, 0.6, 1},
color_obscure = {0.6*0.6, 0.6*0.6, 0.6*0.6, 1},
- ambiant_music = "Anne_van_Schothorst_-_Passed_Tense.ogg",
+ ambient_music = "Anne_van_Schothorst_-_Passed_Tense.ogg",
generator = {
map = {
class = "engine.generator.map.TileSet",
diff --git a/game/modules/tome/data/zones/shertul-fortress/zone.lua b/game/modules/tome/data/zones/shertul-fortress/zone.lua
index 3b3fe5309f0f4f47c078c0795e803673826aeaf0..c961693a9ae450867df6ccbba600cd692be75031 100644
--- a/game/modules/tome/data/zones/shertul-fortress/zone.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/zone.lua
@@ -29,11 +29,11 @@ return {
level_range = {18, 25},
max_level = 1,
width = 60, height = 60,
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Dreaming of Flying.ogg",
+ persistent = "zone",
+ ambient_music = "Dreaming of Flying.ogg",
no_level_connectivity = true,
no_worldport = true,
generator = {
diff --git a/game/modules/tome/data/zones/slime-tunnels/zone.lua b/game/modules/tome/data/zones/slime-tunnels/zone.lua
index ebc2b88526066f6bfd72595b1dec805de1fd5e6b..cade9e6ea4ffc8191e82a22f7efbc11c48acd620 100644
--- a/game/modules/tome/data/zones/slime-tunnels/zone.lua
+++ b/game/modules/tome/data/zones/slime-tunnels/zone.lua
@@ -27,8 +27,8 @@ return {
width = 250, height = 30,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "Thrall's Theme.ogg",
+ persistent = "zone",
+ ambient_music = "Thrall's Theme.ogg",
no_level_connectivity = true,
generator = {
map = {
diff --git a/game/modules/tome/data/zones/tannen-tower/zone.lua b/game/modules/tome/data/zones/tannen-tower/zone.lua
index 20cb71f1a7ab5138829d2c299ef2373e15a4bb0e..0b311f2308d79258a481674fa4feeb1232400872 100644
--- a/game/modules/tome/data/zones/tannen-tower/zone.lua
+++ b/game/modules/tome/data/zones/tannen-tower/zone.lua
@@ -27,9 +27,9 @@ return {
width = 25, height = 25,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
no_level_connectivity = true,
- ambiant_music = "Remembrance.ogg",
+ ambient_music = "Remembrance.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/telmur/zone.lua b/game/modules/tome/data/zones/telmur/zone.lua
index dc985b57fbe101241f573ab3645b994fa2d93711..7262e8ef5da4947108f3038c1d5ea81fe399b0ee 100644
--- a/game/modules/tome/data/zones/telmur/zone.lua
+++ b/game/modules/tome/data/zones/telmur/zone.lua
@@ -27,8 +27,8 @@ return {
width = 20, height = 20,
all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Remembrance.ogg",
+ persistent = "zone",
+ ambient_music = "Remembrance.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/tempest-peak/zone.lua b/game/modules/tome/data/zones/tempest-peak/zone.lua
index 94be3e583148039fc48a5ecfbaa1033b0fb4178d..e0e5573f20d4b0186de6f8c9104db86d28b28dd1 100644
--- a/game/modules/tome/data/zones/tempest-peak/zone.lua
+++ b/game/modules/tome/data/zones/tempest-peak/zone.lua
@@ -27,8 +27,8 @@ return {
width = 70, height = 70,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "World of Ice.ogg",
+ persistent = "zone",
+ ambient_music = "World of Ice.ogg",
generator = {
map = {
class = "engine.generator.map.Roomer",
diff --git a/game/modules/tome/data/zones/temple-of-creation/zone.lua b/game/modules/tome/data/zones/temple-of-creation/zone.lua
index f681030118c013d4baf66e04bd4cface4103052c..1a29f86160828d901de3f03f221db77bcd10969e 100644
--- a/game/modules/tome/data/zones/temple-of-creation/zone.lua
+++ b/game/modules/tome/data/zones/temple-of-creation/zone.lua
@@ -26,8 +26,8 @@ return {
width = 70, height = 70,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "elven_town.ogg",
+ persistent = "zone",
+ ambient_music = "elven_town.ogg",
-- Apply a bluish tint to all the map
color_shown = {0.5, 1, 0.8, 1},
color_obscure = {0.5*0.6, 1*0.6, 0.8*0.6, 0.6},
diff --git a/game/modules/tome/data/zones/test/zone.lua b/game/modules/tome/data/zones/test/zone.lua
index 2413c4aa3fb5c33556c25da8c922cc36c31f9bb0..18a356a79714c58f13924a4ff32fd9affa28884f 100644
--- a/game/modules/tome/data/zones/test/zone.lua
+++ b/game/modules/tome/data/zones/test/zone.lua
@@ -27,7 +27,7 @@ return {
width = 90, height = 90,
all_remembered = true,
all_lited = true,
--- persistant = "zone",
+-- persistent = "zone",
generator = {
map = {
class = "engine.generator.map.Forest",
diff --git a/game/modules/tome/data/zones/town-angolwen/zone.lua b/game/modules/tome/data/zones/town-angolwen/zone.lua
index ffb02d9999312911297aa9e31ba5abefd8438d30..66673cdd10ebbf31a92a96a22c0b0b853f585f83 100644
--- a/game/modules/tome/data/zones/town-angolwen/zone.lua
+++ b/game/modules/tome/data/zones/town-angolwen/zone.lua
@@ -24,11 +24,11 @@ return {
max_level = 1,
width = 50, height = 50,
decay = {300, 800, only={object=true}, no_respawn=true},
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Dreaming of Flying.ogg",
+ persistent = "zone",
+ ambient_music = "Dreaming of Flying.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/town-derth/zone.lua b/game/modules/tome/data/zones/town-derth/zone.lua
index cad39dbd623334d6f0380be0acd85a5781c8575c..658d7fe037ef710a07066ac52a86bd2f9f1a3841 100644
--- a/game/modules/tome/data/zones/town-derth/zone.lua
+++ b/game/modules/tome/data/zones/town-derth/zone.lua
@@ -24,10 +24,10 @@ return {
max_level = 1,
width = 196, height = 80,
decay = {300, 800, only={object=true}, no_respawn=true},
- persistant = "zone",
+ persistent = "zone",
all_remembered = true,
all_lited = true,
- ambiant_music = "Virtue lost.ogg",
+ ambient_music = "Virtue lost.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/town-gates-of-morning/zone.lua b/game/modules/tome/data/zones/town-gates-of-morning/zone.lua
index 7ed4577741f113be35408b77afbb72588423b829..5c874d361a17de7107dd437652549bf8128ea1a8 100644
--- a/game/modules/tome/data/zones/town-gates-of-morning/zone.lua
+++ b/game/modules/tome/data/zones/town-gates-of-morning/zone.lua
@@ -23,10 +23,10 @@ return {
max_level = 1,
width = 196, height = 80,
decay = {300, 800, only={object=true}, no_respawn=true},
- persistant = "zone",
+ persistent = "zone",
all_remembered = true,
all_lited = true,
- ambiant_music = "For the king and the country!.ogg",
+ ambient_music = "For the king and the country!.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/town-last-hope/zone.lua b/game/modules/tome/data/zones/town-last-hope/zone.lua
index b5f532f716d1906153f4c98581e3a0128e8562eb..e0d9c1b47bb0c54b6bb6735fbe1a229411dd3334 100644
--- a/game/modules/tome/data/zones/town-last-hope/zone.lua
+++ b/game/modules/tome/data/zones/town-last-hope/zone.lua
@@ -23,10 +23,10 @@ return {
max_level = 1,
width = 196, height = 80,
decay = {300, 800, only={object=true}, no_respawn=true},
- persistant = "zone",
+ persistent = "zone",
all_remembered = true,
all_lited = true,
- ambiant_music = "For the king and the country!.ogg",
+ ambient_music = "For the king and the country!.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/town-lumberjack-village/zone.lua b/game/modules/tome/data/zones/town-lumberjack-village/zone.lua
index 20dfe20b926d31459246f051f6a81c16264a7ce0..480b38bc3f98d4ba583ca9c073c4928cd91e3a91 100644
--- a/game/modules/tome/data/zones/town-lumberjack-village/zone.lua
+++ b/game/modules/tome/data/zones/town-lumberjack-village/zone.lua
@@ -23,11 +23,11 @@ return {
max_level = 1,
width = 25, height = 25,
decay = {300, 800, only={object=true}, no_respawn=true},
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Virtue lost.ogg",
+ persistent = "zone",
+ ambient_music = "Virtue lost.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/town-sunwall-outpost/zone.lua b/game/modules/tome/data/zones/town-sunwall-outpost/zone.lua
index c73450f61c713b513d4b4a3f6eda3560f8bc56a0..023566a2884bd67e7ef46a24191edb30d3bdf542 100644
--- a/game/modules/tome/data/zones/town-sunwall-outpost/zone.lua
+++ b/game/modules/tome/data/zones/town-sunwall-outpost/zone.lua
@@ -25,10 +25,10 @@ return {
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 50, height = 50,
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
all_lited = true,
- ambiant_music = "Straight Into Ambush.ogg",
+ ambient_music = "Straight Into Ambush.ogg",
generator = {
map = {
class = "engine.generator.map.Town",
diff --git a/game/modules/tome/data/zones/town-zigur/zone.lua b/game/modules/tome/data/zones/town-zigur/zone.lua
index 9b11308178968646c9735e3e7ab98f84e8c717bd..8a1b8962b948e77e17134090727287e7f86f05f5 100644
--- a/game/modules/tome/data/zones/town-zigur/zone.lua
+++ b/game/modules/tome/data/zones/town-zigur/zone.lua
@@ -24,11 +24,11 @@ return {
max_level = 1,
width = 50, height = 50,
decay = {300, 800, only={object=true}, no_respawn=true},
- persistant = "zone",
+ persistent = "zone",
no_worldport = true,
all_remembered = true,
all_lited = true,
- ambiant_music = "Straight Into Ambush.ogg",
+ ambient_music = "Straight Into Ambush.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/trollmire/zone.lua b/game/modules/tome/data/zones/trollmire/zone.lua
index 5dec9f25781f6811fb9c1031d5a8b17b98c3e5a9..12305f0265734458d354fe0022941f2a84f72dcb 100644
--- a/game/modules/tome/data/zones/trollmire/zone.lua
+++ b/game/modules/tome/data/zones/trollmire/zone.lua
@@ -27,8 +27,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Rainy Day.ogg",
+ persistent = "zone",
+ ambient_music = "Rainy Day.ogg",
generator = {
map = {
class = "engine.generator.map.Forest",
diff --git a/game/modules/tome/data/zones/tutorial/zone.lua b/game/modules/tome/data/zones/tutorial/zone.lua
index dc717d1ab39bcd23d586f21753a774e2120e187b..a1b28e48c38914d8b96dc6cb98d4dc81afdd0b05 100644
--- a/game/modules/tome/data/zones/tutorial/zone.lua
+++ b/game/modules/tome/data/zones/tutorial/zone.lua
@@ -27,8 +27,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "Woods of Eremae.ogg",
+ persistent = "zone",
+ ambient_music = "Woods of Eremae.ogg",
no_level_connectivity = true,
generator = {
map = {
diff --git a/game/modules/tome/data/zones/unremarkable-cave/zone.lua b/game/modules/tome/data/zones/unremarkable-cave/zone.lua
index d9da19d432dda5bbe4a90c1267f20d019a3321b5..0d53efa2f3048b5acdf2fb1810ba4488c3e91054 100644
--- a/game/modules/tome/data/zones/unremarkable-cave/zone.lua
+++ b/game/modules/tome/data/zones/unremarkable-cave/zone.lua
@@ -27,8 +27,8 @@ return {
width = 100, height = 50,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
- ambiant_music = "Swashing the buck.ogg",
+ persistent = "zone",
+ ambient_music = "Swashing the buck.ogg",
generator = {
map = {
class = "engine.generator.map.Static",
diff --git a/game/modules/tome/data/zones/valley-moon-caverns/zone.lua b/game/modules/tome/data/zones/valley-moon-caverns/zone.lua
index 31e09c8ee42fd69b9f692b70d97a89901c42b887..230776c48bf64c4cc9024e76c437a79112db08c7 100644
--- a/game/modules/tome/data/zones/valley-moon-caverns/zone.lua
+++ b/game/modules/tome/data/zones/valley-moon-caverns/zone.lua
@@ -27,7 +27,7 @@ return {
width = 70, height = 70,
-- all_remembered = true,
-- all_lited = true,
- persistant = "zone",
+ persistent = "zone",
-- Apply a darkish tint to all the map
color_shown = {0.7, 0.7, 0.7, 1},
color_obscure = {0.7*0.6, 0.7*0.6, 0.7*0.6, 1},
diff --git a/game/modules/tome/data/zones/valley-moon/zone.lua b/game/modules/tome/data/zones/valley-moon/zone.lua
index 744da21f617d70e68512d1f59538de7318d15c08..0d7d0617497da70c1ae68aae39ec8f8195466955 100644
--- a/game/modules/tome/data/zones/valley-moon/zone.lua
+++ b/game/modules/tome/data/zones/valley-moon/zone.lua
@@ -26,8 +26,8 @@ return {
width = 50, height = 50,
-- all_remembered = true,
all_lited = true,
- persistant = "zone",
- ambiant_music = "The Ancients.ogg",
+ persistent = "zone",
+ ambient_music = "The Ancients.ogg",
no_level_connectivity = true,
generator = {
map = {
diff --git a/game/modules/tome/data/zones/vor-armoury/zone.lua b/game/modules/tome/data/zones/vor-armoury/zone.lua
index a8b2d098a36acec9c7d93ab31448e17e95933325..f1cee224e365b49370682ecc6deb6289cea6caec 100644
--- a/game/modules/tome/data/zones/vor-armoury/zone.lua
+++ b/game/modules/tome/data/zones/vor-armoury/zone.lua
@@ -25,10 +25,10 @@ return {
-- decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 30, height = 30,
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
-- all_lited = true,
- ambiant_music = "Breaking the siege.ogg",
+ ambient_music = "Breaking the siege.ogg",
generator = {
map = {
class = "engine.generator.map.TileSet",
diff --git a/game/modules/tome/data/zones/vor-pride/zone.lua b/game/modules/tome/data/zones/vor-pride/zone.lua
index d97d2b66f17d6ba6c95267bbd05ec9d64f8df104..8f5975c664de822e61c8aab80fab9f76ea5d9b01 100644
--- a/game/modules/tome/data/zones/vor-pride/zone.lua
+++ b/game/modules/tome/data/zones/vor-pride/zone.lua
@@ -25,10 +25,10 @@ return {
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
width = 50, height = 50,
- persistant = "zone",
+ persistent = "zone",
-- all_remembered = true,
all_lited = true,
- ambiant_music = "Breaking the siege.ogg",
+ ambient_music = "Breaking the siege.ogg",
generator = {
map = {
class = "engine.generator.map.Town",
diff --git a/game/modules/tome/data/zones/wilderness/zone.lua b/game/modules/tome/data/zones/wilderness/zone.lua
index d8f305f4217793f5b13c2a2b3e2e80526bf20f41..ad6daf79c7353b4767585534bfbc64c65566b14c 100644
--- a/game/modules/tome/data/zones/wilderness/zone.lua
+++ b/game/modules/tome/data/zones/wilderness/zone.lua
@@ -26,8 +26,8 @@ return {
width = 170, height = 100,
-- all_remembered = true,
-- all_lited = true,
- persistant = "memory",
- ambiant_music = "Remembrance.ogg",
+ persistent = "memory",
+ ambient_music = "Remembrance.ogg",
wilderness = true,
wilderness_see_radius = 4,
generator = {
diff --git a/game/modules/tome/dialogs/DeathDialog.lua b/game/modules/tome/dialogs/DeathDialog.lua
index 748265ae81e9e2f39d60b63977773d804507c960..aba5e056bf87df61206b00fb57caffe81d47b8fe 100644
--- a/game/modules/tome/dialogs/DeathDialog.lua
+++ b/game/modules/tome/dialogs/DeathDialog.lua
@@ -79,7 +79,7 @@ function _M:cleanActor(actor)
end
--- Restore resources
-function _M:restoreRessources(actor)
+function _M:restoreResources(actor)
actor:resetToFull()
actor.energy.value = game.energy_to_act
@@ -123,14 +123,14 @@ function _M:use(item)
game.logPlayer(self.actor, "#LIGHT_BLUE#You resurrect! CHEATER !")
self:cleanActor(self.actor)
- self:restoreRessources(self.actor)
+ self:restoreResources(self.actor)
self:resurrectBasic(self.actor)
elseif act == "blood_life" then
self.actor.blood_life = false
game.logPlayer(self.actor, "#LIGHT_RED#The Blood of Life rushes through your dead body. You come back to life!")
self:cleanActor(self.actor)
- self:restoreRessources(self.actor)
+ self:restoreResources(self.actor)
self:resurrectBasic(self.actor)
elseif act == "easy_mode" then
self.actor:attr("easy_mode_lifes", -1)
@@ -142,14 +142,14 @@ function _M:use(item)
self:resurrectBasic(self.actor)
for uid, e in pairs(game.level.entities) do
- self:restoreRessources(e)
+ self:restoreResources(e)
end
elseif act == "skeleton" then
self.actor:attr("re-assembled", 1)
game.logPlayer(self.actor, "#YELLOW#Your bones magically come back together. You are once more able to dish out pain to your foes!")
self:cleanActor(self.actor)
- self:restoreRessources(self.actor)
+ self:restoreResources(self.actor)
self:resurrectBasic(self.actor)
elseif act:find("^consume") then
local inven, item, o = item.inven, item.item, item.object
@@ -157,7 +157,7 @@ function _M:use(item)
game.logPlayer(self.actor, "#YELLOW#Your %s is consumed and disappears! You come back to life!", o:getName{do_colour=true})
self:cleanActor(self.actor)
- self:restoreRessources(self.actor)
+ self:restoreResources(self.actor)
self:resurrectBasic(self.actor)
end
end
diff --git a/src/lualanes/tools.c b/src/lualanes/tools.c
index 38e058bcd954ae296b71b6474c164b0e1e6ea059..69936781a36c8c1d4908f526941a49a5ee842836 100644
--- a/src/lualanes/tools.c
+++ b/src/lualanes/tools.c
@@ -1196,7 +1196,7 @@ void luaG_inter_copy( lua_State* L, lua_State *L2, uint_t n )
}
/*
- * Remove the cache table. Persistant caching would cause i.e. multiple
+ * Remove the cache table. persistent caching would cause i.e. multiple
* messages passed in the same table to use the same table also in receiving
* end.
*/