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

Script CleanUp Phase 2

1 files changed, 8 insertions, 8 deletions

diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt
index 79f4be69e..a78491f65 100644
--- a/npc/re/merchants/ninja_craftsman.txt
+++ b/npc/re/merchants/ninja_craftsman.txt
@@ -43,12 +43,12 @@ que_ng,21,72,6	script	Master Craftsman Gyo#arm	4_M_RASWORD,{
 	mes "For that, you must better protect yourself.";
 	mes "You cannot protect 'others' while you hinder your 'own' protection.";
 	next;
-	if (select("Combine armor.:End conversation.") == 2) {
+	if (select("Combine armor.", "End conversation.") == 2) {
 		mes "[Gyo]";
 		mes "Prudence is also an important virtue in battle.";
 		close;
 	}
-	switch (select("Wolf Armguard:Crescent Armguard:Ninja Scale Armor:Shadow King's Armor:Quit.")) {
+	switch (select("Wolf Armguard", "Crescent Armguard", "Ninja Scale Armor", "Shadow King's Armor", "Quit.")) {
 		case 1:
 			mes "[Gyo]";
 			mes "Wolf Armguard... One beastly piece of armor.";
@@ -82,7 +82,7 @@ que_ng,21,72,6	script	Master Craftsman Gyo#arm	4_M_RASWORD,{
 L_Menu:
 	.@item_make = getarg(0);
 	while(1){
-		switch(select("Check Ingredients.:Check Stats.:Combine.:Quit.")){
+		switch(select("Check Ingredients.", "Check Stats.", "Combine.", "Quit.")){
 			case 1:
 				mes "[Gyo]";
 				mes "To make a ^ff0000"+getitemname(.@item_make)+", "+callsub(L_Ingredients,.@item_make)+".^000000";
@@ -123,7 +123,7 @@ L_Menu:
         		mes "Make sure that ^ff0000you have the correct ingredients and equipment at hand.^000000";
         		mes "No use crying over it later.";
         		next;
-        		if (select("Combine.:Quit.") == 2) {
+        		if (select("Combine.", "Quit.") == 2) {
 					mes "[Gyo]";
 					mes "Looks like you need more time to decide.";
 					close;
@@ -223,12 +223,12 @@ que_ng,23,70,6	script	Master Craftsman Ki#weap	4_DST_SOLDIER,{
 	mes "[Ki]";
 	mes "Of course, it would be better to have something special at hand.";
 	next;
-	if (select("Combine weapon.:End conversation.") == 2) {
+	if (select("Combine weapon.", "End conversation.") == 2) {
 		mes "[Ki]";
 		mes "Being too careful could sometimes be lethal.";
 		close;
 	}
-	switch (select("Raksasa Dagger:Mikatsuki:Petal Shuriken:Quit.")) {
+	switch (select("Raksasa Dagger", "Mikatsuki", "Petal Shuriken", "Quit.")) {
 		case 1:
 			mes "[Ki]";
 			mes "Raksasa Dagger can only be used after plenty of training.";
@@ -257,7 +257,7 @@ que_ng,23,70,6	script	Master Craftsman Ki#weap	4_DST_SOLDIER,{
 L_Menu:
 	.@item_make = getarg(0);
 	while(1){
-		switch(select("Check Ingredients.:Check Stats.:Combine.:Quit.")){
+		switch(select("Check Ingredients.", "Check Stats.", "Combine.", "Quit.")){
 			case 1:
 				mes "[Ki]";
 				mes "To make a ^ff0000"+getitemname(.@item_make)+", "+callsub(L_Ingredients,.@item_make)+".^000000";
@@ -293,7 +293,7 @@ L_Menu:
         		mes "Make sure that ^ff0000you have the correct ingredients and equipment at hand.^000000";
         		mes "No use crying over it later.";
         		next;
-        		if (select("Combine.:Quit.") == 2) {
+        		if (select("Combine.", "Quit.") == 2) {
 					mes "[Ki]";
 					mes "Think carefully~~";
 					close;