Updated Bunny Band and Mr. Smile quests.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11800 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 294 insertions, 151 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f122f3cc4..6f7d7822f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/11/25
+	* 11800 Updated Bunny Band and Mr. Smile quests. [L0ne_W0lf]
 	* Fixed an NPC error in lutie quest file (scrap " left behind.) [l0ne_W0lf]
 	* Changed item names to item IDs on some scripts. [Samuray22]
 2007/11/24
diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index b04d28dd8..b34adf90f 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -3,96 +3,220 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= v1.4
+//= v1.5
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Quest to obtain a Bunny Band headgear.
 //===== Additional Comments: ================================= 
-//= 1.1 using duplicate command
-//= 1.2 Fixed NPC location, removed NPC dupes [Lupus]
-//= 1.3 RE-Fixed exploit V_V, also cleared used VAR [Lupus]
-//= 1.4 replaced BUNYBND with @BUNYBND [Lupus]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//	Changed @BUNYBAN back to a BUNYBAND, it hsoudl be this way.
+//	Removed duplicates. NPC is ALberta-only.
 //============================================================ 
 
-
-// Alberta ------------------------------------------------------------------------------------------------------------------------------------------
-alberta,23,232,1	script	Kafra Corp. Rep.#1::KCRep	83,{
-	mes "[Kafra Corp. Rep.]";
-	if (@BUNYBND) goto L_Check;
-	mes "^529DFFSpecial Event, ^FF0000Bunny Band ^529DFFQuest!!^000000";
-	next;
-	menu "Information",-, "Join",M_Join, "Cancel",M_End;
-
-		mes "[Kafra Corp. Rep.]";
-		mes "To thank our customers for using the Kafra Corp. services, we have prepapred a small event for them...";
-		next;
-		mes "[Kafra Corp. Rep.]";
-		mes "The ^FF0000Bunny Band ^529DFFquest!!!^000000. (Sponsered by: The Alberta Merchant Association.)";
-		mes "This quest allows players to obtain the ultra-rare ^FF0000Bunny Band^000000!";
+alberta,26,229,0	script	Kafra Employee#bunny	83,{
+	if (BUNYBND == 1) {
+		mes "[Kafra Employee]";
+		mes "Hello there~!";
+		mes "How'd you like to";
+		mes "participate in Kafra";
+		mes "Corporation's special";
+		mes "^529DFFBunny Band Event^000000?";
 		next;
-		mes "[Kafra Corp. Rep.]";
-		mes "All you have to do is collect a number of items and bring them to a Kafra Corp. representative such as myself.";
-		mes "We will then carefully handmake a Bunny Band for you on the spot!";
-		next;
-		mes "[Kafra Corp. Rep.]";
-		mes "Here are the items that you will need for the Bunny Band.";
-		mes "^5555FF100 Feather^000000,";
-		mes "^5555FF1 Four Leaf Clover^000000,";
-		mes "^5555FF1 Pearl^000000,";
-		mes "^5555FF1 Kitty Band^000000.";
+		switch(select("Sure, I brought the items.:Event Information:Cancel")) {
+		case 1:
+			mes "[Kafra Employee]";
+			mes "Alrighty~";
+			mes "Let me check to";
+			mes "see if you brought";
+			mes "all the items...";
+			next;
+			if (countitem(949) < 100) {
+				mes "[Kafra Employee]";
+				mes "Ooh, I'm sorry";
+				mes "but you need to";
+				mes "bring at least";
+				mes "100 Feathers.";
+				close;
+			}
+			if (countitem(706) == 0) {
+				mes "[Kafra Employee]";
+				mes "Ooh, I'm sorry";
+				mes "but you need to";
+				mes "bring at least";
+				mes "1 Four-Leaf Clover.";
+				close;
+			}
+			if (countitem(722) == 0) {
+				mes "[Kafra Employee]";
+				mes "Ooh, I'm sorry";
+				mes "but you need to";
+				mes "bring at least";
+				mes "1 Pearl.";
+				close;
+			}		
+			if (countitem(2213) == 0) {
+				mes "Ooh, I'm sorry";
+				mes "but you need to";
+				mes "bring at least";
+				mes "1 Kitty Band.";
+				close;
+			}
+			mes "[Kafra Employee]";
+			mes "Great, I see that";
+			mes "you've gathered";
+			mes "everything I need to";
+			mes "make the Bunny Band.";
+			mes "Please wait a moment";
+			mes "while I put it together...";
+			next;
+			if (countitem(949) < 100) {
+				mes "[Kafra Employee]";
+				mes "Hm? I'm sorry,";
+				mes "but I actually can't";
+				mes "make this right now.";
+				mes "You need 100 Feathers";
+				mes "in order for me to put this";
+				mes "Bunny Band together...";
+				close;
+			}
+			if (countitem(706) < 1) {
+				mes "[Kafra Employee]";
+				mes "Hm? I'm sorry,";
+				mes "but I actually can't";
+				mes "make this right now. You";
+				mes "need 1 Four-Leaf Clover";
+				mes "in order for me to put this";
+				mes "Bunny Band together...";
+				close;
+			}
+			if (countitem(722) < 1) {
+				mes "[Kafra Employee]";
+				mes "Hm? I'm sorry,";
+				mes "but I actually can't";
+				mes "make this right now.";
+				mes "You need 1 Pearl in";
+				mes "order for me to put this";
+				mes "Bunny Band together...";
+				close;
+			}
+			if (countitem(2213) < 1) {
+				mes "[Kafra Employee]";
+				mes "Hm? I'm sorry,";
+				mes "but I actually can't";
+				mes "make this right now.";
+				mes "You need 1 Kitty Band";
+				mes "in order for me to put this";
+				mes "Bunny Band together...";
+				close;
+			}
+			delitem 949,100; //Feather
+			delitem 706,1; //Four_Leaf_Clover
+			delitem 722,1; //Scarlet_Jewel
+			delitem 2213,1; //Cat_Hairband
+			mes "[Kafra Employee]";
+			mes "Ah, here you go~";
+			mes "The perfect Bunny Band!";
+			mes "Well, I hope you enjoy it.";
+			getitem 2214,1; //Bunny_Band
+			set BUNYBND,0;
+			next;
+			mes "[Kafra Employee]";
+			mes "Thank you for";
+			mes "participating in this";
+			mes "special event and your";
+			mes "continued patronage";
+			mes "of the Kafra Services~";
+			close;
+		case 2:
+			mes "[Kafra Employee]";
+			mes "To thank our valued";
+			mes "customers, Kafra Corporation";
+			mes "has prepared a special event";
+			mes "where Kafra Employee will assemble";
+			mes "Bunny Bands for adventurers";
+			mes "who bring the required items.";
+			next;
+			mes "[Kafra Employee]";
+			mes "For this special,";
+			mes "one of a kind item,";
+			mes "bring 100 Feathers,";
+			mes "1 Four-Leaf Clover,";
+			mes "1 Kitty Band and";
+			mes "1 Pearl.";
+			next;
+			mes "[Kafra Employee]";
+			mes "When you're ready,";
+			mes "come back and bring";
+			mes "those items to me.";
+			mes "(Sponsored by the";
+			mes "Alberta Merchant Guild).";
+			close;
+		case 3:
+			close;
+		}
+	}
+	mes "[Kafra Employee]";
+	mes "Hi there~! Would you like";
+	mes "to join our special ^529DFFBunny";
+	mes "Band Event^000000 hosted by the Kafra";
+	mes "Corporation and sponsored by";
+	mes "the Alberta Merchant Guild?";
+	next;
+	switch(select("Join the Event:Event Information:Cancel")) {
+	case 1:
+		set BUNYBND,1;
+		mes "[Kafra Employee]";
+		mes "Great! Thanks for";
+		mes "participating! If you";
+		mes "haven't already heard,";
+		mes "you need to collect these";
+		mes "items if you want me put a";
+		mes "Bunny Band together for you...";
 		next;
-		mes "[Kafra Corp. Rep.]";
-		mes "When you've collected all of the items, just speak with any Kafra Corp. representative like myself.";
-		mes "We can be found in every town across Rune Midgard.";
-		close;
-
-	M_Join:
-
-		mes "[Kafra Corp. Rep.]";
-		mes "Thank you for participating in the event. Please come back when you have gathered all of the items.";
-		set @BUNYBND, 1;
+		mes "[Kafra Employee]";
+		mes "100 Feathers,";
+		mes "1 Four-Leaf Clover,";
+		mes "1 Kitty Band and";
+		mes "1 Pearl. That's it!";
+		mes "Good luck and I'll be";
+		mes "waiting for you here~";
 		close;
-
-	M_End:
-		mes "[Kafra Corp. Rep.]";
-		mes "Have a nice day.";
-		close;
-
-	L_Check:
-		if(countitem(949)<100 || countitem(706)<1 || countitem(722)<1 || countitem(2213)<1) goto sL_NoItems;
-		delitem 949,100;
-		delitem 706,1;
-		delitem 722,1;
-		delitem 2213,1;
-		mes "Wow! Well-done, well-done! You've got every single item! I will make the Bunny Band for you right away...";
-		emotion e_no1;
+	case 2:
+		mes "[Kafra Employee]";
+		mes "To thank our valued";
+		mes "customers, Kafra Corporation";
+		mes "has prepared a special event";
+		mes "where Kafra Employee will assemble";
+		mes "Bunny Bands for adventurers";
+		mes "who bring the required items.";
 		next;
-		mes "[Kafra Corp. Rep.]";
-		mes "Tah dah!!! Here is your ^FF0000Bunny Band^000000... Please take it!";
-		getitem 2214,1;
-		set @BUNYBND,0;
+		mes "[Kafra Employee]";
+		mes "For this special,";
+		mes "one of a kind item,";
+		mes "bring 100 Feathers,";
+		mes "1 Four-Leaf Clover,";
+		mes "1 Kitty Band and";
+		mes "1 Pearl.";
 		next;
-		mes "[Kafra Corp. Rep.]";
-		mes "We appreciate your participation in this special event. Thank you and enjoy your Bunny Band!";
+		mes "[Kafra Employee]";
+		mes "When you're ready,";
+		mes "come back and bring";
+		mes "those items to me.";
+		mes "(Sponsored by the";
+		mes "Alberta Merchant Guild).";
 		close;
-
-		sL_NoItems:
-			mes "Here are the items that you will need for the Bunny Band.";
-			mes "^5555FF100 Feather^000000,";
-			mes "^5555FF1 Four Leaf Clover^000000,";
-			mes "^5555FF1 Pearl^000000,";
-			mes "^5555FF1 Kitty Band^000000.";
-			close;
-
+	case 3:
+		close;
+	}
 }
 
