Some changes in the love triangle quest order and the crying kid quest.

1 files changed, 34 insertions, 37 deletions

diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2_Caretakers_House/husband.txt
index 1253455a..f53c6386 100644
--- a/npc/027-2_Caretakers_House/husband.txt
+++ b/npc/027-2_Caretakers_House/husband.txt
@@ -23,41 +23,40 @@
 	set @SKULL_AMOUNT, 50;
 	set @BONE_EXP, 30000;
 	
-	if ((@state == 4) && (sex == 0) && (@kidstate >= 7)) goto L_Helped_Kid;
-	if (@state == 3) goto L_Brought_Bones;
+	if (@state >= 3) goto L_Brought_Bones;
 	if (@state == 2) goto L_Check_Bones;
 	if (@state == 1) goto L_Ice_Cube;
 	
 	mes "[Pale Man]";
-	mes "\"Hello, I hope you're enjoying your time in Reids Inn. My name is Hamond, and I'm running this inn together with my beautiful wife Reid. If there is anything I can do for you, please let me know.\"";
+	mes "\"Hello, I hope you're enjoying your time in Reid's Inn. My name is Hamond, and I'm running this inn together with my beautiful wife Reid. If there is anything I can do for you, please let me know.\"";
 	if (baselevel < 85) goto L_Close;
 	next;
 	menu
-		"I'd like to know, why all the people in here are dead.",-,
-		"Are you feeling well? You look very pale, better to say - deathly pale.",-,
+		"I'd like to know why all the people in here are dead.",-,
+		"Are you feeling well? You look very pale... In fact, deathly pale.",-,
 		"Thank you, but I'm fine.", L_Close;
 	
-	mes "Hamond seems very confused. Then he notices the grey color of his hands and begans to shake his head in panic.";
+	mes "Hamond seems very confused. Then he notices the grey color of his hands and begins to shake his head in panic.";
 	mes "[Hamond]";
 	mes "\"WHAT IS THIS?\"";
 	next;
 	//TODO: ask a native speaker if this is understandable
-	mes "Because of the rapid movement of his head, it snaps back in his neck along a cut in his throat you haven't seen before.";
+	mes "Because of the fast movement of his head, it bends back in his neck along a cut in his throat, a deep cut you haven't seen before.";
 	next;
 	mes "You're trying hard not to run away screaming. Instead, you grab his hair and pull his head back in place.";
 	next;
-	mes "Hamond blinks his eyes with a puzzled look on his face.";
+	mes "Hamond blinks a few times, with a puzzled look on his face.";
 	mes "[Hamond]";
-	mes "\"This was uncomfortable! It seems, you are right. I am dead. Weird.\"";
+	mes "\"That was uncomfortable! I guess you are right. I am dead. Weird.\"";
 	next;
-	mes "\"How can I be dead, but walking around and talking? This is very strange. \"";
+	mes "\"How can I be dead, if I am walking around and talking? This is very strange. \"";
 	next;
-	mes "\"But nevertheless, I will continue to run this inn and do my best to make happy all our patrons - may they be alive or dead.\"";
+	mes "\"But nevertheless, I will continue to run this inn and do my best to make all our patrons happy and satisfied - be they alive or dead.\"";
 	next;	
 	menu
 		"Can I help with that?", -;
 	mes "[Hamond]";
-	mes "\"Helping me? I never would have asked, but actually, I need something to cool the drinks. Maybe you can find something.\"";
+	mes "\"Help me? I would never ask you for this, but actually, I need something to cool the drinks. Maybe you can find something.\"";
 	
 	set @state, 1;
 	callsub S_Update_Mask;
@@ -118,11 +117,11 @@ L_Check_Ice:
 	mes "[Hamond]";
 	mes "\"Nevermind, nevermind. I'd like to ask you for another favor, if I might.\"";
 	next;
-	mes "\"A patron asked for - uhm, bones. He said, he need it to replace some of his bones, which were damaged in a scuffle with mortals.\"";
+	mes "\"A patron asked for - uhm, bones. He said he need it to replace some of his bones, which were damaged in a scuffle with mortals.\"";
 	next;
-	mes "\"I know, this is a bit strange - I'm still getting used to being dead. But a patrons wish is a patrons wish!\"";
+	mes "\"I know, this is a bit strange - I'm still getting used to being dead. But a patron's wish is a patron's wish!\"";
 	next;
-	mes "\"Maybe you can bring me a huge amount of bones and skulls, so I can fulfill those wishes in future?\"";
+	mes "\"Can you bring me a huge amount of bones and skulls? This way I can fulfill that peculilar wish and make another patron very happy!\"";
 	close;
 	
 L_Check_Bones:
@@ -140,43 +139,40 @@ L_Check_Bones:
 
 L_Brought_Bones:
 	mes "[Hamond]";
