Merge remote branch 'cache/master'

41 files changed, 540 insertions, 769 deletions

diff --git a/data/020-4.wlk b/data/020-4.wlk
deleted file mode 100644
index e2a1852c..00000000
--- a/data/020-4.wlk
+++ /dev/null
diff --git a/data/021-8.wlk b/data/021-8.wlk
deleted file mode 100644
index 8ddde1fd..00000000
--- a/data/021-8.wlk
+++ /dev/null
diff --git a/data/023-1.wlk b/data/023-1.wlk
deleted file mode 100644
index 31f88b7b..00000000
--- a/data/023-1.wlk
+++ /dev/null
diff --git a/data/test.wlk b/data/test.wlk
deleted file mode 100644
index cf612ae7..00000000
--- a/data/test.wlk
+++ /dev/null
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
index cb2a8467..29ad1105 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -9,7 +9,6 @@
 007-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob007-1::On1037
 007-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob007-1::On1038
 007-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob007-1::On1055
-007-1.gat,0,0,0,0	monster Pumpkin		1064,2,30000,20000
 
 
 007-1.gat,0,0,0	script	Mob007-1	-1,{
diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1_Hurnscald_outskirts/_mobs.txt
index 9e7880fe..12147858 100644
--- a/npc/008-1_Hurnscald_outskirts/_mobs.txt
+++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt
@@ -9,7 +9,6 @@
 008-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob008-1::On1037
 008-1.gat,0,0,0,0	monster	Squirrel	1038,10,30,20,Mob008-1::On1038
 008-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob008-1::On1055
-008-1.gat,0,0,0,0	monster Pumpkin		1064,2,40000,40000
 
 
 008-1.gat,0,0,0	script	Mob008-1	-1,{
diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1_Hurnscald/_mobs.txt
index c066bac8..5f1fcf89 100644
--- a/npc/009-1_Hurnscald/_mobs.txt
+++ b/npc/009-1_Hurnscald/_mobs.txt
@@ -5,7 +5,6 @@
 009-1.gat,88,51,15,4	monster	Squirrel	1038,2,0,5000,Mob009-1::On1038
 009-1.gat,80,38,5,5	monster	Squirrel	1038,1,0,5000,Mob009-1::On1038
 009-1.gat,0,0,0,0	monster	Butterfly	1055,5,30,20,Mob009-1::On1055
-009-1.gat,0,0,0,0	monster Pumpkin		1064,1,40000,40000
 
 
 009-1.gat,0,0,0	script	Mob009-1	-1,{
diff --git a/npc/009-4/_mobs.txt b/npc/009-4/_mobs.txt
deleted file mode 100644
index 71cf010f..00000000
--- a/npc/009-4/_mobs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-// 009-4 Cave mobs

-// # see detailed description at orum.txt

-// Cavern

-009-4.gat,107,88,19,28	monster	Silkworm	1035,3,20000,14000,Mob009-4::OnSilkworm

-009-4.gat,107,88,19,28	monster	Cave Snake	1021,5,20000,14000,Mob009-4::OnCaveSnake

-

-009-4.gat,119,45,5,3	monster	Silkworm	1035,3,20000,14000,Mob009-4::OnSilkworm

-009-4.gat,103,28,6,4	monster	Cave Snake	1021,3,20000,14000,Mob009-4::OnCaveSnake

-009-4.gat,103,28,6,4	monster	Silkworm	1035,2,20000,14000,Mob009-4::OnSilkworm

-

-009-4.gat,36,117,4,4	monster	Maggot	1002,3,20000,14000,Mob009-4::OnMaggot

-009-4.gat,71,130,4,4	monster	Maggot	1002,3,20000,14000,Mob009-4::OnMaggot

-

-009-4.gat,0,0,0	script	Mob009-4	-1,{

-OnCaveSnake:

-	set @mobID, 1021;

-	callfunc "MobPoints";

-	break;

-OnMaggot:

-	set @mobID, 1002;

-	callfunc "MobPoints";

-	break;

-OnSilkworm:

-	set @mobID, 1035;

-	callfunc "MobPoints";

-	break;

-

-	end;

-}

diff --git a/npc/009-4/_warps.txt b/npc/009-4/_warps.txt
deleted file mode 100644
index 9666a081..00000000
--- a/npc/009-4/_warps.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-// 009-4 Cave Warps

-

-// Entrances

-009-4.gat,37,112	warp	to Outside	-1,-1,009-3.gat,162,114

-009-4.gat,37,123	warp	to Lair	-1,-1,009-4.gat,36,27

-

-009-4.gat,72,125	warp	to Outside	-1,-1,009-3.gat,162,114

-009-4.gat,72,136	warp	to Lair	-1,-1,009-4.gat,36,27

-

-// Caverns

-009-4.gat,103,22	warp	to Lair	-1,-1,009-4.gat,51,46

-009-4.gat,103,76	warp	to Lair	-1,-1,009-4.gat,51,46

-

-//009-3.gat,162,113,0	script	#OrumQuestEnter	0,0,0,{

-	if (OrumQuest >= 12) goto L_Second_Entrance;

-	warp "009-4.gat", 37, 113;

-	close;

-

-L_Second_Entrance:

-	warp "009-4.gat", 72, 126;

-	close;

-}

-009-4.gat,36,26,0	script	#LairExit	0,0,0,{

-	if (OrumQuest >= 12) goto L_Second_Entrance;

-	warp "009-4.gat", 37, 122;

-	close;

-

-L_Second_Entrance:

-	warp "009-4.gat", 72, 135;

-	close;

-}

-

-009-4.gat,51,47,0	script	#CavernEnter	0,0,0,{

-	if (OrumQuest >= 14) goto L_Second_Cavern;

-	if (OrumQuest < 12) goto L_See_Orum;

-	warp "009-4.gat", 103, 23;

-	close;

-

-L_Second_Cavern:

-	warp "009-4.gat", 103, 77;

-	close;

-

-L_See_Orum:

-	mes "Right as you are entering you hear Orum call out for you.. Perhaps you should see what he wants first..";

-	close;

-}

diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt
index d86c2641..87140ff3 100644
--- a/npc/010-1_Woodland/_mobs.txt
+++ b/npc/010-1_Woodland/_mobs.txt
@@ -13,7 +13,6 @@
 010-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob010-1::On1037
 010-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob010-1::On1038
 010-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob010-1::On1055
