* Merged changes from trunk [14688:14739/trunk].

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

1 files changed, 72 insertions, 158 deletions

diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index cbecbdae8..9e67216a7 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Kisuka
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. [Kisuka]
 //= 1.1 Many Many Fixes. [Kisuka]
+//= 1.2 Some changes. [Kisuka]
 //============================================================
 
 // ================== Lauds ======================
@@ -37,16 +38,11 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		mes "My what?";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "How are you supposed to go on your trip";
-		mes "without your towel!?";
+		mes "How are you supposed to go on your trip without your towel!?";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "If you think this is just another";
-		mes "holiday,";
-		mes "I'm not going to waste my breath.";
-		mes "But if you like to pay a tribute to";
-		mes "great soldiers,";
-		mes "I will help you ready yourself";
+		mes "If you think this is just another holiday, I'm not going to waste my breath.";
+		mes "But if you like to pay a tribute to great soldiers, I will help you ready yourself.";
 		next;
 		if (select("I guess so...:Are you crazy or something?") == 2) {
 			mes "[Mad Sago Lauds]";
@@ -62,11 +58,8 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		mes "Then listen to me carefully.";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "Now before you can pay tribute to";
-		mes "the fallen soldiers";
-		mes "you must be properly equipped";
-		mes "Without your towel you will be";
-		mes "lost!";
+		mes "Now before you can pay tribute to the fallen soldiers you must be properly equipped.";
+		mes "Without your towel you will be lost!";
 		mes "If you bring me the materials, I can make you a towel.";
 		next;
 		mes "[Mad Sago Lauds]";
@@ -79,25 +72,19 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 	else if(Memorial08 == 1) {
 		if (countitem(1059) < 30 || countitem(914) < 20) {
 			mes "[Mad Sago Lauds]";
-			mes "What are these? They aren't";
-			mes "enough?!";
-			mes "*Sigh* Do I really have to tell you";
-			mes "again?!";
+			mes "What are these? They aren't enough?!";
+			mes "*Sigh* Do I really have to tell you again?!";
 			mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000.";
 			close;
 		}else{
-			mes "***Mad Sago Lauds appears to be";
-			mes "muttering to himself***";
+			mes "***Mad Sago Lauds appears to be muttering to himself***";
 			next;
 			mes "[Mad Sago Lauds]";
-			mes "So, did you bring the towel";
-			mes "materials?";
+			mes "So, did you bring the towel materials?";
 			next;
 			mes "[Mad Sago Lauds]";
-			mes "Excellent; you've brought them";
-			mes "all.";
-			mes "Then I shall make you a Towel of";
-			mes "Memory as I promised.";
+			mes "Excellent; you've brought them all.";
+			mes "Then I shall make you a Towel of Memory as I promised.";
 			mes "Give me a moment.";
 			next;
 			mes "[Mad Sago Lauds]";
@@ -113,40 +100,30 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 	
 	else if(Memorial08 == 2) {
 		mes "[Mad Sago Lauds]";
-		mes "Ah, you have fluffy new towel now";
-		mes "I even put your name on it";
+		mes "Ah, you have fluffy new towel now I even put your name on it";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "Say, how do you like to go";
-		mes "on a journey to pay a tribute to";
-		mes "Memorial Day?";
+		mes "Say, how do you like to go on a journey to pay a tribute to Memorial Day?";
 		next;
 		if (select("Sure.:No, I'm Busy.") == 2) {
 			mes "[Mad Sago Lauds]";
-			mes "Don't come crying to me";
-			mes "if someone decides to";
-			mes "build a highway through";
-			mes "your home!";
+			mes "Don't come crying to me if someone decides to build a highway through your home!";
 			close;
 		}
 		mes "[Mad Sago Lauds]";
-		mes "Good. By the way, do you even know";
-		mes "what the towel is for?";
+		mes "Good. By the way, do you even know what the towel is for?";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "It seems you're just carrying it";
-		mes "without understanding its meaning.";
-		mes "What a shame! You should go speak";
-		mes "to ^FF0000Grast in Prontera^000000.";
+		mes "It seems you're just carrying it without understanding its meaning.";
+		mes "What a shame! You should go speak to ^FF0000Grast in Prontera^000000.";
 		set Memorial08,3;
 		close;
 	}
 
 	else if(Memorial08 == 3) {
 		mes "[Mad Sago Lauds]";
-		mes "What are you still doing here? I";
-		mes "told you to go speak to Grast in";
-		mes "Prontera!";
+		mes "What are you still doing here?";
+		mes "I told you to go speak to Grast in Prontera!";
 		close;
 	}
 
@@ -163,20 +140,16 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		mes "HAHAHAHAHAHA!!!! cough cough";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "Please give them to me. Thank you";
-		mes "for your hard work, by the way.";
+		mes "Please give them to me. Thank you for your hard work, by the way.";
 		mes "Say, have you learned anything from the journey?";
-		mes "Now is to go visit the plaque at 12";
-		mes "o'clock direction in Prontera.";
+		mes "Now is to go visit the plaque at 12 o'clock direction in Prontera.";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "What do you mean you were just";
-		mes "there?";
+		mes "What do you mean you were just there?";
 		next;
 		mes "[Mad Sago Lauds]";
-		mes "What? Why are you giving me your";
-		mes "garbage!";
-		mes "Those items are not useful to me at all";
+		mes "What? Why are you giving me your garbage!";
+		mes "Those items are not useful to me at all.";
 		mes "You should be going to the plaque!";
 		set Memorial08,8;
 		close;
@@ -185,8 +158,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 	else if(Memorial08 == 8) {
 		mes "[Mad Sago Lauds]";
 		mes "Stop trying to give me your garbage!";
-		mes "Go to the plaque at 12 o'clock";
-		mes "direction in Prontera for your journey!";
+		mes "Go to the plaque at 12 o'clock direction in Prontera for your journey!";
 		close;
 	}
 	
@@ -201,17 +173,12 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		else if(.@RandomMsg == 2) {
 			mes "[Mad Sago Lauds]";
 			mes "Life... is like a grapefruit.";
-			mes "It's orange and squishy, and has a";
-			mes "few pips in it,";
-			mes "and some folks have half a one for";
-			mes "breakfast.";
+			mes "It's orange and squishy, and has a few pips in it, and some folks have half a one for breakfast.";
 			close;
 		}
 		else if(.@RandomMsg == 3) {
 			mes "[Mad Sago Lauds]";
-			mes "There was a point to this story,";
-			mes "but it has temporarily escaped the";
-			mes "chronicler's mind.";
+			mes "There was a point to this story, but it has temporarily escaped the chronicler's mind.";
 			close;
 		}
 		else if(.@RandomMsg == 4) {
@@ -221,9 +188,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		}
 		else if(.@RandomMsg == 5) {
 			mes "[Mad Sago Lauds]";
-			mes "It is a mistake to think you can";
-			mes "solve any major problems just with";
-			mes "potatoes.";
+			mes "It is a mistake to think you can solve any major problems just with potatoes.";
 			close;
 		}
 	}
@@ -254,14 +219,11 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 	}
 	
 	L_CleanPlaque:
-		mes "- You see a message from the cleaned plaque.";
+		mes "- You see a message from the cleaned plaque.-";
 		next;
-		mes "-Although no sculptured marble";
-		mes "should rise to their memory,-";
-		mes "-nor engraved stone bear record of";
-		mes "their deeds,-";
-		mes "-yet will their remembrance be as";
-		mes "lasting as the land they honored.-";
+		mes "-Although no sculptured marble should rise to their memory,-";
+		mes "-nor engraved stone bear record of their deeds,-";
+		mes "-yet will their remembrance be as lasting as the land they honored.-";
 		mes "-Daniel Webster-";
 		if(Memorial08 == 9) {
 			getexp 93750,43750;
@@ -269,10 +231,8 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		next;
 		mes "-There's another message.-";
 		next;
-		mes "-I may not have gone where I";
-		mes "intended to go,-";
-		mes "-but I think I have ended up where";
-		mes "I needed to be.-";
+		mes "-I may not have gone where I intended to go,-";
+		mes "-but I think I have ended up where I needed to be.-";
 		mes "- Douglas Adams.-";
 		if(Memorial08 == 9) { 
 			getexp 93750,43750;
@@ -280,12 +240,9 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		next;
 		mes "-This is the last message.-";
 		next;
-		mes "-True heroism is remarkably sober,";
-		mes "very undramatic.-";
-		mes "-It is not the urge to surpass all";
-		mes "others at whatever cost,-";
-		mes "- but the urge to serve others at";
-		mes "whatever cost. -";
+		mes "-True heroism is remarkably sober, very undramatic.-";
+		mes "-It is not the urge to surpass all others at whatever cost,-";
+		mes "- but the urge to serve others at whatever cost. -";
 		mes "- Arthur Ashe -";
 		if(Memorial08 == 9) { 
 			getexp 93750,43750;
@@ -300,33 +257,24 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 prontera,150,270,4	script	Grast#Memorial	900,{
 	if(Memorial08 < 3) {
 		mes "[Grast]";
-		mes "Memorial Day is a sad and yet";
-		mes "glorious day.";
-		mes "I wonder how many people remember";
-		mes "them...";
+		mes "Memorial Day is a sad and yet glorious day.";
+		mes "I wonder how many people remember them...";
 		close;
 	}
 	
 	else if(Memorial08 == 3) {
 		mes "[Grast]";
 		mes "Oh, isn't that a Towel of Memory?";
-		mes "I'm so glad to meet someone who";
-		mes "understands the meaning of Memorial Day.";
+		mes "I'm so glad to meet someone who understands the meaning of Memorial Day.";
 		next;
 		mes "[Grast]";
-		mes "It is very important to know what";
-		mes "we're celebrating today, don't you think?";
+		mes "It is very important to know what we're celebrating today, don't you think?";
 		next;
 		mes "[Grast]";
-		mes "If you like to go on a journey to";
-		mes "pay a tribute to Memorial Day,";
-		mes "you should bring me some materials";
-		mes "I ask.";
+		mes "If you like to go on a journey to pay a tribute to Memorial Day, you should bring me some materials I ask.";
 		next;
 		mes "[Grast]";
-		mes "Please bring me ^FF0000one of each Red";
-		mes "Potion, Green Potion, Awakening";
-		mes "Potion, and Butterfly Wing^000000.";
+		mes "Please bring me ^FF0000one of each Red Potion, Green Potion, Awakening Potion, and Butterfly Wing^000000.";
 		mes "I'll be waiting for your return.";
 		set Memorial08,4;
 		close;
@@ -335,20 +283,14 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 	else if(Memorial08 == 4) {
 		if (countitem(501) < 1 || countitem(506) < 1 || countitem(656) < 1 || countitem(602) < 1) {
 			mes "[Grast]";
-			mes "Oops, you haven't brought all";
-			mes "materials.";
+			mes "Oops, you haven't brought all materials.";
 			mes "Please make sure you need to bring me";
-			mes " ^FF0000one of each Red Potion, Green";
-			mes "Potion, Awakening Potion, and";
-			mes "Butteryfly Wing^000000.";
+			mes "^FF0000one of each Red Potion, Green Potion, Awakening Potion, and Butteryfly Wing^000000.";
 			next;
 			mes "[Grast]";
-			mes "You'll have to bring me more";
-			mes "materials afterwards.";
-			mes "If you feel too burdened to gather";
-			mes "them all,";
-			mes "I can provide you all the";
-			mes "materials.";
+			mes "You'll have to bring me more materials afterwards.";
+			mes "If you feel too burdened to gather them all,";
+			mes "I can provide you all the materials.";
 			next;
 			if (select("I'll gather the rest.:Give me the materials.") == 2) {
 				goto L_GiveUp;
@@ -362,9 +304,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 			mes "Hmm, you will need some more things still...";
 			next;
 			mes "[Grast]";
-			mes "Please bring me ^FF0000one of each Trap,";
-			mes "Yggdrasil Leaf, Blue Gemstone,";
-			mes "Crystal Mirror, Meat, and Carrot.^000000";
+			mes "Please bring me ^FF0000one of each Trap, Yggdrasil Leaf, Blue Gemstone, Crystal Mirror, Meat, and Carrot.^000000";
 			mes "I'll be waiting for your return.";
 			set Memorial08,5;
 			close;
@@ -376,15 +316,11 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
 			mes "Please make sure you'll have to bring me";
-			mes " ^FF0000one of each Trap, Yggdrasil Leaf,";
-			mes "Blue Gemstone, Crystal Mirror,";
-			mes "Meat, and Carrot^000000.";
+			mes "^FF0000one of each Trap, Yggdrasil Leaf, Blue Gemstone, Crystal Mirror, Meat, and Carrot^000000.";
 			next;
 			mes "[Grast]";
-			mes "You'll have to bring me more";
-			mes "materials afterwards.";
-			mes "If you feel too burdened to gather them all,";
-			mes "I can provide you all the materials.";
+			mes "You'll have to bring me more materials afterwards.";
+			mes "If you feel too burdened to gather them all, I can provide you all the materials.";
 			next;
 			if (select("I'll gather the rest.:Give me the materials.") == 2) {
 				goto L_GiveUp;
@@ -396,9 +332,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 			mes "Hmm, I think you need just a little bit more.";
 			next;
 			mes "[Grast]";
-			mes "Please bring me ^FF0000one of each Pet";
-			mes "Incubator, Firecracker, Poring";
-			mes "Doll, and Bouquet^000000.";
+			mes "Please bring me ^FF0000one of each Pet Incubator, Firecracker, Poring Doll, and Bouquet^000000.";
 			set Memorial08,6;
 			close;
 		}
@@ -409,17 +343,14 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
 			mes "Please make sure you need to bring me";
-			mes " ^FF0000one of each Pet Incubator,";
-			mes "Firecracker, Poring Doll and Bouquet";
+			mes "^FF0000one of each Pet Incubator, Firecracker, Poring Doll and Bouquet";
 			next;
 			mes "[Grast]";
 			mes "They are the last batch of materials.";
-			mes "If you feel too burdened to gather them all,";
-			mes "I can provide you all the materials.";
+			mes "If you feel too burdened to gather them all, I can provide you all the materials.";
 			next;
 			mes "[Grast]";
-			mes "If I provide you all materials, however,";
-			mes "I won't have to thank you for your service.";
+			mes "If I provide you all materials, however, I won't have to thank you for your service.";
 			mes "It's your call, " + strcharinfo(0) + ".";
 			next;
 			if (select("I'll gather the rest.:Give me the materials.") == 2) {
@@ -429,19 +360,15 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		}else{
 			mes "[Grast]";
 			mes "Have you brought the materials I asked?";
-			mes "Ah, thank you for your hard work;";
-			mes "you've brought all of them.";
+			mes "Ah, thank you for your hard work you've brought all of them.";
 			next;
 			mes "[Grast]";
-			mes "I hope you'll learn a valuable";
-			mes "lesson while gathering these materials.";
+			mes "I hope you'll learn a valuable lesson while gathering these materials.";
 			mes "I like to give you a small gift for your service.";
 			next;
 			mes "[Grast]";
-			mes "You see, I have two different gifts";
-			mes "in my each hand.";
-			mes "A best thing would be giving you";
-			mes "both of them, but...";
+			mes "You see, I have two different gifts in my each hand.";
+			mes "A best thing would be giving you both of them, but...";
 			mes "How do you like to test your luck, " + strcharinfo(0) + "?";
 			next;
 			mes "[Grast]";
@@ -451,8 +378,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 				mes "[Grast]";
 				mes "You've selected my right hand.";
 				mes "Here's the gift for you.";
-				mes "Now, please bring all these";
-				mes "materials to Lauds.";
+				mes "Now, please bring all these materials to Lauds.";
 				set Memorial08, 7;
 				getitem 617,1;
 				close;
@@ -460,8 +386,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 			mes "[Grast]";
 			mes "You've selected my left hand.";
 			mes "Here's the gift for you.";
-			mes "Now, please bring all these";
-			mes "materials to Lauds.";
+			mes "Now, please bring all these materials to Lauds.";
 			set Memorial08, 7;
 			getitem 12109,1;
 			close;
@@ -471,43 +396,32 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 	else if(Memorial08 == 7) {
 		mes "[Grast]";
 		mes "Have you met Lauds?";
-		mes "I hope you'll remember your freedom";
-		mes "and happiness";
-		mes "are built on thousands of lives";
-		mes "sacrificed in war.";
+		mes "I hope you'll remember your freedom and happiness are built on thousands of lives sacrificed in war.";
 		close;
 	}
 
 	else if(Memorial08 >= 8) {
 		mes "[Grast]";
-		mes "A towel is about the most massively";
-		mes "useful thing an adventurer can have.";
+		mes "A towel is about the most massively useful thing an adventurer can have.";
 		close;
 	}
 
 	L_GiveUp:
 		mes "[Grast]";
-		mes "Oh, I see. I guess you're quite";
-		mes "busy nowadays, huh?";
-		mes "No problem; I'll give you all the";
-		mes "supplies...";
+		mes "Oh, I see. I guess you're quite busy nowadays, huh?";
+		mes "No problem; I'll give you all the supplies...";
 		next;
 		mes "[Grast]";
 		mes "There you go.";
-		mes "I crushed all the items together";
-		mes "into a more compact form for you";
-		mes "You can thank me later for that";
-		mes "extra service.";
+		mes "I crushed all the items together into a more compact form for you.";
+		mes "You can thank me later for that extra service.";
 		mes "Please bring them to Lauds.";
 		set Memorial08,7;
 		getitem 7126,1;
 		next;
 		mes "[Grast]";
-		mes "By the way, he had an unfortunate";
-		mes "accident, and has kind of lost his";
-		mes "mind.";
-		mes "Please don't be alarmed even if he";
-		mes "starts babbling.";
+		mes "By the way, he had an unfortunate accident, and has kind of lost his mind.";
+		mes "Please don't be alarmed even if he starts babbling.";
 		close;
 	
 	L_Continue: