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

5 files changed, 25 insertions, 45 deletions

diff --git a/npc/009-2_Hurnscald/nurse.txt b/npc/009-2_Hurnscald/nurse.txt
index 096b2457..7212597f 100644
--- a/npc/009-2_Hurnscald/nurse.txt
+++ b/npc/009-2_Hurnscald/nurse.txt
@@ -282,7 +282,7 @@ L_choosePut:
     mes "You take the glass and look suspiciously at the liquid, which has changed to an odd colour.";
     next;
     mes "[Nurse]";
-    mes "\"Alright, now I will inject the venom into you, then you should drink the antidote imediatly. Are you ready?\"";
+    mes "\"Alright, now I will inject the venom into you, then you should drink the antidote immediately. Are you ready?\"";
     next;
     mes "You take a deep breath and nod.";
     next;
diff --git a/npc/031-2_Angelas_House/angelaHouse.txt b/npc/031-2_Angelas_House/angelaHouse.txt
index 6cd70f34..be1a86a1 100644
--- a/npc/031-2_Angelas_House/angelaHouse.txt
+++ b/npc/031-2_Angelas_House/angelaHouse.txt
@@ -37,9 +37,9 @@ L_Reward:
 	callsub S_Update_Mask;
 	
 	next;
-	mes "\"I hope, this will be useful for you.\"";
+	mes "\"I hope this will be useful for you.\"";
 	next;
-	mes "\"I's so glad, Cindy is save now. But there is still another problem. The Yetis took away all the white and yellow present boxes we wanted to bring to Santa!\"";
+	mes "\"I am so glad Cindy is safe. But there is still another problem. The Yetis took away all the white and yellow present boxes we wanted to bring to Santa!\"";
 	next;
 	mes "\"Usually, Yetis are very shy - I wonder why they do that. There is something strange going on.\"";
 	next;
diff --git a/npc/031-2_Angelas_House/cindyHouse.txt b/npc/031-2_Angelas_House/cindyHouse.txt
index f18da414..46546777 100644
--- a/npc/031-2_Angelas_House/cindyHouse.txt
+++ b/npc/031-2_Angelas_House/cindyHouse.txt
@@ -26,9 +26,9 @@ L_Happy_Random:
 	"I want to go ice skating tomorrow. That will be fun!",
 	"I wonder, when Daddy will come home next time. He always brings exciting stuff!",
 	strcharinfo(0) + "! You're my hero!",
-	"My mother is so upset about the Yetis - they are very very shy usually. You have to be lucky to see one. I wonder, what's wrong with them.",
-	"When I'm a little older, I want to travel like you do and my father. I want to see every place on the world!",
-	"Did you ever meet Santa? He's very kind! He always gives me some candy, when we go to see him.",
+	"My mother is so upset about the Yetis - they are very very shy usually. You have to be lucky to see one. I wonder what's wrong with them.",
+	"When I'm a little older, I want to travel like you and my father. I want to see every place on the world!",
+	"Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.",
 	strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!";
 	set @random, rand(9);
 	if (@random != 5) emotion 3;
diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt
index b61dfc2d..3eeb8184 100644
--- a/npc/031-3_Cave/cindyCave.txt
+++ b/npc/031-3_Cave/cindyCave.txt
@@ -24,7 +24,7 @@
 
 	mes "There is a little girl in a cage. As you come near, she starts to shiver and back off from you as far as she can in that small cage.";
 	next;
-	mes "You don't know, what to do.";
+	mes "You don't know what to do.";
 	close; 
 
 L_Please_Help:
@@ -100,7 +100,7 @@ L_Wizard_Hat:
 L_Visit:
 	mes "\"Thank you so much, please come to my home. It's the house at the beach.\"";
 	next;
-	mes "\"I'm sure, my mother want to thank you as well.\"";	
+	mes "\"I'm sure, my mother wants to thank you as well.\"";	
 	close;
 	
 L_Please_Visit:
@@ -109,7 +109,7 @@ L_Please_Visit:
 	close;
 	
 L_To_Weak:
-	mes "You try to open the cage, but it's stuck. It seems, you're too weak!";
+	mes "You try to open the cage, but it's stuck. It seems you're too weak!";
 	close;
 
 L_Not_Enough_Keys:
diff --git a/npc/031-3_Cave/labyrinth.txt b/npc/031-3_Cave/labyrinth.txt
index a73085e3..29b7f6aa 100755
--- a/npc/031-3_Cave/labyrinth.txt
+++ b/npc/031-3_Cave/labyrinth.txt
@@ -6,8 +6,6 @@
 //#
 //#    reviewed by:
 //#
