From 96e8e326319e01cd187edcf9ea09a67ecce0760d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 25 Dec 2012 01:02:54 +0000
Subject: [PATCH] Dimensional Step doesnt lock on npcs Load Game can now load
older games: WARNING: this WILL destroy the universe
git-svn-id: http://svn.net-core.org/repos/t-engine4@6212 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/modules/boot/dialogs/LoadGame.lua | 7 +++----
.../tome/data/talents/chronomancy/spacetime-weaving.lua | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/game/engines/default/modules/boot/dialogs/LoadGame.lua b/game/engines/default/modules/boot/dialogs/LoadGame.lua
index 7fbe1e2b27..9e0853a059 100644
--- a/game/engines/default/modules/boot/dialogs/LoadGame.lua
+++ b/game/engines/default/modules/boot/dialogs/LoadGame.lua
@@ -61,7 +61,7 @@ function _M:init()
{right=0, bottom=0, ui=self.c_delete, hidden=true},
{left=0, bottom=0, ui=self.c_play, hidden=true},
{left=self.c_tree.w + 5, top=5, ui=Separator.new{dir="horizontal", size=self.ih - 10}},
- {left=0, bottom=0, ui=self.c_compat},
+ {left=self.c_tree.w - self.c_compat.w, bottom=0, ui=self.c_compat},
}
self:setFocus(self.c_tree)
self:setupUI(false, true)
@@ -84,9 +84,8 @@ function _M:generateList()
for j, save in ipairs(m.savefiles) do
local mod_string = ("%s-%d.%d.%d"):format(m.short_name, save.module_version and save.module_version[1] or -1, save.module_version and save.module_version[2] or -1, save.module_version and save.module_version[3] or -1)
local mod = list[mod_string]
- if not mod and self.c_compat.checked then mod = m end
+ if not mod and self.c_compat.checked and m.versions and m.versions[1] then mod = m.versions[1] end
if mod and save.loadable then
- for k,e in pairs(mod) do print("<<<===", k, e) end
local laddons = table.reversekey(Module:listAddons(mod, true), "short_name")
local addons = {}
save.usable = true
@@ -100,7 +99,7 @@ function _M:generateList()
save.zone = Textzone.new{
width=self.c_desc.w,
height=self.c_desc.h,
- text=("#{bold}##GOLD#%s: %s#WHITE##{normal}#\nGame version: %d.%d.%d\nRequires addons: %s\n\n%s"):format(mod.long_name, save.name, mod.version[1], mod.version[2], mod.version[3], save.addons and table.concat(addons, ", ") or "none", save.description)
+ text=("#{bold}##GOLD#%s: %s#WHITE##{normal}#\nGame version: %d.%d.%d\nRequires addons: %s\n\n%s"):format(mod.long_name, save.name, save.module_version and save.module_version[1] or -1, save.module_version and save.module_version[2] or -1, save.module_version and save.module_version[3] or -1, save.addons and table.concat(addons, ", ") or "none", save.description)
}
if save.screenshot then
local w, h = save.screenshot:getSize()
diff --git a/game/modules/tome/data/talents/chronomancy/spacetime-weaving.lua b/game/modules/tome/data/talents/chronomancy/spacetime-weaving.lua
index c3bd20b830..1caa4bfdb3 100644
--- a/game/modules/tome/data/talents/chronomancy/spacetime-weaving.lua
+++ b/game/modules/tome/data/talents/chronomancy/spacetime-weaving.lua
@@ -30,7 +30,7 @@ newTalent{
end,
requires_target = true,
target = function(self, t)
- return {type="hit", range=self:getTalentRange(t)}
+ return {type="hit", range=self:getTalentRange(t), nolock=true, nowarning=true}
end,
direct_hit = true,
no_energy = true,
--
GitLab