-	mes "\"Thanks for your help! Now I'll be able to satisfy our patrons wishes.\"";
+	mes "\"Thanks for your help! Now I'll be able to satisfy another strange request from one of our patrons.\"";
 	next;
 	
 	if ((@kidstate == 4) && (@woman > 5))
 		menu
 			"Would you tell me about this mage named Savaric?", L_Savaric,
 			"I found this in the main hall. Do you know to whom it belongs?", L_Bracelet, 
-			"Your welcome.", L_Close;
+			"You're welcome.", L_Close;
 	
 	if (@kidstate == 4)
 		menu
 			"I found this in the main hall. Do you know to whom it belongs?", L_Bracelet,
-			"Your welcome.", L_Close;
+			"You're welcome.", L_Close;
 	
 	if (@woman > 5)	
 		menu
 			"Would you tell me about this mage named Savaric?", L_Savaric,
-			"Your welcome.",-;
+			"You're welcome.",-;
 	mes "[Hamond]";
 	mes "\"Please make yourself at home.\"";
 	
 	close;
 	
 L_Savaric:
-	mes "Hamonds face turns into an ugly grimace.";
+	mes "Hamond's face turns into an ugly grimace.";
 	mes "[Hamond]";
 	mes "\"This egomaniac cheekily - \"";
 	next;
 	
-	if (Sex == 1) goto L_Man;
 	//TODO: think, if gender change should be checked
 	//TODO: determine correct value for kidstate
-	if ((Sex == 0) && (@kidstate < 5)) goto L_Woman;
-	
-	mes "\"Hrm - I don't think, you'll understand. It is something between men.\"";
-	next;
-	mes "\"Although you're a woman, it was very nice of you to help my son. I'll tell you nevertheless.\"";
+	if ((Sex == 0) && (@kidstate < 7)) goto L_Woman;
+	if ((Sex == 1) && (@kidstate < 7)) goto L_Man;	
+	mes "\"Well, I have been thinking about you. You seem to be a very helpful and wise person. Even my son told me good things about you, making a long speech about how great you are and your ability to comprehend and deal with delicate matters. I wonder how he reached that conclusion... But anyway, I'll tell you about savaric.\"";
 
 L_Jealousy:
 //TODO: go on here
@@ -184,20 +180,21 @@ L_Jealousy:
 	close;
 L_Man:
 	mes "[Hamond]";
-	mes "\"You're a man - I think you will understand what I'm going to tell you.\"";
-	goto L_Jealousy;
+	mes "\"You're a man - I think you would understand what is happening to me.\"";
+	mes "\"But, to be honest, I think I will only be able to talk about such a complicated matter if I am sure I am sharing my feelings with a good, wise and understanding person. No offense, it is just that I barely know you...\"";
+	close;
 
 L_Woman:
 	mes "[Hamond]";
-	mes "\"Hrm - I don't think, you'll understand. It is something between men.\"";
+	mes "\"Hrm - I don't think you'll understand. It is a problem between men.\"";
 	next;
-	mes "\"Maybe if you show me, you're a understanding person.\"";
+	mes "\"And, to be honest, I will only be able to talk about such a complicated matter if I am sure I am sharing my feelings with a good, wise and understanding person. No offense, it is just that I barely know you...\"";
 	close;
 
-L_Helped_Kid:
-	mes "[Hamond]";
-	mes "\"It was very nice of you to help my son. He told me, you found something he lost. I think, I can tell you about Savaric.\"";
-	goto L_Jealousy;
+//L_Helped_Kid:
+//	mes "[Hamond]";
+//	mes "\"It was very nice of you to help my son. He told me, you found something he lost. I think, I can tell you about Savaric.\"";
+//	goto L_Jealousy;
 	
 L_Bracelet:
 	mes "[Hamond]";
@@ -212,14 +209,14 @@ L_Bracelet:
 		
 L_Not_Enough_B:
 	if (countitem("Bone") < @BONE_AMOUNT)
-		mes "\"I'm not sure, but I think, more bones will be better.\"";
+		mes "\"I'm not sure, but I think more bones will be better.\"";
 	if (countitem("Skull") < @SKULL_AMOUNT)
-		mes "\"That are not enough skulls.\"";
+		mes "\"Maybe you should bring more skulls. It is not enough.\"";
 	close;
 
 L_Not_Enough_Cubes:
 	mes "[Hamond]";
-	mes "\"Yes, they look good! But I think, I need more of them. Maybe " + @ICE_CUBE_AMOUNT + "?\"";
+	mes "\"Yes, they look good! But I think I need more of them. Maybe " + @ICE_CUBE_AMOUNT + "?\"";
 	close;
 
 L_Close: