Change all script folders

Script files fixes are comming

25 files changed, 0 insertions, 5113 deletions

diff --git a/npc/new_10-1-xmas/monsters.txt b/npc/new_10-1-xmas/monsters.txt
deleted file mode 100644
index b4515cf2..00000000
--- a/npc/new_10-1-xmas/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_10-1
-// This is the Snow Fields.
-//
-
-new_10-1.gat,0,0,0,0	monster	SantaSlime	1015,10,0,0,Mob10::OnSantaSlime
-new_10-1.gat,0,0,0,0	monster	RudolphSlime	1016,25,0,0,Mob10::OnRudolphSlime
-
-new_10-1.gat,0,0,0	script	Mob10	-1,{
-OnSantaSlime:
-	set @mobID, 1015;
-	callfunc "MobPoints";
-	break;
-
-OnRudolphSlime:
-	set @mobID, 1016;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/new_10-1-xmas/passages.txt b/npc/new_10-1-xmas/passages.txt
deleted file mode 100644
index 6a879b95..00000000
--- a/npc/new_10-1-xmas/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_10-1.gat,69,19	warp	tovillage	4,1,new_11-1.gat,69,127
\ No newline at end of file
diff --git a/npc/new_10-1-xmas/santa.txt b/npc/new_10-1-xmas/santa.txt
deleted file mode 100644
index c53ce55f..00000000
--- a/npc/new_10-1-xmas/santa.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-new_10-1.gat,74,75,0	script	Santa	105,{
-if (ChristmasQuest2 == 1) goto done;
-mes "[Santa]";
-mes "Ho ho ho.";
-mes "Hello my young friend.";
-mes "Would you like to help me?";
-next;
-mes "Those monsters stolen my presents.";
-mes "If you help me, I'll give you something very nice";
-next;
-L_M:
-menu "I have some present boxes",L_Y,"Hmm, see you later",L_N,"What you need exactly?",L_R;
-	L_Y:
-		mes "[Santa]";
-		mes "Hmm, let me check what you have.";
-		next;
-		if(countitem(515)<25) goto NoItem;
-		if(countitem(516)<20) goto NoItem;
-		if(countitem(538)<5) goto NoItem;
-		mes "Great! Here is something for you";
-		delitem 515,25;
-		delitem 516,20;
-		delitem 538,5;
-		getitem 563+rand(2),1;
-		set ChristmasQuest2,1;
-		close;
-	L_R:
-		mes "[Santa]";
-		mes "I need:";
-		mes "25 purple present boxes";
-		mes "20 blue present boxes";
-		mes "5 green present boxes";
-		next;
-		goto L_M;
-	L_N:
-		mes "[Santa]";
-		mes "Enjoy your holidays and I wish you an happy Christmas!";
-		close;
-	NoItem:
-		mes "[Santa]";
-		mes "You dont seem to have enough presents.";
-		close;
-        done:
-                mes "[Santa]";
-		mes "All the children got their Christmas presents.";
-                mes "Thank you for your help.";
-                close;
-
-}
-
diff --git a/npc/new_10-1-xmas/snowman.txt b/npc/new_10-1-xmas/snowman.txt
deleted file mode 100644
index 1e5ba412..00000000
--- a/npc/new_10-1-xmas/snowman.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-new_10-1.gat,77,44,0	script	Snowman	129,{
-	if( ChristmasQuest == 1) goto L_Done;
-
-	mes "[Snowman]";
-	mes "\"Hello there young man.";
-	mes "Would you like a Christmas hat?\"";
-	next;
-
-L_Menu:
-	menu
-		"Yes", L_Sure,
-		"No", -,
-		"What do you need?", L_Need;
-	mes "[Snowman]";
-	mes "\"Well, thats too bad, but make sure to have the holiday spirit!\"";
-	close;
-
-L_Sure:
-	mes "[Snowman]";
-	mes "\"Hmm, let me see what you have.\"";
-	next;
-	if(countitem(510) < 15) goto L_NoItem;
-	if(countitem(509) < 10) goto L_NoItem;
-	if(countitem(502) < 5) goto L_NoItem;
-	delitem 510, 15;
-	delitem 509, 10;
-	delitem 502, 5;
-	mes "\"Here you go, enjoy your new hat!\"";
-	getitem 511, 1;
-	set ChristmasQuest, 1;
-	close;
-
-L_Need:
-	mes "[Snowman]";
-	mes "\"For this special hat, I need a pint of magic and a little help.";
-	mes "Just kidding. I would like to get some food:";
-	mes "15 Candies";
-	mes "10 Chocolate bars";
-	mes "5 Cactus potions\"";
-	next;
-	goto L_Menu;
-
-L_NoItem:
-	mes "[Snowman]";
-	mes "\"Well, I am interested in some food and you don't have enought to get a hat.\"";
-	close;
-
-L_Done:
-	mes "[Snowman]";
-	mes "\"Thank you for help!\"";
-	close;
-}
diff --git a/npc/new_10-1-xmas/taro.txt b/npc/new_10-1-xmas/taro.txt
deleted file mode 100644
index c5ab3289..00000000
--- a/npc/new_10-1-xmas/taro.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-// Snow Taro
-
-new_10-1.gat,57,61,0	script	Taro	114,{
-	if (getequipid(equip_head) == 511 || getequipid(equip_head) == 1206) goto L_Santa;
-	if (getequipid(equip_head) == 633) goto L_Elf;
-	if (getequipid(equip_head) == 628) goto L_NearElf;
-	if (getequipid(equip_head) == 1204) goto L_Antlers;
-	if (getequipid(equip_head) == 1205) goto L_Tree;
-
-	mes "[Taro]";
-	mes "\"I'm scared!!!";
-	mes "Take me back, pleeeease!!!\"";
-	next;
-	menu
-	    "Ok", L_Warp,
-	    "Just give me one more minute.", close;
-	close;
-
-L_Santa:
-	mes "[Taro]";
-	mes "\"SANTA! Will you take me back home?\"";
-	next;
-
-	menu
-	    "Of course!", L_Warp,
-	    "No, I need to finish some stuff up here.", -;
-	close;
-
-L_Elf:
-	mes "[Taro]";
-	mes "\"Aren't you one of Santa's elves? Can you help me back home?\"";
-	next;
-
-	menu
-	    "Yes", L_Warp,
-	    "No. I'm too busy.", -;
-	close;
-
-L_NearElf:
-	mes "[Taro]";
-	mes "\"Aren't you one of Santa's elves? Oh, you're not. Will you help me get home anyways?\"";
-	next;
-
-	menu
-	    "Yes", L_Warp,
-	    "No", -;
-	close;
-
-L_Antlers:
-	mes "[Taro]";
-	mes "\"Mister reindeer? Will you take me home?\"";
-	next;
-
-	menu
-	    "Yes", L_Warp,
-	    "No", -;
-	close;
-
-L_Tree:
-	mes "[Taro]";
-	mes "\"Oh Christmas tree, I wish I could go home now!\"";
-	next;
-
-	menu
-	    "Let me take you", L_Warp,
-	    "Sorry, I'm not a magic tree", -;
-	close;
-
-L_Warp:
-	warp "new_29-1.gat", 52, 45;
-	close;
-}
-
diff --git a/npc/new_10-1-xmas/xmas1.txt b/npc/new_10-1-xmas/xmas1.txt
deleted file mode 100644
index 814dd9cc..00000000
--- a/npc/new_10-1-xmas/xmas1.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_1-1.gat,41,60,0 script Xmas1 105,{
-        if(XMASQUEST1 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST1,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas10.txt b/npc/new_10-1-xmas/xmas10.txt
deleted file mode 100644
index 8ba50ae0..00000000
--- a/npc/new_10-1-xmas/xmas10.txt
+++ /dev/null
@@ -1,243 +0,0 @@
-new_2-1.gat,57,64,0 script Xmas10 105,{
-        if(XMASQUEST10 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas. The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me. The kind will depend on whether you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST10,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas11.txt b/npc/new_10-1-xmas/xmas11.txt
deleted file mode 100644
index 212a5225..00000000
--- a/npc/new_10-1-xmas/xmas11.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_3-1.gat,73,51,0 script Xmas11 105,{
-        if(XMASQUEST11 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST11,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas12.txt b/npc/new_10-1-xmas/xmas12.txt
deleted file mode 100644
index a8527eaf..00000000
--- a/npc/new_10-1-xmas/xmas12.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_4-1.gat,26,51,0 script Xmas12 105,{
-        if(XMASQUEST12 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST12,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas13.txt b/npc/new_10-1-xmas/xmas13.txt
deleted file mode 100644
index 534403da..00000000
--- a/npc/new_10-1-xmas/xmas13.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_5-1.gat,68,95,0 script Xmas13 105,{
-        if(XMASQUEST13 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST13,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas14.txt b/npc/new_10-1-xmas/xmas14.txt
deleted file mode 100644
index 2f1269a4..00000000
--- a/npc/new_10-1-xmas/xmas14.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_7-1.gat,46,46,0 script Xmas14 105,{
-        if(XMASQUEST14 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST14,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas15.txt b/npc/new_10-1-xmas/xmas15.txt
deleted file mode 100644
index 32dc490c..00000000
--- a/npc/new_10-1-xmas/xmas15.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_6-1.gat,112,54,0 script Xmas15 105,{
-        if(XMASQUEST15 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST15,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas16.txt b/npc/new_10-1-xmas/xmas16.txt
deleted file mode 100644
index c072684b..00000000
--- a/npc/new_10-1-xmas/xmas16.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_8-1.gat,37,24,0 script Xmas16 105,{
-        if(XMASQUEST16 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST16,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas17.txt b/npc/new_10-1-xmas/xmas17.txt
deleted file mode 100644
index 292744ef..00000000
--- a/npc/new_10-1-xmas/xmas17.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_9-1.gat,106,58,0 script Xmas17 105,{
-        if(XMASQUEST17 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST17,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas18.txt b/npc/new_10-1-xmas/xmas18.txt
deleted file mode 100644
index e78e1b0c..00000000
--- a/npc/new_10-1-xmas/xmas18.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_1-1.gat,97,18,0 script Xmas18 105,{
-        if(XMASQUEST18 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST18,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas19.txt b/npc/new_10-1-xmas/xmas19.txt
deleted file mode 100644
index 3c60aab7..00000000
--- a/npc/new_10-1-xmas/xmas19.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_11-1.gat,90,83,0 script Xmas19 105,{
-        if(XMASQUEST19 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST19,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas2.txt b/npc/new_10-1-xmas/xmas2.txt
deleted file mode 100644
index bba2b0c8..00000000
--- a/npc/new_10-1-xmas/xmas2.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_10-1.gat,99,42,0 script Xmas2 105,{
-        if(XMASQUEST2 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST2,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas20.txt b/npc/new_10-1-xmas/xmas20.txt
deleted file mode 100644
index 0bc045db..00000000
--- a/npc/new_10-1-xmas/xmas20.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_3-1.gat,55,28,0 script Xmas20 105,{
-        if(XMASQUEST20 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST20,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas3.txt b/npc/new_10-1-xmas/xmas3.txt
deleted file mode 100644
index 28dbc605..00000000
--- a/npc/new_10-1-xmas/xmas3.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_11-1.gat,67,62,0 script Xmas3 105,{
-        if(XMASQUEST3 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST3,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas4.txt b/npc/new_10-1-xmas/xmas4.txt
deleted file mode 100644
index c9f13e3e..00000000
--- a/npc/new_10-1-xmas/xmas4.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_12-1.gat,24,50,0 script Xmas4 105,{
-        if(XMASQUEST4 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST4,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas5.txt b/npc/new_10-1-xmas/xmas5.txt
deleted file mode 100644
index 7269717c..00000000
--- a/npc/new_10-1-xmas/xmas5.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_13-1.gat,22,32,0 script Xmas5 105,{
-        if(XMASQUEST5 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST5,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas6.txt b/npc/new_10-1-xmas/xmas6.txt
deleted file mode 100644
index da47ca1f..00000000
--- a/npc/new_10-1-xmas/xmas6.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_14-1.gat,92,37,0 script Xmas6 105,{
-        if(XMASQUEST6 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST6,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas7.txt b/npc/new_10-1-xmas/xmas7.txt
deleted file mode 100644
index 7bcc2983..00000000
--- a/npc/new_10-1-xmas/xmas7.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_15-1.gat,130,66,0 script Xmas7 105,{
-        if(XMASQUEST7 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST7,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas8.txt b/npc/new_10-1-xmas/xmas8.txt
deleted file mode 100644
index 47752239..00000000
--- a/npc/new_10-1-xmas/xmas8.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_16-1.gat,125,37,0 script Xmas8 105,{
-        if(XMASQUEST8 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST8,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}
diff --git a/npc/new_10-1-xmas/xmas9.txt b/npc/new_10-1-xmas/xmas9.txt
deleted file mode 100644
index f27629d8..00000000
--- a/npc/new_10-1-xmas/xmas9.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-new_17-1.gat,71,34,0 script Xmas9 105,{
-        if(XMASQUEST9 == 1) goto L_only_once;
-        mes "[Helper Santa]";
-        mes "It's Christmas.";
-        mes "The time for gifts and family reunions";
-        next;
-
-        mes "[Helper Santa]";
-        mes "You get a gift from me.";
-	mes "The kind will depend on whether";
-	mes "you've been nice or naughty.";
-        next;
-
-        menu "Want one?",L_nicenaughty,"No thanks.",L_no;
-
-L_nicenaughty:
-	set XMASQUEST9,1;
-	mes "[Helper Santa]";
-	mes "In my book you're marked as...";
-        next;
-	set @TEMP,rand(9);
-	if(@TEMP == 6) goto L_naughty;
-	goto L_nice;
-
-L_nice:
-	mes "[Helper Santa]";
-	mes "...nice!";
-        set @TEMP,rand(17);
-	next;
-        if(@TEMP == 0) goto L_nice_0;
-        if(@TEMP == 1) goto L_nice_1;
-	if(@TEMP == 2) goto L_nice_2;
-	if(@TEMP == 3) goto L_nice_3;
-	if(@TEMP == 4) goto L_nice_4;
-	if(@TEMP == 5) goto L_nice_5;
-	if(@TEMP == 6) goto L_nice_6;
-	if(@TEMP == 7) goto L_nice_7;
-	if(@TEMP == 8) goto L_nice_8;
-	if(@TEMP == 9) goto L_nice_9;
-        if(@TEMP == 10) goto L_nice_10;
-        if(@TEMP == 11) goto L_nice_11;
-        if(@TEMP == 12) goto L_nice_12;
-        if(@TEMP == 13) goto L_nice_13;
-        if(@TEMP == 14) goto L_nice_14;
-        if(@TEMP == 15) goto L_nice_15;
-        if(@TEMP == 16) goto L_nice_16;
-        if(@TEMP == 17) goto L_nice_17;
-
-L_naughty:
-	mes "[Helper Santa]";
-	mes "...naughty!";
-	set @TEMP,rand(6);
-	next;
-	if(@TEMP == 0) goto L_naughty_0;
-	if(@TEMP == 1) goto L_naughty_1;
-	if(@TEMP == 2) goto L_naughty_2;
-	if(@TEMP == 3) goto L_naughty_3;
-	if(@TEMP == 4) goto L_naughty_4;
-	if(@TEMP == 5) goto L_naughty_5;
-	if(@TEMP == 6) goto L_naughty_6;
-
-L_naughty_0:
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	mes "I borrowed some of your money for";
-	mes "my present budget this year.";
-	set Zeny,Zeny-rand(500,1500);
-	close;
-
-L_naughty_1:
-	mes "[Helper Santa]";
-	mes "You will get a spanking";
-	next;
-	mes "[Helper Santa]";
-	mes "Remember to be nice to people!";
-	gmcommand strcharinfo(0)+":@die ";
-	close;
-
-L_naughty_2:
-	mes "[Helper Santa]";
-	mes "But I won't mind!";
-	mes "Have a char reset as a present."
-	next;
-	mes "[Helper Santa]";
-	mes "Abracadabra!";
-	gmcommand strcharinfo(0)+":@charstreset "+strcharinfo(0);
-	gmcommand strcharinfo(0)+":@charskreset "+strcharinfo(0);
-	close;
-
-L_naughty_3:
-	mes "[Helper Santa]";
-	mes "You will now get randomly warped!";
-	next;
-	gmcommand strcharinfo(0)+":@jump ";
-	mes "[Helper Santa]";
-	mes "Merry Christmas!";
-	close;
-
-L_naughty_4:
-	mes "[Helper Santa]";
-	mes "Your sex will now change!";
-	mes "You always get naughty things for naughty things.";
-	mes "It's karma!";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@charchangesex "+strcharinfo(0);
-	close;
-
-L_naughty_5:
-	mes "[Helper Santa]";
-	mes "I'll now kill all monsters on this map.";
-	next;
-	mes "[Helper Santa]";
-	mes "Done!";
-	gmcommand strcharinfo(0)+":@killmonster2 ";
-	close;
-
-L_naughty_6:
-	mes "[Helper Santa]";
-	mes "I'll diss you around the server.";
-	next;
-	mes "[Helper Santa]";
-	mes "Ho ho ho!";
-	gmcommand strcharinfo(0)+":@kami "+strcharinfo(0)+" is not in the holiday mood.";
-	close;
-
-L_nice_0:
-	mes "[Helper Santa]";
-	mes "So you wanted money?.";
-	set Zeny,Zeny+rand(1,1000000);
-	close;
-
-L_nice_1:
-	mes "[Helper Santa]";
-	mes "These hats are really hot now!";
-	getitem 1205,1;
-	close;
-
-L_nice_2:
-	mes "[Helper Santa]";
-	mes "Axe Hats are always on the cutting edge!";
-	getitem 616,1;
-	close;
-
-L_nice_3:
-        mes "[Helper Santa]";
-	mes "You just won a Pirate Hat!";
-	getitem 617,1;
-	close;
-
-L_nice_4:
-        mes "[Helper Santa]";
-	mes "Now you can Goggle all you want.";
-	getitem 618,1;
-	close;
-
-L_nice_5:
-        mes "[Helper Santa]";
-	mes "Let's Goggle all night long!";
-	getitem 619,1;
-	close;
-
-L_nice_6:
-        mes "[Helper Santa]";
-	mes "You just won a Circlet!";
-	getitem 620,1;
-	close;
-
-L_nice_7:
-        mes "[Helper Santa]";
-	mes "This patch is not an eyesore.";
-	getitem 621,1;
-	close;
-
-L_nice_8:
-        mes "[Helper Santa]";
-	mes "Bandana time!";
-	getitem 622,1;
-	close;
-
-L_nice_9:
-        mes "[Helper Santa]";
-	mes "5000 exp!";
-	getexp 5000,0;
-	close;
-
-L_nice_10:
-        mes "[Helper Santa]";
-	mes "Soft packages are always nice.";
-	getitem 1202,1;
-	close;
-
-L_nice_11:
-        mes "[Helper Santa]";
-	mes "Chuck Norris style!";
-	getitem 1203,1;
-	close;
-
-L_nice_12:
-        mes "[Helper Santa]";
-	mes "Even Rudolph would be envious now.";
-	getitem 1204,1;
-        close;
-
-L_nice_13:
-        mes "[Helper Santa]";
-	mes "Now you can become a Santa too!";
-	getitem 1206,1;
-	close;
-
-L_nice_14:
-        mes "[Helper Santa]";
-	mes "Now you can became a Santa too!";
-	getitem 511,1;
-	close;
-
-L_nice_15:
-        mes "[Helper Santa]";
-	mes "These gloves should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_nice_16:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 624,1;
-	close;
-
-L_nice_17:
-        mes "[Helper Santa]";
-	mes "This should keep you warm.";
-	getitem 564,1;
-	close;
-
-L_only_once:
-        mes "[Helper Santa]";
-        mes "You already got one from me.";
-        close;
-
-L_no:
-	mes "[Helper Santa]";
-	mes "You're not in the Christmas spirit?";
-	mes "I hope you get into this gift extravaganza soon.";
-	close;
-}