Merge pull request #1110 from dastgir/22-ScriptClean-Phase2

Script CleanUp Phase 2

1 files changed, 25 insertions, 25 deletions

diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 814a4ec6e..a63a7b3b2 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -236,7 +236,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "Why, hello there. Oh, have you come to listen to my song and forget your worries?";
 		next;
 
-		if(select("Who are you?:Ignore him.")==1) {
+		if(select("Who are you?", "Ignore him.")==1) {
 			cutin "bard_eland04",2;
 			mes "[" + @name$ + "]";
 			mes "You seem to be";
@@ -271,7 +271,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "me alone.";
 		next;
 
-		if(select("No problem~:Is there any way I can help you?")==1) {
+		if(select("No problem~", "Is there any way I can help you?")==1) {
 			cutin "bard_eland04",2;
 			mes "[Errende]";
 			mes "Waaaah~! You're so mean!";
@@ -340,7 +340,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 			mes "I'm sorry to ask a favor of you again, but in your travels, do you think you could find the original lyrics for this song? I can wait for it...";
 			next;
 
-			if(select("No, thanks.:I can, so stop crying.")==1) {
+			if(select("No, thanks.", "I can, so stop crying.")==1) {
 				mes "[Errende]";
 				mes "Ah, I guess it was too much to ask of you. My apologies. Don't worry about it, I'll find out some other way.";
 				gef_bard_q = 25;
@@ -418,7 +418,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 			mes "^3355FFErrende continues to sing about his personal despair. He seems to be disappointed in your refusal to help him. Of course, you begin to feel sorry for him.^000000";
 			next;
 
-			if(select("Well, I should help him then...:Ignore him anyway.")==1) {
+			if(select("Well, I should help him then...", "Ignore him anyway.")==1) {
 				mes "[" + @name$ + "]";
 				mes "Hey. Hey, Errende. Stop singing this song. It's embarassing, okay? Alright, I'll go find the original song for you.";
 				next;
@@ -562,7 +562,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 			mes "I'm sorry to ask a favor of you again, but in your travels, do you think you could find the original lyrics for this song? I can wait for it...";
 			next;
 
-			if(select("No, thanks.:I can, so stop crying.")==1) {
+			if(select("No, thanks.", "I can, so stop crying.")==1) {
 				mes "[Errende]";
 				mes "Ah, I guess it was too much to ask of you. My apologies. Don't worry about it, I'll find out some other way.";
 				gef_bard_q = 25;
@@ -635,7 +635,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "I'm worthless as a Bard~! Please... Just... Please just leave me alone.";
 		next;
 
-		if(select("No problem.:Is there any way I can help you?")==1){
+		if(select("No problem.", "Is there any way I can help you?")==1){
 			mes "[Errende]";
 			mes "Waaaah~! You're so mean!";
 			mes "You're supposed to say, 'Errende, what's wrong? Maybe I can help?'";
@@ -696,7 +696,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 			mes "Ummm...";
 			mes "I'm sorry to ask a favor of you again, but in your travels, do you think you could find the original lyrics for this song? I can wait for it...";
 			next;
-			if(select("No, thanks.:I can, so stop crying.")==1) {
+			if(select("No, thanks.", "I can, so stop crying.")==1) {
 				mes "[Errende]";
 				mes "Ah, I guess it was too much to ask of you. My apologies. Don't worry about it, I'll find out some other way.";
 				gef_bard_q = 5;
@@ -757,7 +757,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 			mes "^3355FFErrende continues to sing about his personal despair. He seems to be disappointed in your refusal to help him. Of course, you begin to feel sorry for him.^000000";
 			next;
 
-			if(select("Well, I should help him then...:Ignore him anyway.")==1) {
+			if(select("Well, I should help him then...", "Ignore him anyway.")==1) {
 				mes "[" + @name$ + "]";
 				mes "Hey. Hey, Errende. Stop singing this song. It's embarassing, okay? Alright, I'll go find the original song for you.";
 				next;
@@ -895,7 +895,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 			mes "I'm sorry to ask a favor of you again, but in your travels, do you think you could find the original lyrics for this song? I can wait for it...";
 			next;
 
-			if(select("No, thanks.:I can, so stop crying.")==1) {
+			if(select("No, thanks.", "I can, so stop crying.")==1) {
 				mes "[Errende]";
 				mes "Ah, I guess it was too much to ask of you. My apologies. Don't worry about it, I'll find out some other way.";
 				gef_bard_q = 5;
@@ -978,7 +978,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "Why, hello there. Oh, have you come to listen to my song and forget your worries?";
 		next;
 
-		if(select("Who are you?:Ignore him.")==1) {
+		if(select("Who are you?", "Ignore him.")==1) {
 			cutin "bard_eland04",2;
 			mes "[" + @name$ + "]";
 			mes "You seem to be";
@@ -1011,13 +1011,13 @@ L_End:
 // SubRoutine for 5 similiar dialogues of the quest
 S_StorySong:
 	next;
-	switch(select("Tell me a story.:Would you play a song?:Eh, maybe later.")) {
+	switch(select("Tell me a story.", "Would you play a song?", "Eh, maybe later.")) {
 	case 1:
 		mes "[Errende]";
 		mes "You like stories, huh? What kind of story would you like me to tell? I'll you whatever I know... Just for you, of course. *Grins*";
 		next;
 
-		if(select("News and rumors~:Cancel.")==1) {
+		if(select("News and rumors~", "Cancel.")==1) {
 			cutin "bard_eland01",2;
 			mes "[Errende]";
 			.@random = rand(1,3);
@@ -1132,7 +1132,7 @@ S_StorySong:
 			mes "At last, I've met someone who recognizes my talent! You deserve to listen to my songs! Now, what would you like to hear? I can play anything you want, you know.";
 		next;
 
-		switch(select("Hmm, any song will do.:Play an upbeat song~!:Never mind...")) {
+		switch(select("Hmm, any song will do.", "Play an upbeat song~!", "Never mind...")) {
 
 		case 1:
 			mes "[Errende]";
@@ -1303,7 +1303,7 @@ S_StorySong:
 					mes "but I have a favor to ask...!";
 					next;
 
-					if(select("Sure, no problem.:I ain't gonna help you.")==1) {
+					if(select("Sure, no problem.", "I ain't gonna help you.")==1) {
 						cutin "bard_eland01",2;
 						mes "[Errende]";
 						mes "Thank you, so much!";
@@ -1390,7 +1390,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 		mes "you want from me?";
 		next;
 
-		switch(select("Tell me a story...:Your voice is...:No thanks, I appreciate it though.")) {
+		switch(select("Tell me a story...", "Your voice is...", "No thanks, I appreciate it though.")) {
 		case 1:
 			.@random = rand(1,3);
 			if (.@random == 1) {
@@ -1537,7 +1537,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 		mes "you want from me?";
 		next;
 
-		switch(select("Tell me a story, or sing something~:Your voice is...:No thanks. I appreciate it, though.")) {
+		switch(select("Tell me a story, or sing something~", "Your voice is...", "No thanks. I appreciate it, though.")) {
 		case 1:
 			.@random = rand(1,3);
 			if (.@random == 1) {
@@ -1677,7 +1677,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 		mes "By the way, why do you have that look on your face? Didn't find what you were looking for? Haha, would you show me your left hand?";
 		next;
 
-		if(select("Here you go.:Um... No!")==1) {
+		if(select("Here you go.", "Um... No!")==1) {
 			mes "[Kino Kitty]";
 			mes "Well, while you were gone,";
 			mes "I remembered the original lyrics to the song. I guess they really are important.";
@@ -1686,7 +1686,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 			mes "Here, let me give you a letter with the lyrics to Errende. I should also give you my seal so that Errende will know it's me. You don't mind, do you?";
 			next;
 
-			switch(select("Yes, I mind!:No, I don't mind.")) {
+			switch(select("Yes, I mind!", "No, I don't mind.")) {
 
 			case 1:
 				mes "[Kino Kitty]";
@@ -1832,7 +1832,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 			gef_bard_q = 10;
 			close;
 		} else {
-			switch(select("Tell me a story.:Sing a song.:Nothing.")) {
+			switch(select("Tell me a story.", "Sing a song.", "Nothing.")) {
 			case 1:
 				mes "[Kino Kitty]";
 				mes "A story? Mmmm...";
@@ -1897,7 +1897,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 		mes "princess.";
 		next;
 
-		if(select("Um, was that a love song?:I'm sorry for interrupting you.")==1) {
+		if(select("Um, was that a love song?", "I'm sorry for interrupting you.")==1) {
 			mes "[Mysterious Bard]";
 			mes "A...";
 			mes "Love song?!";
@@ -1971,7 +1971,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 				mes "Now that I think about it, are you look for anything, or is there a reason you wish to speak to me?";
 				next;
 
-				if(select("I'm looking for Kino Kitty...:Nothing, really.")==1) {
+				if(select("I'm looking for Kino Kitty...", "Nothing, really.")==1) {
 					mes "[Kino Kitty]";
 					mes "How do you";
 					mes "know my name?";
@@ -2155,7 +2155,7 @@ yuno_in01,172,100,3	script	Old Man#bq1	4_M_05,{
 		mes "However, I cannot show these fragile books to just anybody. For the sake of preservation, I can only show these works to preferred customers.";
 		next;
 
-		if(select("Show him your left hand.:Show him your right hand.")==1) {
+		if(select("Show him your left hand.", "Show him your right hand.")==1) {
 			mes "[Sketzi Bundin]";
 			mes "Ah~! You must be the friend of a high ranking Bard! I see, I see. You must be a friend of Minty Errende.";
 			next;
@@ -2255,7 +2255,7 @@ yuno_in01,173,96,0	script	Luke's Songs Vol.1	HIDDEN_NPC,{
 		mes "Contents";
 		next;
 
-		switch(select("Wedding Song:Life is a Water Mill:We")) {
+		switch(select("Wedding Song", "Life is a Water Mill", "We")) {
 
 		case 1:
 			mes "[Wedding Song]";
@@ -2546,13 +2546,13 @@ payon,181,172,3	script	Bard#4	1_M_BARD,{
 		mes "Right, right?";
 		next;
 
-		if(select("Show some interest.:Ignore him.")==1) {
+		if(select("Show some interest.", "Ignore him.")==1) {
 			mes "[Gunther Doubleharmony]";
 			mes "Yay~! I knew it!";
 			mes "So you wanna hear";
 			mes "a song or a story?";
 			next;
-			switch(select("A song:A story:Maybe some other time")) {
+			switch(select("A song", "A story", "Maybe some other time")) {
 			case 1:
 				switch(rand(1,3)) {
 				case 1: