* Optimized "Elemental Stone Trader" (merchants\elemental_trader.txt)

* Optimized "Armor Enchanter" (merchants\enchan_arm.txt)
* Optimized "Manuk Merchant" (merchants\manuk.txt)
* Fixed an incorrect variable in "Thanatos Tower" script, as per bugreport:6073 (quests\thana_quest.txt)
* Reverted quests_morocc edit, encoding error? - bugreport:6067 (quests\quests_morocc.txt)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16325 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 154 insertions, 581 deletions

diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index f86ef3c55..3d30b1668 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -1,9 +1,9 @@
 //===== rAthena Script ======================================= 
 //= Elemental Stone Trader
 //===== By: ================================================== 
-//= rAthena team & others? & MasterOfMuppets
+//= rAthena Team & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,10 +11,9 @@
 //= Trade impure types of elemental stones for pure ones.
 //===== Additional Comments: ================================= 
 //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.1 Optimized. [Euphy]
 //============================================================ 
 
-// Elemental Stone Trader
-//============================================================ 
 ama_in02,61,27,7	script	Alchemist#ama	749,{
 	mes "[Laspuchin Gregory]";
 	mes "KeekeekeeKeheheh.";
@@ -82,314 +81,80 @@ ama_in02,61,27,7	script	Alchemist#ama	749,{
 	mes "[Laspuchin Gregory]";
 	mes "Uh-huh, what did you bring?";
 	next;
-	switch(select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")) {
-	case 1:
-		if (countitem(995) > 7) {
-			mes "[Laspuchin Gregory]";
-			mes "I will take 8 of them and";
-			mes "give you an enchant stone.";
-			mes "How's that sound?";
-			mes "Keheheh.....";
-			next;
-			mes "[Laspuchin Gregory]";
-			mes "HeeHee, what do you want? Choose one!";
-			next;
-			switch(select("Great Nature:Flame Heart:Rough Wind:Cancel the trade")) {
-			case 1:
-				delitem 995,8; //Mistic_Frozen
-				getitem 997,1; //Great_Nature
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 2:
-				delitem 995,8; //Mistic_Frozen
-				getitem 994,1; //Flame_Heart
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have!";
-				close;
-			case 3:
-				if (countitem(995) > 11) {
-					delitem 995,12; //Mistic_Frozen
-					getitem 996,1; //Rough_Wind
-					mes "[Laspuchin Gregory]";
-					mes "Kehhehheh, You know something?";
-					mes "I don't have many of those";
-					mes "so I'm going to take ^0000FF12^000000 of yours, okay?";
-					mes "Of course, it is okay.";
-					mes "It is an honor to help Laspuchin!";
-					close;
-				}
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh, You know something.";
-				mes "I don't have many of these so";
-				mes "I can't just get 8 of yours.";
-				mes "If you want to change them to Rough Wind,";
-				mes "bring me 4 more stones. 8 + 4 = 12...";
-				mes "Requires ^0000FF12^000000 stones.";
-				next;
-				mes "[Laspuchin Gregory]";
-				mes "Bring me stones, slave~!!";
-				mes "And keep your promise! Kehheheheheh...";
-				close;
-			case 4:
-				mes "[Laspuchin Gregory]";
-				mes "Oh, well.";
-				mes "Don't tell anyone about my location...";
-				mes "Keheheh...after all, you did promise~";
-				close;
-			}
-		}
-		else if (countitem(995) > 0) {
-			mes "[Laspuchin Gregory]";
-			mes "You can't help Laspuchin with just a couple";
-			mes "of enchant stones... I said 8!";
-			mes "Bring me just 8 stones!";
-			mes "Keheheh.....";
-			next;
-			mes "[Laspuchin Gregory]";
-			mes "Bring me stones, slave~!!";
-			mes "And keep your promise! Keheheheheh...";
-			close;
-		}
-		mes "[Laspuchin Gregory]";
-		mes "Keheheh~ Check your pockets";
-		mes "before you tell me";
-		mes "how foolish you are.....";
+	setarray .@Items[1],995,997,994,996;
+	set .@i, .@Items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")];
+	mes "[Laspuchin Gregory]";
+	if (countitem(.@i) > 7) {
+		mes "I will take 8 of them and";
+		mes "give you an enchant stone.";
+		mes "How's that sound?";
+		mes "Keheheh.....";
 		next;
 		mes "[Laspuchin Gregory]";
-		mes "Bring me stones! You said you are going to help me!";
-		mes "Keep your promises! Kehehehkehkeh...";
-		close;
-	case 2:
-		if (countitem(997) > 7) {
-			mes "[Laspuchin Gregory]";
-			mes "I will have 8 of them and";
-			mes "give you an enchant stone.";
-			mes "Hows it sound?";
-			mes "Keheheh.....";
-			next;
-			mes "[Laspuchin Gregory]";
-			mes "Keekee, what do you want? Choose one!";
-			next;
-			switch(select("Mystic Frozen:Flame Heart:Rough Wind:Cancel the trade")) {
-			case 1:
-				delitem 997,8; //Great_Nature
-				getitem 995,1; //Mistic_Frozen
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 2:
-				delitem 997,8; //Great_Nature
-				getitem 994,1; //Flame_Heart
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 3:
-				if (countitem(997) > 11) {
-					delitem 997,12; //Great_Nature
-					getitem 996,1; //Rough_Wind
-					mes "[Laspuchin Gregory]";
-					mes "Keheheh, You know something?";
-					mes "I don't have many of these";
-					mes "so I'm going to take ^0000FF12^000000 of yours, okay?";
-					mes "Of course, it is okay.";
-					mes "It is an honor to help Laspuchin!";
-					close;
-				}
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh, You know something?";
-				mes "I don't have many of these so";
-				mes "I can't just get 8 of yours.";
-				mes "If you want to change them to Rough Wind,";
-				mes "bring me 4 more stones. 8 + 4 = 12...";
-				mes "Requires ^0000FF12^000000 stones.";
-				next;
-				mes "[Laspuchin Gregory]";
-				mes "Bring me stones, slave~!!";
-				mes "And keep your promise! Kehehehkehkeh...";
-				close;
-			case 4:
-				mes "[Laspuchin Gregory]";
-				mes "Oh, well.";
-				mes "Don't tell anyone about my location...";
-				mes "Keheheh...You did promise after all...";
-				close;
-			}
+		mes "HeeHee, what do you want? Choose one!";
+		next;
+		set .@menu$, "";
+		for(set .@j,1; .@j<5; set .@j,.@j+1) {
+			if (.@Items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@Items[.@j]);
+			set .@menu$, .@menu$+":";
 		}
-		else if (countitem(997) > 0) {
-			mes "[Laspuchin Gregory]";
-			mes "You can't help Laspuchin with just a couple";
-			mes "of enchant stones... I said 8!";
-			mes "Bring me just 8 stones!";
-			mes "Keheheh.....";
-			next;
-			mes "[Laspuchin Gregory]";
-			mes "Bring me stones, slave!!";
-			mes "And keep your promise! Kehehehkehkeh...";
+		set .@menu$, .@menu$+"Cancel the trade";
+		set .@j, select(.@menu$);
+		mes "[Laspuchin Gregory]";
+		if (.@j == 5) {
+			mes "Oh, well.";
+			mes "Don't tell anyone about my location...";
+			mes "Keheheh...after all, you did promise~";
 			close;
 		}
-		mes "[Laspuchin Gregory]";
-		mes "Keheheh~ Check your pockets";
-		mes "before you tell me";
-		mes "how stupid you are.....";
-		next;
-		mes "[Laspuchin Gregory]";
-		mes "Bring me stones! You said you are going to help me,";
-		mes "so keep your promise! Keheheheheh...";
-		close;
-	case 3:
-		if (countitem(994) > 7) {
-			mes "[Laspuchin Gregory]";
-			mes "I will take 8 of them and";
-			mes "give you an enchant stone.";
-			mes "Hows it sound?";
-			mes "Keheheh.....";
-			next;
-			mes "[Laspuchin Gregory]";
-			mes "Keekee, what do you want? Choose one!";
-			next;
-			switch(select("Mystic Frozen:Great Nature:Rough Wind:Cancel the trade")) {
-			case 1:
-				delitem 994,8; //Flame_Heart
-				getitem 995,1; //Mistic_Frozen
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 2:
-				delitem 994,8; //Flame_Heart
-				getitem 997,1; //Great_Nature
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 3:
-				if (countitem(994) > 11) {
-					delitem 994,12; //Flame_Heart
-					getitem 996,1; //Rough_Wind
-					mes "[Laspuchin Gregory]";
-					mes "Keheheh, You know something.";
-					mes "I don't have many of these";
-					mes "so I'm going to take ^0000FF12^000000 of yours, okay?";
-					mes "Of course, it is okay.";
-					mes "It is an honor to help Laspuchin!";
-					close;
-				}
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh, You know something?";
-				mes "I don't have many of these so";
-				mes "I can't just get 8 of yours.";
-				mes "If you want to change them to Rough Wind,";
-				mes "bring me 4 more stones. 8 + 4 = 12...";
-				mes "Requires ^0000FF12^000000 stones.";
-				next;
-				mes "[Laspuchin Gregory]";
-				mes "Bring me stones, slave~!!";
-				mes "Keep your promise! Kehehehkehkeh...";
-				close;
-			case 4:
-				mes "[Laspuchin Gregory]";
-				mes "Oh, well.";
-				mes "Don't tell anyone about my location...";
-				mes "Keheheh...You did promise, after all...";
+		else if (.@j == 4) {
+			if (countitem(.@i) > 11) {
+				delitem .@i,12;
+				getitem 996,1;
+				mes "Kehhehheh, You know something?";
+				mes "I don't have many of those";
+				mes "so I'm going to take ^0000FF12^000000 of yours, okay?";
+				mes "Of course, it is okay.";
+				mes "It is an honor to help Laspuchin!";
 				close;
 			}
-		}
-		else if (countitem(994) > 0) {
-			mes "[Laspuchin Gregory]";
-			mes "You can't help Laspuchin with just a couple";
-			mes "of enchant stones... I said 8!";
-			mes "Bring me just 8 stones!";
-			mes "Keheheh.....";
+			mes "Keheheh, You know something.";
+			mes "I don't have many of these so";
+			mes "I can't just get 8 of yours.";
+			mes "If you want to change them to Rough Wind,";
+			mes "bring me 4 more stones. 8 + 4 = 12...";
+			mes "Requires ^0000FF12^000000 stones.";
 			next;
 			mes "[Laspuchin Gregory]";
 			mes "Bring me stones, slave~!!";
-			mes "And keep your promise! Kehehehkehkeh...";
+			mes "And keep your promise! Kehheheheheh...";
 			close;
 		}
-		mes "[Laspuchin Gregory]";
-		mes "Keheheh, Check your pockets";
-		mes "before you tell me";
-		mes "how foolish you are.....";
-		next;
-		mes "[Laspuchin Gregory]";
-		mes "Bring me stones! You said you are going to help me,";
-		mes "so keep your promise! Kehehehkehkeh...";
-		close;
-	case 4:
-		if (countitem(996) > 7) {
-			mes "[Laspuchin Gregory]";
-			mes "I will take 8 of them and";
-			mes "give you an enchant stone.";
-			mes "Hows it sound?";
-			mes "Keheheh.....";
-			next;
-			mes "[Laspuchin Gregory]";
-			mes "Keekee, what do you want? Choose one!";
-			next;
-			switch(select("Mystic Frozen:Great Nature:Flame Heart:Cancel the trade")) {
-			case 1:
-				delitem 996,8; //Rough_Wind
-				getitem 995,1; //Mistic_Frozen
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 2:
-				delitem 996,8; //Rough_Wind
-				getitem 997,1; //Great_Nature
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 3:
-				delitem 996,8; //Rough_Wind
-				getitem 994,1; //Flame_Heart
-				mes "[Laspuchin Gregory]";
-				mes "Keheheh! You've chosen a good one!";
-				mes "Use it well...";
-				mes "Bring me other stones if you have them!";
-				close;
-			case 4:
-				mes "[Laspuchin Gregory]";
-				mes "Oh, well.";
-				mes "Don't tell anyone about my location...";
-				mes "Keheheh... You did promise, after all...";
-				close;
-			}
-		}
-		else if (countitem(996) > 0) {
-			mes "[Laspuchin Gregory]";
-			mes "You can't help Laspuchin with just a couple";
-			mes "of enchant stones... I said 8!";
-			mes "Bring me just 8 stones!";
-			mes "Keheheh.....";
-			next;
-			mes "[Laspuchin Gregory]";
-			mes "Bring me stones, slave~!!";
-			mes "And keep your promise! Kehehehkehkeh...";
+		else {
+			delitem .@i,8;
+			getitem .@Items[.@j],1;
+			mes "Keheheh! You've chosen a good one!";
+			mes "Use it well...";
+			mes "Bring me other stones if you have them!";
 			close;
 		}
-		mes "[Laspuchin Gregory]";
-		mes "Keheheh, Check your pockets";
-		mes "before you tell me";
-		mes "how stupid you are.....";
+	} else if (countitem(.@i)) {
+		mes "You can't help Laspuchin with just a couple";
+		mes "of enchant stones... I said 8!";
+		mes "Bring me just 8 stones!";
+		mes "Keheheh.....";
 		next;
 		mes "[Laspuchin Gregory]";
-		mes "Bring me stones! You said you are going to help me,";
-		mes "so keep your promise! Kehehehkehkeh...";
+		mes "Bring me stones, slave~!!";
+		mes "And keep your promise! Keheheheheh...";
 		close;
 	}
-}
+	mes "Keheheh~ Check your pockets";
+	mes "before you tell me";
+	mes "how foolish you are.....";
+	next;
+	mes "[Laspuchin Gregory]";
+	mes "Bring me stones! You said you are going to help me!";
+	mes "Keep your promises! Kehehehkehkeh...";
+	close;
+}
\ No newline at end of file
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index baa5574dd..60acac1c4 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -3,20 +3,21 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
-//= Add a +1, 2, or 3, of a random stat to specified armor.
+//= Add a +1, +2, or +3 random stat to a specified armor.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
 //= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586)
+//= 1.2 Optimized. [Euphy]
 //============================================================ 
 
 prontera,165,60,2	script	Apprentice Craftsman	73,{
+	mes "[Apprentice Craftsman]";
 	if (Zeny > 399999) {
-		mes "[Apprentice Craftsman]";
 		mes "I've been studying ways to enhance an armor to maximize it's capability.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -26,143 +27,37 @@ prontera,165,60,2	script	Apprentice Craftsman	73,{
 		mes "However, you have to keep in mind that if there are two armors of the same kind in your possession, the Enchantment will be applied in the order they are placed in your inventory.";
 		next;
 		mes "[Apprentice Craftsman]";
-		mes "In that case, the Enchantment may be applied to an item which you didn't mean to Enchant. So just bring ^5555ffONE Armor^000000 you want enchanted to be safe..";
+		mes "In that case, the Enchantment may be applied to an item which you didn't mean to Enchant. So just bring ^5555ffONE Armor^000000 you want enchanted to be safe...";
 		next;
 		mes "[Apprentice Craftsman]";
 		mes "I'm not responsible for what would happen if you have more than one of the same kind in your inventory.";
 		next;
 		switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) {
-		case 1:
-			switch(select("Mantle:Coat:Chain Mail:Full Plate:Silk Robe:Saint's Robe:Holy Robe:Wooden Mail:Tights:Silver Robe:Mage Coat:Thief Clothes:Legion Plate Armor:Lucius's Fierce Armor of Volcano:Saphien's Armor of Ocean:Aebeccee's Raging Typhoon Armor:Claytos Cracking Earth Armor:Ninja Suit:Chameleon Armor:Glorious Suit:Glorious Popularized Suit:Glorious Mass-Production Suit")) {
 			case 1:
-				callsub S_EnchantArmor,2307,50;
+				setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396;
+				set .@j,50;
+				break;
 			case 2:
-				callsub S_EnchantArmor,2309,50;
+				setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
+				set .@j,55;
+				set .@k,1;
+				break;
 			case 3:
-				callsub S_EnchantArmor,2314,50;
+				setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
+				set .@j,60;
+				break;
 			case 4:
-				callsub S_EnchantArmor,2316,50;
-			case 5:
-				callsub S_EnchantArmor,2321,50;
-			case 6:
-				callsub S_EnchantArmor,2325,50;
-			case 7:
-				callsub S_EnchantArmor,2327,50;
-			case 8:
-				callsub S_EnchantArmor,2328,50;
-			case 9:
-				callsub S_EnchantArmor,2330,50;
-			case 10:
-				callsub S_EnchantArmor,2332,50;
-			case 11:
-				callsub S_EnchantArmor,2334,50;
-			case 12:
-				callsub S_EnchantArmor,2335,50;
-			case 13:
-				callsub S_EnchantArmor,2341,50;
-			case 14:
-				callsub S_EnchantArmor,2344,50;
-			case 15:
-				callsub S_EnchantArmor,2346,50;
-			case 16:
-				callsub S_EnchantArmor,2348,50;
-			case 17:
-				callsub S_EnchantArmor,2350,50;
-			case 18:
-				callsub S_EnchantArmor,2337,50;
-			case 19:
-				callsub S_EnchantArmor,2386,50;
-			case 20:
-				callsub S_EnchantArmor,2394,50;
-			case 21:
-				callsub S_EnchantArmor,2395,50;
-			case 22:
-				callsub S_EnchantArmor,2396,50;
-			}
-		case 2:
-			switch(select("Mink Coat:Lord's Clothes:Glittering Jacket:Formal Suit:Mantle(1):Coat(1):Chain Mail(1):Full Plate(1):Silk Robe(1):Scapulare(1):Saint's Robe(1):Tights(1):Silver Robe(1):Thief Clothes(1):Legion Plate Armor(1):Lucius's Fierce Armor of Volcano(1):Saphien's Armor of Ocean(1):Aebeccee's Raging Typhoon Armor(1):Claytos Cracking Earth Armor(1)")) {
-			case 1:
-				callsub S_EnchantArmor,2311,55;
-			case 2:
-				callsub S_EnchantArmor,2318,55;
-			case 3:
-				callsub S_EnchantArmor,2319,55;
-			case 4:
-				callsub S_EnchantArmor,2320,55;
-			case 5:
-				callsub S_EnchantArmor,2308,55;
-			case 6:
-				callsub S_EnchantArmor,2310,55;
-			case 7:
-				callsub S_EnchantArmor,2315,55;
-			case 8:
-				callsub S_EnchantArmor,2317,55;
-			case 9:
-				callsub S_EnchantArmor,2322,55;
-			case 10:
-				callsub S_EnchantArmor,2324,55;
-			case 11:
-				callsub S_EnchantArmor,2326,55;
-			case 12:
-				callsub S_EnchantArmor,2331,55;
-			case 13:
-				callsub S_EnchantArmor,2333,55;
-			case 14:
-				callsub S_EnchantArmor,2336,55;
-			case 15:
-				callsub S_EnchantArmor,2342,55;
-			case 16:
-				callsub S_EnchantArmor,2345,55;
-			case 17:
-				callsub S_EnchantArmor,2347,55;
-			case 18:
-				callsub S_EnchantArmor,2349,55;
-			case 19:
-				callsub S_EnchantArmor,2351,55;
-			}
-		case 3:
-			switch(select("Meteo Plate Armor:Orlean's Gown:Life Link:Diablos Robe:Diablos Armor:Assaulter Plate:Elite Engineer Armor:Assassin Robe:Warlock's Battle Robe:Medic's Robe:Elite Archer Suit:Elite Shooter Suit:Sprint Mail:Kandura:Armor of Naga:Improved Tights")) {
-			case 1:
-				callsub S_EnchantArmor,2364,60;
-			case 2:
-				callsub S_EnchantArmor,2365,60;
-			case 3:
-				callsub S_EnchantArmor,2391,60;
-			case 4:
-				callsub S_EnchantArmor,2374,60;
-			case 5:
-				callsub S_EnchantArmor,2375,60;
-			case 6:
-				callsub S_EnchantArmor,2376,60;
-			case 7:
-				callsub S_EnchantArmor,2377,60;
-			case 8:
-				callsub S_EnchantArmor,2378,60;
-			case 9:
-				callsub S_EnchantArmor,2379,60;
-			case 10:
-				callsub S_EnchantArmor,2380,60;
-			case 11:
-				callsub S_EnchantArmor,2381,60;
-			case 12:
-				callsub S_EnchantArmor,2382,60;
-			case 13:
-				callsub S_EnchantArmor,2387,60;
-			case 14:
-				callsub S_EnchantArmor,2388,60;
-			case 15:
-				callsub S_EnchantArmor,2389,60;
-			case 16:
-				callsub S_EnchantArmor,2390,60;
-			}
-		case 4:
-			mes "[Apprentice Craftsman]";
-			mes "Please come back when you have any interest in enchanting your armor.";
-			close;
+				mes "[Apprentice Craftsman]";
+				mes "Please come back when you have any interest in enchanting your armor.";
+				close;
 		}
+		set .@menu$,"";
+		for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+1)
+			set .@menu$, .@menu$+getitemname(.@Items[.@i])+((.@k)?" [1]":"")+":";
+		callsub S_EnchantArmor, .@Items[select(.@menu$)-1], .@j;
+		end;
 	}
 	else {
-		mes "[Apprentice Craftsman]";
 		mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -173,8 +68,8 @@ prontera,165,60,2	script	Apprentice Craftsman	73,{
 S_EnchantArmor:
 	set .@itemid,getarg(0);
 	set .@failrate,getarg(1);
+	mes "[Apprentice Craftsman]";
 	if ((countitem(.@itemid) > 0) && (countitem(.@itemid) < 2)) {
-		mes "[Apprentice Craftsman]";
 		mes "Socket enchant wil cost you 400,000 zeny. And there will be a random option enchanted. Of course, there is a chance of breaking your armor.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -183,94 +78,55 @@ S_EnchantArmor:
 		mes "and Cards will be GONE.^000000";
 		mes "Do you still want to try an Enchant?";
 		next;
-		switch(select("Hmm... Let me think it over.:Go ahead.")) {
-		case 1:
+		if(select("Hmm... Let me think it over.:Go ahead.")==1) {
 			mes "[Apprentice Craftsman]";
-			mes "Well, I can't blame you. Safety first, Ey?";
+			mes "Well, I can't blame you. Safety first, eh?";
 			mes "Now you have a nice day.";
 			close;
-		case 2:
+		}
+		mes "[Apprentice Craftsman]";
+		mes "Quite of an adventurer huh? Well, shall we?";
+		close2;
+		specialeffect2 EF_MAPPILLAR;
+		if (Zeny < 400000) {
 			mes "[Apprentice Craftsman]";
-			mes "Quite of an adventurer huh? Well, shall we?";
-			close2;
-			specialeffect2 EF_MAPPILLAR;
-			if (Zeny < 400000) {
-				mes "[Apprentice Craftsman]";
-				mes "Sorry, but you don't have enough zeny.";
-				close;
-			}
-			progressbar "ffff00",7;
-			set .@enc_ran,rand(1,.@failrate);
-			set zeny,zeny-400000;
-			delitem .@itemid,1;
-			if (.@enc_ran == 1) {
-				set .@addpart,4702;
-			}
-			else if (.@enc_ran == 2) {
-				set .@addpart,4712;
-			}
-			else if (.@enc_ran == 3) {
-				set .@addpart,4722;
-			}
-			else if (.@enc_ran == 4) {
-				set .@addpart,4732;
-			}
-			else if (.@enc_ran == 5) {
-				set .@addpart,4742;
-			}
-			else if (.@enc_ran == 6) {
-				set .@addpart,4752;
-			}
-			else if ((.@enc_ran > 6) && (.@enc_ran < 9)) {
-				set .@addpart,4701;
-			}
-			else if ((.@enc_ran > 8) && (.@enc_ran < 11)) {
-				set .@addpart,4711;
-			}
-			else if ((.@enc_ran > 10) && (.@enc_ran < 13)) {
-				set .@addpart,4721;
-			}
-			else if ((.@enc_ran > 12) && (.@enc_ran < 15)) {
-				set .@addpart,4731;
-			}
-			else if ((.@enc_ran > 14) && (.@enc_ran < 17)) {
-				set .@addpart,4741;
-			}
-			else if ((.@enc_ran > 16) && (.@enc_ran < 19)) {
-				set .@addpart,4751;
-			}
-			else if ((.@enc_ran > 18) && (.@enc_ran < 22)) {
-				set .@addpart,4700;
-			}
-			else if ((.@enc_ran > 21) && (.@enc_ran < 25)) {
-				set .@addpart,4710;
-			}
-			else if ((.@enc_ran > 24) && (.@enc_ran < 28)) {
-				set .@addpart,4720;
-			}
-			else if ((.@enc_ran > 27) && (.@enc_ran < 31)) {
-				set .@addpart,4730;
-			}
-			else if ((.@enc_ran > 30) && (.@enc_ran < 34)) {
-				set .@addpart,4740;
-			}
-			else if ((.@enc_ran > 33) && (.@enc_ran < 37)) {
-				set .@addpart,4750;
-			}
-			else {
-				specialeffect2 EF_PHARMACY_FAIL;
-				mes "[Apprentice Craftsman]";
-				mes "Well that's too bad.";
-				mes "The requested equipment has failed to enchant.";
-				close;
-			}
-			getitem2 .@itemid, 1, 1, 0, 0, 0, 0, 0, .@addpart;
+			mes "Sorry, but you don't have enough zeny.";
+			close;
+		}
+		progressbar "ffff00",7;
+		set .@enc_ran,rand(1,.@failrate);
+		set zeny,zeny-400000;
+		delitem .@itemid,1;
+		if (.@enc_ran == 1) set .@addpart,4702;
+		else if (.@enc_ran == 2) set .@addpart,4712;
+		else if (.@enc_ran == 3) set .@addpart,4722;
+		else if (.@enc_ran == 4) set .@addpart,4732;
+		else if (.@enc_ran == 5) set .@addpart,4742;
+		else if (.@enc_ran == 6) set .@addpart,4752;
+		else if ((.@enc_ran > 6) && (.@enc_ran < 9)) set .@addpart,4701;
+		else if ((.@enc_ran > 8) && (.@enc_ran < 11)) set .@addpart,4711;
+		else if ((.@enc_ran > 10) && (.@enc_ran < 13)) set .@addpart,4721;
+		else if ((.@enc_ran > 12) && (.@enc_ran < 15)) set .@addpart,4731;
+		else if ((.@enc_ran > 14) && (.@enc_ran < 17)) set .@addpart,4741;
+		else if ((.@enc_ran > 16) && (.@enc_ran < 19)) set .@addpart,4751;
+		else if ((.@enc_ran > 18) && (.@enc_ran < 22)) set .@addpart,4700;
+		else if ((.@enc_ran > 21) && (.@enc_ran < 25)) set .@addpart,4710;
+		else if ((.@enc_ran > 24) && (.@enc_ran < 28)) set .@addpart,4720;
+		else if ((.@enc_ran > 27) && (.@enc_ran < 31)) set .@addpart,4730;
+		else if ((.@enc_ran > 30) && (.@enc_ran < 34)) set .@addpart,4740;
+		else if ((.@enc_ran > 33) && (.@enc_ran < 37)) set .@addpart,4750;
+		else {
+			specialeffect2 EF_PHARMACY_FAIL;
+			mes "[Apprentice Craftsman]";
+			mes "Well that's too bad.";
+			mes "The requested equipment has failed to enchant.";
+			close;
 		}
+		getitem2 .@itemid, 1, 1, 0, 0, 0, 0, 0, .@addpart;
 	}
 	else {
-		mes "[Apprentice Craftsman]";
 		mes "Hmm? There's nothing to be enchanted!";
 		mes "Please come back with just ONE equipment to be enchanted.";
 		close;
 	}
-}
+}
\ No newline at end of file
diff --git a/npc/merchants/manuk.txt b/npc/merchants/manuk.txt
index e08034d4a..9500a7eb2 100644
--- a/npc/merchants/manuk.txt
+++ b/npc/merchants/manuk.txt
@@ -1,9 +1,9 @@
 //===== rAthena Script =======================================
 //= Manuk Merchant
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -12,84 +12,39 @@
 //===== Additional Comments: =================================
 //= 1.0 First version 
 //= 1.1 Fixed checkweight. [Gepard]
+//= 1.2 Optimized. [Euphy]
 //============================================================
 
 man_in01,286,16,1	script	Merchant of Manuk	454,{
+	mes "[Merchant of Manuk]";
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
-		if (checkweight(1201,1) == 0) {
-			mes "[Merchant of Manuk]";
+		if (!checkweight(1201,1)) {
 			mes "It looks like you're carrying too many things.";
 			mes "Why not put some of your items in storage and come back?";
 			close;
 		}
-		mes "[Merchant of Manuk]";
 		mes "Hello.";
 		mes "What are you looking for?";
 		next;
-		switch(select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel")) {
-		case 1:
-			mes "[Merchant of Manuk]";
+		setarray .@Items[2],12342,12343,12348;
+		set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel");
+		mes "[Merchant of Manuk]";
+		if (.@i == 1) {
 			mes "Here are the item descriptions.";
 			close2;
 			ReadBook 11019,1;
 			end;
-		case 2:
-			mes "[Merchant of Manuk]";
-			mes "I can sell you 3 Manuk's Opportunity for^3131FF 1 coin^000000";
-			next;
-			switch(select("Purchase:Do not purchase.")) {
-			case 1:
-				if (countitem(6080) > 0) {
-					mes "[Merchant of Manuk]";
-					mes "Thank you for coming.";
-					delitem 6080,1; //Manuk_Coin
-					getitem 12342,3; //Manuk's_Opportunity
-					close;
-				}
-				else {
-					mes "[Merchant of Manuk]";
-					mes "You don't have enough coins.";
-					close;
-				}
-			case 2:
-				mes "[Merchant of Manuk]";
-				mes "Come again if you change your mind.";
-				close;
-			}
-		case 3:
-			mes "[Merchant of Manuk]";
-			mes "I can sell you 3 Manuk's Courage for^3131FF 1 coin^000000";
-			next;
-			switch(select("Purchase:Do not purchase.")) {
-			case 1:
-				if (countitem(6080) > 0) {
-					mes "[Merchant of Manuk]";
-					mes "Thank you for coming.";
-					delitem 6080,1; //Manuk_Coin
-					getitem 12343,3; //Manuk's_Courage
-					close;
-				}
-				else {
-					mes "[Merchant of Manuk]";
-					mes "You don't have enough coins.";
-					close;
-				}
-			case 2:
-				mes "[Merchant of Manuk]";
-				mes "Come again if you change your mind.";
-				close;
-			}
-		case 4:
-			mes "[Merchant of Manuk]";
-			mes "I can sell you 3 Manuk's Faith for^3131FF 1 coin^000000";
+		}
+		else if (.@i < 5) {
+			mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for^3131FF 1 coin^000000.";
 			next;
-			switch(select("Purchase:Do not purchase.")) {
+			switch(select("Purchase:Do not purchase")) {
 			case 1:
-				if (countitem(6080) > 0) {
+				if (countitem(6080)) {
 					mes "[Merchant of Manuk]";
 					mes "Thank you for coming.";
-					delitem 6080,1; //Manuk_Coin
-					getitem 12348,3; //Manuk's_Faith
+					delitem 6080,1;
+					getitem .@Items[.@i],3;
 					close;
 				}
 				else {
@@ -99,19 +54,15 @@ man_in01,286,16,1	script	Merchant of Manuk	454,{
 				}
 			case 2:
 				mes "[Merchant of Manuk]";
-				mes "Come again if you change your mind.";
-				close;
+				break;
 			}
-		case 5:
-			mes "[Merchant of Manuk]";
-			mes "Come again if you change your mind.";
-			close;
 		}
+		mes "Come again if you change your mind.";
+		close;
 	}
 	else {
-		mes "[Merchant of Manuk]";
 		mes "Rtt od d";
 		mes "Qwo hd is d irr";
 		close;
 	}
-}
+}
\ No newline at end of file
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 496e1d865..8628ff426 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script ======================================= 
 //= Quest NPCs related to Morroc
 //===== By: ================================================== 
 //= kobra_k88
@@ -32,7 +32,7 @@
 //= 2.2 Updated Binocular and Stop Post quests. [L0ne_W0lf]
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
 //= 2.4 Implemented Ep. 12.1 Continental Guard Quest. [L0ne_W0lf]
-//=     Moved Dandelion's Request to its own file.
+//=     Moved Dandelion's Request to a it's own file.
 //=     Added support NPCs required to finish Gaebolg quest.
 //= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf]
 //= 2.6 Added quest log commands for Resurrection of Satan Morroc. [L0ne_W0lf]
@@ -2033,7 +2033,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 		if (barmunt_crow == 0) {
 			mes "^660000Morroc, the City of the Desert, has been completely devastated by Satan Morroc.^000000";
 			next;
-			mes "^660000The people of Morroc were resilient enough to endure the region's harsh weather, but their toughness to the weather could not prepare them enough as they witnessed the destruction brought down upon the city by Satan Morroc.^000000";
+			mes "^660000The people of Morroc were resilient enough to endure the region�s harsh weather, but their toughness to the weather could not prepare them enough as they witnessed the destruction brought down upon the city by Satan Morroc.^000000";
 			next;
 			mes "^660000This man, who looks as dry and thin as a fish dried up under the sun, still has a smile that reminds you of a benevolent god, and is touching a book in his hand.^000000";
 			next;
@@ -2998,7 +2998,7 @@ yuno_in04,117,102,3	script	Old News Scrapbook	844,{
 				mes "- Culture Page -";
 				mes "- Please Save My Water -";
 				mes " ";
-				mes "A recently acclaimed young author,";
+				mes "��A recently acclaimed young author,";
 				mes "Jean Cadoc's new series";
 				mes "'Please Save My Water' has been ranked at the top";
 				mes "for the most checked-out book in libraries.";
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index dadc32996..ab3307c5f 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= [Ishizu-chan]
 //===== Current Version: =====================================
-//= 2.5
+//= 2.5a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -27,6 +27,7 @@
 //= 2.3 Added continue and break in switch case. [JayPee]
 //= 2.4 Fixed a minor bug with Arch Bishop checks. [Euphy]
 //= 2.5 Cleaning. [Euphy]
+//= 2.5a Fixed an incorrect variable. [Euphy]
 //============================================================
 
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
@@ -2528,7 +2529,7 @@ OnTouch:
 	next;
 	input .@inputstr$;
 	if (countitem(7437) > 0) {
-		if (@inputstr$ == "Fragment of Misery") {
+		if (.@inputstr$ == "Fragment of Misery") {
 			mes "^3355FFYou insert the";
 			mes "Fragment of Misery";
 			mes "into the crest, causing";