summaryrefslogtreecommitdiff
path: root/npc/functions
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-05-02 10:36:29 -0300
committerJesusaves <cpntb1@ymail.com>2019-05-02 10:36:29 -0300
commitcd73c9e7fffdbdc756aa8ffb90a39deec2aaa8e9 (patch)
tree91850589ba97a49030ef09f286b2a1e52bb81bfa /npc/functions
parent1634ecb4f96c531de6fb79ddd88d506e4b4e6e5c (diff)
downloadserverdata-cd73c9e7fffdbdc756aa8ffb90a39deec2aaa8e9.tar.gz
serverdata-cd73c9e7fffdbdc756aa8ffb90a39deec2aaa8e9.tar.bz2
serverdata-cd73c9e7fffdbdc756aa8ffb90a39deec2aaa8e9.tar.xz
serverdata-cd73c9e7fffdbdc756aa8ffb90a39deec2aaa8e9.zip
Update location, missing constants, sleep for Monter King to avoid eventual bugs, etc.
Diffstat (limited to 'npc/functions')
-rw-r--r--npc/functions/gmbot.txt1
-rw-r--r--npc/functions/util.txt8
2 files changed, 5 insertions, 4 deletions
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;