From cd73c9e7fffdbdc756aa8ffb90a39deec2aaa8e9 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 2 May 2019 10:36:29 -0300
Subject: Update location, missing constants, sleep for Monter King to avoid
 eventual bugs, etc.

---
 npc/functions/gmbot.txt | 1 +
 npc/functions/util.txt  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'npc/functions')

diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index 2c55f43ed..3e0cc2a2d 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -120,6 +120,7 @@ OnTimer90000:
         ++.@e;
     }
     unitwarp($@MK, .mp$, .@x, .@y);
+    sleep(50); // For some reason or other, adding sleep(norid) and sleep2(rid).
     .nearby=getusers(8);
 
     // Handle Mana Stone
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 60274204e..3f4ab0a09 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -651,9 +651,9 @@ function	script	gettimeparam	{
 }
 
 
-// Bug Warning
-// ReportBug( BugID, {Flags{, Return Code}} )
-function	script	ReportBug	{
+// Something went wrong and must be reported (I tried to keep a syntax close to python)
+// Exception( BugID, {Flags{, Return Code}} )
+function	script	Exception	{
     // Fill variable
     .@msg$=getarg(0);
     .@gf=getarg(1,RB_DEFAULT);
@@ -696,7 +696,7 @@ function	script	EnterTown	{
     // Validade variable, see npc/000-1/exit.txt first
     setarray .@locs$, "Candor", "Tulim", "Halin", "Hurns",   "LoF", "Lilit", "Nival", "Frostia";
     if (array_find(.@locs$, .@v$) < 0)
-        return ReportBug("Invalid location passed to EnterTown: "+.@v$);
+        return Exception("Invalid location passed to EnterTown: "+.@v$);
 
     LOCATION$=.@v$;
     return;
-- 
cgit v1.2.3-60-g2f50