-010-1.gat,0,0,0,0	monster Pumpkin		1064,3,30000,20000
 
 
 010-1.gat,0,0,0	script	Mob010-1	-1,{
diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt
index 3aa95c29..05ed18ed 100644
--- a/npc/011-1_Woodland/_mobs.txt
+++ b/npc/011-1_Woodland/_mobs.txt
@@ -11,7 +11,6 @@
 011-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob011-1::On1037
 011-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob011-1::On1038
 011-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob011-1::On1055
-011-1.gat,0,0,0,0	monster Pumpkin		1064,2,30000,20000
 
 
 011-1.gat,0,0,0	script	Mob011-1	-1,{
diff --git a/npc/011-6/_mobs.txt b/npc/011-6/_mobs.txt
index 01a44dc6..9f42488c 100644
--- a/npc/011-6/_mobs.txt
+++ b/npc/011-6/_mobs.txt
@@ -1,12 +1,60 @@
 // 011-6 mobs
 
-011-6.gat,0,0,0,0	monster	Spiky Mushroom	1019,30,30000,100000,Mob011-6::On1019
-011-6.gat,0,0,0,0	monster	Evil Mushroom	1013,15,30000,100000,Mob011-6::On1013
-011-6.gat,115,79,191,110	monster	Bandit	1064,8,30000,100000,Mob011-6::On1064
-011-6.gat,0,0,0,0	monster	Bat	1017,30,30000,100000,Mob011-6::On1017
+011-6.gat,152,72,283,127	monster	Silk Worm	1035,9,30000,100000,Mob011-6::On1035
+011-6.gat,263,38,30,34	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,262,114,38,38	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,132,119,17,21	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,170,66,17,21	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,67,70,17,21	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,196,107,17,21	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,196,29,17,21	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,36,37,17,21	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,112,40,45,48	monster	Bandit	1064,2,30000,60000,Mob011-6::On1064
+011-6.gat,31,99,17,21	monster	Bandit	1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,223,250,123,65	monster	Bat	1017,5,30000,100000,Mob011-6::On1017
+011-6.gat,224,175,118,25	monster	Bat	1017,3,30000,100000,Mob011-6::On1017
+011-6.gat,257,77,4,126	monster	Bat	1017,6,30000,100000,Mob011-6::On1017
+011-6.gat,192,77,4,126	monster	Bat	1017,9,30000,100000,Mob011-6::On1017
+011-6.gat,167,110,87,13	monster	Bat	1017,9,30000,100000,Mob011-6::On1017
+011-6.gat,75,70,104,96	monster	Bat	1017,23,30000,100000,Mob011-6::On1017
+011-6.gat,78,195,129,97	monster	Bat	1017,9,30000,100000,Mob011-6::On1017
+011-6.gat,168,109,36,37	monster	Spiky Mushroom	1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,199,76,36,37	monster	Spiky Mushroom	1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,88,163,29,27	monster	Spiky Mushroom	1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,48,113,35,19	monster	Spiky Mushroom	1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,177,94,20,28	monster	Evil Mushroom	1013,4,30000,100000,Mob011-6::On1013
+011-6.gat,194,49,20,28	monster	Evil Mushroom	1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,51,115,47,24	monster	Evil Mushroom	1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,63,169,13,17	monster	Evil Mushroom	1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,100,226,29,14	monster	Spiky Mushroom	1019,3,30000,100000,Mob011-6::On1019
+011-6.gat,260,44,53,16	monster	Spiky Mushroom	1019,3,30000,100000,Mob011-6::On1019
+011-6.gat,272,48,21,28	monster	Evil Mushroom	1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,95,78,31,25	monster	Yellow Slime	1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,59,36,19,25	monster	Yellow Slime	1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,26,69,19,25	monster	Yellow Slime	1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,61,101,14,10	monster	Yellow Slime	1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,50,61,9,12	monster	Yellow Slime	1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,128,39,9,12	monster	Yellow Slime	1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,41,178,9,12	monster	Yellow Slime	1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,70,229,9,12	monster	Yellow Slime	1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,20,204,9,12	monster	Yellow Slime	1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,114,190,9,12	monster	Yellow Slime	1007,4,30000,100000,Mob011-6::On1007
+011-6.gat,137,205,9,12	monster	Yellow Slime	1007,2,30000,100000,Mob011-6::On1007
+011-6.gat,79,220,29,14	monster	Cave Snake	1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,115,210,29,14	monster	Cave Snake	1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,41,193,31,31	monster	Cave Snake	1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,70,143,31,31	monster	Cave Snake	1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,97,183,29,14	monster	Cave Snake	1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,172,252,9,12	monster	Cave Maggot	1056,4,30000,100000,Mob011-6::On1056
+011-6.gat,263,236,16,5	monster	Cave Maggot	1056,3,30000,100000,Mob011-6::On1056
 
 
 011-6.gat,0,0,0	script	Mob011-6	-1,{
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
 On1013:
 	set @mobID, 1013;
 	callfunc "MobPoints";
@@ -22,6 +70,21 @@ On1019:
 	callfunc "MobPoints";
 	break;
 
+On1021:
+	set @mobID, 1021;
+	callfunc "MobPoints";
+	break;
+
+On1035:
+	set @mobID, 1035;
+	callfunc "MobPoints";
+	break;
+
+On1056:
+	set @mobID, 1056;
+	callfunc "MobPoints";
+	break;
+
 On1064:
 	set @mobID, 1064;
 	callfunc "MobPoints";
diff --git a/npc/011-6/bryant.txt b/npc/011-6/bryant.txt
index 4c1579b9..7e7041d1 100644
--- a/npc/011-6/bryant.txt
+++ b/npc/011-6/bryant.txt
@@ -38,7 +38,7 @@ L_Bryant_No:
 	mes "[Bryant]";
 	mes "\"Well, maybe he ran off.  I'm pretty sure he should be there now.\"";
 	killmonster "011-6.gat", "Bryant::onBanditLordDead";
-	monster "011-6.gat",260,250,"BanditLord",1064,1, "Bryant::onBanditLordDead";
+	monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::onBanditLordDead";
 	close;
 
 L_Bryant_Yes:
diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1_Woodland_Hills/_mobs.txt
index 13e21929..c081df48 100644
--- a/npc/012-1_Woodland_Hills/_mobs.txt
+++ b/npc/012-1_Woodland_Hills/_mobs.txt
@@ -11,7 +11,6 @@
 012-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob012-1::On1037
 012-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob012-1::On1038
 012-1.gat,0,0,0,0	monster	Butterfly	1055,20,30,20,Mob012-1::On1055
-012-1.gat,0,0,0,0	monster Pumpkin		1064,6,40000,30000
 
 
 012-1.gat,0,0,0	script	Mob012-1	-1,{
diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt
index 2086aa5f..04bdf4ce 100644
--- a/npc/013-1_Woodland_hills/_mobs.txt
+++ b/npc/013-1_Woodland_hills/_mobs.txt
@@ -15,7 +15,6 @@
 013-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob013-1::On1037
 013-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob013-1::On1038
 013-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob013-1::On1055
-013-1.gat,0,0,0,0	monster Pumpkin		1064,2,50000,45000
 
 
 013-1.gat,0,0,0	script	Mob013-1	-1,{
diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1_Woodland/_mobs.txt
index fc21e806..6f530db9 100644
--- a/npc/014-1_Woodland/_mobs.txt
+++ b/npc/014-1_Woodland/_mobs.txt
@@ -16,7 +16,6 @@
 014-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob014-1::On1037
 014-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob014-1::On1038
 014-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob014-1::On1055
-014-1.gat,0,0,0,0	monster Pumpkin		1064,2,40000,40000
 
 
 014-1.gat,0,0,0	script	Mob014-1	-1,{
diff --git a/npc/015-1_Woodland/_mobs.txt b/npc/015-1_Woodland/_mobs.txt
index ca1e87bf..da42f9d1 100644
--- a/npc/015-1_Woodland/_mobs.txt
+++ b/npc/015-1_Woodland/_mobs.txt
@@ -2,7 +2,6 @@
 
 015-1.gat,0,0,0,0	monster	Clover	1037,2,100000,1000,Mob015-1::On1037
 015-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob015-1::On1055
-015-1.gat,0,0,0,0	monster Pumpkin		1064,1,60000,60000
 
 
 015-1.gat,0,0,0	script	Mob015-1	-1,{
diff --git a/npc/016-1_Woodland/_mobs.txt b/npc/016-1_Woodland/_mobs.txt
index 9bff35fd..47df3be4 100644
--- a/npc/016-1_Woodland/_mobs.txt
+++ b/npc/016-1_Woodland/_mobs.txt
@@ -2,7 +2,6 @@
 
 016-1.gat,0,0,0,0	monster	Clover	1037,2,100000,30000,Mob016-1::On1037
 016-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob016-1::On1055
-016-1.gat,0,0,0,0	monster Pumpkin		1064,1,60000,60000
 
 
 016-1.gat,0,0,0	script	Mob016-1	-1,{
diff --git a/npc/017-1_Woodland_hills/_mobs.txt b/npc/017-1_Woodland_hills/_mobs.txt
index f5ead1e7..fd79bb69 100644
--- a/npc/017-1_Woodland_hills/_mobs.txt
+++ b/npc/017-1_Woodland_hills/_mobs.txt
@@ -5,7 +5,6 @@
 017-1.gat,91,25,76,8	monster	Loghead	2027,3,5000,60000,Mob017-1::On2027
 017-1.gat,31,48,19,12	monster	Loghead	2027,3,5000,60000,Mob017-1::On2027
 017-1.gat,0,0,0,0	monster	Butterfly	1055,10,30,20,Mob017-1::On1055
-017-1.gat,0,0,0,0	monster Pumpkin		1064,3,32000,20000
 
 
 017-1.gat,0,0,0	script	Mob017-1	-1,{
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
index 2a2af659..292e0547 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -26,7 +26,6 @@
 018-1.gat,160,31,11,18	monster	Red Slime	1008,5,100000,50000,Mob018-1::On1008
 018-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob018-1::On1037
 018-1.gat,0,0,0,0	monster	Butterfly	1055,20,30,20,Mob018-1::On1055
-018-1.gat,0,0,0,0	monster Pumpkin		1064,6,60000,60000
 
 
 018-1.gat,0,0,0	script	Mob018-1	-1,{
diff --git a/npc/019-3_Snow_Cave/_import.txt b/npc/019-3_Snow_Cave/_import.txt
new file mode 100644
index 00000000..728b994b
--- /dev/null
+++ b/npc/019-3_Snow_Cave/_import.txt
@@ -0,0 +1,3 @@
+map: 019-3.gat
+npc: npc/019-3_Snow_Cave/_mobs.txt
+npc: npc/019-3_Snow_Cave/_warps.txt
diff --git a/npc/019-3_Snow_field/_mobs.txt b/npc/019-3_Snow_Cave/_mobs.txt
index c4570bb3..8d4e5d7c 100644
--- a/npc/019-3_Snow_field/_mobs.txt
+++ b/npc/019-3_Snow_Cave/_mobs.txt
@@ -1,4 +1,4 @@
-// 019-3 Snow field mobs
+// 019-3 Snow Cave mobs
 
 019-3.gat,0,0,0,0	monster	Moggun	1061,10,100000,30000,Mob019-3::On1061
 019-3.gat,0,0,0,0	monster	Bats	1017,50,100000,30000,Mob019-3::On1017
diff --git a/npc/019-3_Snow_field/_warps.txt b/npc/019-3_Snow_Cave/_warps.txt
index fb2637a3..65c5dadc 100644
--- a/npc/019-3_Snow_field/_warps.txt
+++ b/npc/019-3_Snow_Cave/_warps.txt
@@ -1,4 +1,4 @@
-// 019-3 Snow field warps
+// 019-3 Snow Cave warps
 
 019-3.gat,40,99	warp	WarpOutside1	-1,-1,019-1.gat,38,73
 019-3.gat,98,25	warp	warpOutside2	-1,-1,019-1.gat,96,38
diff --git a/npc/019-3_Snow_field/_import.txt b/npc/019-3_Snow_field/_import.txt
deleted file mode 100644
index 3c5b1edc..00000000
--- a/npc/019-3_Snow_field/_import.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-map: 019-3.gat
-npc: npc/019-3_Snow_field/_mobs.txt
-npc: npc/019-3_Snow_field/_warps.txt
diff --git a/npc/025-1_Woodland_Swamp/_mobs.txt b/npc/025-1_Woodland_Swamp/_mobs.txt
index 4aed8361..ec980c3c 100644
--- a/npc/025-1_Woodland_Swamp/_mobs.txt
+++ b/npc/025-1_Woodland_Swamp/_mobs.txt
@@ -10,7 +10,6 @@
 025-1.gat,73,61,107,82	monster	Spiky Mushroom	1019,40,90000,500,Mob025-1::On1019
 025-1.gat,101,53,55,65	monster	Squirrel	1038,18,60000,9000,Mob025-1::On1038
 025-1.gat,26,61,15,85	monster	Scorpion	1003,12,100000,50000,Mob025-1::On1003
-025-1.gat,0,0,0,0	monster Pumpkin		1064,5,45000,35000
 
 
 025-1.gat,0,0,0	script	Mob025-1	-1,{
diff --git a/npc/026-1_Swamp/_mobs.txt b/npc/026-1_Swamp/_mobs.txt
index 5068ba8b..2885ca7b 100644
--- a/npc/026-1_Swamp/_mobs.txt
+++ b/npc/026-1_Swamp/_mobs.txt
@@ -8,7 +8,6 @@
 026-1.gat,71,57,113,81	monster	Skeleton	1043,5,900000,10000,Mob026-1::On1043
 026-1.gat,68,61,106,88	monster	LadySkeleton	1044,5,900000,20000,Mob026-1::On1044
 026-1.gat,68,60,107,87	monster	Log Head	1025,8,300000,40000,Mob026-1::On1025
-026-1.gat,0,0,0,0	monster Pumpkin		1064,8,50000,40000
 
 
 026-1.gat,0,0,0	script	Mob026-1	-1,{
diff --git a/npc/027-1_Graveyard/_mobs.txt b/npc/027-1_Graveyard/_mobs.txt
index 73641d27..372c2833 100644
--- a/npc/027-1_Graveyard/_mobs.txt
+++ b/npc/027-1_Graveyard/_mobs.txt
@@ -22,7 +22,6 @@
 027-1.gat,37,65,33,22	monster	Zombie	1036,3,140000,30000,Mob027-1::On1036
 027-1.gat,37,65,33,22	monster	Fallen	1045,3,120000,30000,Mob027-1::On1045
 027-1.gat,28,67,2,1	monster	Jack O	1022,1,265000,200000,Mob027-1::On1022
-027-1.gat,0,0,0,0	monster Pumpkin		1064,9,45000,35000
 
 
 027-1.gat,0,0,0	script	Mob027-1	-1,{
diff --git a/npc/027-1_Graveyard/golbenez.txt b/npc/027-1_Graveyard/golbenez.txt
deleted file mode 100644
index c74c9827..00000000
--- a/npc/027-1_Graveyard/golbenez.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-
-027-1.gat,68,89,0	script	#Golbenez#_M	204,{
-	if ($Golbenez_Inn_Cost >= 500000000) goto Golbenez_Inn_Enough;
-
-	mes "[Voice]";
-	mes "\"Mortal!  I am Golbenez!  I have broken through the barriers of space and time!\"";
-	next;
-	mes "\"For eons I've traveled through existence, tapping powers the living shall never touch.  I now offer my powers for your enjoyment.  In your world, places of leisure bring a desirable break from the threats of life.  I shall create such a place.  This place will be free from the threats found on your world as well as mine.\"";
-	next;
-	mes "\"It is difficult to create portals from my realm to yours.  It is also difficult to create dimensions isolated from the threats that may seek to do you harm.  For this reason I demand a hefty fee.  For 500 million of your gold pieces I will create this place.  This need not come just from you, but it must be delivered from the people of your world to me.\"";
-	next;
-	mes "\"So far, you have brought me " + Golbenez_Inn_Cost + " gold pieces.  The people of your world have brought me " + $Golbenez_Inn_Cost + " gold pieces.  How much would you like to give?\"";
-
-        set @mult, 1;
-	menu
-		"I'd like to give a little.", Golbenez_Little,
-		"I'd like to give thousands.", Golbenez_Thousands,
-		"Nevermind.", Golbenez_Nevermind;
-
-
-Golbenez_Thousands:
-        set @mult, 1000;
-
-Golbenez_Little:
-	input @Give;
-
-        set @Give, @Give * @mult;
-	
-	if (@Give <= 0) close;
-	if (zeny < @Give) goto Golbenez_Inn_NotEnoughZeny;
-	set Golbenez_Inn_Cost, Golbenez_Inn_Cost + @Give;
-	set $Golbenez_Inn_Cost, $Golbenez_Inn_Cost + @Give;
-	set zeny, zeny - @Give;
-	close;
-
-Golbenez_Inn_NotEnoughZeny:
-	mes "[Voice]";
-	mes "\"You don't have as much as you say you do.  Come back when you can give the gold pieces you say you can.\"";
-	close;
-
-Golbenez_Nevermind:
-	mes "[Voice]";
-	mes "\"That's too bad.\"";
-	close;
-
-Golbenez_Inn_Enough:
-	mes "[Voice]";
-	mes "\"I now have enough to create the place of leisure.  Once I have anchored it to this world, you will know.\"";
-	close;
-}
diff --git a/npc/028-1/_mobs.txt b/npc/028-1/_mobs.txt
index 63783af0..317b10d1 100644
--- a/npc/028-1/_mobs.txt
+++ b/npc/028-1/_mobs.txt
@@ -12,7 +12,6 @@
 028-1.gat,76,100,93,16	monster	Spectre	1042,8,200000,15000,Mob028-1::On1042
 028-1.gat,104,114,61,14	monster	Poltergeist	1047,8,200000,15000,Mob028-1::On1047
 028-1.gat,54,42,1,1	monster	Fallen	1045,1,700000,300000,Mob028-1::On1045
-028-1.gat,0,0,0,0	monster Pumpkin		1064,4,40000,40000
 
 
 028-1.gat,0,0,0	script	Mob028-1	-1,{
diff --git a/npc/029-1_Candor/_mobs.txt b/npc/029-1_Candor/_mobs.txt
index 10486a66..32975e8a 100644
--- a/npc/029-1_Candor/_mobs.txt
+++ b/npc/029-1_Candor/_mobs.txt
@@ -6,7 +6,6 @@
 029-1.gat,36,59,22,20	monster	Spiky Mushroom	1019,5,10000,30000,Mob029-1::On1019
 029-1.gat,53,35,17,17	monster	Bats	1017,4,25000,30000,Mob029-1::On1017
 029-1.gat,59,51,13,9	monster	Log heads	1025,2,25000,30000,Mob029-1::On1025
-029-1.gat,0,0,0,0	monster Pumpkin		1064,1,40000,50000
 
 
 029-1.gat,0,0,0	script	Mob029-1	-1,{
diff --git a/npc/031-3/_import.txt b/npc/031-3/_import.txt
deleted file mode 100644
index 4562f635..00000000
--- a/npc/031-3/_import.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-map: 031-3.gat
-npc: npc/031-3/_mobs.txt
-npc: npc/031-3/_warps.txt
-npc: npc/031-3/labyrinth.txt
diff --git a/npc/031-3/_mobs.txt b/npc/031-3/_mobs.txt
deleted file mode 100644
index da9f5d9d..00000000
--- a/npc/031-3/_mobs.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-// 031-3 mobs
-
-031-3.gat,38,50,52,75	monster	Moggun	1061,9,100000,30000,Mob031-3::On1061
-031-3.gat,213,57,66,59	monster	Santa Slime	1015,9,100000,30000,Mob031-3::On1015
-031-3.gat,39,144,52,75	monster	Moggun	1061,11,100000,30000,Mob031-3::On1061
-031-3.gat,39,212,52,75	monster	Moggun	1061,13,100000,30000,Mob031-3::On1061
-031-3.gat,282,142,52,75	monster	Moggun	1061,9,100000,30000,Mob031-3::On1061
-031-3.gat,284,222,52,75	monster	Moggun	1061,9,100000,30000,Mob031-3::On1061
-031-3.gat,99,271,52,75	monster	Moggun	1061,9,100000,30000,Mob031-3::On1061
-031-3.gat,281,58,52,75	monster	Moggun	1061,9,100000,30000,Mob031-3::On1061
-031-3.gat,0,0,0,0	monster	Bat	1017,190,100000,30000,Mob031-3::On1017
-031-3.gat,48,48,83,61	monster	Ice Goblin	1058,9,100000,30000,Mob031-3::On1058
-031-3.gat,122,50,83,61	monster	Ice Goblin	1058,9,100000,30000,Mob031-3::On1058
-031-3.gat,117,140,83,61	monster	Ice Goblin	1058,9,100000,30000,Mob031-3::On1058
-031-3.gat,212,142,83,61	monster	Ice Goblin	1058,12,100000,30000,Mob031-3::On1058
-031-3.gat,211,276,83,61	monster	Ice Goblin	1058,11,100000,30000,Mob031-3::On1058
-031-3.gat,117,207,83,61	monster	Ice Goblin	1058,9,100000,30000,Mob031-3::On1058
-031-3.gat,231,213,83,61	monster	Ice Goblin	1058,7,100000,30000,Mob031-3::On1058
-031-3.gat,261,265,83,61	monster	Ice Goblin	1058,9,100000,30000,Mob031-3::On1058
-031-3.gat,280,56,66,59	monster	Santa Slime	1015,9,100000,30000,Mob031-3::On1015
-031-3.gat,121,57,66,59	monster	Santa Slime	1015,11,100000,30000,Mob031-3::On1015
-031-3.gat,120,143,66,59	monster	Santa Slime	1015,9,100000,30000,Mob031-3::On1015
-031-3.gat,218,215,66,59	monster	Santa Slime	1015,9,100000,30000,Mob031-3::On1015
-031-3.gat,285,216,66,59	monster	Santa Slime	1015,13,100000,30000,Mob031-3::On1015
-031-3.gat,128,272,66,59	monster	Santa Slime	1015,9,100000,30000,Mob031-3::On1015
-031-3.gat,212,279,66,59	monster	Santa Slime	1015,11,100000,30000,Mob031-3::On1015
-
-
-031-3.gat,0,0,0	script	Mob031-3	-1,{
-On1015:
-	callsub Boxes1015;
-	set @mobID, 1015;
-	callfunc "MobPoints";
-	break;
-
-On1017:
-	callsub Boxes1017;
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-On1058:
-	callsub Boxes1058;
-	set @mobID, 1058;
-	callfunc "MobPoints";
-	break;
-
-On1061:
-	callsub Boxes1061;
-	set @mobID, 1061;
-	callfunc "MobPoints";
-	break;
-
-	end;
-
-Boxes1015:
-	set @yellow, rand(30);
-	set @white, rand(60);
-	if (@yellow == 1) goto L_GetYellow;
-	if (@white == 1) goto L_GetWhite;
-	return;
-
-Boxes1017:
-	set @yellow, rand(50);
-	set @white, rand(100);
-	if (@yellow == 1) goto L_GetYellow;
-	if (@white == 1) goto L_GetWhite;
-	return;
-
-
-Boxes1058:
-	set @yellow, rand(50);
-	set @white, rand(100);
-	if (@yellow == 1) goto L_GetYellow;
-	if (@white == 1) goto L_GetWhite;
-	return;
-
-
-Boxes1061:
-	set @yellow, rand(25);
-	set @white, rand(50);
-	if (@yellow == 1) goto L_GetYellow;
-	if (@white == 1) goto L_GetWhite;
-	return;
-
-L_GetYellow:
-	if (Yellow >= 40) goto L_FinishYellow;
-	set Yellow, Yellow + 1;
-	if (Yellow == 10) message strcharinfo(0), "I still need 30 Yellow Boxes.";
-	if (Yellow == 30) message strcharinfo(0), "I need only 10 Yellow Boxes.";
-        getitem 4021, 1;
-	return;
-
-L_GetWhite:
-	if (White >= 30) goto L_FinishWhite;
-	set White, White + 1;
-	if (White == 10) message strcharinfo(0), "I still need 20 White Boxes.";
-	if (White == 20) message strcharinfo(0), "I need only 10 White Boxes.";
-        getitem 4022, 1;
-	return;
-
-L_FinishYellow:
-	message strcharinfo(0), "I collected all the Yellow Boxes!";
-	return;
-
-L_FinishWhite:
-	message strcharinfo(0), "I collected all the White Boxes!";
-	return;
-}
diff --git a/npc/031-3/labyrinth.txt b/npc/031-3/labyrinth.txt
deleted file mode 100755
index 4616891b..00000000
--- a/npc/031-3/labyrinth.txt
+++ /dev/null
@@ -1,487 +0,0 @@
-//#################################################################################
-//#
-//#    Warps for the labyrinth on christmas 2010
-//#
-//#    Authors: alastrim, PjotrOrial
-//#
-//#    reviewed by:
-//#
-//#    This is a labyrinth, having lots of warps in there.
-//#    These warps are activated on different days.
-//#    For each way there are 2 warps: one way and its way back.
-//#    
-//#################################################################################
-
-
-031-3.gat,205,264,0	script	#ChristmasBarrier	127,1,1,{
-    warp "031-3.gat", 149, 261;
-    end;
-}
-
-031-3.gat,149,259,0	script	#ChristmasBarrier	127,1,1,{
-    warp "031-3.gat", 205, 266;
-    end;
-}
-
-// If Donated > 1M < 1.5M - Maze=2
-
-031-3.gat,225,282,0	script	#ChristmasBarrier	127,1,1,{
-    warp "031-3.gat", 274, 299;
-    end;
-}
-
-031-3.gat,274,300,0	script	#ChristmasBarrier	127,1,1,{
-    warp "031-3.gat", 225, 283;
-    end;
-}
-
-// Second Warp
-
-031-3.gat,283,271,0	script	#ChristmasBarrier	127,1,1,{
-    warp "031-3.gat", 269, 244;
-    end;
-}
-
-031-3.gat,269,245,0	script	#ChristmasBarrier	127,1,1,{
-    warp "031-3.gat", 283, 272;
-    end;
-}
-
-031-3.gat,148,150,0	script	#ChristmasBarrier	127,1,1,{
-    warp "031-3.gat", 128, 134;
-    end;
-}
-
-// Third Warp
-031-3.gat,139,258,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 2) goto L_Golbenez;
-    warp "031-3.gat", 155, 196;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,155,195,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 2) goto L_Golbenez;
-    warp "031-3.gat", 139, 259;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// If Donated > 1.5M < 2M - Maze=3
-
-// First Warp
-031-3.gat,142,301,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 97, 298;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,97,301,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 142, 298;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// Second Warp
-031-3.gat,135,196,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 106, 231;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,106,232,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 135, 197;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// Third Warp
-031-3.gat,286,190,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 227, 241;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,227,242,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 286, 191;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// Fourth Warp
-
-031-3.gat,236,211,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 187, 227;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,187,228,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 236, 212;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// If Donated > 2M < 2.5M - Maze=4
-
-// First Warp
-031-3.gat,94,254,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 54, 253;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,54,250,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 94, 257;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// Second Warp
-
-031-3.gat,103,199,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 52, 175;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,52,177,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 103, 201;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// Third Warp
-
-031-3.gat,212,193,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 207, 165;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,207,168,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 212, 195;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// Fourth Warp
-
-031-3.gat,235,167,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 195, 124;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,195,122,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 235, 165;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// If Donated > 2.5M < 3M - Maze=5
-// first warp
-
-031-3.gat,296,97,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 292, 125;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,292,123,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 296, 95;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-// second warp
-031-3.gat,289,164,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 228, 123;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,228,121,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 289, 162;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-// third warp
-031-3.gat,24,157,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 31, 142;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,31,144,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 24, 159;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-// forth warp
-031-3.gat,36,249,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 35, 224;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,35,226,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 5) goto L_Golbenez;
-    warp "031-3.gat", 36, 251;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-
-// If Donated > 3M < 3.5M - Maze=6
-// first warp
-031-3.gat,34,25,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 281, 25;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,281,22,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 34, 28;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-// # second warp
-031-3.gat,283,48,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 275, 74;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,275,73,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 283, 47;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-// # third warp
-031-3.gat,26,178,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 36, 202;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,36,200,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 26, 176;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-
-// If Donated > 3.5M < 4M - Maze=7
-// first warp
-031-3.gat,91,125,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 7) goto L_Golbenez;
-    warp "031-3.gat", 36, 78;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,36,80,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 7) goto L_Golbenez;
-    warp "031-3.gat", 91, 127;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-// # second warp
-031-3.gat,52,78,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 7) goto L_Golbenez;
-    warp "031-3.gat", 192, 72;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-031-3.gat,192,70,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 7) goto L_Golbenez;
-    warp "031-3.gat", 52, 76;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-
-// If Donated > 4M < 5M - Maze=8
-// first warp
-031-3.gat,128,135,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 8) goto L_Golbenez;
-    warp "031-3.gat", 148, 152;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(4000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-// # second warp
-031-3.gat,232,93,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 8) goto L_Golbenez;
-    warp "031-3.gat", 200, 47;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(4000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-031-3.gat,200,50,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 8) goto L_Golbenez;
-    warp "031-3.gat", 232, 90;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(4000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
-}
-
-
-// If Donated > 5M - Maze=9 - You have access to Santa
-
-031-3.gat,120,81,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 9) goto L_Golbenez;
-    warp "031-3.gat", 46, 27;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you are getting close to your objective but you still need to give me " +(5000000-Golbenez_Inn_Cost)+ " Gold Pieces to be able to find Santa.";	
-    end;
-
-}
-031-3.gat,46,24,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 9) goto L_Golbenez;
-    warp "031-3.gat", 120, 79;
-    end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you are getting close to your objective but you still need to give me " +(5000000-Golbenez_Inn_Cost)+ " Gold Pieces to be able to find Santa.";	
-    end;
-
-}
diff --git a/npc/031-3_Cave/_import.txt b/npc/031-3_Cave/_import.txt
new file mode 100644
index 00000000..d28ddba7
--- /dev/null
+++ b/npc/031-3_Cave/_import.txt
@@ -0,0 +1,4 @@
+map: 031-3.gat
+npc: npc/031-3_Cave/_mobs.txt
+npc: npc/031-3_Cave/_warps.txt
+npc: npc/031-3_Cave/labyrinth.txt
diff --git a/npc/031-3_Cave/_mobs.txt b/npc/031-3_Cave/_mobs.txt
new file mode 100644
index 00000000..e5c1ec59
--- /dev/null
+++ b/npc/031-3_Cave/_mobs.txt
@@ -0,0 +1,62 @@
+// 031-3 Cave mobs
+
+031-3.gat,38,50,52,75	monster	Moggun	1061,5,100000,30000,Mob031-3::On1061
+031-3.gat,213,57,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,39,144,52,75	monster	Moggun	1061,5,100000,30000,Mob031-3::On1061
+031-3.gat,39,212,52,75	monster	Moggun	1061,5,100000,30000,Mob031-3::On1061
+031-3.gat,282,142,52,75	monster	Moggun	1061,5,100000,30000,Mob031-3::On1061
+031-3.gat,284,222,52,75	monster	Moggun	1061,5,100000,30000,Mob031-3::On1061
+031-3.gat,99,271,52,75	monster	Moggun	1061,5,100000,30000,Mob031-3::On1061
+031-3.gat,281,58,52,75	monster	Moggun	1061,5,100000,30000,Mob031-3::On1061
+031-3.gat,0,0,0,0	monster	Bat	1017,100,100000,30000,Mob031-3::On1017
+031-3.gat,48,48,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,122,50,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,117,140,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,212,142,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,211,276,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,117,207,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,231,213,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,261,265,83,61	monster	Ice Goblin	1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,280,56,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,121,57,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,120,143,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,218,215,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,285,216,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,128,272,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,212,279,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,141,229,40,9	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,34,288,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,25,166,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,132,160,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,228,37,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,44,73,33,11	monster	yeti	1072,1,100000,30000,Mob031-3::On1072
+
+
+031-3.gat,0,0,0	script	Mob031-3	-1,{
+On1015:
+	set @mobID, 1015;
+	callfunc "MobPoints";
+	break;
+
+On1017:
+	set @mobID, 1017;
+	callfunc "MobPoints";
+	break;
+
+On1058:
+	set @mobID, 1058;
+	callfunc "MobPoints";
+	break;
+
+On1061:
+	set @mobID, 1061;
+	callfunc "MobPoints";
+	break;
+
+On1072:
+	set @mobID, 1072;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/031-3/_warps.txt b/npc/031-3_Cave/_warps.txt
index a15033a1..13bb0b34 100644
--- a/npc/031-3/_warps.txt
+++ b/npc/031-3_Cave/_warps.txt
@@ -1,3 +1,3 @@
-// 031-3 warps
+// 031-3 Cave warps
 
 031-3.gat,212,300	warp	toOutside	-1,-1,031-1.gat,76,26
diff --git a/npc/031-3_Cave/labyrinth.txt b/npc/031-3_Cave/labyrinth.txt
new file mode 100755
index 00000000..89a0623a
--- /dev/null
+++ b/npc/031-3_Cave/labyrinth.txt
@@ -0,0 +1,273 @@
+//#################################################################################
+//#
+//#    Warps for the labyrinth on christmas 2010
+//#
+//#    Authors: alastrim, PjotrOrial
+//#
+//#    reviewed by:
+//#
+//#    This is a labyrinth, having lots of warps in there.
+//#    These warps are activated on different days.
+//#    For each way there are 2 warps: one way and its way back.
+//#    
+//#################################################################################
+
+
+031-3.gat,205,264,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 149, 261;
+    end;
+}
+
+031-3.gat,149,259,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 205, 266;
+    end;
+}
+
+// If Donated > 1M < 1.5M - Maze=2
+
+031-3.gat,225,282,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 274, 299;
+    end;
+}
+
+031-3.gat,274,300,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 225, 283;
+    end;
+}
+
+// Second Warp
+
+031-3.gat,283,271,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 269, 244;
+    end;
+}
+
+031-3.gat,269,245,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 283, 272;
+    end;
+}
+
+031-3.gat,148,150,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 128, 134;
+    end;
+}
+
+// Third Warp
+031-3.gat,139,258,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 155, 196;
+    end;
+}
+
+031-3.gat,155,195,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 139, 259;
+    end;
+}
+
+// First Warp
+031-3.gat,142,301,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 97, 298;
+    end;
+}
+
+031-3.gat,97,301,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 142, 298;
+    end;
+}
+
+// Second Warp
+031-3.gat,135,196,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 106, 231;
+    end;
+}
+
+031-3.gat,106,232,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 135, 197;
+    end;
+}
+
+// Third Warp
+031-3.gat,286,190,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 227, 241;
+    end;
+}
+
+031-3.gat,227,242,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 286, 191;
+    end;
+}
+
+// Fourth Warp
+
+031-3.gat,236,211,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 187, 227;
+    end;
+}
+
+031-3.gat,187,228,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 236, 212;
+    end;
+}
+
+
+
+// First Warp
+031-3.gat,94,254,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 54, 253;
+    end;
+}
+
+031-3.gat,54,250,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 94, 257;
+    end;
+}
+
+// Second Warp
+
+031-3.gat,103,199,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 52, 175;
+    end;
+}
+
+031-3.gat,52,177,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 103, 201;
+    end;
+}
+
+// Third Warp
+
+031-3.gat,212,193,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 207, 165;
+    end;
+}
+
+031-3.gat,207,168,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 212, 195;
+    end;
+}
+
+// Fourth Warp
+
+031-3.gat,235,167,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 195, 124;
+    end;
+}
+
+031-3.gat,195,122,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 235, 165;
+    end;
+}
+
+// If Donated > 2.5M < 3M - Maze=5
+// first warp
+
+031-3.gat,296,97,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 292, 125;
+    end;
+}
+031-3.gat,292,123,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 296, 95;
+    end;
+}
+// second warp
+031-3.gat,289,164,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 228, 123;
+    end;
+}
+031-3.gat,228,121,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 289, 162;
+    end;
+}
+// third warp
+031-3.gat,24,157,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 31, 142;
+    end;
+}
+031-3.gat,31,144,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 24, 159;
+    end;
+}
+// forth warp
+031-3.gat,36,249,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 35, 224;
+    end;
+}
+
+031-3.gat,35,226,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 36, 251;
+    end;
+}
+
+// first warp
+031-3.gat,34,25,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 281, 25;
+    end;
+}
+031-3.gat,281,22,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 34, 28;
+    end;
+}
+// # second warp
+031-3.gat,283,48,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 275, 74;
+    end;
+}
+031-3.gat,275,73,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 283, 47;
+    end;
+}
+// # third warp
+031-3.gat,26,178,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 36, 202;
+    end;
+}
+031-3.gat,36,200,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 26, 176;
+    end;
+}
+
+// first warp
+031-3.gat,91,125,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 36, 78;
+    end;
+}
+031-3.gat,36,80,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 91, 127;
+    end;
+}
+// # second warp
+031-3.gat,52,78,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 192, 72;
+    end;
+}
+
+031-3.gat,192,70,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 52, 76;
+    end;
+}
+
+
+// If Donated > 4M < 5M - Maze=8
+// first warp
+031-3.gat,128,135,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 148, 152;
+    end;
+}
+
+// # second warp
+031-3.gat,232,93,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 200, 47;
+    end;
+}
+031-3.gat,200,50,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 232, 90;
+    end;
+}
+
+031-3.gat,120,81,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 46, 27;
+    end;
+}
+031-3.gat,46,24,0	script	#ChristmasBarrier	127,1,1,{
+    warp "031-3.gat", 120, 79;
+    end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 09c7de0a..f94aa9cf 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -44,7 +44,7 @@ import: npc/018-1_Woodland_mining_camp/_import.txt
 import: npc/018-2_Woodland_mining_camp/_import.txt
 import: npc/018-3_Cave/_import.txt
 import: npc/019-1_Snow_field/_import.txt
