diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index 13f55a5074abc01cfe1922fa4650135ee4431aee..74575bd6007f62a336f7400c1f01ec5d93174058 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 = {0,9,41,"te4",17}
+engine.version = {0,9,42,"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/example/init.lua b/game/modules/example/init.lua
index 8dba3245ee0d9ea42e6994aa67a58f0dcf8de3a7..3153dc177ae2865277c251929937ae311bead987 100644
--- a/game/modules/example/init.lua
+++ b/game/modules/example/init.lua
@@ -23,7 +23,7 @@ short_name = "example"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/modules:example"
version = {1,0,0}
-engine = {0,9,41,"te4"}
+engine = {0,9,42,"te4"}
description = [[
This is *NOT* a game, just an example/template to make your own using the T-Engine4.
]]
diff --git a/game/modules/example_realtime/init.lua b/game/modules/example_realtime/init.lua
index 70e1cbd81a3d326fb8af1a95ff3480315436a4ef..5fcfe7859e4a0a93572cd298489aa441aedafe09 100644
--- a/game/modules/example_realtime/init.lua
+++ b/game/modules/example_realtime/init.lua
@@ -23,7 +23,7 @@ short_name = "example_realtime"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://te4.org/modules:example"
version = {1,0,0}
-engine = {0,9,41,"te4"}
+engine = {0,9,42,"te4"}
description = [[
This is *NOT* a game, just an example/template to make your own using the T-Engine4.
]]
diff --git a/game/modules/tome/class/uiset/Minimalist.lua b/game/modules/tome/class/uiset/Minimalist.lua
index 649ba35491fca54503c0b5c6199b927b8cd577df..6f746912fc18286db2d7cc7da5ef1d0d94633212 100644
--- a/game/modules/tome/class/uiset/Minimalist.lua
+++ b/game/modules/tome/class/uiset/Minimalist.lua
@@ -356,7 +356,7 @@ function _M:activate()
game.uiset.logdisplay(...) else game.uiset.logdisplay(style, ...) end
if game.uiset.show_userchat then game.uiset.logdisplay.changed = old end
end
- game.logSeen = function(e, style, ...) if e and e.x and e.y and game.level.map.seens(e.x, e.y) then game.log(style, ...) end end
+ game.logSeen = function(e, style, ...) if e and e.x and e.y and game.level and game.level.map.seens(e.x, e.y) then game.log(style, ...) end end
game.logPlayer = function(e, style, ...) if e == game.player or e == game.party then game.log(style, ...) end end
self:boundPlaces()
diff --git a/game/modules/tome/data/maps/vaults/greater-crypt.lua b/game/modules/tome/data/maps/vaults/greater-crypt.lua
index 5c325a8d3eee6f1408cb3702fdba82e47dc8d701..b2a7e13daf59d73526808bec533401abe9782165 100644
--- a/game/modules/tome/data/maps/vaults/greater-crypt.lua
+++ b/game/modules/tome/data/maps/vaults/greater-crypt.lua
@@ -82,6 +82,7 @@ defineTile('1', mod.class.Grid.new{
game.logPlayer(actor, "Something in the floor clicks ominously, and suddenly the world spins around you!")
local g = game.zone:makeEntityByName(game.level, "terrain", "FLOOR")
+ if not g then return end
game.zone:addEntity(game.level, g, "terrain", x, y)
end,
}
@@ -98,6 +99,7 @@ defineTile('2', mod.class.Grid.new{
if forced then return end
local g = game.zone:makeEntityByName(game.level, "terrain", "HARDWALL")
local f = game.zone:makeEntityByName(game.level, "terrain", "FLOOR")
+ if not g or not f then return end
game.zone:addEntity(game.level, g, "terrain", x - 1, y)
game.nicer_tiles:updateAround(game.level, x - 1, y)
game.zone:addEntity(game.level, f, "terrain", x, y + 1)
@@ -126,6 +128,7 @@ defineTile('3', mod.class.Grid.new{
if not actor.player then return end
if forced then return end
local g = game.zone:makeEntityByName(game.level, "terrain", "FLOOR")
+ if not g then return end
game.zone:addEntity(game.level, g, "terrain", x + 1, y)
game.nicer_tiles:updateAround(game.level, x + 1, y)
@@ -145,6 +148,7 @@ defineTile('4', mod.class.Grid.new{
if forced then return end
local g = game.zone:makeEntityByName(game.level, "terrain", "HARDMOUNTAIN_WALL")
local f = game.zone:makeEntityByName(game.level, "terrain", "ROCKY_GROUND")
+ if not g or not f then return end
game.zone:addEntity(game.level, g, "terrain", x + 1, y)
game.nicer_tiles:updateAround(game.level, x + 1, y)
game.zone:addEntity(game.level, f, "terrain", x, y + 1)
@@ -176,6 +180,7 @@ defineTile('5', mod.class.Grid.new{
if not actor.player then return end
if forced then return end
local g = game.zone:makeEntityByName(game.level, "terrain", "ROCKY_GROUND")
+ if not g then return end
game.zone:addEntity(game.level, g, "terrain", x - 1, y)
game.nicer_tiles:updateAround(game.level, x - 1, y)
game.zone:addEntity(game.level, g, "terrain", x, y)
@@ -225,4 +230,4 @@ return {
[[#..+..U........UU....%a#.+.~=~~~~~#]],
[[###################################]],
-}
\ No newline at end of file
+}
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index ad9e28a7cb991bf3e8b1a0c09a9bd0db1b0d2e01..27b459cfda7d4f381a33ac14f28e6f72a08844fa 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -1101,7 +1101,7 @@ newEffect{
type = "mental",
subtype = { fear=true },
status = "detrimental",
- parameters = {},
+ parameters = {damage=10},
on_gain = function(self, err) return "#F53CBE##Target# becomes haunted!", "+Haunted" end,
on_lose = function(self, err) return "#Target# is no longer haunted", "-Haunted" end,
activate = function(self, eff)
@@ -1136,7 +1136,7 @@ newEffect{
type = "mental",
subtype = { fear=true },
status = "detrimental",
- parameters = {},
+ parameters = {count=1, damage=10},
on_gain = function(self, err) return "#F53CBE##Target# becomes tormented!", "+Tormented" end,
on_lose = function(self, err) return "#Target# is no longer tormented", "-Tormented" end,
activate = function(self, eff)
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index ddfeeb070ba6519e698328578a7e36a79560f750..32d7bc9c44c1a7c3063dddac94739da9c185725c 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://tome.te4.org/"
-version = {3,9,41}
-engine = {0,9,41,"te4"}
+version = {3,9,42}
+engine = {0,9,42,"te4"}
description = [[
Welcome to Maj'Eyal.