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

1 files changed, 17 insertions, 14 deletions

diff --git a/npc/027-2_Caretakers_House/crying_child.txt b/npc/027-2_Caretakers_House/crying_child.txt
index 354305a6..72c70c76 100644
--- a/npc/027-2_Caretakers_House/crying_child.txt
+++ b/npc/027-2_Caretakers_House/crying_child.txt
@@ -1,6 +1,6 @@
 027-2.gat,50,92,0	script	Aldred	314,{
 
-// Crying Child subquest (Still need to change it to Bitmask)
+// Crying Child subquest
 // Variable states:
 // 1 = You agree to help the child to find the bracelet outside
 // 2 = You found the bracelet (see _mobs.txt)
@@ -59,21 +59,21 @@ L_intro:
 	mes "[Aldred]";
 	mes "\"Err.. I was looking at my parents stuff and I found this funny thing! It looks like a big blue beetle... I thought it would be funny to play with it for a while, so I took it with me. But I... sniffle... I lost it...\"";
 	next;
-	mes "\"I don't know what happened. It was outside and... maybe it fell on the ground! I am so scared! What if someone picked it up? It could be anyone!\"";
+	mes "\"I don't know what happened. I was outside and... maybe it fell on the ground! I am so scared! What if someone picked it up? It could be anyone!\"";
 	next;
 	menu
 		"Don't worry, I will look around. Maybe I can find it for you...",-,
 		"Hey, you messed up, now you deal with this.",L_close;
 
 	mes "[Aldred]";
-	mes "\"Thank you " +strcharinfo(0)+"! I hope you find it soon! It is not like it is worth a lot of money... It looks like a simple thing, but I really don't know what would be my dad's reaction when he finds out I lost something that belongs to him!\"";
+	mes "\"Thank you " +strcharinfo(0)+"! Find it for me, pleeeease!\"";
 	set @state, 1;
 	callsub S_Update_Mask;
 	close;
 
 L_return:
 	mes "[Aldred]";
-	mes "\"Please, help me, find the bracelet. If my father asks me why I'm crying I don't think I can come up with an excuse... Oh no...\"";
+	mes "\"Please, help me " +@madamsir$+ ". What will I say If my father asks me why I'm crying?\"";
 	close;
 
 
@@ -99,13 +99,13 @@ L_return1:
 
 L_return2:
 	mes "[Aldred]";
-	mes "\"Hi "+strcharinfo(0)+ "! I was thinking about something... you are such a nice person and you helped me a lot, but I didn't give you anything in exchange. It was really rude, I know, but I am only a child, I have nothing to give you!\"";
+	mes "\"Hi "+strcharinfo(0)+ "! I was thinking... you were sooo nice helping me find the ... I think I should give you a gift, but I am only a child, I have nothing to give you!\"";
 	next;
 	menu
 		"Don't worry, you don't need to give me anything...",-;
 	next;
 	mes "[Aldred]";
-	mes "\"I know! That is why you are so great! But hey, I have an idea. What if you talk to my father and my mother about this item? If it is not important or valuable to them, I think there is no problem to let you keep it.\"";
+	mes "\"Are you serious? That is why you are so great! But hey, I have an idea. What if you talk to my parents about this item? If it is not important or valuable, I think there is no problem to let you keep it.\"";
 	next;
 	menu
 		"Sounds interesting... But who are your parents?",-,
@@ -114,19 +114,22 @@ L_return2:
 	set @state, 4;
 	callsub S_Update_Mask;
 	mes "[Aldred]";
-	mes "\"Ok, great... But please, don't tell them about it. I don't want my parents to know I was playing with their stuff. My father is always carying a lantern... I guess he is still afraid of the dark. My mother is the innkeeper. She is very beautiful and today she is wearing a red dress.\"";
+	mes "\"Ok, great... But please, don't tell them about it. I don't want my parents to know I was playing with their stuff. My father is always carrying a lantern... I guess he is still afraid of the dark. My mother is the innkeeper. She is very beautiful and today she is wearing a red dress.\"";
+	next;
+	mes "\"Don't forget to come back with the beetle after you talk to my parents.\"";
+	message strcharinfo(0), "Aldred hands you the strange item and you keep it in a small compartment of your backpack";
 	close;
-//TODO: make a message, that the player has the bracelet with him and should come back after talking to the parents
+
 L_return3:
 	mes "[Aldred]";
-	mes "\"I hope this bracelet doesn't mean a lot to my parents, this way you can keep it as a gift.\"";
+	mes "\"I hope this thing doesn't mean a lot to my parents, this way you can keep it as a gift.\"";
 	close;
 
 L_return4:
 	menu
 		"Hi, I talked to your parents.",-;
 	mes "[Aldred]";
-	mes "\"Really? What did my father say about the bracelet?\"";
+	mes "\"Really? What did my father say about that thing?\"";
 	menu
 		"He said it is just a cheap bracelet. And it does not belong to him.",-;
 	mes "[Aldred]";
@@ -134,11 +137,11 @@ L_return4:
 	menu
 		"She said it was a gift to her, but she doesn't want it anymore.",-;
 	mes "[Aldred]";
-	mes "\"Really? A gift? And why she is refusing to keep this gift\"";
+	mes "\"Really? A gift? And why she doesn't want it?\"";
 	next;
 	menu
-		"She is not able to hold it anymore, so it makes her sad",-;
-	mes "\"Ohh... I don't like when my mother gets sad... If this thing is making her feel bad, I guess I should keep it away from her. \"";
+		"She said it makes her sad",-;
+	mes "\"Ohh... really? I don't like when my mother gets sad... If this thing is making her feel bad, I should keep it away from her. \"";
 	next;
 	mes "\"Well, I guess you can keep it, but don't show it to my mother again, she is already very sad. But now I am really curious, who would give a gift to my mother? There are so many strange things happening lately...\"";
 	getinventorylist;
@@ -146,7 +149,7 @@ L_return4:
 	getitem "ScarabArmlet", 1;
 	set @state, 7;
 	callsub S_Update_Mask;
-	mes "\"Now I will tell my parents how good and helpfull you are... Maybe they can even offer you a discount in your expenses here at Reid's Inn...\"";
+	mes "\"Now I will tell my parents how great and helpfull you are... Maybe they can even let you stay here at the inn for free!\"";
 	close;
 
 L_return5: