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

Script CleanUp Phase 2

1 files changed, 17 insertions, 17 deletions

diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index 2217e3f77..d3bf777ab 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -66,7 +66,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 	mes "Select the next step please.";
 	next;
 	.@name$ = strcharinfo(0);
-	switch(select("Read the KVM Catalogue.:Purchase KVM Items.:Confirm KVM Points.:Explanation of KVM Rewards.:Explanation of KVM Points.")) {
+	switch(select("Read the KVM Catalogue.", "Purchase KVM Items.", "Confirm KVM Points.", "Explanation of KVM Rewards.", "Explanation of KVM Points.")) {
 	case 1:
 		mes "[Logistics]";
 		mes "Here is the catalogue of KVM items.";
@@ -84,19 +84,19 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 		mes "the items, please refer to the";
 		mes "^3131FFCatalogue^000000.";
 		next;
-		switch(select("Weapon:Armor/Accessory:Mass-Production Armor/Accessory:Popularized Armor/Accessory")) {
+		switch(select("Weapon", "Armor/Accessory", "Mass-Production Armor/Accessory", "Popularized Armor/Accessory")) {
 		case 1:
 			mes "[Logistics]";
 			mes "You have selected the Weapon Category.";
 			mes "Please select a sub-category.";
 			next;
-			switch(select("Dagger/Sword/Spear:Staff/Mace/Axe/Shuriken:Bow/Katar/Instrument/Whip:Book/Knuckle:Revolver/Rifle/Gun/Grenade Launcher")) {
+			switch(select("Dagger/Sword/Spear", "Staff/Mace/Axe/Shuriken", "Bow/Katar/Instrument/Whip", "Book/Knuckle", "Revolver/Rifle/Gun/Grenade Launcher")) {
 			case 1:
 				mes "[Logistics]";
 				mes "You have selected the Dagger/Sword/Spear category.";
 				mes "Please select a sub-category.";
 				next;
-				switch(select("Dagger:One-handed Sword:Two-handed Sword:One-handed Spear:Two-handed Spear")) {
+				switch(select("Dagger", "One-handed Sword", "Two-handed Sword", "One-handed Spear", "Two-handed Spear")) {
 				case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1
 				case 2:
 					mes "[Logistics]";
@@ -105,7 +105,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 					mes "If you want their details, please refer to the KVM Catalogue.";
 					mes "Please select one of them.";
 					next;
-					switch(select("Glorious Flamberge:Glorious Rapier:Glorious Holy Avenger")) {
+					switch(select("Glorious Flamberge", "Glorious Rapier", "Glorious Holy Avenger")) {
 					case 1: callsub PurchaseItem,13416,0,0; //Krieger_Onehand_Sword1
 					case 2: callsub PurchaseItem,13417,0,0; //Krieger_Onehand_Sword2
 					case 3: callsub PurchaseItem,13418,0,0; //Krieger_Onehand_Sword3
@@ -119,7 +119,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				mes "You have selected the 'Staff/Mace/Axe/Shuriken' category.";
 				mes "Please select a sub-category.";
 				next;
-				switch(select("Staff:Mace:One-handed Axe:Two-handed Axe:Shuriken")) {
+				switch(select("Staff", "Mace", "One-handed Axe", "Two-handed Axe", "Shuriken")) {
 				case 1:
 					mes "[Logistics]";
 					mes "You have selected the 'Staff' category.";
@@ -127,7 +127,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 					mes "If you want their details, please refer to the KVM Catalogue.";
 					mes "Please select one of them.";
 					next;
-					switch(select("Glorious Destruction Staff:Glorious Arc Wand:Glorious Healing Staff")) {
+					switch(select("Glorious Destruction Staff", "Glorious Arc Wand", "Glorious Healing Staff")) {
 					case 1: callsub PurchaseItem,2002,0,0; //Krieger_Twohand_Staff1
 					case 2: callsub PurchaseItem,1640,0,0; //Krieger_Onehand_Staff1
 					case 3: callsub PurchaseItem,1641,0,0; //Krieger_Onehand_Staff2
@@ -142,7 +142,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				mes "You have selected the Bow/Katar/Instrument/Whip category.";
 				mes "Please select a sub-category.";
 				next;
-				switch(select("Bow:Katar:Instrument:Whip")) {
+				switch(select("Bow", "Katar", "Instrument", "Whip")) {
 				case 1: callsub PurchaseItem,1743,0,1; //Krieger_Bow1
 				case 2:
 					mes "[Logistics]";
@@ -151,7 +151,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 					mes "If you want their details, please refer to the KVM Catalogue.";
 					mes "Please select one of them.";
 					next;
-					switch(select("Glorious Bloody Roar:Glorious Jamadhar")) {
+					switch(select("Glorious Bloody Roar", "Glorious Jamadhar")) {
 					case 1: callsub PurchaseItem,1281,0,0; //Krieger_Katar1
 					case 2: callsub PurchaseItem,1282,0,0; //Krieger_Katar2
 					}
@@ -163,7 +163,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				mes "You have selected the Book/Knuckle category.";
 				mes "Please select a sub-category.";
 				next;
-				switch(select("Book:Knuckle")) {
+				switch(select("Book", "Knuckle")) {
 				case 1:
 					mes "[Logistics]";
 					mes "You have selected 'Book'.";
@@ -171,7 +171,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 					mes "If you want their details, please refer to the KVM Catalogue.";
 					mes "Please select one of them.";
 					next;
-					switch(select("Glorious Tablet:Glorious Apocalypse")) {
+					switch(select("Glorious Tablet", "Glorious Apocalypse")) {
 					case 1: callsub PurchaseItem,1576,0,0; //Krieger_Book1
 					case 2: callsub PurchaseItem,1577,0,0; //Krieger_Book2
 					}
@@ -182,7 +182,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 					mes "If you want their details, please refer to the KVM Catalogue.";
 					mes "Please select one of them.";
 					next;
-					switch(select("Glorious Claw:Glorious Fist")) {
+					switch(select("Glorious Claw", "Glorious Fist")) {
 					case 1: callsub PurchaseItem,1826,0,0; //Krieger_Knuckle1
 					case 2: callsub PurchaseItem,1827,0,0; //Krieger_Knuckle2
 					}
@@ -192,7 +192,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				mes "You have selected the 'Revolver/Rifle/Gun/Grenade Launcher' category.";
 				mes "Please select a sub-category.";
 				next;
-				switch(select("Revolver:Rifle:Gatling Gun:Shotgun:Grenade Launcher")) {
+				switch(select("Revolver", "Rifle", "Gatling Gun", "Shotgun", "Grenade Launcher")) {
 				case 1: callsub PurchaseItem,13110,0,1; //Krieger_Pistol1
 				case 2: callsub PurchaseItem,13176,0,1; //Krieger_Rifle1
 				case 3: callsub PurchaseItem,13177,0,1; //Krieger_Gatling1
@@ -205,7 +205,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 			mes "You have selected the 'Armor/Accessory' category.";
 			mes "Please select a sub-category.";
 			next;
-			switch(select("Armor:Cloak:Shoes:Accessory")) {
+			switch(select("Armor", "Cloak", "Shoes", "Accessory")) {
 			case 1: callsub PurchaseItem,2394,1,2; //Krieger_Suit1
 			case 2: callsub PurchaseItem,2549,2,2; //Krieger_Muffler1
 			case 3: callsub PurchaseItem,2444,3,2; //Krieger_Shoes1
@@ -216,7 +216,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 			mes "You have selected the 'Mass-Production Armor/Accessory' category.";
 			mes "Please select a sub-category.";
 			next;
-			switch(select("Mass-Production Armor:Mass-Production Shoes:Mass-Production Accessory")) {
+			switch(select("Mass-Production Armor", "Mass-Production Shoes", "Mass-Production Accessory")) {
 			case 1: callsub PurchaseItem,2395,5,3; //Krieger_Suit2
 			case 2: callsub PurchaseItem,2445,6,3; //Krieger_Shoes2
 			case 3: callsub PurchaseItem,2773,7,3; //Krieger_Ring2
@@ -226,7 +226,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 			mes "You have selected the 'Popularized Armor/Accessory' category.";
 			mes "Please select a sub-category.";
 			next;
-			switch(select("Popularized Armor:Popularized Shoes:Popularized Accessory")) {
+			switch(select("Popularized Armor", "Popularized Shoes", "Popularized Accessory")) {
 			case 1: callsub PurchaseItem,2396,8,4; //Krieger_Suit3
 			case 2: callsub PurchaseItem,2446,9,4; //Krieger_Shoes3
 			case 3: callsub PurchaseItem,2774,10,4; //Krieger_Ring3
@@ -295,7 +295,7 @@ PurchaseItem:
 
 	mes "Are you sure you want this item?";
 	next;
-	switch(select("No, I won't purchase it.:Yes, I will purchase it.")) {
+	switch(select("No, I won't purchase it.", "Yes, I will purchase it.")) {
 	case 1:
 		mes "[Logistics]";
 		mes "You have selected 'I won't purchase it'.";