gy inn: some fixes

7 files changed, 57 insertions, 51 deletions

diff --git a/npc/027-1_Graveyard/_mobs.txt b/npc/027-1_Graveyard/_mobs.txt
index bd05622a..d0fa5ccd 100644
--- a/npc/027-1_Graveyard/_mobs.txt
+++ b/npc/027-1_Graveyard/_mobs.txt
@@ -83,12 +83,13 @@ _MOBCOUNT_ZOMBIES:
 	set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
 
 	set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
-	
+
 	if (@state != 1) return;
 // You have to kill 50?(or more?) zombies OR 50?(or more?) fallens. If you close the client, the @zombies count go back to zero.
 	set @zombies, @zombies + 1;
-// TODO: set 1 to 50
+// TODO: set 1 to 10
 	if (@zombies < 1) return;
+//	if (rand(8) != 0) return;
 	message strcharinfo(0), "You found a strange bracelet hidden in the zombie's rotten rags. Maybe this is what the Crying child was looking for...";
 	set @state, 2;
 	callsub S_Update_Mask;
@@ -100,17 +101,18 @@ _MOBCOUNT_FALLENS:
 	set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
 
 	set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
-	
+
 	if (@state != 1) return;
 // You have to kill 50?(or more?) fallens OR 50?(or more?) zombies. If you close the client, the @fallens count go back to zero.
 	set @fallens, @fallens + 1;
-// TODO: set 1 to 50
+// TODO: set 1 to 10
 	if (@fallens < 1) return;
+//	if (rand(8) != 0) return;
 	message strcharinfo(0), "You found a strange bracelet inside the fallen's broken helmet. Maybe this is what the Crying child was looking for...";
 	set @state, 2;
 	callsub S_Update_Mask;
 	return;