-//#    This is a labyrinth, having lots of warps in there.
-//#    These warps are activated on different days.
 //#    For each way there are 2 warps: one way and its way back.
 //#    
 //#################################################################################
@@ -23,7 +21,6 @@
     end;
 }
 
-// If Donated > 1M < 1.5M - Maze=2
 
 031-3.gat,225,282,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 274, 299;
@@ -35,7 +32,6 @@
     end;
 }
 
-// Second Warp
 
 031-3.gat,283,271,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 269, 244;
@@ -52,7 +48,6 @@
     end;
 }
 
-// Third Warp
 031-3.gat,139,258,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 155, 196;
     end;
@@ -63,7 +58,6 @@
     end;
 }
 
-// First Warp
 031-3.gat,142,301,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 97, 298;
     end;
@@ -74,7 +68,7 @@
     end;
 }
 
-// Second Warp
+
 031-3.gat,135,196,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 106, 231;
     end;
@@ -85,7 +79,6 @@
     end;
 }
 
-// Third Warp
 031-3.gat,286,190,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 227, 241;
     end;
@@ -96,8 +89,6 @@
     end;
 }
 
-// Fourth Warp
-
 031-3.gat,236,211,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 187, 227;
     end;
@@ -108,9 +99,6 @@
     end;
 }
 
-
-
-// First Warp
 031-3.gat,94,254,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 54, 253;
     end;
@@ -121,8 +109,6 @@
     end;
 }
 
-// Second Warp
-
 031-3.gat,103,199,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 52, 175;
     end;
@@ -133,8 +119,6 @@
     end;
 }
 
-// Third Warp
-
 031-3.gat,212,193,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 207, 165;
     end;
@@ -145,8 +129,6 @@
     end;
 }
 
-// Fourth Warp
-
 031-3.gat,235,167,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 195, 124;
     end;
@@ -157,9 +139,6 @@
     end;
 }
 
-// If Donated > 2.5M < 3M - Maze=5
-// first warp
-
 031-3.gat,296,97,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 292, 125;
     end;
@@ -168,25 +147,27 @@
     warp "031-3.gat", 296, 95;
     end;
 }
-// second warp
+
 031-3.gat,289,164,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 228, 123;
     end;
 }
+
 031-3.gat,228,121,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 289, 162;
     end;
 }
-// third warp
+
 031-3.gat,24,157,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 31, 142;
     end;
 }
+
 031-3.gat,31,144,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 24, 159;
     end;
 }
-// forth warp
+
 031-3.gat,36,249,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 35, 224;
     end;
@@ -197,44 +178,46 @@
     end;
 }
 
-// first warp
 031-3.gat,34,25,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 281, 25;
     end;
 }
+
 031-3.gat,281,22,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 34, 28;
     end;
 }
-// # second warp
+
 031-3.gat,283,48,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 275, 74;
     end;
 }
+
 031-3.gat,275,73,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 283, 47;
     end;
 }
-// # third warp
+
 031-3.gat,26,178,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 36, 202;
     end;
 }
+
 031-3.gat,36,200,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 26, 176;
     end;
 }
 
-// first warp
 031-3.gat,91,125,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 36, 78;
     end;
 }
+
 031-3.gat,36,80,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 91, 127;
     end;
 }
-// # second warp
+
 031-3.gat,52,78,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 192, 72;
     end;
@@ -245,19 +228,16 @@
     end;
 }
 
-
-// If Donated > 4M < 5M - Maze=8
-// first warp
 031-3.gat,128,135,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 148, 152;
     end;
 }
 
-// # second warp
 031-3.gat,232,93,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 200, 47;
     end;
 }
+
 031-3.gat,200,50,0	script	#ChristmasBarrier	127,1,1,{
     warp "031-3.gat", 232, 90;
     end;
@@ -268,7 +248,7 @@
     warp "031-3.gat", 46, 27;
 	end;
 L_Block:
-    message strcharinfo(0), "Some force seems to be blocking you from exiting.";
+    message strcharinfo(0), "A force field seems to be blocking you from exiting.";
     end;
 }
 031-3.gat,46,24,0	script	#ChristmasBarrier	127,1,1,{
@@ -276,6 +256,6 @@ if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked;
     warp "031-3.gat", 120, 79;
 	end;
 L_Blocked:
-    message strcharinfo(0), "Some force seems to be blocking you from entering.";
+    message strcharinfo(0), "A force field seems to be blocking you from entering.";
     end;
 }