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

Script CleanUp Phase 2

6 files changed, 41 insertions, 41 deletions

diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 9f4ab27d4..60726edb5 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -88,7 +88,7 @@ prt_church,184,41,4	script	Cleric#aco	1_M_PASTOR,{
 	mes "[Father Mareusis]";
 	mes "What is it that you seek?";
 	next;
-	switch(select("Father, I want to be a Acolyte.:Acolyte Requirements.:Just looking around.")) {
+	switch(select("Father, I want to be a Acolyte.", "Acolyte Requirements.", "Just looking around.")) {
 	case 1:
 		mes "[Father Mareusis]";
 		if (BaseJob == Job_Acolyte) {
@@ -104,7 +104,7 @@ prt_church,184,41,4	script	Cleric#aco	1_M_PASTOR,{
 			mes "wish to become";
 			mes "a servant of God?";
 			next;
-			if (select("Yes Father, I do.:Nope, I lied.") == 1) {
+			if (select("Yes Father, I do.", "Nope, I lied.") == 1) {
 				mes "[Father Mareusis]";
 				mes "Good. I accept " + strcharinfo(0) + "'s will to become an Acolyte. You understand that you must do penance before you can become a servant of God, right?";
 				next;
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 946638d64..49616260a 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -86,7 +86,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 	mes "[Archer Guildsman]";
 	mes "Good day. How may I help you?";
 	next;
-	switch(select("I want to be an Archer.:I need the requirements, please.:Nothing, thanks.")) {
+	switch(select("I want to be an Archer.", "I need the requirements, please.", "Nothing, thanks.")) {
 	case 1:
 		if (BaseJob == Job_Archer) {
 			mes "[Archer Guildsman]";
@@ -107,7 +107,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 			mes "Do you want to be an Archer?";
 			mes "If so, you need to fill out this application form.";
 			next;
-			if (select("Apply.:Cancel") == 1) {
+			if (select("Apply.", "Cancel") == 1) {
 				job_archer_q = 1;
 				setquest 1004;
 				mes "[Archer Guildsman]";
@@ -117,7 +117,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 				mes "If you think you've met them already, we can check that now.";
 				mes "Are you ready?";
 				next;
-				if (select("Yes, I am.:No, not yet.") == 1) {
+				if (select("Yes, I am.", "No, not yet.") == 1) {
 					mes "[Archer Guildsman]";
 					mes "Alright, let me check.";
 					next;
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 4836258c4..86ce6daaa 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -84,7 +84,7 @@ geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 	mes "[Mage Guildsman]";
 	mes "Yo. What's up?";
 	next;
-	switch(select("I want to be a Mage.:Tell me the Requirements.:Pretty much nothing.")) {
+	switch(select("I want to be a Mage.", "Tell me the Requirements.", "Pretty much nothing.")) {
 	case 1:
 		mes "[Mage Guildsman]";
 		if (BaseJob == Job_Mage) {
@@ -110,7 +110,7 @@ geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 			mes "[Mage Guildsman]";
 			mes "Right, you said that you wanna be a Mage? Alright then, please sign the Mage Application.";
 			next;
-			if (select("Sign Up.:Quit.") == 1) {
+			if (select("Sign Up.", "Quit.") == 1) {
 				mes "[Mage Guildsman]";
 				mes "Okay. Sign right there. Oh, you're very good at spelling. Alright. So your name is... " + strcharinfo(0) + ".";
 				next;
@@ -304,13 +304,13 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 	mes "[Mixing Machine]";
 	mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes.";
 	next;
-	if (select("Use Machine.:Cancel.") == 1) {
+	if (select("Use Machine.", "Cancel.") == 1) {
 		mes "[Mixing Machine]";
 		mes "Choose the";
 		mes "Solvent for";
 		mes "the Solution.";
 		next;
-		switch(select("Payon Solution.:Morroc Solution.:No Solvent.")) {
+		switch(select("Payon Solution.", "Morroc Solution.", "No Solvent.")) {
 		case 1:
 			if (countitem(Payon_Potion) == 0) {
 				mes "[Mixing Machine]";
@@ -350,7 +350,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 				mes "[Mixing Machine]";
 				mes "Please choose if you wish to begin mixing, or to re-enter the number of items to be mixed.";
 				next;
-				switch(select("Begin Mixing.:Re-Enter Number of Items.:Reset.")) {
+				switch(select("Begin Mixing.", "Re-Enter Number of Items.", "Reset.")) {
 				case 1:
 					mes "[Mixing Machine]";
 					mes "Please place the items into the Mixing Receptacle. Make sure the item amounts are correct.";
@@ -361,7 +361,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 					mes "[Mixing Machine]";
 					mes "If everything is correct, press the 'Mix' button when you are ready. Otherwise, press the 'Cancel' button.";
 					next;
-					if (select("Press 'Mix' Button.:Press 'Cancel' Button.") == 1) {
+					if (select("Press 'Mix' Button.", "Press 'Cancel' Button.") == 1) {
 						mes "[Mixing Machine]";
 						mes "Place items into the Mixing Receptacle now. Please wait.";
 						next;
@@ -417,7 +417,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 					mes "Reset Complete.";
 					mes "Initiate again?";
 					next;
-					if (select("Yes.:No.") == 1)
+					if (select("Yes.", "No.") == 1)
 						break;
 					mes "[Mixing Machine]";
 					mes "Process Halted.";
@@ -434,7 +434,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 			mes "[Mixing Machine]";
 			mes "Select items to mix.";
 			while(1) {
-				switch(select("Jellopy.:Fluff.:Milk.:Ready to Mix.")) {
+				switch(select("Jellopy.", "Fluff.", "Milk.", "Ready to Mix.")) {
 				case 1:
 					while(1) {
 						input .@input;
@@ -505,7 +505,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 				if (.@input == 0) {
 					mes "Do you want to skip this Menu?";
 					next;
-					if (select("Yes.:No.") == 1) {
+					if (select("Yes.", "No.") == 1) {
 						break;
 					}
 				}
@@ -519,7 +519,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 				mes "[Mixing Machine]";
 				mes "The Serial Number is #" + .@input + ", correct?";
 				next;
-				if (select("Confirm.:Cancel.") == 1) {
+				if (select("Confirm.", "Cancel.") == 1) {
 					if (.@input == 8472)
 						.@magic_powder = 1;
 					else if (.@input == 3735)
@@ -538,7 +538,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 		mes "Choose a";
 		mes "Catalyst Stone.";
 		next;
-		switch(select("Yellow Gemstone.:Red Gemstone.:Blue Gemstone.:1carat Diamond.:Skip.")) {
+		switch(select("Yellow Gemstone.", "Red Gemstone.", "Blue Gemstone.", "1carat Diamond.", "Skip.")) {
 		case 1: .@mixitem3 = 1; break;
 		case 2: .@mixitem3 = 2; break;
 		case 3: .@mixitem3 = 3; break;
@@ -621,7 +621,7 @@ geffen_in,177,112,4	script	Bookshelf	HIDDEN_NPC,{
 	mes "[Guide Book]";
 	mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care.";
 	next;
-	switch(select("Solution No. 1.:Solution No. 2.:Solution No. 3.:Solution No. 4.:Close.")) {
+	switch(select("Solution No. 1.", "Solution No. 2.", "Solution No. 3.", "Solution No. 4.", "Close.")) {
 	case 1:
 		mes "[Mage Test Solution No. 1]";
 		mes "* Ingredients List *";
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 8ba33489d..8319e6e30 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -131,7 +131,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 			mes "The only thing to take care of is your Membership Fee.";
 			mes "Are you ready?";
 			next;
-			switch(select("Pay the rest of the 500 Zeny:Quit")) {
+			switch(select("Pay the rest of the 500 Zeny", "Quit")) {
 			case 1:
 				mes "[Chief Mahnsoo]";
 				if (Zeny < 500) {
@@ -295,7 +295,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 		mes "Is there anything";
 		mes "I can help you with?";
 		next;
-		switch(select("I want to be a Merchant.:Tell me about Merchants.:Tell me the requirements.:Nope.")) {
+		switch(select("I want to be a Merchant.", "Tell me about Merchants.", "Tell me the requirements.", "Nope.")) {
 		case 1:
 			mes "[Chief Mahnsoo]";
 			mes "Do you want to";
@@ -327,7 +327,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 			mes "So what do you think?";
 			mes "Are you ready to join now?";
 			next;
-			if (select("Yes, I will.:Ummm, maybe later...") ==1 ) {
+			if (select("Yes, I will.", "Ummm, maybe later...") ==1 ) {
 				mes "[Chief Mahnsoo]";
 				mes "Let me check if you";
 				mes "filled out everything";
@@ -345,7 +345,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 				mes "How do you wish to";
 				mes "handle the fee?";
 				next;
-				switch(select("Pay all 1,000 Zeny now!:Two payments of 500 Zeny.:Quit")) {
+				switch(select("Pay all 1,000 Zeny now!", "Two payments of 500 Zeny.", "Quit")) {
 				case 1:
 					mes "[Chief Mahnsoo]";
 					if (Zeny >= 1000) {
@@ -600,7 +600,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 		mes "So how did";
 		mes "the delivery go?";
 		next;
-		if (select("*Sob* I lost the package.:Fine.") == 1) {
+		if (select("*Sob* I lost the package.", "Fine.") == 1) {
 			job_merchant_q = 9;
 			mes "[Union Staff Kay]";
 			mes "Are you kidding me? You'll fail the test if you lose the package!";
@@ -618,7 +618,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 		mes "[Union Staff Kay]";
 		mes "Hey, what are you still doing here? Shouldn't you be on your way already?";
 		next;
-		if (select("I need a new package.:Oh, yeah. You're right!") == 1) {
+		if (select("I need a new package.", "Oh, yeah. You're right!") == 1) {
 			if (countitem(Merchant_Box_1) == 0 && countitem(Merchant_Box_2) == 0 && countitem(Merchant_Box_3) == 0 && countitem(Merchant_Box_Etc) == 0) {
 				mes "[Union Staff Kay]";
 				mes "Wha--?";
@@ -626,7 +626,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 				mes "the package go?";
 				mes "Where is it?!";
 				next;
-				if (select("*Sob* I lost it!:I have it right here.") == 1) {
+				if (select("*Sob* I lost it!", "I have it right here.") == 1) {
 					job_merchant_q = 9;
 					mes "[Union Staff Kay]";
 					mes "You...";
@@ -673,7 +673,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 		mes "what brings";
 		mes "you here?";
 		next;
-		switch(select("My Merchant License test.:I'm looking for part time work.:Nothing.")) {
+		switch(select("My Merchant License test.", "I'm looking for part time work.", "Nothing.")) {
 		case 1:
 			mes "[Union Staff Kay]";
 			mes "I see.";
@@ -694,7 +694,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 			mes "[Union Staff Kay]";
 			mes "Alright, there you go. Lemme give you the package. Now, choose the destination of the delivery.";
 			next;
-			switch(select("Prontera.:Geffen.:Morocc.:Byalan Island.")) {
+			switch(select("Prontera.", "Geffen.", "Morocc.", "Byalan Island.")) {
 			case 1: .@where_village = 1; break;
 			case 2: .@where_village = 2; break;
 			case 3: .@where_village = 3; break;
@@ -709,7 +709,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 					if (.@input == 0) {
 						mes "[Union Staff Kay]";
 						mes "Are you sure that you wanna cancel?";
-						if (select("Yes.:Let me try again.") == 1) {
+						if (select("Yes.", "Let me try again.") == 1) {
 							mes "Alright, we'll cancel for now.";
 							close;
 						}
@@ -733,7 +733,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 				else
 					mes "Lucky you! Your destination is Byalan Island. The Serial Number is " + .@input + ". Are you positive?";
 				next;
-				if (select("Positive.:Whoops! Wrong number!") == 1) {
+				if (select("Positive.", "Whoops! Wrong number!") == 1) {
 					break;
 				}
 			}
@@ -1057,7 +1057,7 @@ prontera,248,42,0	script	Kafra Employee#mer	4_F_KAFRA2,{
 		mes "Currently, we offer a Teleport";
 		mes "Service to Izlude for 600 zeny.";
 		next;
-		if (select("Use:Cancel") == 1) {
+		if (select("Use", "Cancel") == 1) {
 			if (Zeny < 600) {
 				mes "[Kafra Employee]";
 				mes "I'm sorry, but you";
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 45da68fa8..d3f230921 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -102,7 +102,7 @@ izlude_in,74,172,4	script	Swordman#swd_1	2_M_SWORDMASTER,{
 	mes "What business";
 	mes "brings you to us?";
 	next;
-	switch(select("Job Change:About Swordman.:About the Job requirements.:Cancel.")) {
+	switch(select("Job Change", "About Swordman.", "About the Job requirements.", "Cancel.")) {
 	case 1:
 		if (BaseJob == Job_Swordman) {
 			mes "[Swordman]";
@@ -118,7 +118,7 @@ izlude_in,74,172,4	script	Swordman#swd_1	2_M_SWORDMASTER,{
 			mes "[Swordman]";
 			mes "So you wish to become a proud Swordman? By all means, please sign up!";
 			next;
-			if (select("Sign up.:Cancel.") == 1) {
+			if (select("Sign up.", "Cancel.") == 1) {
 				savepoint "izlude_in",65,165;
 				job_sword_q = 1;
 				setquest 1014;
@@ -128,7 +128,7 @@ izlude_in,74,172,4	script	Swordman#swd_1	2_M_SWORDMASTER,{
 				mes "[Swordman]";
 				mes "If you have already met the requirements, you can take an interview right now. Would you like to?";
 				next;
-				if (select("Yes.:No.") == 1) {
+				if (select("Yes.", "No.") == 1) {
 					mes "[Swordman]";
 					mes "Good, good.";
 					mes "Now, let's see...";
@@ -341,7 +341,7 @@ function	script	F_JobSwdStaff	{
 	mes "[Test Hall Staff]";
 	mes "Do you surrender?";
 	next;
-	if (select("Yes.:No.") == 1) {
+	if (select("Yes.", "No.") == 1) {
 		mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test.",bc_map;
 		warp "izlude_in",65,165;
 		end;
@@ -356,7 +356,7 @@ OnTouch:
 	mes "[Test Hall Staff]";
 	mes "Applicant " + strcharinfo(0) + ". Do you surrender??";
 	next;
-	if (select("Yes.:No.") == 1) {
+	if (select("Yes.", "No.") == 1) {
 		mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test..",bc_map;
 		warp "izlude_in",65,165;
 		end;
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index 32f2f0d75..8bed74c11 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -167,7 +167,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 		mes "Mushroom Farm?";
 		mes "Have any fun?";
 		next;
-		if (select("Yeah, kinda Cool.:It was horrible.") == 1) {
+		if (select("Yeah, kinda Cool.", "It was horrible.") == 1) {
 			mes "[Thief Guide]";
 			mes "Heh heh! That's a good attitude. In our line of work, you gotta enjoy getting your hands dirty, one way or another.";
 			close;
@@ -180,7 +180,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 		mes "[Thief Guide]";
 		mes "Hey, whaddya doin' here? Aren't you supposed to be gathering Mushrooms? Or did you need it explained to you again?";
 		next;
-		if  (select("Yes.:No, that's okay.") == 1) {
+		if  (select("Yes.", "No, that's okay.") == 1) {
 			mes "[Thief Guide]";
 			mes "*Sigh* Well, there's always one in the bunch. Alright, listen carefully.";
 			next;
@@ -225,7 +225,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 		mes "ready to try again?";
 	}
 	next;
-	if (select("Hey, I came here to be a Thief!:Nah, I'm just looking around.") == 1) {
+	if (select("Hey, I came here to be a Thief!", "Nah, I'm just looking around.") == 1) {
 		if (job_thief_q == 0) {
 			mes "[Thief Guide]";
 			mes "Heh, I like your confidence. Still, you know being a Thief isn't all what it's cracked up to be.";
@@ -236,7 +236,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 			mes "want to be";
 			mes "a Thief?";
 			next;
-			switch(select("Yeah.:No, just wasting your time.:Why did you become a Thief?")) {
+			switch(select("Yeah.", "No, just wasting your time.", "Why did you become a Thief?")) {
 			case 1:
 				mes "[Thief Guide]";
 				mes "Really...";
@@ -258,7 +258,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 			mes "apply to become";
 			mes "a Thief or not?";
 			next;
-			switch(select("Yes, I will.:I'm too scared to be a Thief!")) {
+			switch(select("Yes, I will.", "I'm too scared to be a Thief!")) {
 			case 1:
 				mes "[Thief Guide]";
 				mes "Alright, tell";
@@ -272,7 +272,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 				mes "[Thief Guide]";
 				mes "Alright, your registration has been processed. Okay, you can begin your test if you're ready.";
 				next;
-				switch(select("Yeah, I'm ready.:No, I'm not ready yet.")) {
+				switch(select("Yeah, I'm ready.", "No, I'm not ready yet.")) {
 				case 1:
 					break;
 				case 2:
@@ -318,7 +318,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 		mes "[Thief Guide]";
 		mes "Now, your actual abilities will need to be tested. Do you know anything about the test?";
 		next;
-		switch(select("Yes, I do.:Sorry, I don't.")) {
+		switch(select("Yes, I do.", "Sorry, I don't.")) {
 		case 1:
 			mes "[Thief Guide]";
 			mes "Oh yeah? Well, this makes things a lot easier.";