-	
+
 S_Update_Mask:
         set QUEST_Graveyard_Inn,
         	(QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
diff --git a/npc/027-2_Caretakers_House/crying_child.txt b/npc/027-2_Caretakers_House/crying_child.txt
index ba0549db..354305a6 100644
--- a/npc/027-2_Caretakers_House/crying_child.txt
+++ b/npc/027-2_Caretakers_House/crying_child.txt
@@ -1,4 +1,4 @@
-027-2.gat,50,92,0	script	Crying Child	314,{
+027-2.gat,50,92,0	script	Aldred	314,{
 
 // Crying Child subquest (Still need to change it to Bitmask)
 // Variable states:
@@ -25,6 +25,7 @@
 	if (@state == 1) goto L_return;
 	if (BaseLevel >= 80) goto L_intro;
 
+//TODO: make the dialogue more childish?
 
 L_cry:
 	mes "[Crying Child]";
@@ -43,16 +44,16 @@ L_intro:
 	mes "[Crying Child]";
 	mes "\"Oh, what? Who are you "+@madamsir$+", what are you doing here?\"";
 	next;
-	menu 
+	menu
 		"My name is "+strcharinfo(0)+", I heard you cry and decided to ask if you need help.",-;
 	next;
 	mes "[Crying Child]";
-	mes "\"You look like a good person... Maybe I can trust you... My name is Aldred and I live here with my parents. They own this place.\"";
+	mes "\"My parents told me not to talk to strangers... But you look nice... I trust you... I'm Aldred and we live here, my parents and me. This is our inn.\"";
 	next;
 	mes "[Aldred]";
 	mes "\"My problem is... I don't know what to do... My dad will be so angry with me... He is very nice, but when you do something wrong... he... WAAAAAAH!\"";
 	next;
-	menu 
+	menu
 		"Here, here, don't cry... What did you do?",-;
 	next;
 	mes "[Aldred]";
@@ -60,7 +61,7 @@ L_intro:
 	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!\"";
 	next;
-	menu 
+	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;
 
@@ -102,7 +103,7 @@ L_return2:
 	next;
 	menu
 		"Don't worry, you don't need to give me anything...",-;
-	next;	
+	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.\"";
 	next;
@@ -113,9 +114,9 @@ L_return2:
 	set @state, 4;
 	callsub S_Update_Mask;
 	mes "[Aldred]";
-	mes "\"Ok, great... But please, try to be discrete about it. I don't want my parents to know I was playing with their stuff. My Father owns this place. He 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 is using 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 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.\"";
 	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.\"";
@@ -161,7 +162,7 @@ L_full:
 
 L_close:
 	close;
-	
+
 S_Update_Mask:
         set QUEST_Graveyard_Inn,
         	(QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
@@ -193,7 +194,7 @@ S_Update_Mask:
 //	mes "[Innkeeper's Ghost]";
 //	mes "\"No, no. It is not that I don't like it. I just don't like the feelings it causes on me... It is... Complicated. Please, take this bracelet away. I don't want it... You can have it, or just give to someone else.\"";
 //	set @state, 6;
-//	close; 
+//	close;
 
 
 // Participation of the Husband/Father in the crying child subquest. Merge later with the apropriate NPC
@@ -215,7 +216,7 @@ S_Update_Mask:
 //	next;
 //	mes "\"Well.. this is just a cheap bracelet, it is very popular with the young kids these days, specially the magic students. They call it 'Scarab Armlet'. Fancy name, huh? But for me it is just a cheap bracelet.\"";
 //	next;
-//	mes "\"They also say it increases 'magic atack'. But, in fact, I think these kids are delusional. There is no such thing as magic, everyone knows it.\""; 
+//	mes "\"They also say it increases 'magic atack'. But, in fact, I think these kids are delusional. There is no such thing as magic, everyone knows it.\"";
 //	next;
 //	mes "\"Anyway, you can easily find one of these in a lot of small shops in this town. I am pretty sure that whoever lost it won't bother coming all the way back to get it. \"";
 //	menu
diff --git a/npc/027-2_Caretakers_House/diary.txt b/npc/027-2_Caretakers_House/diary.txt
index 98febebb..9e931733 100644
--- a/npc/027-2_Caretakers_House/diary.txt
+++ b/npc/027-2_Caretakers_House/diary.txt
@@ -3,10 +3,10 @@
 	set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
 
 	set @reid, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
-   
-	if (@reid >= 6) goto L_Diary;		
+
+	if (@reid >= 6) goto L_Diary;
 	end;
-    
+
 L_Diary:
 	mes "You pull out Reid's diary behind a huge poem book. In the back part of the book, you find some entries, which seem to be about Savaric.";
 	next;
@@ -14,27 +14,27 @@ L_Diary:
 	next;
 	mes "'I need to stay away from him! It's not right, what I am feeling. It seems, Hamond doesn't suspect anything of my feelings - but I know, it's just a matter of time. I need to come to my sense again!'";
 	next;
-	mes "'Oh, this chaos between Savaric and me is getting serious. I was in his room today and he put my arms around me - I wanted to push him away, but I couldn't move. It was such a sweet feeling. I was twisted between my brain saying 'No!' and my body wanting to feel his touch. Then Aldred showed up and Savaric let me go.'";
+	mes "'Oh, this chaos between Savaric and me is getting serious. I was in his room today and he put his arms around me - I wanted to push him away, but I couldn't move. It was such a sweet feeling. I was twisted between my brain saying 'No!' and my body wanting to feel his touch. Then Aldred showed up and Savaric let me go.'";
 	next;
 	mes "The next part is blurred - it seems, Reid was crying while writing.";
-	mes "'Savaric was talking again about leaving, because he can't find the mana seed. The thought, I could never see him again made me feel like falling in a big black hole! I need to decide what to do. But Hamond - I owe him so much. And what about Aldred?'";
+	mes "'Savaric was talking again about leaving, because he can't find the mana seed. The thought that I would never see him again made me feel like I was falling into a big black hole! I need to decide what to do. But Hamond - I owe him so much. And what about Aldred?'";
 	next;
 	mes "'We kissed each other - oh, I'm feeling so bad. I'm a disloyal slut. But I want it to happen again.'";
 	next;
-	mes "'I told Savaric, we have to stop with it - he was very understanding. But then he started to hold me again and I couldn't resist. I completely don't know, what to do! His touch on my waist even above my clothes made me feel hotter than every touch of Hamond ever did.'";
+	mes "'I told Savaric, we have to stop with it - he was very understanding. But then he started to hold me again and I couldn't resist. I completely don't know, what to do! His touch at my waist, even though over my clothes, made me feel hotter than Hamonds touch ever did.'";
 	next;
-	mes "'I don't know, if Hamond suspects us - he was holding me tight all the night, whispering declerations of love in my ears. Oh, I'm feeling so bad.'";
+	mes "'I don't know if Hamond suspects us - he was holding me tight all the night, whispering declarations of love in my ears. Oh, I'm feeling so bad.'";
 	next;
-	mes "'Hamond won't be here next night - he needs to visit our wine supplier to negotiate the prices. Savaric knows this. I'm feeling so excited - I should go with Hamond, but I told him, I need to take care about the inn, while he is away. Savaric.. '";
+	mes "'Hamond won't be here next night - he needs to visit our wine supplier to negotiate the prices. Savaric knows this. I'm feeling so excited - I should go with Hamond, but I told him, I need to take care about the inn, while he's away. Savaric.. '";
 	next;
 	mes "This is the last entry.";
 	if (@state != 6) goto L_Close;
-	
+
 	set @state, 7;
 	callsub S_Update_Mask;
 L_Close:
 	close;
-	
+
 S_Update_Mask:
         set QUEST_Graveyard_Inn,
         	(QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
diff --git a/npc/027-2_Caretakers_House/golbanez.txt b/npc/027-2_Caretakers_House/golbanez.txt
index 4e19f137..d9471f43 100644
--- a/npc/027-2_Caretakers_House/golbanez.txt
+++ b/npc/027-2_Caretakers_House/golbanez.txt
@@ -1,68 +1,68 @@
 027-2.gat,39,91,0	script	Golbenez	307,{
-	
+
 	set @Graveyard_Inn_MASK, NIBBLE_4_MASK;
 	set @Graveyard_Inn_SHIFT, NIBBLE_4_SHIFT;
 
 	set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
-	
+
 	set @Graveyard_Inn_Lover_MASK, NIBBLE_1_MASK;
 	set @Graveyard_Inn_Lover_SHIFT, NIBBLE_1_SHIFT;
 
 	set @lover, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Lover_MASK) >> @Graveyard_Inn_Lover_SHIFT);
-	
+
 	if (@state ==1) goto L_Back;
-	
+
 	mes "[Golbanez]";
 	mes "\"How do you like my place of leisure, mortal?\"";
 	menu
 		"What is this place? Why is it full of dead people?",-,
 		"You look different here. Nice horns.",L_Horns,
 		"I'm enjoying myself, thanks for asking.",L_Close;
-		
+
 	mes "[Golbanez]";
 	mes "\"Mortal, this is way over your head. Don't worry about that and enjoy your time.\"";
-	
+
 	if (@lover < 2)
 		goto L_Close;
 	menu
 		"I want to know. Try me.",-;
-		
-	mes "Golbanez takes a gradualist look at you.";
+
+	mes "Golbanez takes a piercing look at you.";
 	mes "[Golbanez]";
 	mes "\"Fine.\"";
 	next;
 	mes "\"This place was an usual inn many many of your years ago. I found it by chance and it became one of my favorite playgrounds ever.\"";
 	next;
-	mes "Golbanez laughs a way, which really gives you the creeps.";
+	mes "Golbanez laughs in a way which really gives you the creeps.";
 	next;
 	mes "[Golbanez]";
 	mes "\"Unfortunaly - it got destroyed. So I took the memories of the dead and recreated this place.\"";
 	menu
 		"What do you mean with playground?",-,
 		"Recreated? What do you mean with that?",-;
-	
+
 	mes "[Golbanez]";
 	mes "\"As I said, you don't understand. You start to bore me. Leave.\"";
-	
+
 	set @state, 1;
 	callsub S_Update_Mask;
-	
+
 	close;
 
 L_Back:
 	//TODO: continue here
 	close;
-	
+
 L_Horns:
 	mes "Golbanez bursts out with laughter.";
 	next;
 	mes "[Golbanez]";
 	mes "\"Mortals! They never stop surprising me.\"";
 	close;
-	
+
 L_Close:
 	close;
-	
+
 S_Update_Mask:
         set QUEST_Graveyard_Inn,
         	(QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2_Caretakers_House/husband.txt
index 79451642..f5206583 100644
--- a/npc/027-2_Caretakers_House/husband.txt
+++ b/npc/027-2_Caretakers_House/husband.txt
@@ -41,7 +41,7 @@
 	mes "\"WHAT IS THIS?\"";
 	next;
 	//TODO: ask a native speaker if this is understandable
-	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.";
+	mes "Because of the fast movement of his head, it hinges 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;
diff --git a/npc/027-2_Caretakers_House/innkeeper.txt b/npc/027-2_Caretakers_House/innkeeper.txt
index d4dd478d..d1069321 100644
--- a/npc/027-2_Caretakers_House/innkeeper.txt
+++ b/npc/027-2_Caretakers_House/innkeeper.txt
@@ -158,7 +158,7 @@ L_Skip2:
 	next;
 	mes "\"My father - he was a very joyful man. But one day, I was just ten years old, he had an accident while carrying a barrel of beer.\"";
 	next;
-	mes "\"The barrel smashed his legs and he wasn't able to walk anymore. He got very desperate about that and started to drink.\"";
+	mes "\"The barrel smashed his legs and he wasn't able to walk anymore. He got very despondent about that and started to drink.\"";
 	next;
 	mes "\"My mother and I didn't know how to cheer him up, and he wouldn't listen to us. My mother tried her best to keep the inn running and I tried my best to help her, even though I was still a child.\"";
 	next;
@@ -243,11 +243,6 @@ L_Not_Enough_Tears:
 L_Man:
 	mes "[Reids Ghost]";
 	mes "\"What I have to tell is very personal. You're a man - I'm not sure if I want to tell you. I know you helped me already and showed me you are a sensitive man, but I barely know you. I am sorry, but I have to think a little bit more. Maybe later, when I know you better, I can tell you more about it. \"";
-	//TODO: REMOVE!!!
-	mes "Skip that for debugging?";
-	menu
-		"yes",L_Lovestory,
-		"no",-;
 	close;
 
 L_Woman:
diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2_Caretakers_House/lover.txt
index 960217a3..2f58dc42 100644
--- a/npc/027-2_Caretakers_House/lover.txt
+++ b/npc/027-2_Caretakers_House/lover.txt
@@ -16,7 +16,7 @@
 	set @golbanez, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golbanez_MASK) >> @Graveyard_Inn_Golbanez_SHIFT);
 
 	//TODO: determine sane values
-	set @CRYSTAL_AMOUNT, 500;
+	set @CRYSTAL_AMOUNT, 300; //200?
 	set @CRYSTAL_EXP, 100000;
 
 	if (@state == 2) goto L_News;
@@ -61,7 +61,7 @@ L_Crystals:
 	next;
 	mes "You lay your dark crystals down on the floor and step back, nervously expecting the coming.";
 	next;
-	mes "The hanged man seems very concentrated now, which looks absurdly with him hanging there.";
+	mes "The hanged man seems very concentrated now, which looks absurd with him hanging there.";
 	next;
 	mes "The dark crystals start to glow and buzz. You take another step back.";
 	next;
@@ -88,7 +88,7 @@ L_Crystals:
 	mes "[Hanged Man]";
 	mes "\"I sometimes forget the fact, not everybody is fascinated by the riddles of magic. Please forgive me.\"";
 	next;
-	mes "\"And I even didn't introduced myself! I am very sorry for my rude behaviour!\"";
+	mes "\"And I even didn't introduce myself! I am very sorry for my rude behavior!\"";
 	next;
 	mes "\"My name is Savaric, first apprentice of the Great Demon Summoner Ymbert.\"";
 	next;
@@ -125,9 +125,17 @@ L_Golbanez:
 	close;
 
 L_Reid:
+	if (@state < 3)
+		goto L_No_Reid;
+	mes "[Savaric]";
 	mes "TODO: add story";
 	close;
 
+L_No_Reid:
+	mes "[Savaric]";
+	mes "\"Relationship? Well, she the innkeeper of this inn and I'm a patron. There is nothing more about this to say.\"";
+	close;
+
 L_Not_Enough_Crystals:
 	mes "It seems, you managed to get some, but not enough. Can you bring me more?";
 	close;