* 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

2 files changed, 7 insertions, 6 deletions

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";