gcsantime() to fix santime() loops. Uh... login frequently.

6 files changed, 12 insertions, 7 deletions

diff --git a/npc/003-10/guarddevoir.txt b/npc/003-10/guarddevoir.txt
index be4cef8ab..8935c637d 100644
--- a/npc/003-10/guarddevoir.txt
+++ b/npc/003-10/guarddevoir.txt
@@ -29,7 +29,7 @@ L_Quest:
     mesq l("Nice! I want you to kill some red scorpions, as I said!");
     next;
     if (.@q == 0) goto L_Continue;
-    if (santime() >= getq2(TulimsharQuest_Devoir) + 60 * 60 * 36) goto L_Repeat; // Repats every 36 hours
+    if (santime() >= getq2(TulimsharQuest_Devoir) + 60 * 60 * 36 || gcsantime()) goto L_Repeat; // Repats every 36 hours
     mesn;
     mesq l("But, it wouldn't look nice if I let you do all the killing! The other guards are working right now!");
     next;
diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt
index 3a5d10f28..9133baca3 100644
--- a/npc/003-4/sorfina.txt
+++ b/npc/003-4/sorfina.txt
@@ -48,7 +48,7 @@ L_Trouble:
 
 L_Basement:
     if (BaseLevel < 13) goto L_TooWeak;
-    if (getq3(TulimsharQuest_Hasan) > santime()) goto L_Wait;
+    if (getq3(TulimsharQuest_Hasan) > santime() || gcsantime()) goto L_Wait;
     mesn;
     mesq l("There's one on the basement of this house. If you kill it, Hasan will think on you as a hero and won't steal you anymore.");
     next;
diff --git a/npc/007-1/dracoula.txt b/npc/007-1/dracoula.txt
index bd09db34c..a40959df9 100644
--- a/npc/007-1/dracoula.txt
+++ b/npc/007-1/dracoula.txt
@@ -40,7 +40,7 @@ L_Quest:
         next;
     }
     if (.@q == 0) goto L_Continue;
-    if (santime() >= getq2(MineQuest_Dracoula) + 60 * 60 * 23) goto L_Repeat;
+    if (santime() >= getq2(MineQuest_Dracoula) + 60 * 60 * 23 || gcsantime()) goto L_Repeat;
     mesn;
     mesq l("But come back in a few hours, I didn't lost all @@!", getitemlink(BatTeeth));
     close;
diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt
index 1b4bda137..5d1d7cd29 100644
--- a/npc/012-2/helena.txt
+++ b/npc/012-2/helena.txt
@@ -41,8 +41,8 @@ L_Daily:
     mesq l("Ah, @@, my friend! Are you here to help us with 5 @@? Or perhaps you have 5 more @@ to show that Hurnscald is getting safer?", strcharinfo(0), getitemlink(TreasureKey), getitemlink(BanditHood));
     mes "";
     select
-        rif(.@k < santime() && countitem(TreasureKey) >= 5, l("I have 5 Treasure keys with me.")),
-        rif(.@h < santime() && countitem(BanditHood) >= 5, l("I have 5 Bandit Hoods with me.")),
+        rif((.@k < santime() || gcsantime()) && countitem(TreasureKey) >= 5, l("I have 5 Treasure keys with me.")),
+        rif((.@h < santime() || gcsantime()) && countitem(BanditHood) >= 5, l("I have 5 Bandit Hoods with me.")),
         l("Nothing at the moment.");
     mes "";
     switch (@menu) {
diff --git a/npc/015-3/arkim.txt b/npc/015-3/arkim.txt
index a7e2114f8..5ae702ff2 100644
--- a/npc/015-3/arkim.txt
+++ b/npc/015-3/arkim.txt
@@ -25,7 +25,7 @@ L_Loop:
     mesq l("I am doing a great research with Bats, and thus far I collected @@ Bat Wings and Teeths.", $ARKIM_ST);
     next;
     // It was yesterday
-    if (.@q3 < $@ARKIM_QTIMER) {
+    if (.@q3 < $@ARKIM_QTIMER || gcsantime()) {
         setq2 HurnscaldQuest_Arkim, 0;
         setq3 HurnscaldQuest_Arkim, $@ARKIM_QTIMER;
     }
diff --git a/npc/functions/time.txt b/npc/functions/time.txt
index be04902a6..f54973dde 100644
--- a/npc/functions/time.txt
+++ b/npc/functions/time.txt
@@ -8,6 +8,7 @@ function	script	now	{
 // That would only hold 194 days, or 6.47 months, so we reduce 6 in 6 months when
 // we hit limit, looping monthly
 // This value is NOT reversable to FuzzyTime
+// santime( {limit} )
 function	script	santime	{
     .@limit=getarg(0, 16777214);
     .@base=1514772000;
@@ -21,8 +22,12 @@ function	script	santime	{
     return .@val;
 }
 
-// Grace period when the month from santime is not matching
+// Grace period when santime is reset: 1 month
+// gcsantime( time )
 function	script	gcsantime	{
+    .@m=(60*60*24*30);
+    if (santime() < .@m && getarg(0) > .@m*5)
+        return 1;
     return 0;
 }