From 3cfbaf9223a0474a0966fc393825cdd985e4b9a2 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sat, 1 Jan 2011 21:52:01 +0000
Subject: [PATCH] code typos
git-svn-id: http://svn.net-core.org/repos/t-engine4@2261 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/Key.lua | 2 +-
game/engines/default/engine/KeyCommand.lua | 2 +-
game/engines/default/engine/NumberBox.lua | 6 +++---
game/engines/default/engine/TextBox.lua | 12 ++++++------
game/engines/default/engine/Zone.lua | 18 +++++++++---------
.../default/engine/generator/map/TileSet.lua | 4 ++--
.../default/engine/interface/ActorTalents.lua | 6 +++---
.../engine/interface/ControlCursorSupport.lua | 6 +++---
.../example/data/zones/dungeon/zone.lua | 2 +-
game/modules/example/dialogs/DeathDialog.lua | 4 ++--
.../data/zones/dungeon/zone.lua | 2 +-
.../example_realtime/dialogs/DeathDialog.lua | 4 ++--
game/modules/tome/class/Game.lua | 12 ++++++------
game/modules/tome/class/GameState.lua | 2 +-
.../tome/class/generator/map/CharredScar.lua | 4 ++--
.../tome/class/generator/map/SlimeTunnels.lua | 2 +-
.../tome/data/general/encounters/maj-eyal.lua | 2 +-
.../tome/data/talents/spells/golemancy.lua | 2 +-
game/modules/tome/data/tilesets/5x5/crypt.lua | 2 +-
.../data/zones/ancient-elven-ruins/zone.lua | 4 ++--
.../modules/tome/data/zones/ardhungol/zone.lua | 4 ++--
.../tome/data/zones/blighted-ruins/zone.lua | 4 ++--
.../tome/data/zones/briagh-lair/zone.lua | 2 +-
.../tome/data/zones/charred-scar/zone.lua | 4 ++--
.../tome/data/zones/crypt-kryl-feijan/zone.lua | 4 ++--
game/modules/tome/data/zones/daikara/zone.lua | 4 ++--
.../tome/data/zones/demon-plane-spell/zone.lua | 2 +-
.../tome/data/zones/demon-plane/zone.lua | 4 ++--
.../tome/data/zones/dreadfell-ambush/zone.lua | 4 ++--
.../modules/tome/data/zones/dreadfell/zone.lua | 4 ++--
game/modules/tome/data/zones/eruan/zone.lua | 4 ++--
.../tome/data/zones/flooded-cave/zone.lua | 4 ++--
.../tome/data/zones/gorbat-pride/zone.lua | 4 ++--
.../tome/data/zones/grushnak-pride/zone.lua | 4 ++--
.../modules/tome/data/zones/high-peak/zone.lua | 4 ++--
.../tome/data/zones/illusory-castle/zone.lua | 2 +-
.../tome/data/zones/infinite-dungeon/zone.lua | 2 +-
game/modules/tome/data/zones/lake-nur/zone.lua | 4 ++--
.../tome/data/zones/mark-spellblaze/zone.lua | 4 ++--
game/modules/tome/data/zones/maze/zone.lua | 4 ++--
.../tome/data/zones/old-forest/zone.lua | 4 ++--
.../tome/data/zones/rak-shor-pride/zone.lua | 4 ++--
game/modules/tome/data/zones/reknor/zone.lua | 4 ++--
.../tome/data/zones/ruined-dungeon/zone.lua | 4 ++--
.../tome/data/zones/ruins-kor-pul/zone.lua | 4 ++--
.../tome/data/zones/sandworm-lair/zone.lua | 4 ++--
.../tome/data/zones/shadow-crypt/zone.lua | 4 ++--
.../tome/data/zones/shertul-fortress/zone.lua | 6 +++---
.../tome/data/zones/slime-tunnels/zone.lua | 4 ++--
.../tome/data/zones/tannen-tower/zone.lua | 4 ++--
game/modules/tome/data/zones/telmur/zone.lua | 4 ++--
.../tome/data/zones/tempest-peak/zone.lua | 4 ++--
.../data/zones/temple-of-creation/zone.lua | 4 ++--
game/modules/tome/data/zones/test/zone.lua | 2 +-
.../tome/data/zones/town-angolwen/zone.lua | 6 +++---
.../tome/data/zones/town-derth/zone.lua | 4 ++--
.../data/zones/town-gates-of-morning/zone.lua | 4 ++--
.../tome/data/zones/town-last-hope/zone.lua | 4 ++--
.../zones/town-lumberjack-village/zone.lua | 6 +++---
.../data/zones/town-sunwall-outpost/zone.lua | 4 ++--
.../tome/data/zones/town-zigur/zone.lua | 4 ++--
.../modules/tome/data/zones/trollmire/zone.lua | 4 ++--
game/modules/tome/data/zones/tutorial/zone.lua | 4 ++--
.../tome/data/zones/unremarkable-cave/zone.lua | 4 ++--
.../data/zones/valley-moon-caverns/zone.lua | 2 +-
.../tome/data/zones/valley-moon/zone.lua | 4 ++--
.../tome/data/zones/vor-armoury/zone.lua | 4 ++--
.../modules/tome/data/zones/vor-pride/zone.lua | 4 ++--
.../tome/data/zones/wilderness/zone.lua | 4 ++--
game/modules/tome/dialogs/DeathDialog.lua | 12 ++++++------
src/lualanes/tools.c | 2 +-
71 files changed, 151 insertions(+), 151 deletions(-)
diff --git a/game/engines/default/engine/Key.lua b/game/engines/default/engine/Key.lua
index 412e3365b9..4ac6ea7726 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 abb380a003..7440264263 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 ca546c0c08..e7d1bee223 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 a1fdab75cb..bfe3e6b0bd 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 7270e13e92..247719c428 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 d87a7fb172..97499dcd8c 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 4170c78c0c..9cfc10dd8e 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 c2bbc12852..ed621e0263 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 ec08a4a8c4..4600e35729 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 6f04045da8..3d2a246ac2 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 ec08a4a8c4..4600e35729 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 6f04045da8..3d2a246ac2 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 69682138f4..100f5a35c6 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 23d4894f35..d9fa4aec7e 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 4165fe77f7..c5ed74e306 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 9a74517a95..951785982c 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 1baa8b7c81..53dc860068 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 a7516f1f2e..c8a2164e51 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 0f2985a211..0f916f93b1 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 649773a37f..ac7ced6e78 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 aa560d6ee1..c30ceb21c4 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 b464056d23..65bc5b5961 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 2b11663fb5..6677283678 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 93bd33b8be..7a00f3236b 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 3424b49f79..c894b25881 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 af1a6a3faa..5f6729c046 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 08fdae8ace..43908da572 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 4a702bbc52..a78be75ec4 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 c9a215c714..97279cdc04 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 d03a31e521..5052e5e2aa 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 c1f77e7ba5..706ff46b45 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 1060ac5b38..340aa26d65 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 b1f5613487..58867277f1 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 2dce05cc0f..64655cf33e 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 11d541e17f..6159e52894 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 b457b3d0d4..96e26f0b4e 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 272e6bf99e..219977c1bc 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 973af08fd3..41f0af2c26 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 85a200369f..8fd5b0b8bd 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 890a0b43b6..029fb9ac8a 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 27320a2a4d..632bed63b8 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 0421f3d3c7..8aec3d5561 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 6a3b84b76a..c17169fdc5 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 035fa9e7e8..dc7a5c07a9 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 08d1fac91f..0383dbc753 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 4ebccd4022..26dc32e521 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 63a7b6f4a3..64896bba83 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 3b3fe5309f..c961693a9a 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 ebc2b88526..cade9e6ea4 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 20cb71f1a7..0b311f2308 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 dc985b57fb..7262e8ef5d 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 94be3e5831..e0e5573f20 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 f681030118..1a29f86160 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 2413c4aa3f..18a356a797 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 ffb02d9999..66673cdd10 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 cad39dbd62..658d7fe037 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 7ed4577741..5c874d361a 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 b5f532f716..e0d9c1b47b 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 20dfe20b92..480b38bc3f 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 c73450f61c..023566a288 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 9b11308178..8a1b8962b9 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 5dec9f2578..12305f0265 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 dc717d1ab3..a1b28e48c3 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 d9da19d432..0d53efa2f3 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 31e09c8ee4..230776c48b 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 744da21f61..0d7d061749 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 a8b2d098a3..f1cee224e3 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 d97d2b66f1..8f5975c664 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 d8f305f421..ad6daf79c7 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 748265ae81..aba5e056bf 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 38e058bcd9..69936781a3 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.
*/
--
GitLab