removed debug functionality from christmas scripts.

2 files changed, 22 insertions, 44 deletions

diff --git a/npc/xmas2007/after-xmas.txt b/npc/xmas2007/after-xmas.txt
index 58a31cc0..d849635c 100644
--- a/npc/xmas2007/after-xmas.txt
+++ b/npc/xmas2007/after-xmas.txt
@@ -6,10 +6,10 @@ new_11-1.gat,78,85,0	script	Santa	105,{
 	mes "were very nice to me. So many";

 	mes "milk and cookies for me...";

 	next;

-	

+

 	if (QUEST_xmas07_milk + QUEST_xmas07_cookies == 0) goto L_Nothing;

 	if (QUEST_xmas07_milk + QUEST_xmas07_cookies < 10) goto L_Notenough;

-	

+

 	set @leastItems, $QUEST_xmas07_milk;

 	if ($QUEST_xmas07_milk > $QUEST_xmas07_cookies) set @leastItems, $QUEST_xmas07_cookies;

         if (@leastItems >=    100) set @presents, 1;

@@ -26,25 +26,23 @@ new_11-1.gat,78,85,0	script	Santa	105,{
 	if (@leastItems >= 204800) set @presents, 12;

 	if (@leastItems >= 409600) set @presents, 13;

 	if (@leastItems >= 819200) set @presents, 14;

-        

-        

+

+

 	mes "[Santa Clause]";

 	mes "Now you deserve your presents. I got";

 	mes @presents + " presents for you. Do you";

 	mes "want them now?";

 	next;

 	menu "Yes! Presents! Presents! Presents!", -, "No, maybe later.", L_Close;

-	

-	//DEBUG - REMOVE BEFORE RELEASE!

-	set QUEST_xmas07_presents, 0;

-	

+

+

 	L_Givepresent:

 	if (@presents == QUEST_xmas07_presents) goto L_Enoughpresents;

-	

+

 	mes "[Santa Clause]";

 	mes "Let's see what I got for you in my sack....";

 	next;

-	

+

 	set QUEST_xmas07_presents, QUEST_xmas07_presents + 1;

 	set @TEMP,rand(7);

         if(@TEMP == 0) goto L_present_0;

@@ -54,71 +52,71 @@ new_11-1.gat,78,85,0	script	Santa	105,{
 	if(@TEMP == 4) goto L_present_4;

 	if(@TEMP == 5) goto L_present_5;

 	if(@TEMP == 6) goto L_present_6;

-	

-	

+

+

 	L_Enoughpresents:

 	mes "[Santa Clause]";

 	mes "That's all I got for you.";

 	mes "Merry Christmas!";

 	set QUEST_xmas07_state, 2;

 	close;

-	

+

 	L_present_0:

 	mes "[Santa Clause]";

 	mes "Here you got a new funky hat!";

 	getitem 628, 1;

 	next;

 	goto L_Givepresent;

-	

+

 	L_present_1:

 	mes "[Santa Clause]";

 	mes "Here you got a pompouse top hat!";

 	getitem 627, 1;

 	next;

 	goto L_Givepresent;

-	

+

 	L_present_2:

 	mes "[Santa Clause]";

 	mes "Here you got a funny elven hat!";

 	getitem 633, 1;

 	next;

 	goto L_Givepresent;

-	

+

 	L_present_3:

 	mes "[Santa Clause]";

 	mes "Here you got a creepy face mask!";

 	getitem 634, 1;

 	next;

 	goto L_Givepresent;

-	

+

 	L_present_4:

 	mes "[Santa Clause]";

 	mes "Here you got a stylish mushroom hat!";

 	getitem 629, 1;

 	next;

 	goto L_Givepresent;

-	

+

 	L_present_5:

 	mes "[Santa Clause]";

 	mes "Here you got an evil mushroom hat!";

 	getitem 630, 1;

 	next;

 	goto L_Givepresent;

-	

+

 	L_present_6:

 	mes "[Santa Clause]";

 	mes "Here you got a beautiful skirt!";

 	getitem 632, 1;

 	next;

 	goto L_Givepresent;

-	

+

 	L_State2:

 	mes "[Santa Clause]";

 	mes "Ho! Ho! Ho!";

 	mes "I hope you like your presents.";

 	mes "See you next year.";

 	close;

-	

+

 	L_Notenough:

 	mes "[Santa Clause]";

 	mes "But you did nothing to help. You";

@@ -126,7 +124,7 @@ new_11-1.gat,78,85,0	script	Santa	105,{
 	mes "want a present while others did";

 	mes "all the work? get lost!";

 	close;

-	

+

 	L_Nothing:

 	mes "[Santa Clause]";

 	mes "But you did nothing to help. You";

@@ -134,9 +132,9 @@ new_11-1.gat,78,85,0	script	Santa	105,{
 	mes "others did all the work.";

 	mes "Get lost!";

 	close;

-	

+

 	L_Close:

 	close;

-	

+

 

 }
\ No newline at end of file
diff --git a/npc/xmas2007/pre-xmas.txt b/npc/xmas2007/pre-xmas.txt
index 632120f6..aa33841b 100644
--- a/npc/xmas2007/pre-xmas.txt
+++ b/npc/xmas2007/pre-xmas.txt
@@ -222,23 +222,3 @@ new_11-1.gat,76,85,0	script	Assistant	105,{
 	L_Close:

 	close;

 }

-

-new_11-1.gat,74,85,0	script	Debug	105,{

-	menu "Give 10 milk", L_10milk, "Give 10 cookie", L_10cookie, "Double milk", L_2xmilk, "Double cookies", L_2xcookie, "Reset", L_Reset;

-

-	L_10milk:

-	getitem 527, 10;

-	close;

-	L_10cookie:

-	getitem 635, 10;

-	close;

-	L_2xmilk:

-	getitem 527, countitem(527);

-	close;

-	L_2xcookie:

-	getitem 635, countitem(635);

-	close;

-	L_Reset:

-	set $QUEST_xmas07_cookies, 0;

-	set $QUEST_xmas07_milk, 0;

-}
\ No newline at end of file