> Reorganization:

* Cleaned up "Custom Scripts" configuration file (scripts_custom.conf)
* Moved "Event King Items" scripts from events to quests (custom\quests\kings_items.txt)
* Moved "p_track" from events to etc (custom\etc\p_track.txt)
* Renamed "lvl99_quest" to "jewel_case" for easier identification (custom\quests\jewel_case.txt)
* Deleted "2006_dogs_year" event script (pointless and incomplete)

> Script changes:
* Cleaned/standardized "Valentine Event Script" (events\valentinesday.txt)
* Cleaned "Slotted Sunglasses Quest" (custom\quests\sunglasses.txt)
* Optimized "Lord Kaho's Horns Quest" (custom\quests\kahohorn.txt)
* Cleaned and optimized "Balmung & Lord Kaho's Horns Quest" (custom\quests\kaho_balmung.txt)

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

10 files changed, 228 insertions, 446 deletions

diff --git a/npc/custom/events/p_track.txt b/npc/custom/etc/p_track.txt
index 87794ac28..87794ac28 100644
--- a/npc/custom/events/p_track.txt
+++ b/npc/custom/etc/p_track.txt
diff --git a/npc/custom/events/2006_dogs_year.txt b/npc/custom/events/2006_dogs_year.txt
deleted file mode 100644
index 494fbb3bc..000000000
--- a/npc/custom/events/2006_dogs_year.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-//===== rAthena Script =======================================
-//= Eastern New Year 2006 The Year Of The Fire Dog
-//===== By: ==================================================
-//= Lupus (1.0)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN; 5000+ (with 'disguise' command)
-//===== Description: =========================================
-//= Custom event: For 28-29 January
-//===== Additional Comments: =================================
-//= 1.0 Tested, fully working.[Lupus]
-//=     Add some national info in English if you can.
-//=    (Mine was in Russian, and it's damn hard to translate 8)
-//= 1.1 Commented out monster spawn as it is a custom mob and [L0ne_W0lf]
-//=     not in the mob database.
-//============================================================
-
-prontera,149,167,6	script	Maria	81,{
-	mes "[Maria]";
-	//month
-	if((gettime(6)==1 && (gettime(5)==28 || gettime(5)==29))==0) {
-		mes "Happy New Year Of The Fire Dog! Woof!";
-		close;
-	}
-
-	mes "Happy New Year of The Fire Dog!";
-	if(rand(2))mes "By the way, 'Dogs' fit the most to the ones, born in years of Horse, Tiger and Rabbit.";
-	next;
-	menu "Tell me about Japanese traditions",-,
-		"Tell me about Chinese New Year",M_NGCH,
-		"Tell me about Korean New Year",M_NGCO,
-		"I need a doggy costume!",M_PRIZE,
-		"Happy New Year to you.",LEnd;
-
-	mes "[Maria]";
-	mes "Japan...";
-	mes "Put here some notes in English about their HNY.";
-	next;
-	mes "[Maria]";
-	mes "Put here some notes in English about their HNY.";
-	close;
-
-M_NGCH:
-	mes "[Maria]";
-	mes "China...";
-	mes "Put here some notes in English about their HNY.";
-	next;
-	mes "[Maria]";
-	mes "Put here some notes in English about their HNY.";
-	close;
-
-M_NGCO:
-	mes "[Maria]";
-	mes "Korea...";
-	mes "Put here some notes in English about their HNY.";
-	next;
-	mes "[Maria]";
-	mes "Put here some notes in English about their HNY.";
-	close;
-
-M_PRIZE:
-	mes "[Maria]";
-	if(countitem(12132)>9) {
-		mes "You should use all of your old costumes first!";
-		close;
-	}
-	mes "Some buddhistic books tell us legends about humans to dogs reincarnation... Buy ^FF0000this magic doggie costume^000000 for just ^0000FF999 Zeny^000000!";
-	mes "And prove old legends yourself!";
-	next;
-	menu "I'll buy one.",-,"No, thank you.",LEnd;
-	
-		mes "[Maria]";
-		if(Zeny<999) goto NoZ;
-		set Zeny,Zeny-999;
-		getitem 12132,1;
-		mes "Here you go. Its form will show true power of your spirit.";
-		emotion 15;
-		close;
-		NoZ:
-			mes "Oh dear, you lack of zeny. I have 7 puppies to feed, you know...";
-			emotion 17;
-			close;
-	LEnd:
-		mes "[Maria]";
-		mes "Happy New Year of the Fire Me!!! Woof-woof!";
-		emotion rand(19,20);
-		close;
-
-OnInit:
-	//Magic Doggie Costum
-	setitemscript 12132,"{ misceffect 215; if(BaseLevel>97){disguise 1022;end;}if(BaseLevel>90){disguise 1296;end;}if(BaseLevel>80){disguise 1106;end;}if(BaseLevel>50){disguise 1013;end;}if(BaseLevel>40){disguise 1135;end;}disguise 1107;}";
-	end;
-}
-
-// Requires custom monster.
-//prontera,0,0,0,0	monster	Fire Dog	1987,50,3600000,1800000,0
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index edc2bacec..509b25f71 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -10,7 +10,7 @@
 // Close to other official stValentine event (added white chocolate)
 // Custom: Handmade choco gives some EXP bonuses to married people
 //===== Additional Comments: =================================
