4 files changed, 73 insertions, 51 deletions
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
index 855671ad..e389a836 100644
--- a/npc/019-1_Snow_field/_import.txt
+++ b/npc/019-1_Snow_field/_import.txt
@@ -2,6 +2,6 @@ map: 019-1.gat
 npc: npc/019-1_Snow_field/_mobs.txt
 npc: npc/019-1_Snow_field/_warps.txt
 npc: npc/019-1_Snow_field/monsters.txt
-npc: npc/019-1_Snow_field/santa.txt
+npc: npc/019-1_Snow_field/santa_helper.txt
 npc: npc/019-1_Snow_field/snowman.txt
 npc: npc/019-1_Snow_field/taro.txt
diff --git a/npc/019-1_Snow_field/santa.txt b/npc/019-1_Snow_field/santa.txt
deleted file mode 100644
index 01481d67..00000000
--- a/npc/019-1_Snow_field/santa.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-019-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/019-1_Snow_field/santa_helper.txt b/npc/019-1_Snow_field/santa_helper.txt
new file mode 100644
index 00000000..a8a86af6
--- /dev/null
+++ b/npc/019-1_Snow_field/santa_helper.txt
@@ -0,0 +1,65 @@
+019-1.gat,74,75,0	script	Santa's Helper	105,{
+	if (ChristmasQuest2 == 1) goto L_Done;
+	mes "[Santa's Helper]";
+	mes "\"Hello my young friend.";
+	mes "Would you like to help me?\"";
+	next;
+	mes "[Santa's Helper]";
+	mes "\"Those monsters stole Santa's 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's Helper]";
+	mes "\"Hmm, let me check what you have.\"";
+	next;
+	if (countitem(515) < 25) goto L_NoItem;
+	if (countitem(516) < 20) goto L_NoItem;
+	if (countitem(538) < 5) goto L_NoItem;
+	getinventorylist;
+	if (@inventorylist_count > 99) goto L_TooMany;
+	mes "[Santa's Helper]";
+	mes "\"Great! Here is something for you\"";
+	delitem 515, 25;
+	delitem 516, 20;
+	delitem 538, 5;
+	getitem 564, 1;
+	set ChristmasQuest2,1;
+	close;
+
+L_R:
+	mes "[Santa's Helper]";
+	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's Helper]";
+	mes "\"Enjoy your holidays and I wish you an happy Christmas!\"";
+	close;
+
+L_NoItem:
+	mes "[Santa's Helper]";
+	mes "\"You dont seem to have enough presents.\"";
+	close;
+
+L_Done:
+        mes "[Santa's Helper]";
+	mes "\"All the children got their Christmas presents.";
+        mes "Thank you for your help.\"";
+        close;
+
+L_TooMany:
+        mes "[Santa's Helper]";
+	mes "\"It doesn't look like you have room for this. Come back later.\"";
+        close;
+}
diff --git a/npc/019-1_Snow_field/snowman.txt b/npc/019-1_Snow_field/snowman.txt
index 1f56e4f2..ca8c1f09 100644
--- a/npc/019-1_Snow_field/snowman.txt
+++ b/npc/019-1_Snow_field/snowman.txt
@@ -24,6 +24,8 @@ L_Sure:
 	if(countitem(510) < 15) goto L_NoItem;
 	if(countitem(509) < 10) goto L_NoItem;
 	if(countitem(502) < 5) goto L_NoItem;
+	getinventorylist;
+	if (@inventorylist_count > 99) goto L_TooMany;
 	delitem 510, 15;
 	delitem 509, 10;
 	delitem 502, 5;
@@ -51,4 +53,9 @@ L_Done:
 	mes "[Snowman]";
 	mes "\"Thank you for help!\"";
 	close;
+
+L_TooMany:
+	mes "[Snowman]";
+	mes "\"It doesn't look like you have room for this. Come back later.\"";
+	close;
 }