Merge pull request #357 from mekolat/debug

deprecate debug npcs

1 files changed, 11 insertions, 11 deletions

diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 7885c821..bcb54777 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;
+    close;
 
 L_Begin:
     set @debug_mask, 65535;
@@ -918,6 +923,7 @@ L_Close:
 
 029-2,30,26,0|script|Debug#0|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -928,6 +934,7 @@ OnInit:
 
 001-1,53,47,0|script|Debug#1|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -938,6 +945,7 @@ OnInit:
 
 009-1,45,33,0|script|Debug#2|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -948,6 +956,7 @@ OnInit:
 
 020-1,75,85,0|script|Debug#3|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -956,18 +965,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: