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

Script CleanUp Phase 2

1 files changed, 33 insertions, 33 deletions

diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index c9e931be3..5b2c5f21d 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -48,7 +48,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "......";
 		mes "May I help you?";
 		next;
-		switch(select("Oh! N-Nothing!:Excuse me...")) {
+		switch(select("Oh! N-Nothing!", "Excuse me...")) {
 		case 1:
 			mes "[Scholar]";
 			mes "...";
@@ -99,7 +99,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "......";
 		mes "May I help you?";
 		next;
-		switch(select("Oh! N-Nothing!:By any chance...")) {
+		switch(select("Oh! N-Nothing!", "By any chance...")) {
 		case 1:
 			mes "[Scholar]";
 			mes "...";
@@ -217,7 +217,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "happened to put that";
 		mes "expression on your face?";
 		next;
-		switch(select("I found something in Juperos.:Nothing much.")) {
+		switch(select("I found something in Juperos.", "Nothing much.")) {
 		case 1:
 			mes "[" +strcharinfo(0)+"]";
 			mes "I went to Juperos like";
@@ -292,7 +292,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "So what brings you to";
 		mes "the Juno Library today?";
 		next;
-		switch(select("Nice weather today, isn't it?:I found something in Juperos.:Nothing much.")) {
+		switch(select("Nice weather today, isn't it?", "I found something in Juperos.", "Nothing much.")) {
 		case 1:
 			mes "[Fayruz]";
 			mes "Well, I wouldn't know.";
@@ -323,7 +323,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 				mes "tell you some tales about";
 				mes "Juperos that I've learned.";
 				next;
-				switch(select("Please, be my guest.:No way, you can't have it.")) {
+				switch(select("Please, be my guest.", "No way, you can't have it.")) {
 				case 1:
 					if (countitem(Transparent_Plate01)) callfunc "Func_JupHist",7352,1;
 					else if (countitem(Transparent_Plate02)) callfunc "Func_JupHist",7353,2;
@@ -385,7 +385,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "back with something that'd";
 		mes "help me in my research!";
 		next;
-		switch(select("Take a look at this.:Oh, I'm sorry...")) {
+		switch(select("Take a look at this.", "Oh, I'm sorry...")) {
 		case 1:
 			switch(jupe_hist) {
 				case 1: callfunc "Func_JupHist",7353,7354,7355,7352;
@@ -436,7 +436,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "in Juperos for anything that";
 		mes "might help me in my research?";
 		next;
-		switch(select("Yeah, take a look at this.:No, I'm sorry...")) {
+		switch(select("Yeah, take a look at this.", "No, I'm sorry...")) {
 		case 1:
 			switch(jupe_hist) {
 				case 3: callfunc "Func_JupHist",7354,7355,7352,7353;
@@ -485,7 +485,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "So did you have been to Juperos again? I'm really hoping that you";
 		mes "were able to find something new that would help in my research...";
 		next;
-		switch(select("Actually, I did find this...:I'm sorry, I haven't...")) {
+		switch(select("Actually, I did find this...", "I'm sorry, I haven't...")) {
 		case 1:
 			switch(jupe_hist) {
 				case 7: callfunc "Func_JupHist",7355,7352,7353,7354;
@@ -517,7 +517,7 @@ yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
 		mes "So what exactly brings you";
 		mes "to the Juno Library this time?";
 		next;
-		switch(select("I found another Transparent Plate.:Just visiting, really.")) {
+		switch(select("I found another Transparent Plate.", "Just visiting, really.")) {
 		case 1:
 			if ((countitem(Transparent_Plate01)) || (countitem(Transparent_Plate02)) || (countitem(Transparent_Plate03)) || (countitem(Transparent_Plate04))) {
 				mes "[Fayruz]";
@@ -939,14 +939,14 @@ yuno_in04,186,125,4	script	Bundle of Files	HIDDEN_NPC,{
 	mes "By Fayruz Khrhiyha";
 	mes "Sage Castle Researcher^000000";
 	next;
-	switch(select("Table of Contents.:Leave it alone.")) {
+	switch(select("Table of Contents.", "Leave it alone.")) {
 	case 1:
 		if (yuno_hist > 4) {
 			mes "^8B6914 1. Preface";
 			mes " 2. Juperos Background";
 			mes " 3. Theory Behind Its Fall^000000";
 			next;
-			switch(select("Preface:Juperos Background:Theory Behind Its Fall:Leave it alone.")) {
+			switch(select("Preface", "Juperos Background", "Theory Behind Its Fall", "Leave it alone.")) {
 			case 1:
 				mes "^8B6914Scholars are certain";
 				mes "that the Juperos civilization";
@@ -1122,7 +1122,7 @@ yuno_in04,186,125,4	script	Bundle of Files	HIDDEN_NPC,{
 				close;
 			}
 		}
-		switch(select("Preface:Close the file.")) {
+		switch(select("Preface", "Close the file.")) {
 		case 1:
 			mes "^8B6914Scholars are certain";
 			mes "that the Juperos civilization";
@@ -1283,7 +1283,7 @@ juperos_01,99,112,4	script	Bronze Statue#1	CLEAR_NPC,{
 		mes "engraving on the";
 		mes "Bronze Statue's rod.^000000";
 		next;
-		switch(select("Investigate:Ignore it")) {
+		switch(select("Investigate", "Ignore it")) {
 		case 1:
 			mes "^3355FFIt's an inscription that's";
 			mes "written in an old language";
@@ -1375,7 +1375,7 @@ yuno_in04,102,106,1	script	Popular Feasts	HIDDEN_NPC,{
 	mes "Publisher:";
 	mes "Muha Books, Co.^000000";
 	next;
-	switch(select(" 1. Fried Yoyo Tails: 14. Poring Salad: 252. Beak Soup")) {
+	switch(select(" 1. Fried Yoyo Tails", " 14. Poring Salad", " 252. Beak Soup")) {
 	case 1:
 		mes "^8B6914...";
 		mes "If possible, try";
@@ -1422,7 +1422,7 @@ yuno_in04,167,127,1	script	Red Book	HIDDEN_NPC,{
 	mes "^3355FFYou find a book";
 	mes "with red binding.^000000";
 	next;
-	switch(select("Read.:Leave it alone.")) {
+	switch(select("Read.", "Leave it alone.")) {
 	case 1:
 		mes "^8B6914...^000000";
 		next;
@@ -1481,7 +1481,7 @@ yuno_in04,121,109,1	script	Scroll	HIDDEN_NPC,{
 	mes "that's collected a";
 	mes "layer of fine dust.^000000";
 	next;
-	switch(select("Peruse:Leave it alone")) {
+	switch(select("Peruse", "Leave it alone")) {
 	case 1:
 		mes "^8B6914Item Upgrade Introduction";
 		mes " ";
@@ -1533,7 +1533,7 @@ yuno_in04,118,116,4	script	Paper	HIDDEN_NPC,{
 	mes "paper that looks";
 	mes "like a personal letter.^000000";
 	next;
-	switch(select("Read it.:Leave it alone.")) {
+	switch(select("Read it.", "Leave it alone.")) {
 	case 1:
 		if (yuno_hist > 7) {
 			mes "^8B6914P.S.";
@@ -1642,7 +1642,7 @@ OnTouch:
 	mes "Its warmth is...";
 	mes "Wrapping all over me...";
 	next;
-	switch(select("Ah, it's so nice...:No! This is wrong!")) {
+	switch(select("Ah, it's so nice...", "No! This is wrong!")) {
 	case 1:
 		mes "^777777["+ strcharinfo(0) +"]^000000";
 		mes "Ahhhh...";
@@ -1840,7 +1840,7 @@ jupe_area1,88,224,0	script	#hole#1-1	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest1) > 0) {
 				mes "^3355FFYou take out your";
@@ -2130,7 +2130,7 @@ jupe_area1,25,238,0	script	#hole#1-2	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest2) > 0) {
 				mes "^3355FFYou take out your";
@@ -2417,7 +2417,7 @@ jupe_area1,36,146,0	script	#hole#1-3	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest3) > 0) {
 				mes "^3355FFYou take out your";
@@ -2703,7 +2703,7 @@ jupe_area1,50,49,0	script	#hole#1-4	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest4) > 0) {
 				mes "^3355FFYou take out your";
@@ -2971,7 +2971,7 @@ jupe_area1,112,162,0	script	Lever#ufe	CLEAR_NPC,{
 	mes "whose function";
 	mes "is not known to you.^000000";
 	next;
-	switch(select("Pull.:Cancel.")) {
+	switch(select("Pull.", "Cancel.")) {
 	case 1:
 		if ($@JupreArea1InUse == 1) close;
 		initnpctimer;
@@ -3039,7 +3039,7 @@ jupe_area2,74,224,0	script	#hole#2-1	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest1) > 0) {
 				mes "^3355FFYou take out your";
@@ -3329,7 +3329,7 @@ jupe_area2,138,238,0	script	#hole#2-2	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest2) > 0) {
 				mes "^3355FFYou take out your";
@@ -3616,7 +3616,7 @@ jupe_area2,127,146,0	script	#hole#2-3	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest3) > 0) {
 				mes "^3355FFYou take out your";
@@ -3904,7 +3904,7 @@ jupe_area2,113,49,0	script	#hole#2-4	CLEAR_NPC,{
 		mes "probably need to insert";
 		mes "some kind of object...^000000";
 		next;
-		switch(select("Insert a Crest Piece.:Cancel.")) {
+		switch(select("Insert a Crest Piece.", "Cancel.")) {
 		case 1:
 			if (countitem(Piece_Of_Crest4) > 0) {
 				mes "^3355FFYou take out your";
@@ -4174,7 +4174,7 @@ jupe_area2,51,162,0	script	Lever#ufe2	CLEAR_NPC,{
 	mes "whose function";
 	mes "is not known to you.^000000";
 	next;
-	switch(select("Pull.:Cancel.")) {
+	switch(select("Pull.", "Cancel.")) {
 	case 1:
 		if ($@JupreArea2InUse == 1) close;
 		initnpctimer;
@@ -4233,7 +4233,7 @@ jupe_ele_r,51,98,0	script	Switch#ufe	CLEAR_NPC,{
 		mes "lever that's located";
 		mes "next to four empty slots.^000000";
 		next;
-		switch(select("Pull the lever.:Leave it alone.")) {
+		switch(select("Pull the lever.", "Leave it alone.")) {
 		case 1:
 			mes "^3355FF*Snap Snap*^000000";
 			next;
@@ -4260,7 +4260,7 @@ jupe_ele_r,51,98,0	script	Switch#ufe	CLEAR_NPC,{
 					delitem Piece_Of_Crest2,1;
 					delitem Piece_Of_Crest3,1;
 					next;
-					switch(select("Pull out the Crest Pieces.:Pull the lever.")) {
+					switch(select("Pull out the Crest Pieces.", "Pull the lever.")) {
 					case 1:
 						cutin "5",2;
 						mes "^3355FFYou pull out all";
@@ -4902,7 +4902,7 @@ OnTouch:
 	mes "that will teleport you";
 	mes "to the previous floor.^000000";
 	next;
-	switch(select("Use it.:Ignore it.")) {
+	switch(select("Use it.", "Ignore it.")) {
 	case 1:
 		specialeffect2 EF_LIGHTSPHERE;
 		close2;
@@ -4977,7 +4977,7 @@ sec_in02,39,167,0	script	Juperos Manager	4_F_OPERATION,{
 		mes "you'll cancel their progress";
 		mes "through the quest.";
 		next;
-		switch(select("jupe_Area1:jupe_Area2:jupe_ele_r:jupe_ele")) {
+		switch(select("jupe_Area1", "jupe_Area2", "jupe_ele_r", "jupe_ele")) {
 		case 1:
 			.@loc$ = "jupe_Area1";
 			.@var$ = "$@JupreArea1InUse";
@@ -5000,7 +5000,7 @@ sec_in02,39,167,0	script	Juperos Manager	4_F_OPERATION,{
 		mes "to reset "+.@loc$+".";
 		mes "Shall we proceed?";
 		next;
-		switch(select("Yes.:No.")) {
+		switch(select("Yes.", "No.")) {
 		case 1:
 			mes "[Juperos Manager]";
 			mes "The global variable in";