-//= WARNING!! To use this event, dicable original valentinesday.txt
+//= WARNING!! To use this event, disable original valentinesday.txt
 //= You can use this event from 12 till 16 February 8) [Lupus]
 //= 1.1 Removed Duplicates [Silent]
 //============================================================
diff --git a/npc/custom/quests/lvl99_quest.txt b/npc/custom/quests/jewel_case.txt
index 7cee1a481..dfa52bdf6 100644
--- a/npc/custom/quests/lvl99_quest.txt
+++ b/npc/custom/quests/jewel_case.txt
@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= Quest for 99 Base Level Players
+//= Jewel Case Quest
 //===== By: ==================================================
 //= Lupus
 //===== Current Version: =====================================
@@ -7,8 +7,8 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= It makes players stay longer at 99th level and get a
-//= Jewel Case as a reward
+//= A quest for players at base level 99,
+//= with Jewel Case as a reward.
 //===== Additional Comments: =================================
 //= 
 //============================================================
diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt
index 11ef0442a..f3a82def4 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -3,84 +3,49 @@
 //===== By: ==================================================
 //= MagicalTux
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= 
+//= Custom quests for Balmung and Lord Kaho's Horns.
+//= WARNING: The quests are very easy, so be careful!
 //===== Additional Comments: =================================
-//= Warning! Don't use this quest 8)
+//= 1.1 Cleaned and optimized. [Euphy]
 //============================================================
 
 prontera,158,356,4	script	Royal Messenger	105,{
+	
+	setarray .@Req1[0],1161,999,120,984,10,996,10,994,10,995,10,997,10;
+	setarray .@Req2[0],5013,2298,1,1001,10,996,10,994,10,995,10,997,10;
+	
 	mes "[Royal Messenger]";
-	mes "Welcome to prontera, I am the Royal Messenger in charge of the royal quest.";
+	mes "Welcome to Prontera.";
+	mes "I am the messenger in charge of the Royal Quests.";
 	next;
-	menu "Listen",-,"No",Lend;
-
+	if(select("Listen...:Walk away")==2) close;
 	mes "[Royal Messenger]";
-	mes "There are too quests please chose the one you must like.";
+	mes "There are two quests.";
+	mes "Choose the one you like.";
 	next;
-	menu "Balmung",-,"Lord Kahos horns",Lkahos,"No",Lend;
-
-	mes "[Royal Messenger]";
-	mes "The Balmung quest consist of the next items:";
-	mes "120 Steel";
-	mes "10 Oridecon";
-	mes "10 Rough Wind";
-	mes "10 Flame Heart";
-	mes "10 Mystic Frozen";
-	mes "10 Great Nature";
-	mes "1,000,000z";
+	set .@i, select("Balmung:Lord Kaho's Horns:^777777Never mind.^000000");
+	mes "[Royal Messenger]";
+	if (.@i==3) {
+		mes "Have a nice day.";
+		close; }
+	mes "You will need the following items:";
+	for(set .@j,1; .@j<13; set .@j,.@j+2) {
+		mes " ~ "+getd(".@Req"+.@i+"["+(.@j+1)+"]")+"x ^0055FF"+getitemname(getd(".@Req"+.@i+"["+.@j+"]"))+"^000000";
+		if (!.@nr && countitem(getd(".@Req"+.@i+"["+.@j+"]")) < getd(".@Req"+.@i+"["+(.@j+1)+"]")) set .@nr,1; }
+	mes " ~ 1,000,000z";
 	next;
-	if(countitem(999)<120 || countitem(984)<10 || countitem(996)<10 || countitem(994)<10
-		|| countitem(995)<10 || countitem(997)<10 || Zeny<1000000) goto NoItems;
-	delitem 999,120;
-	delitem 984,10;
-	delitem 996,10;
-	delitem 994,10;
-	delitem 995,10;
-	delitem 997,10;
-	set Zeny,Zeny-1000000;
-	mes "[Royal Messenger]";
-	mes "I see you already have all the items you need.";
-	mes "nice work.";
-	getitem 1161,1;
-	close;
-
-Lkahos:
-	mes "[Royal Messenger]";
-	mes "The Lord Kahos horns quest consists of the next items:";
-	mes "1 Green Feelers";
-	mes "10 Star Dust";
-	mes "10 Rough Wind";
-	mes "10 Flame Heart";
-	mes "10 Mystic Frozen";
-	mes "10 Great Nature";
-	mes "1,000,000z";
-	next;
-	if(countitem(2298)<1 || countitem(1001)<10 || countitem(996)<10 || countitem(994)<10
-		|| countitem(995)<10 || countitem(997)<10 || Zeny<1000000) goto NoItems;
-	delitem 2298,1;
-	delitem 1001,10;
-	delitem 996,10;
-	delitem 994,10;
-	delitem 995,10;
-	delitem 997,10;
-	set Zeny,Zeny-1000000;
-	mes "[Royal Messenger]";
-	mes "I see you already have all the items you need.";
-	mes "nice work.";
-	getitem 5013,1;
-	close;
-
-Lend:
-	mes "[Royal Messenger]";
-	mes "Have a nice day.";
-	close;
-NoItems:
 	mes "[Royal Messenger]";
-	mes "Sorry you don't have all the items or zeny I need.";
-	mes "Come back when you have them all";
+	if (.@nr || Zeny < 1000000) {
+		mes "Come back when you meet all the requirements.";
+		close; }
+	for(set .@j,1; .@j<13; set .@j,.@j+2)
+		delitem getd(".@Req"+.@i+"["+.@j+"]"), getd(".@Req"+.@i+"["+(.@j+1)+"]");
+	set Zeny, Zeny-1000000;
+	mes "I see you already have all the items you need. Here's your "+getitemname(getd(".@Req"+.@i+"[0]"))+", as promised.";
+	getitem getd(".@Req"+.@i+"[0]"),1;
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 7b3d7b50b..697047821 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -3,94 +3,67 @@
 //===== By: ==================================================
 //= 
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= 
+//= Custom quest for Lord Kaho's Horns.
 //===== Additional Comments: =================================
-//= This quest is custom. Don't use it.
+//= 1.1 Optimized, and fixed some requirements. [Euphy]
 //============================================================
 
 geffen,115,107,5	script	Lord Kaho's Servant	61,{
-	mes "[Lord Kaho's Servant]";
+
+	setarray .@Items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754;
+	setarray .@Drops[0],1272,1087,1039,1260,1046,1115,1252,1147,1038,1059;
+	set .@n$, "[Lord Kaho's Servant]";
+
+	mes .@n$;
 	mes "I worked myself to death trying to fulfill Lord Kaho's ridiculous expectations for a headgear!";
-	mes "Now that I've finally found the formula for the perfect headgear, I'm willing to share my time and talents";
+	mes "Now that I've finally found the formula for the perfect headgear, I'm willing to share my time and talents.";
 	next;
-	mes "You need the following to get the Kaho horns!";
-	mes "3 emperiums";
-	mes "Oh yea... i also forgot to mention these X_X";
+	mes .@n$;
+	mes "You need the following to get the Kaho horns:";
+	mes "3x ^0055FFEmperium^000000";
 	next;
-	mes "1 Skull - From Dark Lord";
-	mes "1 Heroic Emblem - From Orc Hero";
-	mes "1 Evil Horn - From Baphomet";
-	mes "1 Red Frame - From Doppelganger";
-	mes "1 Smoking Pipe - From Eddga";
-	mes "1 Fang of Garm - From Garm";
-	mes "1 Mother's Nightmare - From Maya";
-	mes "1 Sphynx Hat - from Osiris";
-	mes "1 Diamond Ring - from Mistress";
+	mes .@n$;
+	mes "Oh yeah...";
+	mes "I also forgot to mention these...";
 	next;
-	mes "Were' not done yet sweety...";
-	mes "Im a big fan of dolls, so you need to bring me these cuties";
-	mes "1 Poring Doll - a Poring drop";
-	mes "1 Chonchon Doll - a Chonchon Drop";
-	mes "1 Baphomet Doll - a Baphomet drop";
-	mes "1 Osiris Doll - an Osiris drop";
-	mes "1 Rocker Doll - a Rocker drop";
-	mes "1 Apez Fanitem Doll - a Yoyo drop";
-	mes "1 Racoon Doll - a Smokie drop";
-	mes "1 Spore Doll - a Spore drop";
+	mes .@n$;
+	for(set .@i,0; .@i<10; set .@i,.@i+1)
+		mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000 (from "+strmobinfo(1,.@Drops[.@i])+")";
 	next;
-	mes "Finally, i worked hard to make these horns for my master with all the mentioned items above...";
-	mes "Please include 5 million zeny for my efforts."; 
+	mes .@n$;
+	mes "We're not done yet, sweetie...";
+	mes "I'm a big fan of dolls, so you need to bring me these cuties!";
+	for(set .@i,10; .@i<18; set .@i,.@i+1)
+		mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000";
 	next;
-	mes "[Lord Kaho's Servant]";
-	mes ". . . . . .";
+	mes .@n$;
+	mes "Finally, I've worked hard to make these horns for my master with all the items mentioned above...";
+	mes "Please include ^0055FF5 million Zeny^000000 for my efforts."; 
+	next;
+	mes .@n$;
 	mes "Are you ready for me to make this special item?";
 	next;
-	menu "Sure am!",-,"These requirements are unfathomable!",LUnfathomable;
-
-	mes "[Lord Kaho's Servant]";
-	if(countitem(754) < 1 || countitem(753) < 1 || countitem(752) < 1 || countitem(751) < 1 || countitem(750) < 1
-		|| countitem(743) < 1 || countitem(742) < 1 || countitem(741) < 1 || countitem(2613) < 1
-		|| countitem(5053) < 1 || countitem(7020) < 1 || countitem(7036) < 1 || countitem(2268) < 1
-		|| countitem(734) < 1 || countitem(923) < 1 || countitem(968) < 1 || countitem(7005) < 1
-		|| countitem(714) < 3 || Zeny < 5000000) goto LNotEnough;
-	delitem 754,1;
-	delitem 753,1;
-	delitem 752,1;
-	delitem 751,1;
-	delitem 750,1;
-	delitem 743,1;
-	delitem 742,1;
-	delitem 741,1;
-	delitem 2613,1;
-	delitem 5053,1;
-	delitem 7020,1;
-	delitem 7036,1;
-	delitem 2268,1;
-	delitem 734,1;
-	delitem 923,1;
-	delitem 968,1;
-	delitem 7005,1;
+	if(select("Sure am!:These requirements are unfathomable!")==2) {
+		mes .@n$;
+		mes "What I had to go through was more unfathomable...";
+		mes "If you succeed in getting these items, you will have incredible strength!";
+		close; }
+	mes .@n$;
+	for(set .@i,0; .@i<18; set .@i,.@i+1)
+		if (!countitem(.@Items[.@i])) { set .@nr,1; break; }
+	if (.@nr || countitem(714) < 3 || Zeny < 5000000) {
+		mes "I can't afford to make this if you don't bring all materials needed. Please understand this is to benefit heroes such as yourself!";
+		close; }
+	for(set .@i,0; .@i<18; set .@i,.@i+1)
+		delitem .@Items[.@i],1;
 	delitem 714,3;
-	set Zeny,Zeny-5000000;
-	mes "Wow!  You are brave indeed!";
+	set Zeny, Zeny-5000000;
+	mes "Wow! You are brave indeed!";
 	getitem 5013,1;
-	mes ". . . . .";
-	mes "Enjoy being God of Rune Midgard!";
-	close;
-
-LNotEnough:
-	mes ". . . . .";
-	mes ". . .I'm sorry .. You don't have enough money and items ..";
-	mes "I can't afford to make this if you don't bring all materials needed.  Please understand this is to benefit heroes such as yourself!";
-	close;
-
-LUnfathomable:
-	mes ". . . . .";
-	mes "What I had to go through was more unfathomable..";
-	mes "If you succeed in getting these items, you will have incredible strength!";
+	mes "Enjoy being God of Rune-Midgard!";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/custom/events/kings_items.txt b/npc/custom/quests/kings_items.txt
index 8140827c1..8140827c1 100644
--- a/npc/custom/events/kings_items.txt
+++ b/npc/custom/quests/kings_items.txt
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index 5f554ea23..fb3353556 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -1,60 +1,64 @@
 //===== rAthena Script =======================================
-//= Quest For Slotted Sunglasses
+//= Slotted Sunglasses Quest
 //===== By: ==================================================
 //= amichan
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= Quest to get Slotted Sunglasses
+//= Quest to get Slotted Sunglasses.
+//= Will reset after quest completion.
 //===== Additional Comments: =================================
-//= quest will reset it self after 1 pair of Slotted Sunglasses is made. 
-//=
 //= 1.0 by Aegis 1.1 by aichan 1.2 by x[tsk] 1.3 by Darkchild
 //= 1.5 Fixed Exploit [Lupus]
 //= 1.6 Fixed Exploit [KarLaeda]
 //= 1.7 Relocated 'Maseph' to moc_fild07. [Kisuka]
+//= 1.8 Cleaning. [Euphy]
 //============================================================
 
-// 1st part of the quest
 alberta,88,193,5	script	Sunglasses Trader	73,{
-	if(SG_QUEST1 == 1) goto L_SG_Q1_Done;
 	mes "[Sunglasses Trader]";
+	if(SG_QUEST1 == 1) {
+		mes "There is nothing more I can tell you.";
+		next;
+		mes "[Sunglasses Trader]";
+		mes "Go see Maseph. She is somewhere north of Morroc.";
+		close; }
 	mes "Hello. What can I do for you?";
 	next;
-	menu "I heard that you can make ^0000FFSlotted Sunglasses^000000.",-,"Nothing, sorry to bother you.",L_SG_No;
-
+	if(select("I heard that you can make ^0000FFSlotted Sunglasses^000000.:Nothing, sorry to bother you.")==2) {
+		mes "[Sunglasses Trader]";
+		mes "Come back to me than you are ready.";
+		close; }
 	mes "[Sunglasses Trader]";
 	mes "I do not make them, but I can tell you where to find the person who does. For a small fee...";
 	next;
-	menu "How much?",L_SG_1,"No way, I will find her, myself!",-;
-
-	mes "[Sunglasses Trader]";
-	mes "Suit yourself, the Maker will not make you ^0000FFSlotted Sunglasses^000000 unless she knows that you are coming.";
-	mes "Only I can tell her you are coming.";
-	next;
-	mes "[Sunglasses Trader]";
-	mes "Come back to me, when you have given up. Hahaha.";
-	close;
-L_SG_1:
+	if(select("How much?:No way, I will find her myself!")==2) {
+		mes "[Sunglasses Trader]";
+		mes "Suit yourself, the Maker will not make you ^0000FFSlotted Sunglasses^000000 unless she knows that you are coming.";
+		mes "Only I can tell her you are coming.";
+		next;
+		mes "[Sunglasses Trader]";
+		mes "Come back to me when you have given up. Hahaha...";
+		close; }
 	mes "[Sunglasses Trader]";
-	mes "In order for me to tell you information on ^0000FFSlotted Sunglasses^000000 you need to get me: ";
-	mes "^0000881 Carat Diamond^000000, ";
-	mes "^00008850 Feathers^000000, ";
-	mes "and ^000088100000z^000000.";
+	mes "In order for me to tell you information on ^0000FFSlotted Sunglasses^000000 you need to get me:";
+	mes " - ^0000881 Carat Diamond^000000";
+	mes " - ^00008850 Feathers^000000";
+	mes " - ^000088100000z^000000";
 	next;
-	menu "Alright, here.",L_SG_1_Check,"That's too much!",-;
+	if(select("Alright, here.:That's too much!")==2) {
+		mes "[Sunglasses Trader]";
+		mes "Suit yourself.";
+		close; }
 	mes "[Sunglasses Trader]";
-	mes "Suit Yourself.";
-	close;
-L_SG_1_Check:
-	if (countitem(730) < 1) goto L_SG_Diamond;
-	if (countitem(949) < 50) goto L_SG_Feathers;
-	if (zeny<100000) goto L_SG_Funds;
+	if (countitem(730) < 1 || countitem(949) < 50 || Zeny < 100000) {
+		mes "You're missing something. Come back when you've gathered all the materials.";
+		close; }
 	delitem 730,1;
 	delitem 949,50;
-	set zeny,zeny-100000;
+	set Zeny, Zeny-100000;
 	set SG_QUEST1,1;
 	mes "[Sunglasses Trader]";
 	mes "Great. Now, listen carefully.";
@@ -63,81 +67,42 @@ L_SG_1_Check:
 	mes "Look for someone named Maseph somewhere north of Morroc.";
 	mes "I will send her a message to let her know that you are coming.";
 	close;
-L_SG_Diamond:
-	mes "[Sunglasses Trader]";
-	mes "You do not have the ^0000881 Carat Diamond^000000. Come back to me when you do.";
-	close;
-L_SG_Feathers:
-	mes "[Sunglasses Trader]";
-	mes "You do not have ^00008850 Feathers^000000. Come back to me when you do.";
-	close;
-L_SG_Funds:
-	mes "[Sunglasses Trader]";
-	mes "You do not have ^000088100000z^000000. Come back to me when you do.";
-	close;
-L_SG_Q1_Done:
-	mes "[Sunglasses Trader]";
-	mes "There is nothing more I can tell you.";
-	next;
-	mes "[Sunglasses Trader]";
-	mes "Go see Maseph. She is somewhere north of Morroc.";
-	close;
-L_SG_No:
-	mes "[Sunglasses Trader]";
-	mes "Come back to me than you are ready.";
-	close;
 }
- 
-// 2nd part of the quest
+
 moc_fild07,334,186,5	script	Maseph	702,{
-	if(SG_QUEST1 == 1) goto L_SG_2;
-	mes "[Maseph]";
-	mes "Lovely Day, isn't it ?";
-	close;
-L_SG_2:
 	mes "[Maseph]";
+	if(SG_QUEST1 != 1) {
+		mes "Lovely day, isn't it ?";
+		close; }
 	mes "Hello there.";
-	next;
-	mes "[Maseph]";
 	mes "You came for the ^000088Slotted Sunglasses^000000, right?";
 	next;
-	menu "Yes",L_SG_2_Start,"No, sorry to bother you.",-;
-
-	mes "[Maseph]";
-	mes "Off you go, then.";
-	close;
-L_SG_2_Start:
+	if(select("Yes:No, sorry to bother you.")==2) {
+		mes "[Maseph]";
+		mes "Off you go, then.";
+		close; }
 	mes "[Maseph]";
 	mes "To make one, I will need one pair of ^000088Sunglasses^000000 and 400000z.";
 	next;
-	menu "Here you go.",L_SG_Q2_Check,"No, thanks.",-;
-
+	if(select("Here you go.:No, thanks.")==2) {
+		mes "[Maseph]";
+		mes "As you wish.";
+		close; }
 	mes "[Maseph]";
-	mes "As you wish.";
-	close;
-L_SG_Q2_Check:
-	if(countitem(2201) < 1) goto L_SG_Sunglasses;
-	if(zeny<400000) goto L_SG_Funds;
+	if (countitem(2201) < 1) {
+		mes "I need one pair of ^000088Sunglasses^000000. Come back to me when you have one.";
+		close; }
+	if (Zeny < 400000) {
+		mes "You do not have enough Zeny. Come back to me when you do.";
+		close; }
 	delitem 2201,1;
-	set zeny,zeny-400000;
-	mes "[Maseph]";
-	mes "Thank you. I will get on it right away.";
+	set Zeny, Zeny-400000;
+	mes "Thank you. I will get on it right away...";
 	next;
 	mes "[Maseph]";
-	mes "Here you go my friend.";
+	mes "Here you go, my friend.";
+	mes "Enjoy your ^000088Slotted Sunglasses^000000.";
 	getitem 2202,1;
-// quest reset
 	set SG_QUEST1,0;
-	next;
-	mes "[Maseph]";
-	mes "Enjoy your ^000088Slotted Sunglasses^000000.";
 	close;
-L_SG_Sunglasses:
-	mes "[Maseph]";
-	mes "I need one pair of ^000088Sunglasses^000000. Come back to me when you have one.";
-	close;
-L_SG_Funds:
-	mes "[Maseph]";
-	mes "You do not have enough money. Please come back to me when you do.";
-	close;
-}
+}
\ No newline at end of file
diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt
index c067a1491..519ccb350 100644
--- a/npc/events/valentinesday.txt
+++ b/npc/events/valentinesday.txt
@@ -1,20 +1,20 @@
 //===== rAthena Script =======================================
 //= Valentine Event Script
 //===== By: ==================================================
-//= Muad_Dib(Prometheus Project)
+//= Muad_Dib (Prometheus Project)
 //===== Current Version: =====================================
-//= 1.01
+//= 1.1
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= rAthena SVN
 //===== Description: =========================================
 //
 //===== Additional Comments: =================================
 //= 07/06/05 : Added 1st Version. [Muad_Dib]
 //= 08/28/05 : Ver. 1.01 Added a missing close; [Muad_Dib]
 //= Converted to rAthena format by Dr.Evil
+//= 1.1 Cleaning. [Euphy]
 //============================================================
 
-
 // Stephen - Valentine Event Chocolate seller ------------------
 alberta,26,243,4	script	Stephen	58,{
 	mes "[Stephen]";
@@ -26,47 +26,36 @@ alberta,26,243,4	script	Stephen	58,{
 	mes "That's right, don't you love chocolate.... I do.";
 	mes "And you are in luck, because I'm selling them for only 5,000 zeny a piece!";
 	next;
-	menu "I want some chocolate!",M_CHOCO,"No thanks.",-;
-	mes "[Stephen]";
-	mes "You don't want any chocolate?";
-	mes "I'm telling you! You'll regret it!";
-	mes "You better get some now... you won't come across Chocolate like this ever again!";
-	mes "Think it over and visit me again sometime.";
-	close;
-
-M_CHOCO:
+	if(select("I want some chocolate!:No thanks.")==2) {
+		mes "[Stephen]";
+		mes "You don't want any chocolate?";
+		mes "I'm telling you! You'll regret it!";
+		mes "You better get some now... you won't come across Chocolate like this ever again!";
+		mes "Think it over and visit me again sometime.";
+		close; }
 	mes "[Stephen]";
 	mes "Hah!";
 	mes "I knew it!";
-	mes "But I can't sell you more then 5 at once....but, if you really need more....";
+	mes "But I can't sell you more then 5 at once... but, if you really need more....";
 	mes "you can come back again.";
 	mes "So how many do you want?";
 	next;
-	set @needmon,0;
-	input @flag_num;
-	if (@flag_num <= 0) goto L_NONE;
-	if (@flag_num > 5) goto L_ERR;
-	set @needmon,@flag_num*5000;
-	if (Zeny < @needmon) goto L_NOTENO;
-	set Zeny,Zeny - @needmon;
-	getitem 558,@flag_num;
+	input .@i;
+	if (.@i <= 0) close;
 	mes "[Stephen]";
+	if (.@i > 5)  {
+		mes "I'm sorry, but I can't give you that many.";
+		close; }
+	if (Zeny < .@i*5000) {
+		mes "I'm sorry, but it seems you can't afford to buy these off me.";
+		close; }
+	set Zeny, Zeny - .@i*5000;
+	getitem 558,.@i;
 	mes "There you go!";
 	mes "You can give that to someone as a gift, or enjoy it yourself!";
-	mes "Mmm....sweet chocolate...";
+	mes "Mmm... sweet chocolate...";
 	mes "Visit me anytime...!";
 	close;
-
-L_ERR:
-	mes "[Stephen]";
-	mes "I'm sorry but I can't give you that many.";
-L_NONE:
-	close;
-
-L_NOTENO:
-	mes "[Stephen]";
-	mes "I'm sorry but it seems you can't afford to buy these off me.";
-	close;
 }
 
 // Jainie -- Gives information about Valentine Event ------------------------
@@ -97,44 +86,43 @@ prt_castle,54,34,4	script	Carl Orleans	47,{
 	mes "[Carl Orleans]";
 	mes "Yes?";
 	next;
-	menu "I want some hand made chocolate...",-,"I'm lost, sorry to bother you.",M_WAT;
-     
+	if(select("I want some hand made chocolate...:I'm lost, sorry to bother you.")==2) {
+		mes "[Carl Orleans]";
+		mes "Oh... well, if you want me to make some of my special Hand Made Chocolate....";
+		mes "You will need to give me at least ^0000FF 3 Chocolates^000000.";
+		next;
+		mes "[Carl Orleans]";
+		mes "That's right, only ^0000FF 3 Chocolates^000000";
+		mes "Bring them to me and you'll get what you came for.";
+		next;
+		mes "[Carl Orleans]";
+		mes "See You.";
+		close; }
 	mes "[Carl Orleans]";
 	mes "Well, I just might be able to fulfill your needs...";
 	next;
-	if (countitem(558) >=3) goto L_ENO;
-	mes "I'm sorry you do not have enough Chocolate Bars to do this";
-	close;
-
-L_ENO:
-	delitem 558,3;
 	mes "[Carl Orleans]";
-	mes "You got 3 pieces of pure chocolate I see.";
+	if (countitem(558) < 3) {
+		mes "I'm sorry, you don't have enough Chocolate Bars to do this.";
+		close; }
+	delitem 558,3;
+	mes "You got 3 pieces of pure chocolate, I see.";
 	mes "Give them to me...";
 	next;
+	mes "[Carl Orleans]";
 	mes "Ok, now I will only create my special hand made chocolates if you promise to use it wisely.";
 	next;
+	mes "[Carl Orleans]";
 	mes "....Hmmmmmm.....";
 	mes "Well...";
 	next;
-	mes "Here.";
+	mes "[Carl Orleans]";
 	getitem 559,1;
+	mes "Here.";
 	mes "I hope you give it to someone special, because its a special chocolate.";
 	mes "As you know... only I can create this.";
 	next;
-	mes "Enjoy.";
-	close;
-
-M_WAT:
-	mes "[Carl Orleans]";
-	mes "Oh..well, if you want me to make some of my special Hand Made Chocolate....";
-	mes "You will need to give me at least ^0000FF 3 Chocolates^000000.";
-	next;
 	mes "[Carl Orleans]";
-	mes "That's right, only ^0000FF 3 Chocolates^000000";
-	mes "Bring them to me and you'll get what you came for.";
-	next;
-	mes "[Carl Orleans]";
-	mes "See You.";
+	mes "Enjoy.";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index 0dea7ca90..2fbd6899b 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -40,35 +40,18 @@
 //npc: npc/custom/etc/rpsroulette.txt
 // -- Black Jack
 //npc: npc/custom/etc/blackjack.txt
-// -- Airplane script (unofficial)
-//npc: npc/custom/etc/airplane.txt
 // -- Hire ninja squads to assassinate an enemy!
 //npc: npc/custom/etc/shifty_assassin.txt
 // -- Train your monsters to fight against other players' monsters
 //npc: npc/custom/etc/monster_arena.txt
 // -- Raceway mini-game
 //npc: npc/custom/etc/morroc_raceway.txt
-// -- Dev NPCs (NPCs named after devs...)
-//npc: npc/custom/etc/devnpc.txt
 // -- Unofficial poetry
 //npc: npc/custom/etc/wandering_poets.txt
 // -- Random change of Drop/Exp rates 1x ~ 1.5x every 6 hours on your server 
-//npc: npc/custom/floating_rates.txt
-// -- Disable shops in the Prontera streets and open a special market place.
-//npc: npc/custom/market.txt
-
-// --------------------------------------------------------------
-// BattleGround (please read conf/battle/battleground.conf before
-// uncommenting battleground scripts).
-// --------------------------------------------------------------
-//npc: npc/custom/battleground/bg_common.txt
-//npc: npc/custom/battleground/bg_tierra_01.txt
-//npc: npc/custom/battleground/bg_tierra_02.txt
-//npc: npc/custom/battleground/bg_flavius_01.txt
-//npc: npc/custom/battleground/bg_flavius_02.txt
-//npc: npc/custom/battleground/bg_kvm01.txt
-//npc: npc/custom/battleground/bg_kvm02.txt
-//npc: npc/custom/battleground/bg_kvm03.txt
+//npc: npc/custom/etc/floating_rates.txt
+// -- Custom Poring Track files
+//npc: npc/custom/etc/p_track.txt
 
 // ----------------------- Quest Scripts -----------------------
 // -- Treasure Hunters Guild Quests (40 Quests + Special Guild Shop)
@@ -77,50 +60,55 @@
 //npc: npc/custom/quests/thq/THQS_QuestNPC.txt
 //npc: npc/custom/quests/thq/THQS_Quests.txt
 //npc: npc/custom/quests/thq/THQS_TTShop.txt
-// -- Godly Equipments Quests
-//npc: npc/custom/quests/valhallen.txt
-// -- Misc
+// -- Equipment Quests
 //npc: npc/custom/quests/magicalhatquest.txt
-//npc: npc/custom/quests/fashion.txt
 //npc: npc/custom/quests/elvenear.txt
+//npc: npc/custom/quests/fashion.txt
 //npc: npc/custom/quests/ironcane.txt
 //npc: npc/custom/quests/sunglasses.txt
-//npc: npc/custom/quests/berzebub.txt
-// -- Bandit Beard headgear quest (very long and safe quest)
 //npc: npc/custom/quests/bandit_beard.txt
-// -- Dead Branch (and Bloody Branch) quest (safe to use)
-//npc: npc/custom/quests/dead_branch.txt
-// -- Removed Hats with official quests. Only 6 hats are left
 //npc: npc/custom/quests/event_6_new_hats.txt
-// -- Both Lord Kaho (GM Item), but different and quest.txt has Balmung (GM Item) too
-// -- Warning! It might break your server balance.
-//npc: npc/custom/quests/kaho_balmung.txt
-//npc: npc/custom/quests/kahohorn.txt
-// -- Nice Custom thanatos Tower Statues Quest
-//npc: npc/custom/quests/tha_statues.txt
-// -- A quest for Jewel Case for 99 Level Players of any 2nd Class
-//npc: npc/custom/quests/lvl99_quest.txt
-// -- Quest for: Bird Nest,Lion Mask,Skeleton Manteau,Fashion Hip Sack,Sales Banner
 //npc: npc/custom/quests/may_hats.txt
-// -- Extracted custom quests from the official Umbalian Quests (better, don't use)
-//npc: npc/custom/quests/sphinx_mask.txt
-//npc: npc/custom/quests/umbalian_language.txt
-// -- Custom Kiel Mansion Dungeon Quest
-//npc: npc/custom/quests/kiel_quest.txt
-// -- Custom Bongun Accessory/Bongun taming item quest
+//npc: npc/custom/quests/kings_items.txt
+// -- Misc Item Quests
+//npc: npc/custom/quests/dead_branch.txt
+//npc: npc/custom/quests/berzebub.txt
+//npc: npc/custom/quests/jewel_case.txt
 //npc: npc/custom/quests/bongunsword.txt
-// -- Custom Baphomet Jr. Taming item quest.
 //npc: npc/custom/quests/bookofthedevil.txt
-// -- A custom event for 3 holidays: X-Mas, Karachun and New Year
-// -- Should be activated between 8 December and 8 January
+// -- Godly Equipment Quests (be careful!)
+//npc: npc/custom/quests/valhallen.txt
+//npc: npc/custom/quests/kaho_balmung.txt
+//npc: npc/custom/quests/kahohorn.txt
+
+// ----------------------- Event Scripts -----------------------
+// -- X-Mas, Karachun, and New Year (8 Dec. ~ 8 Jan.)
 //npc: npc/custom/events/xmas_rings_event.txt
-// -- Grand Circlet Quest combined with Excalibur Quest
-//npc: npc/custom/events/kings_items.txt
-// -- Custom Halloween Event
+// -- Custom Valentine's Day event
+//npc: npc/custom/events/valentinesdayexp.txt
+// -- Custom Halloween scripts
 //npc: npc/custom/events/hallow06.txt
 //npc: npc/custom/events/uneasy_cemetery.txt
 //npc: npc/custom/events/draculax.txt
-//npc: npc/custom/events/2006_dogs_year.txt
-//npc: npc/custom/events/valentinesdayexp.txt
-// -- Poring track files
-//npc: npc/custom/events/p_track.txt
+// -- Hyegun event
+//npc: npc/custom/events/hyegun_event.txt
+
+// ----------------------- Unofficial Scripts -----------------------
+// -- Unofficial Airplane script
+//npc: npc/custom/etc/airplane.txt
+// -- Thanatos Tower Statues Quest
+//npc: npc/custom/quests/tha_statues.txt
+// -- Custom quests from official Umbalian Quests
+//npc: npc/custom/quests/sphinx_mask.txt
+//npc: npc/custom/quests/umbalian_language.txt
+// -- Custom Kiel Mansion Dungeon Quest
+//npc: npc/custom/quests/kiel_quest.txt
+// -- Unofficial Battlegrounds
+//npc: npc/custom/battleground/bg_common.txt
+//npc: npc/custom/battleground/bg_tierra_01.txt
+//npc: npc/custom/battleground/bg_tierra_02.txt
+//npc: npc/custom/battleground/bg_flavius_01.txt
+//npc: npc/custom/battleground/bg_flavius_02.txt
+//npc: npc/custom/battleground/bg_kvm01.txt
+//npc: npc/custom/battleground/bg_kvm02.txt
+//npc: npc/custom/battleground/bg_kvm03.txt
\ No newline at end of file