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

Script CleanUp Phase 2

1 files changed, 16 insertions, 16 deletions

diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index ecb900535..5b2054193 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -597,7 +597,7 @@ alberta_in,70,51,5	script	Guarnien	4W_M_02,{
 
 	mes "You've just started out as a Merchant, haven't you? How would you like to learn the fundamentals of business from an experienced colleague?";
 	next;
-	if(select("Sure!:I'll make it on my own!")==1){
+	if(select("Sure!", "I'll make it on my own!")==1){
 		tu_merchant = 1;
 		if(getskilllv(MC_INCCARRY) < 4){
 			setquest 8229;
@@ -686,7 +686,7 @@ prontera,66,111,3	script	Sagle	4_KID01,{
 		mes "[Sagle]";
 		mes "I will sell you 10 Red Potions for ^871F78420 zeny^000000. You'd better get them now while they're still here!";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Sagle]";
 			mes "Excellent!";
@@ -733,7 +733,7 @@ prontera,66,111,3	script	Sagle	4_KID01,{
 		mes "[Sagle]";
 		mes "I will sell you 10 Red Potions for ^871F78410 zeny^000000. You'd better get them now while they're still here!";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Sagle]";
 			mes "Excellent!";
@@ -781,7 +781,7 @@ prontera,66,111,3	script	Sagle	4_KID01,{
 		mes "[Sagle]";
 		mes "I will sell you 10 Red Potions for ^871F78390 zeny^000000. You'd better get them now while they're still here!";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Sagle]";
 			mes "Excellent!";
@@ -840,7 +840,7 @@ prontera,93,330,3	script	Kellion	4W_M_01,{
 		mes "10 Red Potions for 340 Zeny.";
 		mes "Would you like some?";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Kellion]";
 			mes "Good choice~";
@@ -879,7 +879,7 @@ prontera,93,330,3	script	Kellion	4W_M_01,{
 		mes "10 Red Potions for 390 Zeny.";
 		mes "Would you like some?";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Kellion]";
 			mes "Good choice~";
@@ -918,7 +918,7 @@ prontera,93,330,3	script	Kellion	4W_M_01,{
 		mes "10 Red Potions for 400 Zeny.";
 		mes "Would you like some?";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Kellion]";
 			mes "Good choice~";
@@ -977,7 +977,7 @@ prt_in,169,11,3	script	Aigie	4_F_03,{
 		mes "to buy 10 Red Potions";
 		mes "for 390 Zeny, kind adventurer?";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Aigie]";
 			mes "Thank you so much.";
@@ -1022,7 +1022,7 @@ prt_in,169,11,3	script	Aigie	4_F_03,{
 		mes "to buy 10 Red Potions";
 		mes "for 420 Zeny, kind adventurer?";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Aigie]";
 			mes "Thank you so much.";
@@ -1067,7 +1067,7 @@ prt_in,169,11,3	script	Aigie	4_F_03,{
 		mes "to buy 10 Red Potions";
 		mes "for 340 Zeny, kind adventurer?";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Aigie]";
 			mes "Thank you so much.";
@@ -1116,7 +1116,7 @@ prontera,247,129,3	script	Jayon	4_M_03,{
 		mes "[Jayon]";
 		mes "If you've checked out the market for Red Potions, you know that my price is the best. I'm offering 10 Red Potions for only 410 Zeny!";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Jayon]";
 			mes "Heh heh...!";
@@ -1162,7 +1162,7 @@ prontera,247,129,3	script	Jayon	4_M_03,{
 		mes "[Jayon]";
 		mes "If you've checked out the market for Red Potions, you know that my price is the best. I'm offering 10 Red Potions for only 400 Zeny!";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Jayon]";
 			mes "Heh heh...!";
@@ -1209,7 +1209,7 @@ prontera,247,129,3	script	Jayon	4_M_03,{
 		mes "[Jayon]";
 		mes "If you've checked out the market for Red Potions, you know that my price is the best. I'm offering 10 Red Potions for only 410 Zeny!";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Jayon]";
 			mes "Heh heh...!";
@@ -1271,7 +1271,7 @@ prt_in,251,129,3	script	Maos	4_M_SEAMAN,{
 		mes "I'll sell them to you";
 		mes "for the low price of 420 Zeny~";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Maos]";
 			mes "Excellent choice!";
@@ -1307,7 +1307,7 @@ prt_in,251,129,3	script	Maos	4_M_SEAMAN,{
 		mes "I'll sell them to you";
 		mes "for the low price of 340 Zeny~";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Maos]";
 			mes "Excellent choice!";
@@ -1342,7 +1342,7 @@ prt_in,251,129,3	script	Maos	4_M_SEAMAN,{
 		mes "I'll sell them to you";
 		mes "for the low price of 400 Zeny~";
 		next;
-		switch(select("Buy:Cancel")){
+		switch(select("Buy", "Cancel")){
 		case 1:
 			mes "[Maos]";
 			mes "Excellent choice!";