-
-// Geffen ------------------------------------------------------------------------------------------------------------------------------------------
-//geffen,116,62,2	duplicate(KCRep)	Kafra Corp. Rep.#2	83,
-// Morroc ------------------------------------------------------------------------------------------------------------------------------------------
-//morocc,154,97,4	duplicate(KCRep)	Kafra Corp. Rep.#3	83,
-// Payon ------------------------------------------------------------------------------------------------------------------------------------------
-//payon,184,104,4	duplicate(KCRep)	Kafra Corp. Rep.#4	83,
-// Prontera ------------------------------------------------------------------------------------------------------------------------------------------
-//prontera,146,87,6	duplicate(KCRep)	Kafra Corp. Rep.#5	83,
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.1 using duplicate command
+//= 1.2 Fixed NPC location, removed NPC dupes [Lupus]
+//= 1.3 RE-Fixed exploit V_V, also cleared used VAR [Lupus]
+//= 1.4 replaced BUNYBND with @BUNYBND [Lupus]
+//============================================================ 
diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt
index 5f8f3c6ef..e3d7f5eda 100644
--- a/npc/quests/mrsmile.txt
+++ b/npc/quests/mrsmile.txt
@@ -3,90 +3,108 @@
 //===== By: ================================================== 
 //= kobra_k88, Akaru
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
-//= 
+//= [Aegis Conversion]
+//= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
 //===== Additional Comments: ================================= 
