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

Script CleanUp Phase 2

1 files changed, 27 insertions, 27 deletions

diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index e27446594..fe2b21754 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -69,7 +69,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 	mes "[Artifice]";
 	mes "All I need is 10 Mora Coins of yours to grant you a relic!";
 	next;
-	switch(select("I don't think I'm ready.:I'm ready to exchange my Mora Coins.:Exchange my Ring.")) {
+	switch(select("I don't think I'm ready.", "I'm ready to exchange my Mora Coins.", "Exchange my Ring.")) {
 	case 1:
 		mes "[Artifice]";
 		mes "See you next time!";
@@ -80,7 +80,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 		//mes "You influence what part are you?";
 		mes "What kind of relic do you want?";
 		next;
-		switch(select("I'm not ready.:Ring:Shoes:Shawl:Robe:Shield:Weapon")) {
+		switch(select("I'm not ready.", "Ring", "Shoes", "Shawl", "Robe", "Shield", "Weapon")) {
 		case 1:
 			mes "[Artifice]";
 			mes "Go with the light.";
@@ -141,7 +141,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 		mes "[Artifice]";
 		mes "You have a "+getitemname(.@item)+". Do you really want to trade it for 10 Mora Coins?";
 		next;
-		switch(select("I'm not ready:Exchange my "+getitemname(.@item))) {
+		switch(select("I'm not ready", "Exchange my "+getitemname(.@item))) {
 		case 1:
 			mes "[Artifice]";
 			mes "If you change your mind, please stop by again.";
@@ -169,7 +169,7 @@ mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
 	mes "[Relice]";
 	mes "I enhance Relics that holy Arch-Bishops use, it will take 2 Mora Coins and the relic to allow me to attempt to enhance it.";
 	next;
-	switch(select("More details please.:Please Enhance my Relic.")) {
+	switch(select("More details please.", "Please Enhance my Relic.")) {
 	case 1:
 		mes "[Relice]";
 		mes "Let me briefly explain, for 2 Mora Coins and the relic I can give you a single Enchantment on that relic.";
@@ -190,7 +190,7 @@ mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
 		mes "[Relice]";
 		mes "If you have a ritual for luck, you should use it now!";
 		next;
-		.@select = select("Wait a minute!:Light of Cure:Seal of Cathedral:Ring of Archbishop:Shoes of Affection:Shoes of Judgement:Shawl of Affection:Shawl of Judgement:Robe of Affection:Robe of Judgement:Bible of Promise 1st Vol:Wand of Affection:Mace of Judgement");
+		.@select = select("Wait a minute!", "Light of Cure", "Seal of Cathedral", "Ring of Archbishop", "Shoes of Affection", "Shoes of Judgement", "Shawl of Affection", "Shawl of Judgement", "Robe of Affection", "Robe of Judgement", "Bible of Promise 1st Vol", "Wand of Affection", "Mace of Judgement");
 		switch(.@select) {
 		case 1:
 			mes "[Relice]";
@@ -367,7 +367,7 @@ mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
 	mes "[Guardian of Artifacts]";
 	mes "Do you want to buy an artifact with your Mora Coins?";
 	next;
-	if(select("Maybe later... I have things to do.:Yes, I do.") == 1) {
+	if(select("Maybe later... I have things to do.", "Yes, I do.") == 1) {
 		mes "[Guardian of Artifacts]";
 		mes "Okay, see you later then.";
 		close;
@@ -375,7 +375,7 @@ mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
 	mes "[Guardian of Artifacts]";
 	mes "What type of item do you want to buy?";
 	next;
-	switch(select("Quit:Shoes:Orbs:Robes:Staves")) {
+	switch(select("Quit", "Shoes", "Orbs", "Robes", "Staves")) {
 	case 1:
 		mes "[Guardian of Artifacts]";
 		mes "Okay, see you later then.";
@@ -420,7 +420,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
 	mes "[Artifact Crafter]";
 	mes "My job is to imbue artifacts with new power. If you have enough Coins, you can have one of the following items reinforced.";
 	next;
-	if(select("Tell me more.:I want to have my item reinforced.") == 1) {
+	if(select("Tell me more.", "I want to have my item reinforced.") == 1) {
 		mes "[Artifact Crafter]";
 		mes "Let me explain. One reinforcement costs you two Coins.";
 		next;
@@ -437,7 +437,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
 	if (.@info_only)
 		close;
 	next;
-	.@select = select("Maybe next time.:Golden Rod Staff:Aqua Staff:Crimson Staff:Forest Staff:Golden Rod Shoes:Aqua Shoes:Crimson Shoes:Forest Shoes:Golden Rod Orb:Aqua Orb:Crimson Orb:Forest Orb:Golden Rod Robe:Aqua Robe:Crimson Robe:Forest Robe");
+	.@select = select("Maybe next time.", "Golden Rod Staff", "Aqua Staff", "Crimson Staff", "Forest Staff", "Golden Rod Shoes", "Aqua Shoes", "Crimson Shoes", "Forest Shoes", "Golden Rod Orb", "Aqua Orb", "Crimson Orb", "Forest Orb", "Golden Rod Robe", "Aqua Robe", "Crimson Robe", "Forest Robe");
 	switch(.@select) {
 	case 1:
 		mes "[Artifact Crafter]";
@@ -568,7 +568,7 @@ mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
 	mes "^ff0000Choose carefully because these artifacts aren't easy to come by^000000. So what class do you want it for?";
 	next;
 	setarray .@jobs$[0],"Rune Knight","Guillotine Cross","Ranger";
-	.@job = select("Cancel:Rune Knight:Guillotine Cross:Ranger")-2;
+	.@job = select("Cancel", "Rune Knight", "Guillotine Cross", "Ranger")-2;
 	if (.@job == -1) {
 		mes "[Guardian of Power]";
 		mes "Talk to me later then.";
@@ -581,15 +581,15 @@ mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
 	switch(.@job) {
 	case 0: // Rune Knight
 		setarray .@items[0],2475,2476,2574,2575;
-		.@i = select("Cancel:Ur's Greaves (Shoes):Peuz's Greaves (Shoes):Ur's Manteau (Garment):Peuz's Manteau (Garment)")-2;
+		.@i = select("Cancel", "Ur's Greaves (Shoes)", "Peuz's Greaves (Shoes)", "Ur's Manteau (Garment)", "Peuz's Manteau (Garment)")-2;
 		break;
 	case 1: // Guillotine Cross
 		setarray .@items[0],2477,2478,2577,2578;
-		.@i = select("Cancel:Sapha Shoes (Shoes):Nab Shoes (Shoes):Sapha Hood (Garment):Nab Hood (Garment)")-2;
+		.@i = select("Cancel", "Sapha Shoes (Shoes)", "Nab Shoes (Shoes)", "Sapha Hood (Garment)", "Nab Hood (Garment)")-2;
 		break;
 	case 2: // Ranger
 		setarray .@items[0],2479,2480,2580,2581;
-		.@i = select("Cancel:White Wing Boots (Shoes):Black Wing Boots (Shoes):White Wing Manteau (Garment):Black Wing Manteau (Garment)")-2;
+		.@i = select("Cancel", "White Wing Boots (Shoes)", "Black Wing Boots (Shoes)", "White Wing Manteau (Garment)", "Black Wing Manteau (Garment)")-2;
 		break;
 	}
 	if (.@i == -1) {
@@ -623,7 +623,7 @@ mora,148,98,3	script	Artifact Researcher#new	4_F_MORAFINE2,{
 	mes "Nice to meet you.";
 	mes "I'm here in Mora studying ancient relics and artifacts. The new discoveries of Adventurers has made this village very exciting for me.";
 	next;
-	switch(select("Tell me more...:Give abilities to artifacts.:Reset Enhanced abilities.")) {
+	switch(select("Tell me more...", "Give abilities to artifacts.", "Reset Enhanced abilities.")) {
 	case 1:
 		mes "[Artifact Researcher]";
 		mes "New artifacts have been found here in Mora village, haven't you heard the news?";
@@ -655,7 +655,7 @@ mora,148,98,3	script	Artifact Researcher#new	4_F_MORAFINE2,{
 	mes "[Artifact Researcher]";
 	mes "Ok, so are you ready? Before I start working on this, what kind of equipment did you want me to enhance?";
 	next;
-	.@i = select("I'm not wearing the equipment:1. Weapon:2. Shoes:3. Garment:4. Armor:5. Accessory")-2;
+	.@i = select("I'm not wearing the equipment", "1. Weapon", "2. Shoes", "3. Garment", "4. Armor", "5. Accessory")-2;
 	if (.@i == -1) {
 		mes "[Artifact Researcher]";
 		mes "Make sure you're wearing the equipment first.";
@@ -784,7 +784,7 @@ L_Socket:
 			close;
 		}
 		next;
-		if(select("I'll come back later.:Please continue!") == 1) {
+		if(select("I'll come back later.", "Please continue!") == 1) {
 			mes "[Artifact Researcher]";
 			mes "If you change your mind, please come back.";
 			close;
@@ -1183,7 +1183,7 @@ mora,124,82,4	script	Artifact Collector#blan	4_M_RAFLE_OR,{
 	mes "[Artifact Collector]";
 	mes "Greetings Adventurer. We will be great friends in a moment after I tell you how to Empower your Artifacts!";
 	next;
-	switch(select("Let's do this!:Empower Artifacts?:Nope, not for me!")) {
+	switch(select("Let's do this!", "Empower Artifacts?", "Nope, not for me!")) {
 	case 1:
 		break;
 	case 2:
@@ -1286,7 +1286,7 @@ mora,124,82,4	script	Artifact Collector#blan	4_M_RAFLE_OR,{
 		setarray .@artifacts[0],1657,16013,2007,2008,2009,2010;
 		setarray .@empowered[0],1660,16018,2011,2012,2013,2014;
 		while(1) {
-			.@i = select("I don't think I'm interested:Staff of Mercy:Mace of Judgement:Golden Rod Staff:Aqua Staff:Crimson Staff:Forest Staff")-2;
+			.@i = select("I don't think I'm interested", "Staff of Mercy", "Mace of Judgement", "Golden Rod Staff", "Aqua Staff", "Crimson Staff", "Forest Staff")-2;
 			if (.@i == -1) {
 				emotion e_what;
 				mes "[Artifact Collector]";
@@ -1387,7 +1387,7 @@ mora,124,82,4	script	Artifact Collector#blan	4_M_RAFLE_OR,{
 	mes "[Artifact Collector]";
 	mes "I'm going to take your ^FF0000"+getequipname(EQI_HAND_R)+"^000000 and exchange it, are you ready?";
 	next;
-	switch(select("NOOO!:Yes, I'm ready!:What will it be after?")) {
+	switch(select("NOOO!", "Yes, I'm ready!", "What will it be after?")) {
 	case 1:
 		emotion e_an;
 		mes "[Artifact Collector]";
@@ -1400,7 +1400,7 @@ mora,124,82,4	script	Artifact Collector#blan	4_M_RAFLE_OR,{
 		mes "[Artifact Collector]";
 		mes "Surely you want to go on?";
 		next;
-		if(select("No, I don't.:Yes, do it!") == 1) {
+		if(select("No, I don't.", "Yes, do it!") == 1) {
 			emotion e_an;
 			mes "[Artifact Collector]";
 			mes "You've got to be kidding... you got my hopes up...";
@@ -1538,7 +1538,7 @@ mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 			mes "[Master Tailor]";
 			mes "I happen to have a few army paddings in stock. Would you like to buy one? The price is 1 Mora Coin. So cheap.";
 			next;
-			switch(select("Maybe next time.:I'll buy one now.")) {
+			switch(select("Maybe next time.", "I'll buy one now.")) {
 			case 1:
 				mes "[Master Tailor]";
 				mes "Okay, I understand.";
@@ -1558,7 +1558,7 @@ mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 	mes "[Master Tailor]";
 	mes "Have you come to add art to one of your army paddings?";
 	next;
-	switch(select("Please tell me more.:Yes, I have.")) {
+	switch(select("Please tell me more.", "Yes, I have.")) {
 	case 1:
 		mes "[Master Tailor]";
 		mes "A typical army padding isn't warm enough. It feels rough on your skin and doesn't look good. And artistic value? It has next to none.";
@@ -1579,7 +1579,7 @@ mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 		mes "[Master Tailor]";
 		mes "And another thing - once I fail to add art to it, it becomes unusable... you'll need to buy a new one in that case.";
 		next;
-		switch(select("Come on, what's the rush?:Okay! Let's do it!!")) {
+		switch(select("Come on, what's the rush?", "Okay! Let's do it!!")) {
 		case 1:
 			mes "[Master Tailor]";
 			mes "What's wrong with you?";
@@ -1633,7 +1633,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 	mes "[Pendant Crafter]";
 	mes "Have you come to have your Guardian's Pendant upgraded?";
 	next;
-	switch(select("Please tell me more.:Yes, I have.")) {
+	switch(select("Please tell me more.", "Yes, I have.")) {
 	case 1:
 		mes "[Pendant Crafter]";
 		mes "My job is to polish the stone in a Guardian's Pendant, and then carve a symbol with special power on it.";
@@ -1652,7 +1652,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 		mes "[Pendant Crafter]";
 		mes "And worse, it can lose its power and become an ordinary pendant. Of course, stone is not as susceptible to damage as cloth, so you won't lose the pendant itself.";
 		next;
-		switch(select("Come on, what's the rush?:Okay! Let's do it!!")) {
+		switch(select("Come on, what's the rush?", "Okay! Let's do it!!")) {
 		case 1:
 			mes "[Pendant Crafter]";
 			mes "Come back when you're not in a hurry. I always have a lot of time on my hands.";
@@ -1706,7 +1706,7 @@ mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
 	mes "[Bulberry Westhood]";
 	mes "So you have a Loki's Scarf 1042 Special Edition. You really have an eye for quality. Can I start working on it right away?";
 	next;
-	switch(select("I don't get it.:Yes, please.")) {
+	switch(select("I don't get it.", "Yes, please.")) {
 	case 1:
 		mes "[Bulberry Westhood]";
 		mes "Like I said, I only handle quality items - not random scarfs from a marketplace.";
@@ -1732,7 +1732,7 @@ mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
 		mes "[Bulberry Westhood]";
 		mes "Of course, the Loki's Scarf is a quality item, so you won't lose the scarf itself in the process.";
 		next;
-		switch(select("Maybe later, sir...:I'd like to own a quality item!")) {
+		switch(select("Maybe later, sir...", "I'd like to own a quality item!")) {
 		case 1:
 			mes "[Bulberry Westhood]";
 			mes "Ha...!";