* Updated Dialogs from "Pretend Murdered Quest".

* Updated Dialogs from "Stop Post Quest".

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

3 files changed, 73 insertions, 82 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f384443d4..fafef4e38 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
 Date		Added
 ======
+2007/06/18
+	* Updated Dialogs from "Pretend Murdered Quest". [Samuray22]
+	* Updated Dialogs from "Stop Post Quest". [Samuray22]
 2007/06/17
 	* Fixed a Little Bug with the "How Does the Airship Work" Quest. [Samuray22]
 	-Thanks to Playtester ^^U.
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 25a22789a..b4ab31016 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -20,48 +20,46 @@
 //==================================================================================//
 // 				Stop Post Quest
 //==================================================================================//
-morocc_in,142,100,4	script	William	89,{
-	mes "[William]";
-	mes "Welcome to MacMillan's ^3355FF'Post'^000000 Workshop .";
+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";
 	next;
-	mes "[William]";
-	mes "My Clan, MacMillan, Has been producing professional grade Traffic Signal Posts for more than 250 years.";
-	mes "Nowadays we are taking special orders for our very unique, ^3355FF'Stop Post'^000000.";
+	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.";
 	next;
-	menu "Could I order a ^3355FF'Stop Post'^000000?",-, "I'm not interested.",M_End;
-
-		mes "[William]";
-		mes "MacMillan's one of a kind ^3355FF'Stop Post'^000000 fits comfortably on a persons head.";
-		mes "Not only does it make an interesting head accessory, but it can actually be used as a stop sign as well.";
-		next;
-		mes "[William]";
-		mes "I garauntee that our ^3355FF'Stop Post'^000000 will last for well over 100 years, or my name isn't MacMillan!!";
-		next;
-		mes "[William]";
-		mes "For us to make you a ^3355FF'Stop Post'^000000, we will need:";
-		mes "^3355FF91100 Zeny,";
-		mes "50 Trunks,";
-		mes "and 1 Black Dyestuff^000000.";
-		next;
-		if(countitem(1019) >= 50 && countitem(983) >= 1 && Zeny >= 91100) goto sL_GetPost;
-		mes "[William]";
-		mes "Come back when you have all of the items.";
-		close;
-
-		sL_GetPost:
-			delitem 1019,50;
-			delitem 983,1;
-			set Zeny, Zeny - 91100;
-			mes "[William]";
-			mes "Here you are! A hand made, one of a kind, ^3355FF'Stop Post '^000000! Thank you for your patronage!";
-			getitem 2272,1;
-			emotion e_thx;
+	switch( select( "Order ^3355FF' Stop Post '^000000.","End conversation.")) {
+	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("Wooden_Block") > 49 && countitem("Black_Dyestuffs") > 0 && Zeny > 91099) {
+			delitem "Wooden_Block",50;
+			delitem "Black_Dyestuffs",1;
+			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 "Stop_Post",1;
 			close;
-
-	M_End:
-		mes "[William]";
-		mes "Thanks for stopping by the MacMillan's Workshop.  I hope to see you soon.";
+		}
+			mes "[Pierce]";
+			mes "You don't have enough items...";
+			mes "Please check it again!";
+			close;
+	case 2:
+		mes "[Pierce]";
+		mes "Thank you for shopping at the Brosnan's.";
+		mes "All the best to you!";
 		close;
+	}
 }
 
 
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index b1800957b..842ae922a 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -14,6 +14,7 @@
 //= 1.2 Fixed skirt of virgin [Lupus]
 //= 1.3 Fixed exploits [Lupus]
 //= 1.4 Removed Duplicates [Silent]
+//= 1.5 Updated Dialogs from "Pretend Murdered Quest" [Samuray22]
 //============================================================ 
 
 
@@ -22,53 +23,42 @@
 //				Pretend Murdered quest
 //==========================================================================================//
 payon,154,170,4	script	Granny	78,{
-	mes "[Granny]";
-	if(countitem(1049) >= 4) goto L_Get;
-
-	mes "Oh deary me.  What to do... what to do........  You see I want to nitt some special clothes for my family but I don't have the right cloth to do so.";
-	next;
-	mes "[Granny]";
-	mes ".....sigggghhhhhh........";
-	next;
-	mes "[Granny]";
-	mes "Why what's this? Mushrooms? Oh yes I remember now, I pick these mushrooms on the Payon Mountain side.";
-	mes "Ho ho, I have such a hard time remembering things now.";
-	next;
-	mes "[Granny]";
-	mes "What was I saying before? Oh yes! I need some special cloth to make clothes for my family.";
-	mes "If you happen to come across some ^5555FF'Skirt of Virgin'^000000, please let me know.";
-	emotion e_hmm;
-	next;
-	mes "[Granny]";
-	mes "I need ^5555FF'4 Skirt of Virgin'^000000 to make the clothes.  I will be very greatfull if you could bring me some.";
-	close;
-
-L_Get:
-	mes "Oh! You have 4 Skirt of Virgin.  Would you be willing to give them to me dear?";
-	next;
-	menu "Why of course granny",-,"Heck no ya old bag!",M_No;
-
-		if(countitem(1049) < 4) goto M_No;
-		mes "[Granny]";
-		mes "Bless your kind heart.  Now I can make some special clothes for my family.  Let me give you a reward for being so genrous dear.";
-		emotion e_lv2;
+	if(countitem("Skirt_Of_Virgin") > 3 ) {
+		mes "[Granny in Payon]";
+		mes "Hey... Is this the item for Skirt of Virgin tHat my children will wear for the coming festival...";
+		mes "Could you give me some ^3355FF' Skirt of Virgin '^000000 for young girl... I need four of it... please ?";
+		mes "I am begging you, please!";
 		next;
-		getitem 2293,1;
-		delitem 1049,4;
-		mes "[Granny]";
-		mes "There you are.  It's something I kept from my younger days as an actress.  I was quite fetching and very popular back then.";
-		mes "I've kept it as a reminder of my days as an actress, but with my memory as bad as it is, it's really of no use to me anymore.";
+		switch(select( "Give it to her.","No way!")) {
+		case 1:
+			delitem "Skirt_Of_Virgin",4;
+			mes "[Granny in Payon]";
+			mes "Uh-uh... Thank you very much! Now I can make Skirt of Virgin for my children.";
+			mes "Hey... Oh! Yeah! I was in a stage play when I was young...";
+			mes "This is the overcoat I kept when I left the troupe after I got married...";
+			next;
+			mes "[Granny in Payon]";
+			mes "Take it if you like it... please!";
+			mes "Good bye! Nice meeting you...";
+			getitem "Pretend_Murdered",1;
+			close;
+		case 2:
+			mes "[Granny in Payon]";
+			mes "Uh-uh... How can I get  ^3355FF'Skirt of Virgin '^000000 by myself... I am so weak and tired.";
+			mes "It's such a cold world...";
+			close;
+		}
+	}
+		mes "[Granny in Payon]";
+		mes "I gather Mushrooms on the Mountain of Payon Everyday for my living. I don't know how I will survive this month.";
+		mes "... But festive is coming next month!";
+		mes "My children requested for Skirt of Virgin for this festival.";
+		mes "For Skirt of Virgin, I need ^3355FF' Skirt of Virgin '^000000 ...";
 		next;
-		mes "[Granny]";
-		mes "I'm sure you'll have fun using it at parties."; 
+		mes "[Granny in Payon]";
+		mes "Young man, I have a favor to ask... If you ever find ^3355FF' Skirt of Virgin '^000000... ";
+		mes "Please come back to me. I will never forget your kindness...";
 		close;
-		
-	M_No:
-		mes "[Granny]";
-		mes "Well I never!!! Kids these days just have no respect or compasion for their elders!";
-		emotion e_pif;
-		close;
-
 }