-//= Fully working. 1.1 Optimized
-//= 1.2 updated Payon coords [Lupus]
-//= 1.3 fixed exploit [Lupus]
+//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
-
-
-// Alberta ------------------------------------------------------------------------------------------
-alberta,113,53,3	script	Smile Assistance::SmileAT	92,{
-	mes "[Smile Assistant]";
-	mes "Hi, I'm a Smile Assistance.  How may I help you?";
+prontera,157,187,4	script	Smile Assistance#prt::SmileHelper	92,{
+	mes "[Smile Girl]";
+	mes "Hi ~ Hi ~";
+	mes "This is Smile Assistance.";
+	mes "How may I help you ?";
 	next;
-	menu "^0099FFMr. Smile^000000?",M_0, "Construct a ^0099FFMr. Smile^000000",M_1, "Quit",M_End;
-	
-	M_0:
-		mes "[Smile Assistant]";
-		mes "Oh, the Mr. Smile Event is a nationwide event that is being sponsered by ^0099FFHis Majesty Tristram the 3rd^000000.";
-		mes "The goal of the event is to get the citizens of Rune Midgard to put on happy looking Mr. Smile masks.";
-		next;
-		mes "[Smile Assistance]";
-		mes "By having this event, His Majesty wishes to encourage the people of Rune Midgard to have more fun and enjoy themselves!";
-		mes "As you may have guessed, the Mr. Smile mask is simply a smiley face.";
-		next;
-		mes "[Smile Assistance]";
-		mes "Although it may be simple, no one can argue the power of a smile! And if everybody in the kingdom were to wear one....";
-		mes "just imagine how much joy and cheer the world would see!";
-		next;
-		mes "[Smile Assistant]";
-		mes "As a Smile Assistant, it is my job to make a Mr. Smile mask for all of those who want one.";
-		mes "All I need to make the mask are some little items, namely:";
-		mes "^5555FF10 Jellopy^000000";
-		mes "^5555FF10 Fluff^000000";
-		mes "^5555FF10 Clover^000000";
-		next;
+	switch(select("^3355FFMr. Smile^000000 ?:Construct ^3355FFMr. Smile^000000 :Quit")) {
+	case 1:
 		mes "[Smile Girl]";
-		mes "The world could use more smiles so get those items and come back soon.  I'll be waiting right here.";
-		close;
-	M_1:
-		mes "[Smile Assistant]";
-		if(countitem(705) < 10 || countitem(909) < 10 || countitem(914) < 10) goto sL_NoItems;
-		delitem 705,10;
-		delitem 909,10;
-		delitem 914,10;
-		mes "Oh, great! You've brought back all of the items needed.  Wait just a sec while I get your Mr. Smile ready.....";
+		mes "National Event held by the command of ^5577FFHis majesty Tristram the 3rd^000000,";
+		mes "that intends to encourage the nation of the Rune-Midgarts Kingdom";
+		mes " to play in more enjoyable atmosphere!";
+		mes "I am ^3355FF' Smile Assistance '^000000,";
+		mes ".. who leads the national event under the name of ";
+		mes "^3355FFSmile throughout the Rune-Midgarts Kingdom~^000000";
 		next;
-		mes "~!shook!~!shook!~!clack!~!clack!~!tok!~!tok!~";
-		next;
-		mes "[Smile Assistant]";
-		mes "Here ya go, your very own Mr. Smile!";
-		getitem 2278,1;
+		mes "[Smile Girl]";
+		mes "With simple and easy-to-get items,";
+		mes "I can provide you";
+		mes "^3355FF' Mr. Smile '^000000.";
+		mes "The requirements are followings.";
 		next;
-		mes "[Smile Assistant]";
-		mes "The Mr. Smile Event is just one of the many ways His Majesty Tristam the 3rd is trying to make life more enjoyable here in Rune Midgard.";
+		mes "[Smile Girl]";
+		mes "^3355FF10 Jellopy^000000";
+		mes "^3355FF10 Fluff^000000";
+		mes "^3355FF10 Clover^000000";
 		next;
-		mes "[Smile Assistant]";
-		mes "Hopefully you will be reminded of that fact everytime you put on your Mr. Smile.";
+		mes "[Smile Girl]";
+		mes "With this event";
+		mes "Everybody will be happy and smile,";
+		mes "getting together with other people,";
+		mes "And will try to make Ragnarok the most enjoyable game in the world.";
 		close;
-	
-		sL_NoItems:
-			mes "Oh... Unfortunately you don't have enough items for a Mr. Smile.  What you need are:";
-			mes "^5555FF10 Jellopy^000000,";
-			mes "^5555FF10 Fluff^000000,";
-			mes "^5555FF10 Clover^000000,";
-			mes "I'll be waiting here so hurry back.";
+	case 2:
+		if (countitem(909) > 9 && countitem(914) > 9 && countitem(705) > 9) {
+			mes "[Smile Girl]";
+			mes "Congratulations !";
+			mes "Now please take this Mr.Smile.";
+			next;
+			delitem 909,10; //Jellopy
+			delitem 914,10; //Fluff
+			delitem 705,10; //Clover
+			getitem 2278,1; //Mr_Smile
+			mes "[Smile Girl]";
+			mes "His majesty,Tristram the 3rd";
+			mes "has promised to try his best to make Ragnarok better and more enjoyable.";
+			next;
+			mes "The fact mentioned above";
+			mes "was announced by";
+			mes "the Public Information Bureau of the Rune-Midgarts Kingom.";
+			close;
+		}
+		else {
+			mes "[Smile Girl]";
+			mes "Oh - unfortunately";
+			mes "You have not brought";
+			mes "enough items for Mr. Smile.";
+			mes "^3355FF10 Jellopy^000000";
+			mes "^3355FF10 Fluff^000000";
+			mes "^3355FF10 Clover^000000";
+			mes "Please check the requirements above.";
 			close;
-	M_End:
+		}
+	case 3:
+		mes "[Smile Girl]";
+		mes "Thank you for visiting us.";
+		mes "We ..";
+		mes "The Rune-Midgarts Kingdom";
+		mes "always try to make Ragnarok";
+		mes "better and more enjoyable game.";
+		next;
+		mes "[Smile Girl]";
+		mes "We sincerely ask you";
+		mes "to cooperate.";
+		mes "The fact mentioned above";
+		mes "was announced by the Public Information Bureau of the Rune-Midgarts Kingom.";
 		close;
+	}
 }
 
-// Aldebaran --------------------------------------------------------------------------------
-aldebaran,136,135,4	duplicate(SmileAT)	Smile Assistance#2	92
-// Geffen -----------------------------------------------------------------------------------
-geffen,119,107,4	duplicate(SmileAT)	Smile Assistance#3	92
-// Izlude -----------------------------------------------------------------------------------
-izlude,129,118,4	duplicate(SmileAT)	Smile Assistance#4	92
-// Morroc -----------------------------------------------------------------------------------
-morocc,158,97,4	duplicate(SmileAT)	Smile Assistance#5	92
-// Payon ------------------------------------------------------------------------------------
-payon,168,225,4	duplicate(SmileAT)	Smile Assistance#6	92
-// Prontera ---------------------------------------------------------------------------------
-prontera,157,187,4	duplicate(SmileAT)	Smile Assistance#7	92
+// Additional Smile Assistance staff
+morocc,158,97,4	duplicate(SmileHelper)	Smile Assistance#moc	92
+aldebaran,136,135,4	duplicate(SmileHelper)	Smile Assistance#alde	92
+geffen,119,107,4	duplicate(SmileHelper)	Smile Assistance#gef	92
+alberta,113,53,4	duplicate(SmileHelper)	Smile Assistance#alb	92
+payon,186,104,5	duplicate(SmileHelper)	Smile Assistance#pay	92
+izlude,129,118,4	duplicate(SmileHelper)	Smile Assistance:iz	92
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= Fully working. 1.1 Optimized
+//= 1.2 updated Payon coords [Lupus]
+//= 1.3 fixed exploit [Lupus]
+//============================================================