From 4ce0606fdf18a87165b72be3acd9cba5b6255e15 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Thu, 5 Jun 2014 16:27:46 +0200
Subject: [PATCH] Fixed various small bugs
bump to 121
---
game/engines/default/engine/Entity.lua | 1 +
game/engines/default/engine/utils.lua | 6 +++++-
game/engines/default/engine/version.lua | 2 +-
game/modules/tome/class/Grid.lua | 1 +
.../tome/data/talents/techniques/combat-training.lua | 1 +
game/modules/tome/init.lua | 4 ++--
6 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/game/engines/default/engine/Entity.lua b/game/engines/default/engine/Entity.lua
index f0165acd26..99d3f81494 100644
--- a/game/engines/default/engine/Entity.lua
+++ b/game/engines/default/engine/Entity.lua
@@ -974,6 +974,7 @@ function _M:loadList(file, no_default, res, mod, loaded)
setfenv(f, setmetatable(newenv, {__index=_G}))
f()
setfenv(f, {})
+ newenv.currentZone = nil
self:triggerHook{"Entity:loadList", file=file, no_default=no_default, res=res, mod=mod, loaded=loaded}
diff --git a/game/engines/default/engine/utils.lua b/game/engines/default/engine/utils.lua
index 4fb29398ca..e81efbf7ec 100644
--- a/game/engines/default/engine/utils.lua
+++ b/game/engines/default/engine/utils.lua
@@ -1808,7 +1808,11 @@ function util.findAllReferences(t, what)
if type(e) == "function" then
local fenv = getfenv(e)
local data = table.clone(data)
- data[#data+1] = "e:fenv:"..tostring(k)
+ if fenv.__CLASSNAME then
+ data[#data+1] = "e:fenv["..fenv.__CLASSNAME"]:"..tostring(k)
+ else
+ data[#data+1] = "e:fenv[--]:"..tostring(k)
+ end
recurs(fenv, data)
end
diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index ea605b02a9..295887274c 100644
--- a/game/engines/default/engine/version.lua
+++ b/game/engines/default/engine/version.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
-- Engine Version
-engine.version = {1,2,0,"te4",17}
+engine.version = {1,2,1,"te4",17}
engine.require_c_core = engine.version[5]
engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
diff --git a/game/modules/tome/class/Grid.lua b/game/modules/tome/class/Grid.lua
index df34e80b01..4283c6ff62 100644
--- a/game/modules/tome/class/Grid.lua
+++ b/game/modules/tome/class/Grid.lua
@@ -145,6 +145,7 @@ function _M:getName()
end
function _M:tooltip(x, y)
+ if not x or not y then return tstring("") end
local tstr
local dist = nil
if game.player.x and game.player.y then dist = tstring{" (range: ", {"font", "italic"}, {"color", "LIGHT_GREEN"}, tostring(core.fov.distance(game.player.x, game.player.y, x, y)), {"color", "LAST"}, {"font", "normal"}, ")"} end
diff --git a/game/modules/tome/data/talents/techniques/combat-training.lua b/game/modules/tome/data/talents/techniques/combat-training.lua
index f7d3995f74..6678a0bacd 100644
--- a/game/modules/tome/data/talents/techniques/combat-training.lua
+++ b/game/modules/tome/data/talents/techniques/combat-training.lua
@@ -42,6 +42,7 @@ newTalent{
points = 5,
require = {stat = {str = function(level) return 16 + (level + 2) * (level - 1) end}},
ArmorEffect = function(self, t) -- Becomes more effective with heavier armors
+ if not self:getInven("BODY") then return 0 end
local am = self:getInven("BODY")[1] or {}
-- if am.subtype == "cloth" then return 0.75
-- elseif am.subtype == "light" then return 1.0
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index dc7bb68069..f6ff3599ac 100644
--- a/game/modules/tome/init.lua
+++ b/game/modules/tome/init.lua
@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
short_name = "tome"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/"
-version = {1,2,0}
-engine = {1,2,0,"te4"}
+version = {1,2,1}
+engine = {1,2,1,"te4"}
description = [[
Welcome to Maj'Eyal.
--
GitLab