From 7c9d368c0dfc1d6245b35189638969ad884bfe44 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Fri, 3 Mar 2017 15:35:30 +0100
Subject: [PATCH] and now the actualy fix, heh
---
game/modules/tome/class/Player.lua | 4 ++--
game/modules/tome/data/quests/lightning-overload.lua | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 41f8f47254..6edbea35ee 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -1013,9 +1013,9 @@ function _M:restCheck()
for res, res_def in ipairs(_M.resources_def) do
if res_def.wait_on_rest and res_def.regen_prop and self:attr(res_def.regen_prop) then
if not res_def.invert_values then
- if self[res_def.regen_prop] > -0.0001 and self:check(res_def.getFunction) < self:check(res_def.getMaxFunction) then print("waiting on ", res_def.regen_prop) return true end
+ if self[res_def.regen_prop] > 0.0001 and self:check(res_def.getFunction) < self:check(res_def.getMaxFunction) then return true end
else
- if self[res_def.regen_prop] < 0.0001 and self:check(res_def.getFunction) > self:check(res_def.getMinFunction) then print("waiting on ", res_def.regen_prop) return true end
+ if self[res_def.regen_prop] < -0.0001 and self:check(res_def.getFunction) > self:check(res_def.getMinFunction) then return true end
end
end
end
diff --git a/game/modules/tome/data/quests/lightning-overload.lua b/game/modules/tome/data/quests/lightning-overload.lua
index faea311dcb..8b9f6a19f6 100644
--- a/game/modules/tome/data/quests/lightning-overload.lua
+++ b/game/modules/tome/data/quests/lightning-overload.lua
@@ -149,8 +149,8 @@ end
reenter_derth = function(self)
if (self:isCompleted() or self:isEnded()) and not self:isCompleted("restored-derth") then
- game.level.map:setShown(unpack(game.level.map.color_shown))
- game.level.map:setObscure(unpack(game.level.map.color_obscure))
+ game.level.map:setShown(unpack(self.old_shown))
+ game.level.map:setObscure(unpack(self.old_obscure))
game.level.data.background = nil
game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "restored-derth")
--
GitLab