From 3deb044efa671d652671cfe0f521f40108c3ec79 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Mon, 20 Jul 2020 17:10:36 +0200
Subject: [PATCH] Lost life warning input disabler now counts both max life and
max negative life
---
game/modules/tome/class/Game.lua | 4 ++--
game/modules/tome/class/Player.lua | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index d619645f71..4e478c170c 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -2031,14 +2031,14 @@ function _M:setupCommands()
print("===============")
end end,
[{"_g","ctrl"}] = function() if config.settings.cheat then
+ game.player:takeHit(100, game.player)
+do return end
game.player:setEffect("EFF_STUNNED", 1, {apply_power=200})
do return end
local f, err = loadfile("/data/general/events/rat-lich.lua")
print(f, err)
setfenv(f, setmetatable({level=self.level, zone=self.zone}, {__index=_G}))
print(pcall(f))
-do return end
- game.player:takeHit(100, game.player)
do return end
self:changeLevel(game.level.level + 1)
do return end
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 6a954f6908..52dd4d8851 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -385,7 +385,7 @@ function _M:act()
self:updateMainShader()
if config.settings.tome.life_lost_warning and self.shader_old_life then
- local perc = (self.shader_old_life - self.life) / self.max_life
+ local perc = (self.shader_old_life - self.life) / (self.max_life - self.die_at)
if perc > (config.settings.tome.life_lost_warning / 100) then
game.bignews:say(100, "#LIGHT_RED#LIFE LOST WARNING!")
game.key.disable_until = core.game.getTime() + 2000
--
GitLab