* Fixed Missing Variables in Metto quest. (bugreport:473)

* Deleted some unused Variables in Bio Ethics quest.
* Changed some bad RGB Codes in THQ. (bugreport:211)

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

4 files changed, 36 insertions, 70 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index e01f32bf1..3ac258853 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2007/11/22
+	* Fixed Missing Variables in Metto quest. (bugreport:473) [Samuray22]
+	* Deleted some unused Variables in Bio Ethics quest.
+	* Changed some bad RGB Codes in THQ. (bugreport:211)
 2007/11/17
 	* Rev. 11777 Fixed conf files for jmonster and eamonsters. (bugreport:432) [L0ne_W0lf]
 2007/11/17
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index db02c88fe..a6c9a5e23 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -21,6 +21,7 @@
 //= 1.0 - Straight conversionof Aegis NPC file
 //= 1.1 Added time penalty to prevent get quests to often [Lupus]
 //= 1.2 Fixed not working penalty, added anti-cheat [Lupus]
+//= 1.3 Changed some bad RGB Codes. (bugreport:211) [Samuray22]
 //============================================================
 
 
@@ -434,8 +435,8 @@ N_JobList8:
 	mes "Ok you have a couple quests that can be done here.";
 	next;
 	menu "Banana Juice",-,"Another Delivery",N_Delivery4,"My lost beeds",N_LostBeeds,"^FF0000Baphomet!^000000",N_Bapho;
-	mes "^FF0000Banana Juice^FF0000";
-	mes "^FF0000------------^FF0000";
+	mes "^FF0000Banana Juice^000000";
+	mes "^FF0000------------^000000";
 	mes "Sound gross to some good to others.";
 	mes " ";
 	mes "There is a little girl up in prontera Square a bit north from the fountain, go talk to her.";
@@ -443,8 +444,8 @@ N_JobList8:
 	goto L_QuestGiven;
 
 N_Delivery4:
-	mes "^FF0000Another Delivery^FF0000";
-	mes "^FF0000----------------^FF0000";
+	mes "^FF0000Another Delivery^000000";
+	mes "^FF0000----------------^000000";
 	mes "Well yah box delivering is in high demand,lots of lazy people.";
 	mes " ";
 	mes "Take this package to a man in Morroc named Klye.";
@@ -453,8 +454,8 @@ N_Delivery4:
 	goto L_QuestGiven;
 
 N_Bapho:
-	mes "^FF0000Baphomet!^FF0000";
-	mes "^FF0000*********^FF0000";
+	mes "^FF0000Baphomet!^000000";
+	mes "^FF0000*********^000000";
 	mes "Hidden in the Temple he watches and guards.";
 	mes " ";
 	mes "Rumor has it that a Goat Man is lurking in the Hidden Temple, There is also a man in the Hidden Temple names Zack that needs you help with this Goat Man known as Baphomet.";
@@ -462,8 +463,8 @@ N_Bapho:
 	goto L_QuestGiven;
 
 N_LostBeeds:
-	mes "^FF0000My lost Beeds^FF0000";
-	mes "^FF0000-------------^FF0000";
+	mes "^FF0000My lost Beeds^000000";
+	mes "^FF0000-------------^000000";
 	mes "Oh great I smell stupidity...";
 	mes " ";
 	mes "A little girl in Payon wants to talk to you, her name is Flower, What a stupid name,Hahaha.";
@@ -476,8 +477,8 @@ N_JobList9:
 	mes "Ok you have a couple quests that can be done here.";
 	next;
 	menu "Smelly Box",-,"Payon Cave",N_PayonC,"^FF0000Sohee's Everywere!^000000",N_Sohee,"^FF0000Moonlight Flower^000000",N_Moonlight;
-	mes "^FF0000Smelly Box^FF0000";
-	mes "^FF0000----------^FF0000";
+	mes "^FF0000Smelly Box^000000";
+	mes "^FF0000----------^000000";
 	mes "Oh god please get this out of here fast.";
 	mes " ";
 	mes "Oh man smells like someone died in here.Take this to the Magic School in Geffen and hurry,ahh the smell its burning my eye's!!!";
