summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-06-15 16:00:28 -0300
committerJesusaves <cpntb1@ymail.com>2018-06-15 16:00:28 -0300
commitf9096ffb3cc5228188723d3c7a8c95e753b32e19 (patch)
treebebe81f2d38f12ccdaf3c4c46390c2c27ec9180c /npc
parentede40ee0bbab989e09262302f2177bf65b76334e (diff)
downloadserverdata-f9096ffb3cc5228188723d3c7a8c95e753b32e19.tar.gz
serverdata-f9096ffb3cc5228188723d3c7a8c95e753b32e19.tar.bz2
serverdata-f9096ffb3cc5228188723d3c7a8c95e753b32e19.tar.xz
serverdata-f9096ffb3cc5228188723d3c7a8c95e753b32e19.zip
Correct order of events
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/class.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/npc/functions/class.txt b/npc/functions/class.txt
index 02354ed1d..85a28fb0e 100644
--- a/npc/functions/class.txt
+++ b/npc/functions/class.txt
@@ -9,7 +9,7 @@
function script ClassMaster {
.@CLASS=getarg(0);
.@CNAME$=getarg(1);
- .@OTHER$=getarg(2);
+ .@OTHER=getarg(2);
//.name$=strnpcinfo(1);
// Skills
@@ -18,6 +18,7 @@ function script ClassMaster {
mesq l("I am the @@ master.", .@CNAME);
if (!MAGIC_LVL) goto L_NoMagic;
if (getskilllv(.@OTHER) && !is_admin()) close;
+ if (getskilllv(.@CLASS) == 0) goto L_SignUp;
if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 0) goto L_Tier2;
if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 1) mes col("...Where is the recipe for the potion? Ah, I lost it...", 9);
@@ -25,8 +26,6 @@ function script ClassMaster {
// Sanity check
if (getskilllv(.@SK_T1) >= 1) mesq l("Are you using my skill?");
if (getskilllv(.@SK_T1) >= 1) close;
-
- if (getskilllv(.@CLASS) == 0) goto L_SignUp;
close;
L_SignUp: