Misc. fixes, added most of Wyara

3 files changed, 30 insertions, 14 deletions

diff --git a/npc/001-1_Tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index 698a3b3a..5d52f0a6 100644
--- a/npc/001-1_Tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
@@ -4,7 +4,6 @@
 	setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
 			"\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
 			"\"As the Sun sets down in the forest's brown, she whom the fragrance holds counts her gold.\"";
-	set @id, rand(3);
         set @name, "Bill Ballshaker the Bard";
         mes "[" + @name + "]";
         if (Sex)
@@ -148,6 +147,7 @@ L_Q_auldsbel:
         goto L_Main;
 
 L_Song:
+	set @id, rand(3);
 	mes @songs$[@id];
 	close;
 }
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index e2771cf0..452df411 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -101,14 +101,30 @@ L_8:
 	close;
 
 L_9:
-        mes "\"I know a bad word, but I promised my mom that I wouldn't tell anyone.\"";
-        menu "That's good.  You shouldn't tell such things.", -,
-             "What's that bad word?", L_badword;
+	mes "\"I know a very bad word. But I must not say it, because monsters will come and get me if I do!\"";
+	menu
+		"A bad word?", L_tell,
+		"Oh, you better keep it for yourself then.", -;
+	close;
+
+L_tell:
+	mes "[Nina]";
+	mes "\"Yes, I heard my mother say it once. And she made me promise her to never say it. Never.\"";
+	next;
+	menu	"If I promise to never tell anyone, can you tell me the word?", L_keepword,
+		"I understand, you do not need to tell...", L_giveword,
+		"Goodbye!", -;
+	close;
+
+L_keepword:
+	mes "[Nina]";
+	mes "\"No.\"";
+	close;
 
-L_badword
+L_giveword:
 	mes "[Nina]";
-        mes "She looks around nervously, then motions you to come closer.";
-        mes "\"It's '" + getspellinvocation("aggravate") + "', she whispers in your ear.\"";
+	mes "Nina looks around as she hushes you to silence. After a few seconds she whispers to you.";
+	mes "\"I like you! So I will tell you the bad word.  But you can't tell anyone else about it! The bad word is '" + getspellinvocation("aggravate") + "'.\"";
         next;
 
 	mes "[Nina]";
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index 9fa5f7cb..2efaab93 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -126,7 +126,7 @@ L_Main:
             menu
         	"Can you heal me?", L_NoHealMessage,
                 "Can you teach me more?", L_Teach,
-                "Where can I get more lifestones?, L_Lifestones,
+                "Where can I get more lifestones?", L_Lifestones,
 		"What do you know about...", L_Question;
 
         if (!@has_magic)
@@ -140,10 +140,10 @@ OnPCKillEvent:
         set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
         if (@Q_heal_exp < 8)
 		goto L_OnPcKillWipe;
-        @Q_heal_exp = @Q_heal_exp - 8;
+        set @Q_heal_exp, @Q_heal_exp - 8;
         goto L_OnPcKillFinish;
 L_OnPcKillWipe:
-        @Q_heal_exp = 0;
+        set @Q_heal_exp, 0;
 L_OnPcKillFinish:
         set MAGIC_EXPERIENCE, (MAGIC_EXPERIENCE & ~(255 << 24)) | (@Q_heal_exp << 24);
         close;
@@ -180,8 +180,8 @@ L_Lifestones_Trade:
         getexp 200, 1;
 	mes "[Elanore the Healer]";
         mes "Elanore carefully goes over your leaves, then smiles.";
-        mes "\"These will do just fine.\";
-        mes "She picks up all fourty and presses them together in her hands, then whispers something.\"";
+        mes "\"These will do just fine.\"";
+        mes "She picks up all fourty and presses them together in her hands, then whispers something.";
         next;
 	mes "[Elanore the Healer]";
         mes "As she opens her hands again, the leaves have turned into ten golden crystals.";
@@ -251,7 +251,7 @@ L_Teach_Initial:
         next;
 
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@LIFESTONE) == 0)
+	if ((@inventorylist_count == 100) && (countitem(@LIFESTONE) == 0))
         	goto L_Teach_Initial_Noroom;
 
         getitem @LIFESTONE, 1;
@@ -312,7 +312,7 @@ L_Teach_CheckAdvanceTo2_fail:
         mes "\"I think I would like to observe you for a little longer to see if you would make a good healer.\"";
         if (@Q_heal_exp < 5)
         	mes "\"You are still at the beginning of your path, but do keep practicing.\"";
-        if ((@Q_heal_exp >= 5) && (@Q_heal_exp < 20)
+        if ((@Q_heal_exp >= 5) && (@Q_heal_exp < 20))
         	mes "\"You are making progress, but you still need more practice.\"";
         if (@Q_heal_exp >= 20)
         	mes "\"You have made good progress, but please do continue in your efforts.\"";