@@ -486,8 +487,8 @@ N_JobList9:
 	goto L_QuestGiven;
 
 N_Sohee:
-	mes "^FF0000Sohee's Everywere!^FF0000";
-	mes "^FF0000******************^FF0000" ;
+	mes "^FF0000Sohee's Everywere!^000000";
+	mes "^FF0000******************^000000" ;
 	mes "Hmmm seem's a man named Jack wants to speak to you in the Archer Guild House.";
 	mes " ";
 	mes "Well what we know about Payon is that a while ago there was a freak fire that burnt down the old school.";
@@ -498,8 +499,8 @@ N_Sohee:
 	goto L_QuestGiven;
 
 N_Moonlight:
-	mes "^FF0000Moonlight Flower^FF0000";
-	mes "^FF0000****************^FF0000" ;
+	mes "^FF0000Moonlight Flower^000000";
+	mes "^FF0000****************^000000" ;
 	mes "Hmmm seem's a man named Jack wants to speak to you in the Archer Guild House.";
 	mes " ";
 	mes "Well I don't know much about this, it has to do with the deepest reagions of Payon Cave, We don't know much because no one ever seems to make it back alive.";
@@ -507,8 +508,8 @@ N_Moonlight:
 	goto L_QuestGiven;
 
 N_PayonC:
-	mes "^FF0000Payon Cave^FF0000";
-	mes "^FF0000----------^FF0000" ;
+	mes "^FF0000Payon Cave^000000";
+	mes "^FF0000----------^000000" ;
 	mes "Hmmm seem's a man named Jack wants to speak to you in the Archer Guild House.";
 	mes " ";
 	mes "The farther we go into the cave the stranger it gets.";
@@ -522,8 +523,8 @@ N_JobList10:
 	next;
 	menu "The Blank Box",-,"^FF0000Eddga^000000",N_Eddga,"^FF0000Phreeoni^000000",N_Phreeoni,"^FF0000Maya^000000",N_Maya;
 
-	mes "^FF0000The Blank Box^FF0000";
-	mes "^FF0000-------------^FF0000";
+	mes "^FF0000The Blank Box^000000";
+	mes "^FF0000-------------^000000";
 	mes "Package to Morroc";
 	mes " ";
 	mes "There is nothing writen on this box but a notice to deliver it to a man Kreg.";
@@ -532,8 +533,8 @@ N_JobList10:
 	goto L_QuestGiven;
 
 N_Eddga:
-	mes "^FF0000Eddga^FF0000";
-	mes "^FF0000*****^FF0000";
+	mes "^FF0000Eddga^000000";
+	mes "^FF0000*****^000000";
 	mes "Tony the Tiger is on crack and destroying the forest.";
 	mes " ";
 	mes "Talk to a man outside the 'Hidden' Hunter Guild, He needs your help.";
@@ -541,8 +542,8 @@ N_Eddga:
 	goto L_QuestGiven;
 
 N_Phreeoni:
-	mes "^FF0000Phreeoni^FF0000";
-	mes "^FF0000********^FF0000";
+	mes "^FF0000Phreeoni^000000";
+	mes "^FF0000********^000000";
 	mes "He is big and Pink and you run and hide!";
 	mes " ";
 	mes "This guy just poped into some hole one day, He dosent look that tough but you would be supprised. Talk to a man named Caral outside of Ant Hell.";
@@ -550,8 +551,8 @@ N_Phreeoni:
 	goto L_QuestGiven;
 
 N_Maya:
-	mes "^FF0000Maya^FF0000";
-	mes "^FF0000****^FF0000";
+	mes "^FF0000Maya^000000";
+	mes "^FF0000****^000000";
 	mes "Something scary!";
 	mes " ";
 	mes "This half naked freak need an army to take down, now its your job, good luck. Meet a girl named Jeni outside of the back entrance to Ant Hell.";
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index 25850f893..f6ee4e3c0 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -30,6 +30,7 @@
 //= 1.6 Fixed various errors in the Bajin NPC. [L0ne_W0lf]
 //= 1.7 Changed ALCH_Q check and set to corrispond to new alchemist job quest. [L0ne_W0lf]
 //= 1.8 Fixed metto_q never reaching 2. Made some names more unique. [L0ne_W0lf]
+//= 1.9 Fixed Missing Variables in Metto quest. (bugreport:473) [Samuray22]
 //============================================================ 
 
 // Metto Quest
@@ -55,6 +56,7 @@ yuno_in03,26,39,3	script	Metto#juno	709,{
 		close;
 	}
 	else if (metto_q == 3) {
+		set metto_q,4;
 		mes "What? That punk Stangckle said he doesn't want to help me?! This is not good. This will slow my research considerably.";
 		next;
 		mes "[Metto]";
@@ -76,6 +78,7 @@ yuno_in03,26,39,3	script	Metto#juno	709,{
 		close;
 	}
 	else if (metto_q == 5) {
+		set metto_q,6;
 		mes "What? You mean to tell me that the very thing I need to continue my research, the mighty Great Z, has been destroyed?!!";
 		next;
 		mes "[Metto]";
@@ -345,47 +348,7 @@ yuno_in01,19,183,5	script	Kato#juno	55,{
 		mes "Um... Hey.";
 		close;
 	}
-	else if (metto_q == 5) {
-		mes "I am interested in researching artificial intelligence. You know, like robots.";
-		next;
-		mes "[Kato]";
-		mes "I know it a very difficult feat to accomplish, but where there's a will, there's a way.";
-		next;
-		mes "[Kato]";
-		mes "If you ever see something really amazing like this, you'll know its my handiwork.";
-		close;
-	}
-	else if (metto_q == 6) {
-		mes "I am interested in researching artificial intelligence. You know, like robots.";
-		next;
-		mes "[Kato]";
-		mes "I know it a very difficult feat to accomplish, but where there's a will, there's a way.";
-		next;
-		mes "[Kato]";
-		mes "If you ever see something really amazing like this, you'll know its my handiwork.";
-		close;
-	}
-	else if (metto_q == 7) {
-		mes "I am interested in researching artificial intelligence. You know, like robots.";
-		next;
-		mes "[Kato]";
-		mes "I know it a very difficult feat to accomplish, but where there's a will, there's a way.";
-		next;
-		mes "[Kato]";
-		mes "If you ever see something really amazing like this, you'll know its my handiwork.";
-		close;
-	}
-	else if (metto_q == 8) {
-		mes "I am interested in researching artificial intelligence. You know, like robots.";
-		next;
-		mes "[Kato]";
-		mes "I know it a very difficult feat to accomplish, but where there's a will, there's a way.";
-		next;
-		mes "[Kato]";
-		mes "If you ever see something really amazing like this, you'll know its my handiwork.";
-		close;
-	}
-	else if (metto_q == 9) {
+	else if (metto_q == 6 || metto_q == 7 || metto_q == 8 || metto_q == 9) {
 		mes "I am interested in researching artificial intelligence. You know, like robots.";
 		next;
 		mes "[Kato]";
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index 5f5f9b358..6a7d20f92 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen, Samuray22
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.1a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -14,6 +14,7 @@
 //= 1.9 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 2.0 Rescripted (and re-added) Bio Ethics quest. [L0ne_W0lf]
 //= 2.1 Fixed a Resurrection -> Homunculus Resurrection. [L0ne_W0lf]
+//= 2.1a Deleted some unused Variables in Bio Ethics quest. [Samuray22]
 //============================================================
 
 yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
@@ -1416,9 +1417,6 @@ lhz_in01,224,140,3	script	Kellasus#qsk_al	57,{
 		mes "Homunculus, putting it in";
 		mes "an inert state of hibernation?";
 		next;
-		set jungdap1,Vaporize;
-		set jungdap2,Embryo;
-		set jungdap3,Resurrection;
 		input .@input$;
 		if (.@input$ == "Vaporize") {
 			mes "[Kellasus]";