Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata

4 files changed, 10 insertions, 10 deletions

diff --git a/npc/021-2_Tulimshar/bakery.txt b/npc/021-2_Tulimshar/bakery.txt
index 18219a82..8fcddf81 100644
--- a/npc/021-2_Tulimshar/bakery.txt
+++ b/npc/021-2_Tulimshar/bakery.txt
@@ -51,7 +51,7 @@ L_lace_chococake:
 
 	mes "[Riskim]";
         mes "\"Please have a seat!\"";
-        mes "You watch at Riskim melts the chocolate and stirs in the potion, then glazes a cake with the mixture.";
+        mes "You watch as Riskim melts the chocolate and stirs in the potion, then glazes a cake with the mixture.";
         mes "\"It's a bit more chocolatey than your average chocolate cake, of course...\"";
         next;
 
diff --git a/npc/021-2_Tulimshar/furquest.txt b/npc/021-2_Tulimshar/furquest.txt
index 44126aa5..6727ea7d 100644
--- a/npc/021-2_Tulimshar/furquest.txt
+++ b/npc/021-2_Tulimshar/furquest.txt
@@ -157,8 +157,8 @@ L_State_1:
 L_State_2:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"Well, Winter Gloves are so fashionable for their lovable fur!";
-	mes "Only the best furs can be saw for these gloves!";
-	mes "But, as you see, I am a tailor, not a hunter! So, why don't you bring me the best fluffy's fur you can see?\"";
+	mes "Only the best furs can be used for these gloves!";
+	mes "But, as you see, I am a tailor, not a hunter! So, why don't you bring me the best fluffy's fur you can find?\"";
 	set QUEST_WG_state, 3;
 	next;
 	menu
@@ -202,7 +202,7 @@ L_State_4_try:
 	close;
 
 L_State_4_success:
-	mes "Agostine turns into a smile";
+	mes "Agostine breaks into a smile";
 	next;
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"It's perfect! Perfect! Good job, my friend! I will prepare your gloves right now!\"";
@@ -227,7 +227,7 @@ L_State_5_pay:
 	getitem "WinterGloves", 1;
 	set QUEST_WG_state, 6;
 	mes "[Agostine, The Legendary Tailor]";
-	mes "\"Here they are. You will have the more fashionable hands in the world!\"";
+	mes "\"Here they are. You will have the most fashionable hands in the world!\"";
 	close;
 
 L_State_5_nocash:
@@ -287,7 +287,7 @@ L_State_11_try:
 	close;
 
 L_State_11_success:
-	mes "Agostine turns into a smile";
+	mes "Agostine breaks into a smile";
 	next;
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"This one is good enough, my friend. Good job.\"";
@@ -300,7 +300,7 @@ L_State_12:
 	mes "And my payment, obviously. 15,000 GP is right.\"";
 	next;
 	menu
-		"Sure, here it is all.", L_State_12_pay,
+		"Sure, here it all is.", L_State_12_pay,
 		"I missed something, I will be back soon!", -;
 	close;
 
diff --git a/npc/021-2_Tulimshar/government_building.txt b/npc/021-2_Tulimshar/government_building.txt
index 9ecfb219..f4f9d0de 100644
--- a/npc/021-2_Tulimshar/government_building.txt
+++ b/npc/021-2_Tulimshar/government_building.txt
@@ -3,7 +3,7 @@
 // A clerk
 021-2.gat,27,17,0	script	Estard	107,{
 	mes "[Estard]";
-	mes "\"Hello what Can I do for you?\"";
+	mes "\"Hello what can I do for you?\"";
 	next;
 
 L_main:
@@ -48,7 +48,7 @@ L_marry_too_young:
 	next;
 	
 	menu
-		"Can I atleast get wedding rings?", L_get_rings,
+		"Can I at least get wedding rings?", L_get_rings,
 		"Thanks anyways.", -;
 	close;
 
diff --git a/npc/021-2_Tulimshar/heathin.txt b/npc/021-2_Tulimshar/heathin.txt
index 556a7141..5d675e3c 100644
--- a/npc/021-2_Tulimshar/heathin.txt
+++ b/npc/021-2_Tulimshar/heathin.txt
@@ -119,7 +119,7 @@ L_Heathin_Terranite_Yes:
 	next; 
 	mes "Heathin thinks for a moment.";
 	next;
-	mes "\"Ah, I know!  I will make a helm...  Well, more like a hood, since it will woven.\"";
+	mes "\"Ah, I know!  I will make a helm...  Well, more like a hood, since it will be woven.\"";
 	next;
 	mes "\"It will require a great amount of heat, if the rumors are to be believed.  For this, I will need 100 [Coal] to keep my forge burning hot.  I will also need 10 [Terranite Ore] to make the armor.  Of course, such work does not come cheap.  While I may enjoy my work, my time and effort is very valuable.  To compensate my efforts I will need 200,000 gold pieces.  Please come back with the gold, [Coal] and ore and I'll make this hood for you.\"";
 	close;