-import: npc/019-3_Snow_field/_import.txt
+import: npc/019-3_Snow_Cave/_import.txt
 import: npc/020-1_Nivalis/_import.txt
 import: npc/020-2_Nivalis/_import.txt
 import: npc/020-3_Ice_cave/_import.txt
@@ -64,5 +64,5 @@ import: npc/029-1_Candor/_import.txt
 import: npc/029-3_Fight_Cave/_import.txt
 import: npc/030-1_Snow_field/_import.txt
 import: npc/031-1_NivalisPort/_import.txt
-import: npc/031-3/_import.txt
+import: npc/031-3_Cave/_import.txt
 import: npc/botcheck/_import.txt
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt
index 07f05247..ae83968f 100644
--- a/npc/functions/clear_vars.txt
+++ b/npc/functions/clear_vars.txt
@@ -23,7 +23,7 @@ function	script	ClearVariables	{
 	set HWQUEST18, 0;
 	set HWQUEST19, 0;
 	set HWQUEST20, 0;
-	
+
 	// Christmas 2006
 	set XMASQUEST1, 0;
 	set XMASQUEST2, 0;
@@ -45,26 +45,57 @@ function	script	ClearVariables	{
 	set XMASQUEST18, 0;
 	set XMASQUEST19, 0;
 	set XMASQUEST20, 0;
-	
+
 	set QUEST_xmas07_state, 0;
 	set QUEST_xmas07_milk, 0;
 	set QUEST_xmas07_cookies, 0;
 	set QUEST_xmas07_presents, 0;
-	
+
 	set QUEST_Easter08_state, 0;
-	
+
 	set Halloween08, 0;
-	
+
 	set QUEST_xmas08_state, 0;
-	
+
 	set QUEST_Easter09, 0;
-	
+
 	set Candyman, 0; // Halloween 2009
-	
+
 	set QUEST_Christmas09_state, 0;
-	
+
+	 set QUEST_Easter09_slots, 0;
+
+	// easter 2010
+	// This must not be cleared: since some people would like to go to the easter island!
+	// set Easter_2010_QuestState, 0;
+	set Easter_2010_EggState1, 0;
+	set Easter_2010_EggState2, 0;
+	set Easter_2010_EggState3, 0;
+	set Easter_2010_EggState4, 0;
+	set Easter_2010_EggState5, 0;
+
+	// halloween 2010
+	set hween10, 0;
+	set hween10_collect_canpump, 0;
+	set hween10_credits, 0;
+	set hween10_collect, 0;
+	set hween10_collect_mmallow, 0;
+	set hween10_collect_jelskul, 0;
+	set hween10_bonecount, 0;
+	set hween10_collect_tondel, 0;
+	set hween10_paid, 0;
+
+	// Xmas 2010:
+	set Count_Yellow, 0;
+	set Count_White, 0;
+	set Maze, 0;
+	set Yellow, 0;
+	set White, 0;
+	set Xmas2010, 0;
+	set Golbenez_Inn_Cost, 0;
+
 	if (#BankAccount < 0) goto FixBank;
-	
+
 	return;
 
 FixBank:
@@ -81,7 +112,7 @@ L_Fix_Full:
 	return;
 //Tulimshar and Mine Variables
 	set Scorp, 0;
-	set Bugleg, 0; 
+	set Bugleg, 0;
 	set ChestQuest, 0;
-	
+
 }
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 26a91829..42622c1b 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -79,4 +79,4 @@ import: npc/_import.txt
 // Halloween 2010
 // npc: npc/halloween/2010/gak.txt
 
-import: npc/xmas/2010/_import.txt
+// import: npc/xmas/2010/_import.txt
diff --git a/tools/showvars.py b/tools/showvars.py
new file mode 100755
index 00000000..4b3d0cb4
--- /dev/null
+++ b/tools/showvars.py
@@ -0,0 +1,81 @@
+#!/usr/bin/python
+
+
+# must be started in the npc dir
+
+import os
+import re
+from optparse import OptionParser
+parser = OptionParser()
+parser.add_option("-v", "--verbose", dest="verbose", action="store_true", default=False,
+                  help="show the occurrences of that var", metavar="FILE")
+
+(options, args) = parser.parse_args()
+
+def handleFile(fname):
+	f = open(fname)
+	lines = f.readlines();
+	f.close()
+	for l in lines:
+		#remove comments
+		line = l.split(r"//")[0]
+
+		sp = line.split()
+
+		# no set command?
+		if not "set" in sp:
+			continue
+
+		# ignore those lines printing messages
+		if 'mes "' in line:
+			continue
+
+		#ignore anything before the "set" command:
+		sp = sp[sp.index("set")+1:]
+		line = "".join(sp)
+		endpos = line.find(",")
+
+		#check for comma
+		if endpos>0:
+			#ok its a oneliner, the comma is in the same line:
+			varname = line[0:endpos].strip()
+			if varname.startswith("@"):
+				continue
+			if varname.startswith("$"):
+				continue
+			if varname in allvars:
+				if not fname in allvars[varname]:
+					allvars[varname] += [fname]
+			else:
+				allvars[varname] = [fname]
+		else:
+			# ok error, you need to check manually:
+			print "\tline:\t",line
+
+allvars = {}
+
+print "please check manully for vars in here:"
+os.chdir(".."+os.sep+"npc")
+for tpl in os.walk("."):
+	for fname in tpl[2]:
+		handleFile(tpl[0]+os.sep+fname)
+
+# now check if the variable is not in npc/functions/clear_vars.txt, if so remove it
+checkstring = "." + os.sep + "functions" + os.sep + "clear_vars.txt"
+rm = []
+for var in allvars:
+	if checkstring in allvars[var]:
+		rm += [var]
+
+#now really remove these vars
+for var in rm:
+	del allvars[var]
+
+print "These variables are valid variables of the scripts:"
+for var in allvars:
+	print "\t",var
+	if options.verbose:
+		for fname in allvars[var]:
+			print "\t","\t", fname
+
+print "number of vars:", len(allvars)