Skip to content
Snippets Groups Projects
Commit b4ce8276 authored by DarkGod's avatar DarkGod
Browse files

fix

parent bcd2eafc
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -21,7 +21,7 @@
-- Where values are {major, minor, patch, engine_name, c_core}
-- @script engine.version
engine.version = {1,6,2,"te4",17}
engine.version = {1,6,3,"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])
......
......@@ -198,7 +198,7 @@ newTalent{
if self.temporary <= 0 then
game.logSeen(self, "Reality asserts itself and forces the wormhole shut.")
if game.level.map(self.x, self.y, engine.Map.TRAP) == self then game.level.map:remove(self.x, self.y, engine.Map.TRAP) end
game.level:removeEntity(self)
game.level:removeEntity(self, true)
end
end,
}
......
......@@ -69,8 +69,13 @@ return {
if e.immediate then
e = e:clone()
e:resolve() e:resolve(nil, true)
local where = game.level:pickSpotRemove{type=e.immediate[1], subtype=e.immediate[2]}
while where and (game.level.map:checkAllEntities(where.x, where.y, "block_move") or not game.level.map:checkAllEntities(where.x, where.y, "can_encounter")) do where = game.level:pickSpotRemove{type=e.immediate[1], subtype=e.immediate[2]} end
local where
if e.immediate.force_spot then
where = e.immediate.force_spot
else
where = game.level:pickSpotRemove{type=e.immediate[1], subtype=e.immediate[2]}
while where and (game.level.map:checkAllEntities(where.x, where.y, "block_move") or not game.level.map:checkAllEntities(where.x, where.y, "can_encounter")) do where = game.level:pickSpotRemove{type=e.immediate[1], subtype=e.immediate[2]} end
end
if e:check("on_encounter", where) then
e:added()
print("[Encounter] Immediate set", e.name, where.x, where.y)
......
......@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
short_name = "tome"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "https://te4.org/"
version = {1,6,2}
engine = {1,6,2,"te4"}
version = {1,6,3}
engine = {1,6,3,"te4"}
description = [[
Welcome to Maj'Eyal.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment