Updated several ancient headgear quests.

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

1 files changed, 77 insertions, 74 deletions

diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 94cd2aa86..501e61b2a 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -23,121 +23,124 @@
 //= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 2.0a Corrected a Typo error ";;". [Samuray22]
 //= 2.1 Assassins will now get their request item. (bugreport:1220) [L0ne_W0lf]
+//= 2.2 Updated Binocular and Stop Post quests. [L0ne_W0lf]
 //============================================================ 
 
-
-
 //==================================================================================//
 // 				Stop Post Quest
 //==================================================================================//
-morocc_in,142,100,4	script	Pierce	89,{
-	mes "[Pierce]";
-	mes "Welcome to the most famous shop for ^3355FF'Stop Post'^000000... the Brosnan's";
+morocc_in,142,100,4	script	William	89,{
+	mes "[William]";
+	mes "Welcome to";
+	mes "MacMillan's ^3355FFPost^000000 Workshop.";
 	next;
-	mes "[Pierce]";
-	mes "Have you heard about our family?";
-	mes "We have been producing traffic signs for 250 years when people were still traveling by carriage.";
-	mes "And I have been getting many orders for ^3355FF'Stop Post'^000000 recently. It is in fashion now as accessories.";
+	mes "[William]";
+	mes "My family, the MacMillan Clan, has been producing Professional Traffic Signal Posts for more than 250 years. Nowadays, we are booking Special Orders for our unique ornament, ^3355FFStop Post^000000.";
 	next;
-	switch( select( "Order ^3355FF' Stop Post '^000000.","End conversation.")) {
+	switch(select("Could I order one ^3355FFStop Post^000000?:Nah...")) {
 	case 1:
-		mes "[Pierce]";
-		mes "Accessories made from the famous ^3355FF'Stop Post'^000000 by a family of 250 years old...";
-		mes "With our years of experience in traffic signs, we guarantee you the long lasting usage.";
-		mes "Satisfaction guarantee for all customers!";
-		next;
-		mes "[Pierce]";
-		mes "For producing ^3355FF'Stop Post'^000000, we need ^3355FF' 91100 Zeny '^000000";
-		mes "And 50 ^3355FF' Trunk '^000000 and one ^3355FF' Black Dyestuffs'^000000.";
-		next;
-		if(countitem(1019) > 49 && countitem(983) > 0 && Zeny > 91099) {
-			delitem 1019,50;
-			delitem 983,1;
+		mes "[William]";
+		mes "This unique ornament, ^3355FFStop Post^000000, is a traffic signal on the road, and doubles as a hair ornament! This, we solemnly promise on the strength of a 100-year guarantee.";
+		next;
+		mes "[William]";
+		mes "To produce a ^3355FFStop Post^000000, we need ^3355FF91100 Zeny^000000, ^3355FF50 Trunk^000000 and ^3355FF1 Black Dyestuffs^000000.";
+		next;
+		if ((countitem(1019) > 49) && (countitem(983) > 0) && (Zeny > 91099)) {
+			delitem 1019,50;  //Wooden_Block
+			delitem 983,1;  //Black_Dyestuffs
 			set Zeny,Zeny-91100;
-			mes "[Pierce]";
-			mes "Alright! This is the famous ^3355FF'Stop Post '^000000 of 250 years history!";
-			mes "Thank you for shopping here! See you soon!";
-			getitem 2272,1;
+			mes "[William]";
+			mes "Here you are~!";
+			mes "This ^3355FFStop Post^000000 has";
+			mes "been especially made";
+			mes "just for you!";
+			mes "Thank you for stopping by!";
+			mes "...Get the joke?";
+			getitem 2272,1; // Stop_Post
 			close;
 		}
-			mes "[Pierce]";
-			mes "You don't have enough items...";
-			mes "Please check it again!";
+		else {
+			mes "[William]";
+			mes "So...";
+			mes "When you get those items, swing on by and we'll give you a Stop Post.";
 			close;
+		}
 	case 2:
-		mes "[Pierce]";
-		mes "Thank you for shopping at the Brosnan's.";
-		mes "All the best to you!";
+		mes "[William]";
+		mes "Anyway, thank you for coming by 'MacMillan's Workshop.' But think about buying something next time, will ya?";
 		close;
 	}
 }
 
-
 //==================================================================================//
 //				Binoculars Quest
 //==================================================================================//
-morocc_in,76,163,4	script	Marius#binos	64,5,5,{
+morocc_in,76,163,4	script	Alchemist	64,{
 	mes "[Marius]";
-	mes "Ha! Ha! Ha! Another customer coming!";
-	mes "I know what you are gonna say.";
-	mes "You are here for the magic glasses, right?";
+	mes "Howdy, new customer!!";
+	mes "I know what you're gonna talk about. You want the Magic Glasses from me, riiiiight?";
 	next;
-	switch(select( "What is magic glasses?","Making magic glasses.","Skip.")) {
+	switch(select("What is that?:Manufacture:Ignore him")) {
 	case 1:
 		mes "[Marius]";
-		mes "Right! Its proper name is ' ^3355FFBinoculars^000000 '!";
-		mes "It is like a cylinder with...";
-		mes "A lot of lens piled together inside!";
-		mes "Using the effect of light reflection...";
-		mes "To see something far away.";
-		mes "It is not for something near to you!";
+		mes "Hmm~!";
+		mes "Well, the official name for them is ^3355FFBinoculars^000000! An optical device that works like a pair of field glasses, they're designed for simultaneous use by both eyes!";
 		next;
 		mes "[Marius]";
-		mes "WHat do you think? Is it great?";
-		mes "Ha! Ha! Ha!";
-		mes ".........";
-		mes "... WHat? You don't look convinced!";
-		mes "I am telling the truth!!";
+		mes "They're made up of two small telescopes joined with a single focusing device. You can arrange the lenses to produce stereoscopic vision.";
 		next;
 		mes "[Marius]";
-		mes "Mark down the items you need to make a Binoculars.";
-		mes "One by one...";
-		mes "One ^3355FFGeek Glasses^000000! 100 ^3355FFSteel^000000! And ^3355FF50.000 Zeny^000000!";
+		mes "So?";
+		mes "Ain't that";
+		mes "something, huh?";
+		mes "Muhahahahahaha!";
+		mes ". . . . .";
+		next;
+		mes "[Marius]";
+		mes "Hm? You don't seem to";
+		mes "believe what I just said?";
+		mes "Oh c'mon, jerk. It's real!!";
+		next;
+		mes "[Marius]";
+		mes "I will let you";
+		mes "know the items I need...";
+		mes "1 ^3355FFGeek Glasses^000000! 100 ^3355FFSteel^000000!";
+		mes "And ^3355FF50000 Zeny^000000!";
 		close;
 	case 2:
-		if (countitem(2243) > 0 && countitem(999) > 99 && Zeny > 49999) {
+		if ((countitem(2243) > 0) && (countitem(999) > 99) && (Zeny > 49999)) {
 			mes "[Marius]";
-			mes "Great! It is great!";
-			mes "I made one Binoculars!";
-			mes "And I found the right owner for it!";
+			mes "Perfect, perfect !";
+			mes "Now my masterpiece will be complete!";
+			mes "Muhahahaha !";
 			next;
-			delitem 2243,1;
-			delitem 999, 100;
+			delitem 2243,1;  //Spinning_Eyes
+			delitem 999,100;  //Steel
 			set Zeny,Zeny-50000;
-			next;
 			mes "[Marius]";
-			mes "Here you are... Binoculars!";
-			getitem 2296,1;
+			mes "Here you are!";
+			mes "Binoculars !";
+			getitem 2296,1; // Binoculars
 			next;
 			mes "[Marius]";
-			mes "I hope you won't need to use this Binoculars...";
-			mes "To see something tHat you shouldn't...";
-			mes "Ha! Ha! Ha!";
+			mes "Just remember...";
+			mes "Don't peep at something you shouldn't look at. Well, at least try not to.";
 			close;
 		}
+		else {
 			mes "[Marius]";
-			mes "Not enough! Insufficient items!";
-			mes "How can you disrespect the world's best alchemist? ";
-			mes "You have serious attitude problems!";
-			mes "This is ridiculous!";
+			mes "Argggghhhhhhh!!";
+			mes "You didn't bring";
+			mes "enough items!!!!";
+			mes "How dare you";
+			mes "disgrace me!!!";
+			mes "Baaaadddd !!";
 			close;
+		}
 	case 3:
 		mes "[Marius]";
-		mes "Hey! You!";
-		mes "You are talking to...";
-		mes "the world famous...";
-		mes "Optics master... Marius!";
-		mes "This is not the right attitude!";
+		mes "Hey you~!";
+		mes "Now you're in front of Marius, an Alchemist among Alchemists. Ignoring me, eh? Come on, I'll beat your ass!";
 		close;
 	}
 }