Merge branch 'master' into jesusalva/featherjesusalva/feather

3 files changed, 47 insertions, 2 deletions

diff --git a/npc/functions/math.txt b/npc/functions/math.txt
index 004125c7..357407da 100644
--- a/npc/functions/math.txt
+++ b/npc/functions/math.txt
@@ -2,6 +2,7 @@
 // Authors:
 //    4144
 //    Reid
+//    Jesusalva
 // Description:
 //    Math functions
 
@@ -38,3 +39,12 @@ function	script	lognbaselvl	{
 
     return .@ret;
 }
+
+
+// result is: lower < target <= higher
+// is_between ( lower, higher, target)
+function	script	is_between	{
+    .@val=getarg(2);
+    return (getarg(0) < .@val && getarg(1) >= .@val);
+}
+
diff --git a/npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt b/npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt
index 68ba67fe..bda45b90 100644
--- a/npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt
+++ b/npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt
@@ -14,7 +14,8 @@ function	script	QuestDebug32	{
 
         GenericQuestDebug ArtisQuests_MonaDad,
             l("Does not have the quest"), 0,
-            l("Mona's dad is missing"), 1;
+            l("Mona's dad is missing"), 1,
+            l("Mona's dad was rescued"), 3;
 
         if (@menuret < 0)
         {
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index d5fe8bc4..a8e157b2 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -107,6 +107,40 @@ function	script	get_race	{
         return .@allskins$[.@g];
     else
         return .@allskins$[.@g] + " " + .@allraces$[.@g];
-
 }
 
+// gettimeparam(GETTIME_X)
+//   Returns the number of seconds/minutes/hours/days/months/years since 01/01/1970
+//   This is for truly daily quests, which doesn't imposes a timed wait in hours
+function	script	gettimeparam	{
+    .@p=getarg(0, GETTIME_MINUTE);
+
+    // Seconds (same as gettimetick(2) - use that instead)
+    .@t=gettimetick(2);
+    if (.@p == GETTIME_SECOND)
+        return .@t;
+
+    // Minutes (default)
+    .@t=.@t/60;
+    if (.@p == GETTIME_MINUTE)
+        return .@t;
+
+    // Hours
+    .@t=.@t/60;
+    if (.@p == GETTIME_HOUR)
+        return .@t;
+
+    // Days
+    .@t=.@t/24;
+    if (.@p == GETTIME_DAYOFMONTH)
+        return .@t;
+
+    // Months (estimative)
+    .@t=.@t/30;
+    if (.@p == GETTIME_MONTH)
+        return .@t;
+
+    // Years (estimative, unused, fallback)
+    .@t=.@t/12;
+    return .@t;
+}