Update scripts to reflect gmcommand's simplification

If you are using mainline TMW-eAthena, you will have to update your
scripts as well.

Signed-off-by: Chuck Miller <shadowmil@gmail.com>

20 files changed, 200 insertions, 200 deletions

diff --git a/npc/halloween/2006/halloween1.txt b/npc/halloween/2006/halloween1.txt
index 6be68cd3..3d36a02b 100644
--- a/npc/halloween/2006/halloween1.txt
+++ b/npc/halloween/2006/halloween1.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
 	next;
 	mes "[Halloweenist]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween10.txt b/npc/halloween/2006/halloween10.txt
index 265f0371..7f17c860 100644
--- a/npc/halloween/2006/halloween10.txt
+++ b/npc/halloween/2006/halloween10.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween11.txt b/npc/halloween/2006/halloween11.txt
index a0dbd464..adb25c88 100644
--- a/npc/halloween/2006/halloween11.txt
+++ b/npc/halloween/2006/halloween11.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween12.txt b/npc/halloween/2006/halloween12.txt
index 2b4be211..e9dfb3f8 100644
--- a/npc/halloween/2006/halloween12.txt
+++ b/npc/halloween/2006/halloween12.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween13.txt b/npc/halloween/2006/halloween13.txt
index a57108be..1d6825f1 100644
--- a/npc/halloween/2006/halloween13.txt
+++ b/npc/halloween/2006/halloween13.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween14.txt b/npc/halloween/2006/halloween14.txt
index 591d2b25..de1bcbd1 100644
--- a/npc/halloween/2006/halloween14.txt
+++ b/npc/halloween/2006/halloween14.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween15.txt b/npc/halloween/2006/halloween15.txt
index 02c7f53e..86ae037c 100644
--- a/npc/halloween/2006/halloween15.txt
+++ b/npc/halloween/2006/halloween15.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween16.txt b/npc/halloween/2006/halloween16.txt
index a668787b..c1ce2a0f 100644
--- a/npc/halloween/2006/halloween16.txt
+++ b/npc/halloween/2006/halloween16.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween17.txt b/npc/halloween/2006/halloween17.txt
index 83fe2e50..68fa53fc 100644
--- a/npc/halloween/2006/halloween17.txt
+++ b/npc/halloween/2006/halloween17.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween18.txt b/npc/halloween/2006/halloween18.txt
index 70c1cbbd..4fe1c98a 100644
--- a/npc/halloween/2006/halloween18.txt
+++ b/npc/halloween/2006/halloween18.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween19.txt b/npc/halloween/2006/halloween19.txt
index c1c7536a..5899781e 100644
--- a/npc/halloween/2006/halloween19.txt
+++ b/npc/halloween/2006/halloween19.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween2.txt b/npc/halloween/2006/halloween2.txt
index fdc441c6..d4415452 100644
--- a/npc/halloween/2006/halloween2.txt
+++ b/npc/halloween/2006/halloween2.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween20.txt b/npc/halloween/2006/halloween20.txt
index ed7e69a5..bb7c2a0b 100644
--- a/npc/halloween/2006/halloween20.txt
+++ b/npc/halloween/2006/halloween20.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween3.txt b/npc/halloween/2006/halloween3.txt
index 5ff36592..c640522e 100644
--- a/npc/halloween/2006/halloween3.txt
+++ b/npc/halloween/2006/halloween3.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween4.txt b/npc/halloween/2006/halloween4.txt
index ac245dca..94f4cc2a 100644
--- a/npc/halloween/2006/halloween4.txt
+++ b/npc/halloween/2006/halloween4.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween5.txt b/npc/halloween/2006/halloween5.txt
index 98f9abb7..187b59c5 100644
--- a/npc/halloween/2006/halloween5.txt
+++ b/npc/halloween/2006/halloween5.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween6.txt b/npc/halloween/2006/halloween6.txt
index 4f3dedd6..bd991810 100644
--- a/npc/halloween/2006/halloween6.txt
+++ b/npc/halloween/2006/halloween6.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween7.txt b/npc/halloween/2006/halloween7.txt
index 613aa8af..2e8993aa 100644
--- a/npc/halloween/2006/halloween7.txt
+++ b/npc/halloween/2006/halloween7.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween8.txt b/npc/halloween/2006/halloween8.txt
index e0acab51..257ca0e0 100644
--- a/npc/halloween/2006/halloween8.txt
+++ b/npc/halloween/2006/halloween8.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0:
diff --git a/npc/halloween/2006/halloween9.txt b/npc/halloween/2006/halloween9.txt
index ecf97801..3b97ecac 100644
--- a/npc/halloween/2006/halloween9.txt
+++ b/npc/halloween/2006/halloween9.txt
@@ -65,7 +65,7 @@ L_trick_1:
 	next;
 	mes "[Halloweenist]";
 	mes "Have a nice halloween as a corpse!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_trick_2:
@@ -74,15 +74,15 @@ L_trick_2:
         next;
         mes "[Halloweenist]";
         mes "Abracadabra!";
-        gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-        gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+        gmcommand "@charstreset "+strcharinfo(0);
+        gmcommand "@charskreset "+strcharinfo(0);
         close;
 
 L_trick_3:
 	mes "[Halloweenist]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Halloweenist]";
 	mes "Happy Halloween!";
 	close;
@@ -93,7 +93,7 @@ L_trick_4:
 	next;
 	mes "[Halloweenist]";
 	mes "Better luck with my collegues...";
-	gmcommand strcharinfo(0)+":@dropall ";
+	gmcommand "@dropall ";
 	close;
 
 L_trick_5:
@@ -102,7 +102,7 @@ L_trick_5:
 	next;
 	mes "[Halloweenist]";
 	mes "Bwahahaha!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_trick_6:
@@ -111,7 +111,7 @@ L_trick_6:
 	next;
 	mes "[Halloweenist]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_trick_7:
@@ -120,7 +120,7 @@ L_trick_7:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1002 50 ";
+	gmcommand "@spawn 1002 50 ";
 	close;
 
 L_trick_8:
@@ -129,7 +129,7 @@ L_trick_8:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahaha!";
-	gmcommand strcharinfo(0)+":@spawn 1023 5 ";
+	gmcommand "@spawn 1023 5 ";
 	close;
 
 L_trick_9:
@@ -138,7 +138,7 @@ L_trick_9:
 	next;
 	mes "[Halloweenist]";
 	mes "Mwahahahah!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is getting tricked!";
+	gmcommand "@kami "+strcharinfo(0)+" is getting tricked!";
 	close;
 
 L_treat_0: