gy inn: love triangle quest, adding rewards so far, adding comments and some minor fixes

5 files changed, 74 insertions, 13 deletions

diff --git a/npc/027-2_Caretakers_House/crying_child.txt b/npc/027-2_Caretakers_House/crying_child.txt
index c3b9ddc9..045a4cd6 100644
--- a/npc/027-2_Caretakers_House/crying_child.txt
+++ b/npc/027-2_Caretakers_House/crying_child.txt
@@ -1,3 +1,6 @@
+// author: alastrim
+// love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
+
 027-2.gat,50,92,0	script	Aldred	314,{
 
 // Crying Child subquest
@@ -25,8 +28,6 @@
 	if (@state == 1) goto L_return;
 	if (BaseLevel >= 80) goto L_intro;
 
-//TODO: make the dialogue more childish?
-
 L_cry:
 	mes "[Crying Child]";
 	mes "\"Waaahhhhh! (Sniffle)\"";
diff --git a/npc/027-2_Caretakers_House/golbanez.txt b/npc/027-2_Caretakers_House/golbanez.txt
index 36c68cac..301d0a8f 100644
--- a/npc/027-2_Caretakers_House/golbanez.txt
+++ b/npc/027-2_Caretakers_House/golbanez.txt
@@ -1,3 +1,14 @@
+// author: Jenalya
+// love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
+// state 0: just talking, if lovers state is >= 2, go on
+// state 1: ignores you until lovers state is >= 3, player can ask about the inn. needs if woman >= 7, lover >= 3 and husband >= 4 to go on
+// state 2: shows reids memory if the player brings @ROTTENRAGS_AMOUNT rotten rags and an orange cake
+// state 3: shows hamonds memory if the player brings @UNDEADEAR_AMOUNT undead ears and a chocolate cake
+// state 4: shows savarics memory if the player brings @UNDEADEYE_AMOUNT undead eyes and an apple cake
+// state 5: shows all memories again if asked for them. if @lover == 6, player can ask for savarics soul
+// state 6: wants jackOsouls, random chance of 1/50 to success
+// state 7: done
+
 027-2.gat,39,91,0	script	Golbenez	307,{
 
 	set @Graveyard_Inn_MASK, NIBBLE_4_MASK;
@@ -274,7 +285,7 @@ L_Soul_Try:
 	set @soul, rand(50);
 	if (@soul == 0) goto L_Soul_Success;
 	mes "[Golbanez]";
-	mes "\"No, this one isn't as powerful as the mage ones. Bring me another.\"";
+	mes "\"No, this one isn't as powerful as the mage ones. Bring me another one of them.\"";
 	goto L_Soul_Try;
 
 L_Soul_Success:
diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2_Caretakers_House/husband.txt
index 9cfc3826..da65d0a3 100644
--- a/npc/027-2_Caretakers_House/husband.txt
+++ b/npc/027-2_Caretakers_House/husband.txt
@@ -1,3 +1,14 @@
+// author: Jenalya
+// love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
+// state 0: if baselevel >= 85, he asks for something to cool the drinks (ice cubes)
+// state 1: can be asked about the bracelet. needs @ICE_CUBE_AMOUNT ice cubes, then asks for bones and skulls.
+// state 2: wants @BONE_AMOUNT and @SKULL_AMOUNT bones and skulls
+// state 3: can be asked about the bracelet. needs @woman > 5 to be asked about savaric, tells, if crying child quest is completed
+// state 4: if @golbanez < 5, can be told about the memories, then asks the player to bring @RUBY_AMOUNT rubies to reid
+// state 5: waiting
+// state 6: is set in reid, gives as reward a special bowler hat
+// state 7: done
+
 027-2.gat,22,84,0	script	Hamond	319,{
 
 	set @Graveyard_Inn_MASK, NIBBLE_3_MASK;
@@ -272,8 +283,8 @@ L_Apologize:
 	mes "\"However, you are a great friend and did a lot for me. I want you to have this.\"";
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_Full_Inv;
-	//TODO: determine reward and give it, idea: different bowler hat?
-	getitem "Acorn", 1;
+	//TODO: change it to different kind of bowlerhat
+	getitem "BowlerHat", 1;
 	set @state, 7;
 	callsub S_Update_Mask;
 	close;
@@ -285,9 +296,9 @@ L_Thanks:
 
 L_Not_Enough_B:
 	if (countitem("Bone") < @BONE_AMOUNT)
-		mes "\"I'm not sure, but I think more bones will be better.\"";
+		mes "\"I need more bones than you have with you right now.\"";
 	if (countitem("Skull") < @SKULL_AMOUNT)
-		mes "\"Maybe you should bring more skulls. It is not enough.\"";
+		mes "\"Maybe you should come back with more skulls than you have now. It is not enough.\"";
 	close;
 
 L_Not_Enough_Cubes:
diff --git a/npc/027-2_Caretakers_House/innkeeper.txt b/npc/027-2_Caretakers_House/innkeeper.txt
index 1764da98..194c010a 100644
--- a/npc/027-2_Caretakers_House/innkeeper.txt
+++ b/npc/027-2_Caretakers_House/innkeeper.txt
@@ -1,3 +1,18 @@
+// author: Jenalya
+// love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
+// state 0: first talk
+// state 1: if baselevel >= 85 player can ask about the inn and dead
+// state 2: reid knows now she's dead, can be asked about the bracelet
+// state 3: can be asked about bracelet, player offered help to find out what happened, she wants something to represent her sadness (frozen yeti tears)
+// state 4: can be asked about bracelet, can be asked about her life
+// state 5: if crying child quest is completed she tells about savaric, and her rooms on the first floor can be entered now to read her diary
+// state 6: tells the player to read her diary
+// state 7: set in diary, if player has seen all memories (@golbanez < 5), can tell her about it
+// state 8: can bring rubies or diamonds, if hamond and savaric told so, set their state
+// state 9: can bring rubies or diamonds, if hamond and savaric told so, set their state
+// state 10: she spoke with hamond and savaric, gives reward mylarin dust (needed for a crafting quest in thermin)
+// state 11: done, can ask about mylarin dust again
+
 027-2.gat,104,39,0	script	Reid's Ghost	315,{
 
 	set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
@@ -99,7 +114,7 @@ L_Offer_Help2:
 
 	if (@kidstate == 5)
 		menu
-			"Shall I help you to find out what happened to you?", L_Skip1,
+			"Shall I help you to find out what happened to you?", L_Offer_Help1,
 			"Hi. I found this in the main hall. Do you know to whom it belongs?", L_Bracelet,
 			"I don't want to bother you.", L_Close;
 L_Skip1:
@@ -276,7 +291,6 @@ L_Savaric:
 	mes "\"I'm feeling hurt. And confused. Both Hamond and Savaric turned out not to be the person I believed them to be.\"";
 	set @state, 8;
 	callsub S_Update_Mask;
-	if (@lover < 4) close;
 	close;
 
 L_Sorry:
@@ -337,15 +351,25 @@ L_Thanks:
 	mes "\"I'm so glad, now I know what happened and spoke to Savaric and Hamond. Thank you so much. Please take this.\"";
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_Full_Inv;
-	//TODO: determine reward and give it
-	getitem "Acorn", 1;
+	getitem "MylarinDust", 1;
 	set @state, 11;
 	callsub S_Update_Mask;
+	next;
+L_Mylarin:
+	mes "[Reid's Ghost]";
+	mes "\"This is called mylarin dust. My mother gave it to me when my father had his accident. She said it is very valuable.\"";
+	next;
+	mes "\"I'm not sure what it is used for, but I remember her saying something about some special crafting tradition which uses it to make really strong armor.\"";
+	next;
+	mes "\"Maybe you should try to find someone who can use it.\"";
 	close;
 
 L_Happy:
 	mes "[Reid's Ghost]";
 	mes "\"Thank you for all you've done.\"";
+	menu
+		"Can you tell me again about the powder you gave me?",L_Mylarin,
+		"I'm glad I could helped.",-;
 	close;
 
 L_Not_Enough_Tears:
diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2_Caretakers_House/lover.txt
index e11caf76..f816269b 100644
--- a/npc/027-2_Caretakers_House/lover.txt
+++ b/npc/027-2_Caretakers_House/lover.txt
@@ -1,3 +1,14 @@
+// author: Jenalya
+// love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
+// state 0: if baselevel >= 85, tells he want dark crystals
+// state 1: needs @CRYSTAL_AMOUNT dark crystals to go on, tells the player to search the inn for source of magic (Golbanez)
+// state 2: if the player has talked to Golbanez, he tells you to negotiate with him to find out what happened
+// state 3: when player has seen all memories (@golbanez < 5), telling Savaric what happened. he asks the player to bring reid @DIAMOND_AMOUNT diamonds
+// state 4: waiting for reid
+// state 5: is set in reid, he thanks for help and asks to negotiate with golbanez for his soul
+// state 6: waiting for youl, if @golbanez >= 7 got it, giving sorcerer robe
+// state 7: done
+
 027-2.gat,43,73,0	script	Savaric	317,{
 
 	set @Graveyard_Inn_MASK, NIBBLE_1_MASK;
@@ -29,6 +40,7 @@
 
 	mes "You see a dead man hanging. This place is creepy!";
 	next;
+	if (baselevel < 85) goto L_Close;
 	mes "Suddenly the man opens his eyes and look at you.";
 	next;
 	mes "[Hanged Man]";
@@ -218,10 +230,12 @@ L_Soul:
 	mes "\"Please take this as a symbol of my gratitude.\"";
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_Full_Inv;
-	//TODO: determine and give reward
-	getitem "Acorn", 1;
+	getitem "SorcererRobeRed", 1;
 	set @state, 7;
 	callsub S_Update_Mask;
+	mes "\"This is what mages and their apprentices weared when I lived. It is white because I wasn't a master yet.\"";
+	next;
+	mes "\"But I guess the old traditions have changed since then.\"";
 	close;
 
 L_Have_Soul: