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

Script CleanUp Phase 2

1 files changed, 25 insertions, 25 deletions

diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index 288f5f340..237c1f33e 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -53,7 +53,7 @@ prt_in,162,24,3	script	Splendid-Looking Knight	4_M_KNIGHT_SILVER,2,2,{
 		mes "[Rune Knight Manuel]";
 		mes "Anyway the drinks here are really good. Would you like to have one?";
 		next;
-		if(select("Sure, let's have a drink.:I refuse.") == 2) {
+		if(select("Sure, let's have a drink.", "I refuse.") == 2) {
 			mes "[Rune Knight Manuel]";
 			mes "Are you sure? You don't know the true elegance of these drinks...";
 			close;
@@ -85,7 +85,7 @@ prt_in,162,24,3	script	Splendid-Looking Knight	4_M_KNIGHT_SILVER,2,2,{
 				mes "[Rune Knight Manuel]";
 				mes "If you are interested, I'll introduce you to the masters who will guide you to the way of the Rune Knight with my recommendation.";
 				next;
-				switch(select("I am not ready yet.:I'm ready to be a Rune Knight.")) {
+				switch(select("I am not ready yet.", "I'm ready to be a Rune Knight.")) {
 				case 1:
 					mes "[Rune Knight Manuel]";
 					mes "Right. Every challenge always needs preparation. Okay, I'll wait for you.";
@@ -155,7 +155,7 @@ glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 		mes "[Guide, Jungberg]";
 		mes "So, What can I help you with?";
 		next;
-		switch(select("I want to go to the gathering place.:Nothing.")) {
+		switch(select("I want to go to the gathering place.", "Nothing.")) {
 		case 1:
 			mes "[Guide, Jungberg]";
 			mes "Right. I'll send you right now. I'll see you soon.";
@@ -180,7 +180,7 @@ glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 		mes "If you are a breathing human, then listen to me carefullly. I wouldn't risk my life here by hesitating to talk to just anyone.";
 		next;
 		if (job_rune_edq == 0) {
-			switch(select("Who are you?:What are you doing here?:Cancel.")) {
+			switch(select("Who are you?", "What are you doing here?", "Cancel.")) {
 			case 1:
 				mes "[Guide, Jungberg]";
 				mes "I am the only knight who's keeping the way of the Swordsman in this cursed place Glast Heim.";
@@ -211,7 +211,7 @@ glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 				close;
 			}
 		} else if (job_rune_edq == 1) {
-			switch(select("I came to be a Rune Knight.:Cancel.")) {
+			switch(select("I came to be a Rune Knight.", "Cancel.")) {
 			case 1:
 				mes "[Guide, Jungberg]";
 				mes "Um... Are you the Rune Knight candidate that Manuel talked about?";
@@ -255,7 +255,7 @@ glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 	}
 	mes "It seems that you are still taking the test. Do your best and pass all the tests.";
 	next;
-	switch(select("I want to go to the gathering place.:Quit the conversation.")) {
+	switch(select("I want to go to the gathering place.", "Quit the conversation.")) {
 	case 1:
 		mes "[Guide, Jungberg]";
 		mes "All right. I'll send you right away. I'll check you later.";
@@ -272,7 +272,7 @@ gl_knt02,150,55,3	script	Rune Knight Staff	4_M_01,2,2,{
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?";
 		next;
-		switch(select("Yes, take me there.:I'm on other business.:Cancel.")) {
+		switch(select("Yes, take me there.", "I'm on other business.", "Cancel.")) {
 		case 1:
 			mes "[Rune Knight Staff]";
 			mes "Okay, come in. I'll guide you.";
@@ -520,7 +520,7 @@ job3_rune01,80,60,3	script	Rune Knight Captain	4_M_KNIGHT_SILVER,2,2,{
 			mes "[Captain Tigris]";
 			mes "Well, my job is done now. Would you like to start your new life as a Rune Knight?";
 			next;
-			switch(select("Every preparation is done.:I need more time to think.")) {
+			switch(select("Every preparation is done.", "I need more time to think.")) {
 			case 1:
 				if (SkillPoint != 0 || checkmount() == MOUNT_PECO) {
 					mes "[Captain Tigris]";
@@ -618,7 +618,7 @@ job3_rune01,90,50,3	script	Rune Knight Lunarea	4_M_KNIGHT_GOLD,2,2,{
 			mes "[Rune Knight, Lunarea]";
 			mes "When you are ready to go to the test field talk to me.";
 			next;
-			switch(select("Move to the test field now.:Give me time to get ready.")) {
+			switch(select("Move to the test field now.", "Give me time to get ready.")) {
 			case 1:
 				callsub L_Test,0;
 				close;
@@ -638,7 +638,7 @@ job3_rune01,90,50,3	script	Rune Knight Lunarea	4_M_KNIGHT_GOLD,2,2,{
 			mes "[Rune Knight, Lunarea]";
 			mes "If you are ready to move to the test field talk to me.";
 			next;
-			switch(select("Move to the test field now.:Please give me time to prepare.")) {
+			switch(select("Move to the test field now.", "Please give me time to prepare.")) {
 			case 1:
 				if (questprogress(3220,PLAYTIME) == 1) {
 					mes "[Rune Knight, Lunarea]";
@@ -805,7 +805,7 @@ job3_rune01,55,50,3	script	Rune Knight, Renoa	4_M_KNIGHT_GOLD,2,2,{
 		} else if (job_rune_edq > 11 && job_rune_edq < 14) {
 			mes "If you are ready I'll open the way to the sage, Serpeone who's in the Rune-Midgard post at Ash-Vacuum. Are you prepared?";
 			next;
-			switch(select("Yes, I am prepared.:Not yet.")) {
+			switch(select("Yes, I am prepared.", "Not yet.")) {
 			case 1:
 				mes "[Rune Knight, Renoa]";
 				mes "Good. Then I'll send you there now. But, there's one thing I need to tell you.";
@@ -871,7 +871,7 @@ job3_rune01,55,50,3	script	Rune Knight, Renoa	4_M_KNIGHT_GOLD,2,2,{
 			mes "[Rune Knight, Renoa]";
 			mes "The number of total rune stones you need to make is exactly 20. Remember that well.";
 			next;
-			switch(select("Check number of made runes?:I've made all the 20 rune stones.")) {
+			switch(select("Check number of made runes?", "I've made all the 20 rune stones.")) {
 			case 1:
 				mes "[Rune Knight, Renoa]";
 				mes "The number of rune stones made 'til now is " + job_rune_edq2 + ".";
@@ -930,7 +930,7 @@ job3_rune01,58,51,1	script	Rune Furnace	CLEAR_NPC,{
 	} else if (job_rune_edq == 15) {
 		mes "I can see a hole under the huge Rune Stone Statue behind Renoa. Clearly this is a mass-produced rune heating furnace that I read in the book.";
 		next;
-		if(select("Use the Rune Heating Furnace:Stop.") == 2) close;
+		if(select("Use the Rune Heating Furnace", "Stop.") == 2) close;
 		switch(rand(24)) {
 			case 0: setarray .@str$[0],"Ehwaz","This red hot spiral is..."; break;
 			case 1: setarray .@str$[0],"Osilla","The rune flashing with this violet oblique line shape is..."; break;
@@ -1004,7 +1004,7 @@ job3_rune01,40,54,1	script	Runes and Rune Knights	CLEAR_NPC,{
 		close;
 	}
 	while(1) {
-		switch(select("The birth of Rune Knights:Runes and Magic Energy:Stop Reading")) {
+		switch(select("The birth of Rune Knights", "Runes and Magic Energy", "Stop Reading")) {
 		case 1:
 			.@book1 = 1;
 			mes "Rune Knights are the gathering of evolved swordmen who have achieved the harmony of sword and magic.";
@@ -1063,7 +1063,7 @@ job3_rune01,43,44,1	script	The Principles of Runes	CLEAR_NPC,{
 		close;
 	}
 	while(1) {
-		switch(select("The principle use of Runes:The types of Runes:Stop Reading")) {
+		switch(select("The principle use of Runes", "The types of Runes", "Stop Reading")) {
 		case 1:
 			.@book1 = 1;
 			mes "A rune is a kind of symbol that's been used on the Rune-Midgard continent since ancient times. Up until now it has only been used by occult circles.";
@@ -1110,7 +1110,7 @@ job3_rune01,50,36,1	script	Runes, Make & Use	CLEAR_NPC,{
 		close;
 	}
 	while(1) {
-		switch(select("The Making of Rune Stones:Rune Stone Ability Details:Stop Reading")) {
+		switch(select("The Making of Rune Stones", "Rune Stone Ability Details", "Stop Reading")) {
 		case 1:
 			.@book1 = 1;
 			mes "The making of Rune stones is achieved through a skill called rune mastery which is learned when one becomes a Rune Knight.";
@@ -1128,7 +1128,7 @@ job3_rune01,50,36,1	script	Runes, Make & Use	CLEAR_NPC,{
 			break;
 		case 2:
 			.@book2 = 1;
-			switch(select("Chapter One:Chapter Two:Chapter Three:Chapter Four:Stop Reading")) {
+			switch(select("Chapter One", "Chapter Two", "Chapter Three", "Chapter Four", "Stop Reading")) {
 			case 1:
 				mes "Ehwaz - This rune means the enhancement of luck and positive power. It shapes the source in the form of a red spiral in a Rune Furnace.";
 				next;
@@ -1239,13 +1239,13 @@ mid_camp,13,138,3	script	Dispatched Rune Knight#1	4_M_01,2,2,{
 		if (strnpcinfo(0) == "Dispatched Rune Knight#1") {
 			mes "Do you want to go out to the Splendide field?";
 			next;
-			if(select("Move to Splendide field:Cancel.") == 1)
+			if(select("Move to Splendide field", "Cancel.") == 1)
 				warp "spl_fild01",355,325;
 			close;
 		} else if (strnpcinfo(0) == "Dispatched Rune Knight#2") {
 			mes "Do you want to go back to the expeditionary team's post?";
 			next;
-			if(select("Yes please.:Not yet.") == 1)
+			if(select("Yes please.", "Not yet.") == 1)
 				warp "mid_camp",50,153;
 			close;
 		}
@@ -1359,7 +1359,7 @@ mid_camp,235,250,3	script	Sage Serpeone	4_F_FAIRY,2,2,{
 		} else if (job_rune_edq == 13) {
 			mes "Are you gathering enough magical energy? Or do you have any questions?";
 			next;
-			switch(select("I've gathered enough energy.:To the gathering place.:Stop the conversation.")) {
+			switch(select("I've gathered enough energy.", "To the gathering place.", "Stop the conversation.")) {
 			case 1:
 				mes "[Sage Serpeone]";
 				mes "Is it so? Then let's check this out.";
@@ -1397,7 +1397,7 @@ mid_camp,235,250,3	script	Sage Serpeone	4_F_FAIRY,2,2,{
 				mes "[Sage Serpeone]";
 				mes "Do you want to go back the Rune Knight gathering place?";
 				next;
-				if(select("I want to go back.:I want to cancel.") == 1)
+				if(select("I want to go back.", "I want to cancel.") == 1)
 					warp "job3_rune01",80,65;
 				close;
 			case 3:
@@ -1406,7 +1406,7 @@ mid_camp,235,250,3	script	Sage Serpeone	4_F_FAIRY,2,2,{
 		} else if (job_rune_edq == 14) {
 			mes "Are you ready to go back to the Rune Knight gathering place?";
 			next;
-			if(select("I want to go back now.:I am not ready yet.") == 1)
+			if(select("I want to go back now.", "I am not ready yet.") == 1)
 				warp "job3_rune01",80,65;
 			close;
 		}
@@ -1418,7 +1418,7 @@ mid_camp,235,250,3	script	Sage Serpeone	4_F_FAIRY,2,2,{
 		mes "[Sage Serpeone]";
 		mes "Then I'll send you to the Rune Knight gathering place where you should be.";
 		next;
-		if(select("I'll go back now.:I'll stay.") == 1)
+		if(select("I'll go back now.", "I'll stay.") == 1)
 			warp "job3_rune01",80,65;
 		close;
 	}
@@ -1492,7 +1492,7 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 				mes "If all of your preparations are done, I'll send you to the final test field.";
 				job_rune_edq = 18;
 				next;
-				if(select("Enter the final test field.:I'm not ready yet.") == 2) close;
+				if(select("Enter the final test field.", "I'm not ready yet.") == 2) close;
 				if (getequipisequiped(EQI_HEAD_TOP) || getequipisequiped(EQI_ARMOR) || getequipisequiped(EQI_GARMENT) || getequipisequiped(EQI_SHOES) ||
 				    getequipisequiped(EQI_ACC_L) || getequipisequiped(EQI_ACC_R) || getequipisequiped(EQI_HEAD_MID) || getequipisequiped(EQI_HEAD_LOW)) {
 					mes "[Rune Knight Velpino]";
@@ -2159,7 +2159,7 @@ sec_in02,34,167,3	script	R.Knight Job Manager	4_M_KNIGHT_SILVER,1,1,{
 	if (callfunc("F_GM_NPC","1854",1) == 1) {
 		mes "Rune Knight Job Change Managing Module Start";
 		next;
-		switch(select("GlobalVar check:GlobalVar Oneshot Modification")) {
+		switch(select("GlobalVar check", "GlobalVar Oneshot Modification")) {
 		case 1:
 			mes "Rune Knight Job Change GlobalVar right now is " + $@job_rune_test1 + ".";
 			mes "The number of Rune Knight Test field right now is... " + getmapusers("job3_rune02") + ".";