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>

43 files changed, 352 insertions, 352 deletions

diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index f71c7be0..931fb678 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -1336,10 +1336,10 @@ CONST E10_FLAG_USED_FREE_WARP_SHIFT = 17
 #    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
 #      EFFECT warp(caster, @("028-1.gat", 139, 46));
 #             {
-#              gmcommand strcharinfo(0)+":@blvl -255";
-#              gmcommand strcharinfo(0)+":@blvl 199";
-#              gmcommand strcharinfo(0)+":@setmagic all 5 Xakelbael the Dark";
-#              gmcommand strcharinfo(0)+":@allstats";
+#              gmcommand "@blvl -255";
+#              gmcommand "@blvl 199";
+#              gmcommand "@setmagic all 5 Xakelbael the Dark";
+#              gmcommand "@allstats";
 #              savepoint "028-1.gat", 130, 46;
 #             }
 #             create_item(caster, "DarkTalisman", 1);
@@ -1390,7 +1390,7 @@ CONST E10_FLAG_USED_FREE_WARP_SHIFT = 17
 #    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
 #      EFFECT FOREACH PC p IN rbox(location(caster), 50) DO IF (p <> caster)
 #             THEN ( script_target = p;
-#                    { gmcommand strcharinfo(0)+":@jump"; }
+#                    { gmcommand "@jump"; }
 #                    message(p, "A powerful force sends you flying!");
 #                  )
 #             warp(caster, @("028-1.gat", 130, 46));
@@ -1451,7 +1451,7 @@ CONST E10_FLAG_USED_FREE_WARP_SHIFT = 17
 #             ELSE IF (t == "s") THEN ( warp(caster, @("028-1.gat", 69, 96)); )
 #             ELSE IF (t == "c") THEN ( warp(caster, @("028-3.gat", 50, 58)); )
 #             ELSE IF (t == "t") THEN ( warp(caster, @("009-1.gat", 48, 35)); )
-#             ELSE { gmcommand strcharinfo(0)+":@jump"; };
+#             ELSE { gmcommand "@jump"; };
 
 #NONMAGIC SILENT SPELL easter-invader-taunt-local (s : STRING) : "#l" =
 #    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
@@ -1509,11 +1509,11 @@ NONMAGIC SILENT SPELL world-shift : "#S00" =
 
 #NONMAGIC SILENT SPELL easter-invader-killer : "#z" =
 #    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#    EFFECT { gmcommand strcharinfo(0)+"@killer"; }
+#    EFFECT { gmcommand "@killer"; }
 
 #NONMAGIC SILENT SPELL easter-invader-killable : "#x" =
 #    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#    EFFECT { gmcommand strcharinfo(0)+"@killable"; }
+#    EFFECT { gmcommand "@killable"; }
 
 #NONMAGIC SILENT SPELL easter-debug-reset (s : STRING) : "#r" =
 #    (REQUIRE name_of(caster) == "Freeyorp") =>
diff --git a/npc/027-2_Caretakers_House/caretaker.txt b/npc/027-2_Caretakers_House/caretaker.txt
index 3d742704..bf4d35fc 100644
--- a/npc/027-2_Caretakers_House/caretaker.txt
+++ b/npc/027-2_Caretakers_House/caretaker.txt
@@ -120,8 +120,8 @@ OnTimer3000:
 
 OnWifeDeath:
 	mapannounce "027-2.gat", "NO! YOU KILLED MY WIFE!", 0;
-	gmcommand strcharinfo(0) + " : @l I killed the caretaker's wife!";
-	gmcommand strcharinfo(0) + " : @ban +5mn " + strcharinfo(0);
+	gmcommand "@l I killed the caretaker's wife!";
+	gmcommand "@ban +5mn " + strcharinfo(0);
 	setnpctimer 0;
 	end;
 
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:
diff --git a/npc/items/restricted_item.txt b/npc/items/restricted_item.txt
index 4ce1d096..7d8e96ab 100644
--- a/npc/items/restricted_item.txt
+++ b/npc/items/restricted_item.txt
@@ -12,7 +12,7 @@ function	script	RestrictedItem	{
 	message strcharinfo(0), "This item repells you with extreme force. It does not seem to be meant for you.";
 	unequipbyid @slotId;
 	if (getgmlevel(0)) return;
-	gmcommand strcharinfo(0) + " : @wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
-	gmcommand strcharinfo(0) + " : @l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
+	gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
+	gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
 	end;
 }
