From 04d26c36533e03ac5cb76e93940e861aed5a4e19 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 11 Jul 2024 11:30:38 -0300 Subject: A rogue min function test fix --- npc/functions/clientversion.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt index 9b9161250..4d25fb608 100644 --- a/npc/functions/clientversion.txt +++ b/npc/functions/clientversion.txt @@ -23,15 +23,17 @@ function script clientupdater { .@v3=getstatus(SC_JAILED, 3); .@v4=getstatus(SC_JAILED, 4); .@ti=getstatus(SC_JAILED, 5); - consolebug("Please reduce sentence from %d to %d (in %d)", .@v1, min(1, .@v1-##HARDCORE_JAILTIME+1), (##HARDCORE_JAILTIME-1)); - .@v1 = min(1, .@v1-##HARDCORE_JAILTIME+1); + consolebug("Please reduce sentence from %d to %d (in %d)", .@v1, max(1, .@v1-##HARDCORE_JAILTIME+1), (##HARDCORE_JAILTIME-1)); + .@v1 = max(1, .@v1-##HARDCORE_JAILTIME+1); if (.@ti > 60000) - .@ti = min(60000, .@ti - ((##HARDCORE_JAILTIME+1) * 60000)); + .@ti = max(60000, .@ti - ((##HARDCORE_JAILTIME+1) * 60000)); //sc_end SC_JAILED; - //sc_start4 SC_JAILED, .@ti, .@v1, .@v2, .@v3, .@v4, 10000, SCFLAG_FIXEDRATE|SCFLAG_FIXEDTICK|SCFLAG_NOAVOID; - //dispbottom l("Information: Your sentence was reduced in %d minute(s).", (##HARDCORE_JAILTIME-1)); + sc_start4 SC_JAILED, .@ti, .@v1, .@v2, .@v3, .@v4, 10000, SCFLAG_FIXEDRATE|SCFLAG_FIXEDTICK|SCFLAG_NOAVOID; + dispbottom l("Information: Your sentence was reduced in %d minute(s). Sentence left: %s", (##HARDCORE_JAILTIME-1), FuzzyTime(gettimetick(2)+.@v1)); + ##HARDCORE_JAILTIME=-1; // Ensure cleanup, should be overriden soon + } else { + dispbottom l("You will revive automatically. Use %s to see remaining jail time.", b("@jailtime")); } - dispbottom l("You will revive automatically. Use %s to see remaining jail time.", b("@jailtime")); ##HARDCORE_JAILTIME=1; } // If you're in Jail on HardCore and this is Beta Server -- cgit v1.2.3-70-g09d2