diff --git a/game/engines/default/modules/boot/dialogs/LoadGame.lua b/game/engines/default/modules/boot/dialogs/LoadGame.lua index 7fbe1e2b27b7b794a9ccd9eb4f9c9111ce1a9cc7..9e0853a0593bba331a5c152d4d626f7656dfa797 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 c3bd20b8300e9bf37da37b4c9f4b5252d0e9b50c..1caa4bfdb37685d2e3a71d37a07a974535cb657b 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,