gy inn: minor changes in item references, headless man quest

1 files changed, 18 insertions, 18 deletions

diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2_Caretakers_House/lover.txt
index d3c21dab..be3a1abe 100644
--- a/npc/027-2_Caretakers_House/lover.txt
+++ b/npc/027-2_Caretakers_House/lover.txt
@@ -1,8 +1,8 @@
 // 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 1: needs @CRYSTAL_AMOUNT dark crystals to go on, tells the player to search the inn for source of magic (Golbenez)
+// state 2: if the player has talked to Golbenez, 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
@@ -21,10 +21,10 @@
 
 	set @woman, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Woman_MASK) >> @Graveyard_Inn_Woman_SHIFT);
 
-	set @Graveyard_Inn_Golbanez_MASK, NIBBLE_4_MASK;
-	set @Graveyard_Inn_Golbanez_SHIFT, NIBBLE_4_SHIFT;
+	set @Graveyard_Inn_Golbenez_MASK, NIBBLE_4_MASK;
+	set @Graveyard_Inn_Golbenez_SHIFT, NIBBLE_4_SHIFT;
 
-	set @golbanez, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golbanez_MASK) >> @Graveyard_Inn_Golbanez_SHIFT);
+	set @golbanez, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golbenez_MASK) >> @Graveyard_Inn_Golbenez_SHIFT);
 
 	set @CRYSTAL_AMOUNT, 500;
 	set @CRYSTAL_EXP, 200000;
@@ -55,14 +55,14 @@
 	mes "[Hanged Man]";
 	mes "\"Oh, someone is holding you back with magic! I sense a really dark and mighty power. What has happened!?\"";
 	next;
-	mes "\"Can I ask you for a favor? Can you bring me lots of dark crystals? You might need to ask a dark mage for it. I want to try to break the barrier.\"";
+	mes "\"Can I ask you for a favor? Can you bring me lots of [Dark Crystal]s? You might need to ask a dark mage for it. I want to try to break the barrier.\"";
 	set @state, 1;
 	callsub S_Update_Mask;
 	close;
 
 L_Crystals:
 	mes "[Hanged Man]";
-	mes "\"Ah, you're back! Did you get the dark crystals?\"";
+	mes "\"Ah, you're back! Did you get the [Dark Crystal]s?\"";
 
 	if (countitem("DarkCrystal") == 0)
 		menu
@@ -120,7 +120,7 @@ L_News:
 
 	if ((@woman < 6) && (@golbanez > 0))
 		menu
-			"Yes, let me tell you.",L_Golbanez,
+			"Yes, let me tell you.",L_Golbenez,
 			"I don't think so",L_Close;
 
 	if ((@woman >=  6) && (@golbanez == 0))
@@ -131,11 +131,11 @@ L_News:
 	if ((@woman >=  6) && (@golbanez >= 0))
 		menu
 			"Can you tell me about your relationship to Reid?",L_Reid,
-			"Yes, let me tell you.",L_Golbanez,
+			"Yes, let me tell you.",L_Golbenez,
 			"I don't think so",L_Close;
 
-L_Golbanez:
-	mes "You explain how you came in the inn and what Golbanez said to you.";
+L_Golbenez:
+	mes "You explain how you came in the inn and what Golbenez said to you.";
 	next;
 	mes "[Savaric]";
 	mes "\"This... this is very disturbing news. Playground he said? Mh.. \"";
@@ -147,11 +147,11 @@ L_Golbanez:
 		"Hey! I'm talking with you!",-;
 	mes "Savaric winces.";
 	next;
-	mes "\"Oh, right - I was just thinking. It makes me feel uncomfortable to hear about Golbanez being involved in this.\"";
+	mes "\"Oh, right - I was just thinking. It makes me feel uncomfortable to hear about Golbenez being involved in this.\"";
 	next;
 	mes "\"I told you, I'm the apprentice of a demon summoner, remember? Well, this includes learning about the astral beings in this world.\"";
 	next;
-	mes "\"And Golbanez - he is a very powerful being, a Demi-God, with a very questionable sense of humor. He was worshipped by a group of cultists some hundred years ago - uhm, some hundreds of years ago from my lifetime, I mean.\"";
+	mes "\"And Golbenez - he is a very powerful being, a Demi-God, with a very questionable sense of humor. He was worshipped by a group of cultists some hundred years ago - uhm, some hundreds of years ago from my lifetime, I mean.\"";
 	next;
 	mes "\"But most of his adherents died when he thought it would be funny to test their loyality by sending them on a journey over the sea to a paradise island he promised them - of course, there was no such island.\"";
 	next;
@@ -161,7 +161,7 @@ L_Golbanez:
 	next;
 	mes "\"He told you this inn was one of his favorite playgrounds - so it seems he was playing one of his evil games with the people in this inn. And now, he resurrected our memories to this parody of life!\"";
 	next;
-	mes "\"" + strcharinfo(0) + "! I need your help again! Please return to Golbanez and try to get out of him what was happening here. But be careful when negotiating.. he will demand a service in return.\"";
+	mes "\"" + strcharinfo(0) + "! I need your help again! Please return to Golbenez and try to get out of him what was happening here. But be careful when negotiating.. he will demand a service in return.\"";
 	set @state, 3;
 	callsub S_Update_Mask;
 	close;
@@ -176,7 +176,7 @@ L_Golb:
 		"Now I know what happened. I'll tell you.",-,
 		"I'm sorry to tell you, but this was all your fault.",-;
 
-	mes "You tell Savaric about what Golbanez showed to you.";
+	mes "You tell Savaric about what Golbenez showed to you.";
 	next;
 	mes "[Savaric]";
 	mes "\"I.. I can't believe.. My master told me, I need to be careful because of my temper - but I never thought, it would lead me to make such a terrible mistake. Oh, Reid - and all the people in the inn! What have I done?!\"";
@@ -186,14 +186,14 @@ L_Golb:
 	mes "[Savaric]";
 	mes "\"" + strcharinfo(0) + ", please, can you go to Reid and tell her about what I've done? And then ask her if she will ever be able to forgive me?\"";
 	next;
-	mes "\"But wait. It is not enough just to ask for forgiveness. Please, can you bring her " + @DIAMOND_AMOUNT + " diamonds? They symbolize my pure feelings for her.\"";
+	mes "\"But wait. It is not enough just to ask for forgiveness. Please, can you bring her " + @DIAMOND_AMOUNT + " [Diamond]s? They symbolize my pure feelings for her.\"";
 	set @state, 4;
 	callsub S_Update_Mask;
 	close;
 
 L_Waiting:
 	mes "[Savaric]";
-	mes "\"Have you already brought the diamonds to Reid?\"";
+	mes "\"Have you already brought the [Diamond]s to Reid?\"";
 	close;
 
 L_Apologize:
@@ -204,7 +204,7 @@ L_Apologize:
 	next;
 	mes "\"You did so much for me, can I ask you for one last favor?\"";
 	next;
-	mes "\"Golbanez took my soul and I want it back. You were very clever how you negotiated with him so far. Could you get my soul back for me?\"";
+	mes "\"Golbenez took my soul and I want it back. You were very clever how you negotiated with him so far. Could you get my soul back for me?\"";
 	set @state, 6;
 	callsub S_Update_Mask;
 	close;