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, 140 insertions, 140 deletions

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: