1 files changed, 44 insertions, 43 deletions

diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index be8d4fb4..44af4d40 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -2,7 +2,12 @@
 
 function|script|Debug
 {
-    goto L_Begin;
+    if(!@debug_npc) goto L_Begin;
+    mes "The debug NPCs have been deprecated. Please use this magic spell instead:";
+    mes "";
+    mes "%%E        ##a"+ getspellinvocation("debug0") +"##0";
+    set @debug_npc, 0;
+    goto L_Close;
 
 L_Begin:
     set @debug_mask, 65535;
@@ -59,12 +64,12 @@ L_Status:
         "Close.", L_Close;
 
 L_ChangeAllStats:
-    statusup2 bStr, 99 - readparam(bStr);
-    statusup2 bAgi, 99 - readparam(bAgi);
-    statusup2 bVit, 99 - readparam(bVit);
-    statusup2 bInt, 99 - readparam(bInt);
-    statusup2 bDex, 99 - readparam(bDex);
-    statusup2 bLuk, 99 - readparam(bLuk);
+    set Str, 99;
+    set Agi, 99;
+    set Vit, 99;
+    set Int, 99;
+    set Dex, 99;
+    set Luk, 99;
     mes "You now have 99 in all stats.";
     next;
     goto L_Begin;
@@ -76,7 +81,7 @@ L_ChangeStrength:
         goto L_StatTooLow;
     if (@str > 99)
         goto L_StatTooHigh;
-    statusup2 bStr, @str - readparam(bStr);
+    set Str, @str;
     goto L_ChangeAgility;
 
 L_ChangeAgility:
@@ -86,7 +91,7 @@ L_ChangeAgility:
         goto L_StatTooLow;
     if (@agi > 99)
         goto L_StatTooHigh;
-    statusup2 bAgi, @agi - readparam(bAgi);
+    set Agi, @agi;
     goto L_ChangeVitality;
 
 L_ChangeVitality:
@@ -96,7 +101,7 @@ L_ChangeVitality:
         goto L_StatTooLow;
     if (@vit > 99)
         goto L_StatTooHigh;
-    statusup2 bVit, @vit - readparam(bVit);
+    set Vit, @vit;
     goto L_ChangeIntelligence;
 
 L_ChangeIntelligence:
@@ -106,7 +111,7 @@ L_ChangeIntelligence:
         goto L_StatTooLow;
     if (@int > 99)
         goto L_StatTooHigh;
-    statusup2 bInt, @int - readparam(bInt);
+    set Int, @int;
     goto L_ChangeDexterity;
 
 L_ChangeDexterity:
@@ -116,7 +121,7 @@ L_ChangeDexterity:
         goto L_StatTooLow;
     if (@dex > 99)
         goto L_StatTooHigh;
-    statusup2 bDex, @dex - readparam(bDex);
+    set Dex, @dex;
     goto L_ChangeLuck;
 
 L_ChangeLuck:
@@ -126,13 +131,13 @@ L_ChangeLuck:
         goto L_StatTooLow;
     if (@luk > 99)
         goto L_StatTooHigh;
-    statusup2 bLuk, @luk - readparam(bLuk);
-    mes "You now have " + readparam(bStr) + " in strength.";
-    mes "You now have " + readparam(bAgi) + " in agility.";
-    mes "You now have " + readparam(bVit) + " in vitality.";
-    mes "You now have " + readparam(bInt) + " in intelligence.";
-    mes "You now have " + readparam(bDex) + " in dexterity.";
-    mes "You now have " + readparam(bLuk) + " in luck.";
+    set Luk, @luk;
+    mes "You now have " + Str + " in strength.";
+    mes "You now have " + Agi + " in agility.";
+    mes "You now have " + Vit + " in vitality.";
+    mes "You now have " + Int + " in intelligence.";
+    mes "You now have " + Dex + " in dexterity.";
+    mes "You now have " + Luk + " in luck.";
     next;
     goto L_Begin;
 
@@ -165,8 +170,8 @@ L_ChangeStrengthSingle:
         goto L_StatTooLow;
     if (@str > 99)
         goto L_StatTooHigh;
-    statusup2 bStr, @str - readparam(bStr);
-    mes "You now have " + readparam(bStr) + " in strength.";
+    set Str, @str;
+    mes "You now have " + Str + " in strength.";
     next;
     goto L_Begin;
 
@@ -177,8 +182,8 @@ L_ChangeAgilitySingle:
         goto L_StatTooLow;
     if (@agi > 99)
         goto L_StatTooHigh;
-    statusup2 bAgi, @agi - readparam(bAgi);
-    mes "You now have " + readparam(bAgi) + " in agility.";
+    set Agi, @agi;
+    mes "You now have " + Agi + " in agility.";
     next;
     goto L_Begin;
 
@@ -189,8 +194,8 @@ L_ChangeVitalitySingle:
         goto L_StatTooLow;
     if (@vit > 99)
         goto L_StatTooHigh;
-    statusup2 bVit, @vit - readparam(bVit);
-    mes "You now have " + readparam(bVit) + " in vitality.";
+    set Vit, @vit;
+    mes "You now have " + Vit + " in vitality.";
     next;
     goto L_Begin;
 
@@ -201,8 +206,8 @@ L_ChangeIntelligenceSingle:
         goto L_StatTooLow;
     if (@int > 99)
         goto L_StatTooHigh;
-    statusup2 bInt, @int - readparam(bInt);
-    mes "You now have " + readparam(bInt) + " in intelligence.";
+    set Int, @int;
+    mes "You now have " + Int + " in intelligence.";
     next;
     goto L_Begin;
 
@@ -213,8 +218,8 @@ L_ChangeDexteritySingle:
         goto L_StatTooLow;
     if (@dex > 99)
         goto L_StatTooHigh;
-    statusup2 bDex, @dex - readparam(bDex);
-    mes "You now have " + readparam(bDex) + " in dexterity.";
+    set Dex, @dex;
+    mes "You now have " + Dex + " in dexterity.";
     next;
     goto L_Begin;
 
@@ -225,8 +230,8 @@ L_ChangeLuckSingle:
         goto L_StatTooLow;
     if (@luk > 99)
         goto L_StatTooHigh;
-    statusup2 bLuk, @luk - readparam(bLuk);
-    mes "You now have " + readparam(bLuk) + " in luck.";
+    set Luk, @luk;
+    mes "You now have " + Luk + " in luck.";
     next;
     goto L_Begin;
 
@@ -912,12 +917,14 @@ L_ResetAll:
     goto L_Begin;
 
 L_Close:
-    close;
+    close2;
+    return;
 
 }
 
 029-2,30,26,0|script|Debug#0|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -928,6 +935,7 @@ OnInit:
 
 001-1,53,47,0|script|Debug#1|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -936,8 +944,9 @@ OnInit:
     end;
 }
 
-009-1,52,33,0|script|Debug#2|154
+009-1,45,33,0|script|Debug#2|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -948,6 +957,7 @@ OnInit:
 
 020-1,75,85,0|script|Debug#3|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -956,18 +966,9 @@ OnInit:
     end;
 }
 
-017-9,21,24,0|script|Debug#4|154
-{
-    callfunc "Debug";
-    end;
-OnInit:
-    if (!debug)
-        disablenpc "Debug#4";
-    end;
-}
-
 027-2,125,103,0|script|Debug#5|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit: