Misc. fixes, added most of Wyara

1 files changed, 7 insertions, 7 deletions

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.\"";