diff --git a/npc/xmas/2006/xmas1.txt b/npc/xmas/2006/xmas1.txt
index a6e71686..a79be191 100644
--- a/npc/xmas/2006/xmas1.txt
+++ b/npc/xmas/2006/xmas1.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas10.txt b/npc/xmas/2006/xmas10.txt
index ed9b2654..b0f057fc 100644
--- a/npc/xmas/2006/xmas10.txt
+++ b/npc/xmas/2006/xmas10.txt
@@ -70,7 +70,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -80,15 +80,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -101,7 +101,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -110,7 +110,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -119,7 +119,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas11.txt b/npc/xmas/2006/xmas11.txt
index 559ece7c..47fece68 100644
--- a/npc/xmas/2006/xmas11.txt
+++ b/npc/xmas/2006/xmas11.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas12.txt b/npc/xmas/2006/xmas12.txt
index 3311e902..cf234be1 100644
--- a/npc/xmas/2006/xmas12.txt
+++ b/npc/xmas/2006/xmas12.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas13.txt b/npc/xmas/2006/xmas13.txt
index d84d3634..aa2c87f8 100644
--- a/npc/xmas/2006/xmas13.txt
+++ b/npc/xmas/2006/xmas13.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas14.txt b/npc/xmas/2006/xmas14.txt
index d279eed2..73673088 100644
--- a/npc/xmas/2006/xmas14.txt
+++ b/npc/xmas/2006/xmas14.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas15.txt b/npc/xmas/2006/xmas15.txt
index 5bad6dbf..6deca2d2 100644
--- a/npc/xmas/2006/xmas15.txt
+++ b/npc/xmas/2006/xmas15.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas16.txt b/npc/xmas/2006/xmas16.txt
index 10a644df..05325115 100644
--- a/npc/xmas/2006/xmas16.txt
+++ b/npc/xmas/2006/xmas16.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas17.txt b/npc/xmas/2006/xmas17.txt
index f0d88648..0144dcf4 100644
--- a/npc/xmas/2006/xmas17.txt
+++ b/npc/xmas/2006/xmas17.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas18.txt b/npc/xmas/2006/xmas18.txt
index fc83c980..a4d059a7 100644
--- a/npc/xmas/2006/xmas18.txt
+++ b/npc/xmas/2006/xmas18.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas19.txt b/npc/xmas/2006/xmas19.txt
index c6e35812..aa2c83c8 100644
--- a/npc/xmas/2006/xmas19.txt
+++ b/npc/xmas/2006/xmas19.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas2.txt b/npc/xmas/2006/xmas2.txt
index 9812186d..6fbc22bf 100644
--- a/npc/xmas/2006/xmas2.txt
+++ b/npc/xmas/2006/xmas2.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas20.txt b/npc/xmas/2006/xmas20.txt
index 62e979d4..488d97f6 100644
--- a/npc/xmas/2006/xmas20.txt
+++ b/npc/xmas/2006/xmas20.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas3.txt b/npc/xmas/2006/xmas3.txt
index ebcb54c1..df6094b1 100644
--- a/npc/xmas/2006/xmas3.txt
+++ b/npc/xmas/2006/xmas3.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas4.txt b/npc/xmas/2006/xmas4.txt
index d27cd4de..a873ad76 100644
--- a/npc/xmas/2006/xmas4.txt
+++ b/npc/xmas/2006/xmas4.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas5.txt b/npc/xmas/2006/xmas5.txt
index 50dd6928..ae3829e6 100644
--- a/npc/xmas/2006/xmas5.txt
+++ b/npc/xmas/2006/xmas5.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas6.txt b/npc/xmas/2006/xmas6.txt
index c424664e..d119451f 100644
--- a/npc/xmas/2006/xmas6.txt
+++ b/npc/xmas/2006/xmas6.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas7.txt b/npc/xmas/2006/xmas7.txt
index 00905793..1e38da05 100644
--- a/npc/xmas/2006/xmas7.txt
+++ b/npc/xmas/2006/xmas7.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas8.txt b/npc/xmas/2006/xmas8.txt
index dc5793ea..506ebefe 100644
--- a/npc/xmas/2006/xmas8.txt
+++ b/npc/xmas/2006/xmas8.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0:
diff --git a/npc/xmas/2006/xmas9.txt b/npc/xmas/2006/xmas9.txt
index dea1832f..18da309e 100644
--- a/npc/xmas/2006/xmas9.txt
+++ b/npc/xmas/2006/xmas9.txt
@@ -73,7 +73,7 @@ L_naughty_1:
 	next;
 	mes "[Helper Santa]";
 	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
+	gmcommand "@die ";
 	close;
 
 L_naughty_2:
@@ -83,15 +83,15 @@ L_naughty_2:
 	next;
 	mes "[Helper Santa]";
 	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
+	gmcommand "@charstreset "+strcharinfo(0);
+	gmcommand "@charskreset "+strcharinfo(0);
 	close;
 
 L_naughty_3:
 	mes "[Helper Santa]";
 	mes "You will now get randomly warped!";
 	next;
-	gmcommand strcharinfo(0)+":@jump ";
+	gmcommand "@jump ";
 	mes "[Helper Santa]";
 	mes "Merry Christmas!";
 	close;
@@ -104,7 +104,7 @@ L_naughty_4:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
+	gmcommand "@charchangesex "+strcharinfo(0);
 	close;
 
 L_naughty_5:
@@ -113,7 +113,7 @@ L_naughty_5:
 	next;
 	mes "[Helper Santa]";
 	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
+	gmcommand "@killmonster2 ";
 	close;
 
 L_naughty_6:
@@ -122,7 +122,7 @@ L_naughty_6:
 	next;
 	mes "[Helper Santa]";
 	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
+	gmcommand "@kami "+strcharinfo(0)+" is not in the holiday mood.";
 	close;
 
 L_nice_0: