From 6484abaf0f8808e00cc3d54014d788ec0afefd8b Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Fri, 9 Jan 2015 01:53:36 +0100
Subject: [PATCH] typo improve resolution chooser
---
.../engines/default/engine/dialogs/DisplayResolution.lua | 9 +++++++--
game/modules/tome/data/timed_effects/physical.lua | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/game/engines/default/engine/dialogs/DisplayResolution.lua b/game/engines/default/engine/dialogs/DisplayResolution.lua
index c3929f904c..35383ebdbf 100644
--- a/game/engines/default/engine/dialogs/DisplayResolution.lua
+++ b/game/engines/default/engine/dialogs/DisplayResolution.lua
@@ -35,16 +35,21 @@ function _M:init(on_change)
self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) self:use(item) end}
self.c_fs = Checkbox.new{title="Fullscreen", default=fullscreen,
fct=function() end,
- on_change=function(s) if s then self.c_bl.checked = false end end
+ on_change=function(s) if s then self.c_wn.checked = false self.c_bl.checked = false end end
}
self.c_bl = Checkbox.new{title="Borderless", default=borderless,
fct=function() end,
- on_change=function(s) if s then self.c_fs.checked = false end end
+ on_change=function(s) if s then self.c_wn.checked = false self.c_fs.checked = false end end
+ }
+ self.c_wn = Checkbox.new{title="Windowed", default=not borderless and not fullscreen,
+ fct=function() end,
+ on_change=function(s) if s then self.c_fs.checked = false self.c_bl.checked = false end end
}
self:loadUI{
{left=0, top=0, ui=self.c_fs},
{left=self.c_fs.w + 5, top=0, ui=self.c_bl},
+ {left=self.c_fs.w + 5 + self.c_bl.w + 5, top=0, ui=self.c_wn},
{left=0, top=self.c_fs.h, ui=self.c_list},
}
self:setFocus(self.c_list)
diff --git a/game/modules/tome/data/timed_effects/physical.lua b/game/modules/tome/data/timed_effects/physical.lua
index 03c8a2ce00..d1e6fe260b 100644
--- a/game/modules/tome/data/timed_effects/physical.lua
+++ b/game/modules/tome/data/timed_effects/physical.lua
@@ -1566,7 +1566,7 @@ newEffect{
if eff.type == DamageType.FIRE then return ("Increases global speed by %d%%."):format(100 * self:callTalent(self.T_ELEMENTAL_HARMONY, "fireSpeed"))
elseif eff.type == DamageType.COLD then return ("Increases armour by %d."):format(3 + eff.power *2)
elseif eff.type == DamageType.LIGHTNING then return ("Increases all stats by %d."):format(math.floor(eff.power))
- elseif eff.type == DamageType.ACID then return ("Increases life regen by %0.2f%%."):format(5 + eff.power * 2)
+ elseif eff.type == DamageType.ACID then return ("Increases life regen by %0.2f."):format(5 + eff.power * 2)
elseif eff.type == DamageType.NATURE then return ("Increases all resists by %d%%."):format(5 + eff.power * 1.4)
end
end,
--
GitLab