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

Script CleanUp Phase 2

10 files changed, 24 insertions, 24 deletions

diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt
index 8a57d4f3e..7dec41f79 100644
--- a/npc/custom/quests/berzebub.txt
+++ b/npc/custom/quests/berzebub.txt
@@ -22,7 +22,7 @@ prontera,165,178,8	script	Old Woman	8_F_GRANDMOTHER,{
 		close; }
 	mes "Greeting, lad. I found a really nifty item while I was picking mushrooms near Glast Heim.";
 	next;
-	if(select("Keep Talking:Leave")==2) goto M_Leave;
+	if(select("Keep Talking", "Leave")==2) goto M_Leave;
 
 	mes .@n$;
 	mes "I have never seen an item like this before. I am told it can be placed inside any accessory with a slot available.";
@@ -30,7 +30,7 @@ prontera,165,178,8	script	Old Woman	8_F_GRANDMOTHER,{
 	mes .@n$;
 	mes "If you're interested in this item, I'll tell you what you need for me to make you one of your own. I can only give one of these to each player, so once you finish this quest, you may not do it again.";
 	next;
-	if(select("Tell me more about it:Nah, I don't care about it")==2) goto M_Leave;
+	if(select("Tell me more about it", "Nah, I don't care about it")==2) goto M_Leave;
 
 	mes .@n$;
 	mes "I believe the item is called a ^FF0000Berzebub Card^000000. It makes you cast spells really fast!";
@@ -41,7 +41,7 @@ prontera,165,178,8	script	Old Woman	8_F_GRANDMOTHER,{
 		mes " ~ "+.@items[.@i+1]+"x "+getitemname(.@items[.@i]);
 		if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; }
 	next;
-	if(select("I have all of that!:I'll get those ASAP")==2) goto M_Leave;
+	if(select("I have all of that!", "I'll get those ASAP")==2) goto M_Leave;
 
 	mes .@n$;
 	if (.@nr) {
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index 372c6bffe..ad18a73f5 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -99,7 +99,7 @@ function Chk; function Cm;
 		else if (.Reset > 0)
 			mes "It will cost "+Cm(.Reset)+" Zeny.";
 		next;
-		switch(select(" ~ Abandon...: ~ ^777777Cancel^000000")) {
+		switch(select(" ~ Abandon...", " ~ ^777777Cancel^000000")) {
 		case 1:
 			if (.Reset > 0) {
 				if (Zeny < .Reset) {
diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt
index ff581825b..f08ece027 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -19,12 +19,12 @@ prontera,158,356,4	script	Royal Messenger	8W_SOLDIER,{
 	mes "Welcome to Prontera.";
 	mes "I am the messenger in charge of the Royal Quests.";
 	next;
-	if(select("Listen...:Walk away")==2) close;
+	if(select("Listen...", "Walk away")==2) close;
 	mes "[Royal Messenger]";
 	mes "There are two quests.";
 	mes "Choose the one you like.";
 	next;
-	set .@i, select("Balmung:Lord Kaho's Horns:^777777Never mind.^000000");
+	set .@i, select("Balmung", "Lord Kaho's Horns", "^777777Never mind.^000000");
 	mes "[Royal Messenger]";
 	if (.@i==3) {
 		mes "Have a nice day.";
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 880e2aff9..4d37c9530 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -45,7 +45,7 @@ geffen,115,107,5	script	Lord Kaho's Servant	1_M_PUBMASTER,{
 	mes .@n$;
 	mes "Are you ready for me to make this special item?";
 	next;
-	if(select("Sure am!:These requirements are unfathomable!")==2) {
+	if(select("Sure am!", "These requirements are unfathomable!")==2) {
 		mes .@n$;
 		mes "What I had to go through was more unfathomable...";
 		mes "If you succeed in getting these items, you will have incredible strength!";
diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt
index 055315810..991112286 100644
--- a/npc/custom/quests/kings_items.txt
+++ b/npc/custom/quests/kings_items.txt
@@ -15,7 +15,7 @@ prt_castle,80,170,4	script	King of Prontera	1_M_PRON_KING,{
 	mes "[King of Prontera]";
 	mes "Hello, can you help me?";
 	next;
-	if(select("Sure, what can I do?:Sorry, I'm busy.")==2) {
+	if(select("Sure, what can I do?", "Sorry, I'm busy.")==2) {
 		mes "[King of Prontera]";
 		mes "Ok, that's fine, I'm sure someone else will help.";
 		close; }
@@ -26,7 +26,7 @@ prt_castle,80,170,4	script	King of Prontera	1_M_PRON_KING,{
 	next;
 	setarray .@items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20;
 	setarray .@items2[0],1137,2254,1,2282,1,714,1;
-	switch(select("What do you need?:I have the items!:Forget it.")) {
+	switch(select("What do you need?", "I have the items!", "Forget it.")) {
 		case 1:
 			for(set .@i,1; .@i<3; set .@i,.@i+1) {
 				mes "[King of Prontera]";
@@ -40,7 +40,7 @@ prt_castle,80,170,4	script	King of Prontera	1_M_PRON_KING,{
 			mes "[King of Prontera]";
 			mes "What item do you want?";
 			next;
-			set .@i, select("Crown:Sword");
+			set .@i, select("Crown", "Sword");
 			for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2)
 				if (countitem(getd(".@items"+.@i+"["+.@j+"]")) < getd(".@items"+.@i+"["+(.@j+1)+"]")) set .@nr,1;
 			mes "[King of Prontera]";
@@ -66,7 +66,7 @@ prt_castle,84,170,4	script	King's Daughter	1_M_SIZ,{
 	mes "[King's Daughter]";
 	mes "Hmph, I hate my dad right now!!";
 	next;
-	if(select("Why?:Whatever...")==2) {
+	if(select("Why?", "Whatever...")==2) {
 		mes "[King's Daughter]";
 		mes "FINE THEN! Hmph!!";
 		close; }
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index 2d1ab33a4..dd7fad138 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -126,7 +126,7 @@ OnBuyItem:
 		set .@preview,1;
 	addtimer 1000, strnpcinfo(0)+"::OnEnd";
 	while(1) {
-		switch(select(" ~ Purchase ^0055FF"+getitemname(.@q[0])+"^000000:"+((.@preview && !@qe[7])?" ~ Preview...":"")+": ~ ^777777Cancel^000000")) {
+		switch(select(" ~ Purchase ^0055FF"+ getitemname(.@q[0]) +"^000000", ((.@preview && !@qe[7])?" ~ Preview...": ""), " ~ ^777777Cancel^000000")) {
 		case 1:
 			if (@qe[0]) {
 				mes "[Quest Shop]";
diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt
index e4336a67a..ba335d2d4 100644
--- a/npc/custom/quests/questboard.txt
+++ b/npc/custom/quests/questboard.txt
@@ -30,7 +30,7 @@ prontera,129,215,5	script	Questboard	4_BOARD3,{
 		mes "Base EXP: ^0000FF"+getd("." +currentquest$+"_collectionexp["+0+"]")+"^000000";
 		mes "Job EXP: ^0000FF"+getd("." +currentquest$+"_collectionexp["+1+"]")+"^000000";
 		next;
-		if(select("Finish:Abort") == 2){
+		if(select("Finish", "Abort") == 2){
 			mes "[^FF7700Questboard^000000]";
 			mes "Quest aborted.";
 			set currentquest$, "";
@@ -55,7 +55,7 @@ prontera,129,215,5	script	Questboard	4_BOARD3,{
 		mes "Base EXP: ^0000FF"+getd("." +currentquest$+"_huntingexp["+0+"]")+"^000000";
 		mes "Job EXP: ^0000FF"+getd("." +currentquest$+"_huntingexp["+1+"]")+"^000000";
 		next;
-		if(select("Finish:Abort") == 2){
+		if(select("Finish", "Abort") == 2){
 			mes "[^FF7700Questboard^000000]";
 			mes "Quest aborted.";
 			for(set .@x, 1; .@x < getarraysize(getd("."+currentquest$+"_huntingmob")); set .@x,.@x+2){
@@ -105,7 +105,7 @@ L_questmenu:
 		mes "Base EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+0+"]")+"^000000";
 		mes "Job EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+1+"]")+"^000000";
 		next;
-		if(select("Accept:Decline") == 2){
+		if(select("Accept", "Decline") == 2){
 			close;
 		}
 		if(BaseLevel >= getd("." +.@selection+"_collectionmin") && BaseLevel <= getd("." +.@selection+"_collectionmax"))
@@ -152,7 +152,7 @@ L_questmenu:
 		mes "Base EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+0+"]")+"^000000";
 		mes "Job EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+1+"]")+"^000000";
 		next;
-		if(select("Accept:Decline") == 2){
+		if(select("Accept", "Decline") == 2){
 			close;
 		}
 		if(BaseLevel >= getd("." +.@selection+"_huntingmin") && BaseLevel <= getd("." +.@selection+"_huntingmax"))
diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt
index a32828b8b..f7e1023c4 100644
--- a/npc/custom/quests/sphinx_mask.txt
+++ b/npc/custom/quests/sphinx_mask.txt
@@ -37,7 +37,7 @@ L_Menu:
 		case 2: mes "Ahh a business man are you no?  Fine, how about..."; break;
 		case 3: mes "Hmmm... you drive a hard bargain, ok... my final offer..."; break; }
 	next;
-	if(select("Pay "+getarg(1)+"z:No deal")==2) return;
+	if(select("Pay "+getarg(1)+"z", "No deal")==2) return;
 	mes "[Turban Thief]";
 	if (Zeny < getarg(2)) {
 		mes "Are youz playin wit me? You don't have ze money!";
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index 1b45c9036..416dcb571 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -25,14 +25,14 @@ alberta,88,193,5	script	Sunglasses Trader	1_F_MERCHANT_01,{
 		close; }
 	mes "Hello. What can I do for you?";
 	next;
-	if(select("I heard that you can make ^0000FFSlotted Sunglasses^000000.:Nothing, sorry to bother you.")==2) {
+	if(select("I heard that you can make ^0000FFSlotted Sunglasses^000000.", "Nothing, sorry to bother you.")==2) {
 		mes "[Sunglasses Trader]";
 		mes "Come back to me than you are ready.";
 		close; }
 	mes "[Sunglasses Trader]";
 	mes "I do not make them, but I can tell you where to find the person who does. For a small fee...";
 	next;
-	if(select("How much?:No way, I will find her myself!")==2) {
+	if(select("How much?", "No way, I will find her myself!")==2) {
 		mes "[Sunglasses Trader]";
 		mes "Suit yourself, the Maker will not make you ^0000FFSlotted Sunglasses^000000 unless she knows that you are coming.";
 		mes "Only I can tell her you are coming.";
@@ -46,7 +46,7 @@ alberta,88,193,5	script	Sunglasses Trader	1_F_MERCHANT_01,{
 	mes " - ^00008850 Feathers^000000";
 	mes " - ^000088100000z^000000";
 	next;
-	if(select("Alright, here.:That's too much!")==2) {
+	if(select("Alright, here.", "That's too much!")==2) {
 		mes "[Sunglasses Trader]";
 		mes "Suit yourself.";
 		close; }
@@ -75,14 +75,14 @@ moc_fild07,334,186,5	script	Maseph	4_F_GON,{
 	mes "Hello there.";
 	mes "You came for the ^000088Slotted Sunglasses^000000, right?";
 	next;
-	if(select("Yes:No, sorry to bother you.")==2) {
+	if(select("Yes", "No, sorry to bother you.")==2) {
 		mes "[Maseph]";
 		mes "Off you go, then.";
 		close; }
 	mes "[Maseph]";
 	mes "To make one, I will need one pair of ^000088Sunglasses^000000 and 400000z.";
 	next;
-	if(select("Here you go.:No, thanks.")==2) {
+	if(select("Here you go.", "No, thanks.")==2) {
 		mes "[Maseph]";
 		mes "As you wish.";
 		close; }
diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt
index c70de008b..1a2b45968 100644
--- a/npc/custom/quests/valhallen.txt
+++ b/npc/custom/quests/valhallen.txt
@@ -17,7 +17,7 @@ prontera,147,171,5	script	Lenneth	4_F_VALKYRIE,{
 	mes "I can transmute for you many of the Valhallen items,";
 	mes "although they require many rare elements to make.";
 	next;
-	switch(select("Mjolnir:Sleipnir:Brisingamen:Gleipnir:Megingjard")) {
+	switch(select("Mjolnir", "Sleipnir", "Brisingamen", "Gleipnir", "Megingjard")) {
 		case 1:
 			mes "[Lenneth]";
 			mes "^3355FFMjolnir^000000 is the mighty Hammer of Thor.";
@@ -52,7 +52,7 @@ prontera,147,171,5	script	Lenneth	4_F_VALKYRIE,{
 	mes "[Lenneth]";
 	mes "Do you desire ^3355FF"+getitemname(.@items[0])+"^000000?";
 	next;
-	if(select("Yes:No")==2) {
+	if(select("Yes", "No")==2) {
 		mes "[Lenneth]";
 		mes "Please return if you change your mind.";
 		close; }