gwendolin and nurse fully done, luca uncommented and corrected.

now 2 skills are completely working.
luca needs another rework to focus on skills.

3 files changed, 246 insertions, 223 deletions

diff --git a/npc/001-1_Tulimshar/luca.txt b/npc/001-1_Tulimshar/luca.txt
index bc048e65..0a12545f 100644
--- a/npc/001-1_Tulimshar/luca.txt
+++ b/npc/001-1_Tulimshar/luca.txt
@@ -2,11 +2,11 @@
 
 001-1.gat,108,55,0	script	Luca	102,{
 
-//	if (BaseLevel >= 45)
-//		goto L_teach_soon;
+	if (BaseLevel >= 35)
+		goto L_teach;
 
-//	if (BaseLevel >= 50)
-//		goto L_teach;
+	if (BaseLevel >= 25)
+		goto L_teach_soon;
 
 	mes "[Luca the Hunter]";
 	mes "\"Ouch! It hurts, this wound I got from battle.\"";
@@ -15,10 +15,10 @@
 
 L_Exp:
 	mes "[Luca the Hunter]";
-	mes "\"I was just coming back from a long journey.  I ran into a group of scorpions and started fighting them for experience.\"";
-        next;
+	mes "\"I was just coming back from a long journey. I ran into a group of scorpions and started fighting them for experience.\"";
+    next;
 	mes "[Luca the Hunter]";
-        mes "\"Then, out of a cave came a BLACK one!  I had NEVER seen it before!\"";
+    mes "\"Then, out of a cave came a BLACK one! I had NEVER seen it before!\"";
 	next;
 	mes "[Luca the Hunter]";
 	mes "\"Luckily i had a camera with me! Here's a picture of it... Let me find it, I put it in my pocket somewhere...\"";
@@ -35,32 +35,32 @@ L_Nev:
 
 L_teach_soon:
 	mes "[Luca the Hunter]";
-	mes "\"You've grown quite a bit stronger since I first saw you, strolling around town like that!  You know, if you train a little more, maybe we can help each other out a little?\"";
-        close;
+	mes "\"You've grown quite a bit stronger since I first saw you, strolling around town like that! You know, if you train a little more, maybe we can help each other out a little?\"";
+    close;
 
 L_teach:
 	if (getskilllv(SKILL_POOL))
 		goto L_teachmore;
 
 	mes "[Luca the Hunter]";
-	mes "\"Hey there!  You've become quite the adventurer, haven't you?  I think it's time that someone taught you some basic skills.\"";
-        next;
+	mes "\"Hey there! You've become quite the adventurer, haven't you? I think it's time that someone taught you some basic skills.\"";
+    next;
 	mes "[Luca the Hunter]";
 	mes "\"If you want, I can help with that!\"";
-        next;
-        menu
+    next;
+    menu
 		"Sure, that sounds fun!", -,
 		"I'm not interested.", L_Nev;
 
 	mes "[Luca the Hunter]";
-	mes "\"All right!  It's not all that easy, though.  First you have to learn how to focus.  That's because you can learn many skills, but you can't focus on all of them all the time.\"";
-        next;
+	mes "\"All right! It's not all that easy, though. First you have to learn how to focus. That's because you can learn many skills, but you can't focus on all of them all the time.\"";
+    next;
 
 	mes "[Luca the Hunter]";
-	mes "\"When you can do that, you can learn some real skills, and when you know them, you can come back to me to tell me which ones you want to focus on.  Deal?\"";
-        next;
+	mes "\"When you can do that, you can learn some real skills, and when you know them, you can come back to me to tell me which ones you want to focus on. Deal?\"";
+    next;
 
-        menu
+    menu
 		"Yeah!", L_teach0_follow,
 		"Certainly!", L_teach0_follow,
 		"Wait... what do you mean?", -,
@@ -71,182 +71,183 @@ L_teach:
 
 L_teach0_follow:
 	mes "[Luca the Hunter]";
-        mes "\"Great!  Now, before I can give you that skill, I have to make sure that those stories about you are all true and that you really are experienced enough.\"";
-        next;
+    mes "\"Great! Now, before I can give you that skill, I have to make sure that those stories about you are all true and that you really are experienced enough.\"";
+    next;
 	mes "[Luca the Hunter]";
-        mes "\"So I'm going to ask you some easy questions.\"";
-        next;
+    mes "\"So I'm going to ask you some easy questions.\"";
+    next;
 
 	mes "[Luca the Hunter]";
-        mes "\"First, who is the man who guards the entrance to the old Tulimshar underground arena?\"";
-        next;
-        input @anser$;
-        if (@answer$ != "Phaet" && @answer$ != "phaet")
-		goto L_wronganser;
+    mes "\"First, who is the man who guards the entrance to the old Tulimshar underground arena?\"";
+    next;
+    input @answer$;
+    if (@answer$ != "Phaet" && @answer$ != "phaet")
+		goto  L_wronganswer;
 
 	mes "[Luca the Hunter]";
-        mes "\"Good.  Next, what's the name of the pipe-smoker who lives on top of Lore Mountain and makes leathery goods there?\"";
-        next;
-        input @anser$;
-        if (@answer$ != "Pachua" && @answer$ != "pachua")
-		goto L_wronganser;
+    mes "\"Good. Next, what's the name of the pipe-smoker who lives on top of Lore Mountain and makes leathery goods there?\"";
+    next;
+    input @answer$;
+    if (@answer$ != "Pachua" && @answer$ != "pachua")
+		goto  L_wronganswer;
 
 	mes "[Luca the Hunter]";
-        mes "\"Great!  One more:  Who was the adventurer who built Dimond's Cove for Dimond?\"";
-        next;
-        input @anser$;
-        if (@answer$ != "Merlin" && @answer$ != "merlin")
-		goto L_wronganser;
+    mes "\"Great! One more: Who was the adventurer who built Dimond's Cove for Dimond?\"";
+    next;
+    input @answer$;
+    if (@answer$ != "Merlin" && @answer$ != "merlin")
+		goto  L_wronganswer;
 
 
 	mes "[Luca the Hunter]";
-        mes "Luca laughs in excitement.";
-        mes "\"All right!  You're the real thing, my friend!\"";
-        next;
+    mes "Luca laughs in excitement.";
+    mes "\"All right! You're the real thing, my friend!\"";
+    next;
 
 	mes "[Luca the Hunter]";
-        mes "\"Now stand over there.  This should only take a second...\"";
-        mes "He takes of a pendant he is wearing and holds it up.";
-        next;
+    mes "\"Now stand over there. This should only take a second...\"";
+    mes "He takes of a pendant he is wearing and holds it up.";
+    next;
 
 	mes "[Luca the Hunter]";
-        mes "\"See that fang at the end of the chain?  Keep staring at it at it.\"";
-        next;
+    mes "\"See that fang at the end of the chain? Keep staring at it at it.\"";
+    next;
 
 	mes "[Luca the Hunter]";
-        mes "He starts swinging the pendant back and forth.";
-        mes "\"And whatever you do, don't blink.  Don't look away, and don't blink.\"";
-        next;
+    mes "He starts swinging the pendant back and forth.";
+    mes "\"And whatever you do, don't blink. Don't look away, and don't blink.\"";
+    next;
 
 	mes "[Luca the Hunter]";
-        mes "The world slows down around you as you focus on the pendant going back...";
-        next;
+    mes "The world slows down around you as you focus on the pendant going back...";
+    next;
 
-        mes "and forth...";
-        next;
+    mes "and forth...";
+    next;
 
-        mes "and back...";
-        next;
+    mes "and back...";
+    next;
 
-        mes "and forth...";
-        next;
+    mes "and forth...";
+    next;
 
-        mes "and back...";
-        next;
+    mes "and back...";
+    next;
 
-        mes "and...";
-        next;
+    mes "and...";
+    next;
 
-        mes "You feel relaxed.";
-        next;
+    mes "You feel relaxed.";
+    next;
 
 	mes "[Luca the Hunter]";
-        mes "\"... still there?\"";
-        mes "You hear the sound of fingers snapping.  Why would someone do that on such a calm day?";
-        next;
+    mes "\"... still there?\"";
+    mes "You hear the sound of fingers snapping. Why would someone do that on such a calm day?";
+    next;
 
 	mes "[Luca the Hunter]";
-        mes "\"Oh, good... I think it worked.  Nice job!\"";
-        mes "He grins.";
-        mes "[You gain 10,000 experience points]";
-        mes "[You learned Skill Focus]";
-        setskill SKILL_POOL, 1;
-        getexp 10000, 0;
-        next;
+    mes "\"Oh, good... I think it worked. Nice job!\"";
+    mes "He grins.";
+    mes "[You gain 10,000 experience points]";
+    mes "[You learned Skill Focus]";
+    setskill SKILL_POOL, 1;
+    getexp 10000, 0;
+    next;
 
-        goto L_teachmore2;
+    goto L_teachmore2;
 
-L_wronganser:
+ L_wronganswer:
 	mes "[Luca the Hunter]";
-        mes "\"No, that was wrong.  I suppose you're not as experienced as I thought you'd be.\"";
-        close;
+    mes "\"No, that was wrong. I suppose you're not as experienced as I thought you'd be.\"";
+    close;
 
 S_explain:
-        mes "[Luca the Hunter]";
-        mes "\"Alright, what do you want to know?\"";
-        next;
+    mes "[Luca the Hunter]";
+    mes "\"Alright, what do you want to know?\"";
+    next;
 S_explain_loop:
 	menu
-        	"What's skill focus?", L_explain_focus,
-        	"What skills are there?", L_explain_skills,
-        	"How do skills work?", L_explain_work,
-        	"Thanks, I think I got it!", -;
+    	"What's skill focus?", L_explain_focus,
+    	"What skills are there?", L_explain_skills,
+    	"How do skills work?", L_explain_work,
+    	"Thanks, I think I got it!", -;
 	return;
 
 L_explain_focus:
-        mes "[Luca the Hunter]";
-        mes "\"Well, you can learn many, many skills.  But you can't really use all of them at once, not even old Aulsbels' head is big enough for that!  So you have to focus.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"But you can change that focus whenever you want.  It works like this:  You come to me, you tell me what you want to focus on, and we do exercises until it's stuck in your head.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"If there's not enough space in your head, you'll first have to stop thinking about some other thing.  There's an exercise I learned to do that, so when you talk to me you can just let me know what you want to forget.\"";
-        next;
-        mes "[Luca the Hunter]";
-        if (getskilllv(SKILL_POOL) == 0)
-	        mes "\"Right now you can't focus on anything yet, so I'll first have to teach you a simple skill to keep your focus.\"";
-        if (getskilllv(SKILL_POOL) == 1)
-	        mes "\"Right now you can only focus on one thing at a time.  So if you want to change, you have to forget whatever else you've focused on.\"";
-        if (getskilllv(SKILL_POOL) > 1)
-	        mes "\"You can focus on " + getskilllv(SKILL_POOL) + " skills right now.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"You can come back to me to focus or unfocus whenever you want, I'm here all day.\"";
-        next;
-        goto S_explain_loop;
+    mes "[Luca the Hunter]";
+    mes "\"Well, you can learn many, many skills. But you can't really use all of them at once, not even old Aulsbels' head is big enough for that! So you have to focus.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"But you can change that focus whenever you want. It works like this: You come to me, you tell me what you want to focus on, and we do exercises until it's stuck in your head.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"If there's not enough space in your head, you'll first have to stop thinking about some other thing. There's an exercise I learned to do that, so when you talk to me you can just let me know what you want to forget.\"";
+    next;
+    mes "[Luca the Hunter]";
+    if (getskilllv(SKILL_POOL) == 0)
+	    mes "\"Right now you can't focus on anything yet, so I'll first have to teach you a simple skill to keep your focus.\"";
+    if (getskilllv(SKILL_POOL) == 1)
+	    mes "\"Right now you can only focus on one thing at a time. So if you want to change, you have to forget whatever else you've focused on.\"";
+    if (getskilllv(SKILL_POOL) > 1)
+	    mes "\"You can focus on " + getskilllv(SKILL_POOL) + " skills right now.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"You can come back to me to focus or unfocus whenever you want, I'm here all day.\"";
+    next;
+    goto S_explain_loop;
 
 L_explain_skills:
-        mes "[Luca the Hunter]";
-        mes "\"Well, I don't really know... lots, I think.  I can teach you brawling, which is good when you've run out of arrows or don't have a weapon around.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"But there's other skills around.  Some mages need special skills to concentrate, so ask around in that crowd, if that's your thing.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"I've also heard that there is someone in Hurnscald who can help you make your body more resistant against some things.  But body and mind belong together, so you probably have to focus for that, too.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"Other than that, just ask around!  There have to be some people who can teach you something...\"";
-        next;
-        goto S_explain_loop;
+    mes "[Luca the Hunter]";
+    mes "\"Well, I don't really know... lots, I think. I can teach you brawling, which is good when you've run out of arrows or don't have a weapon around.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"But there's other skills around. Some mages need special skills to concentrate, so ask around in that crowd, if that's your thing.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"I've also heard that there is someone in Hurnscald who can help you make your body more resistant against some things. But body and mind belong together, so you probably have to focus for that, too.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"Other than that, just ask around! There have to be some people who can teach you something...\"";
+    next;
+    goto S_explain_loop;
 
 L_explain_work:
-        mes "[Luca the Hunter]";
-        mes "\"Well, skills allow you to be better in some things, or just to do what you couldn't do without them.  When you've learned a skill and are focussing on it, then it affects what you do.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"Now, when you start out with a skill, you won't be very good at it yet.  But if you keep practicing you'll learn how to get better.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"My old teacher always called that getting `skill points' and that you can see them with [F5], whoever that is.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"She also said that with this [F5] thing you can get better at those skills, and that it costs you as many skill points as the level you want to go to.\"";
-        next;
-        mes "[Luca the Hunter]";
-        mes "\"She always would have one cactus poition too many...  but she was an amazing teacher.\"";
-        mes "He nods emphatically.";
-        next;
-        goto S_explain_loop;
+    mes "[Luca the Hunter]";
+    mes "\"Well, skills allow you to be better in some things, or just to do what you couldn't do without them. When you've learned a skill and are focussing on it, then it affects what you do.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"Now, when you start out with a skill, you won't be very good at it yet. But if you keep practicing you'll learn how to get better.\"";
+    next;
+    mes "[Luca the Hunter]";
+    mes "\"My old teacher always called that getting `skill points' and that you can see them with [F5], whoever that is.\"";
+    next;
+    //TODO:
+    //mes "[Luca the Hunter]";
+    //mes "\"She also said that with this [F5] thing you can get better at those skills, and that it costs you as many skill points as the level you want to go to.\"";
+    //next;
+    mes "[Luca the Hunter]";
+    mes "\"She always would have one cactus poition too many... but she was an amazing teacher.\"";
+    mes "He nods emphatically.";
+    next;
+    goto S_explain_loop;
 
 L_teachmore:
-        mes "[Luca the Hunter]";
-        mes "\"Good to see you again!\"";
-        next;
+    mes "[Luca the Hunter]";
+    mes "\"Good to see you again!\"";
+    next;
 
 L_teachmore2:
-        menu
-        	"I would like to focus.", L_focus,
-        	"I would like to unfocus.", L_unfocus,
-                "Can you teach me a skill?", L_teach_brawling,
-                "Can you explain skills again?", L_teachmore_explain,
-                "I'm done for now, thanks!";
+    menu
+    	"I would like to focus.", L_focus,
+    	"I would like to unfocus.", L_unfocus,
+        "Can you teach me a skill?", L_teach_brawling,
+        "Can you explain skills again?", L_teachmore_explain,
+        "I'm done for now, thanks!",-;
 	close;
 
 L_teachmore_explain:
 	callsub S_explain;
-        goto L_teachmore2;
+    goto L_teachmore2;
 
 L_focus:
 //FIXME
@@ -256,6 +257,6 @@ L_unfocus:
 
 L_teach_brawling:
 //FIXME
-        close;
+    close;
 
 }
diff --git a/npc/009-2_Hurnscald/nurse.txt b/npc/009-2_Hurnscald/nurse.txt
index 8d6f1ee9..1cffc5b4 100644
--- a/npc/009-2_Hurnscald/nurse.txt
+++ b/npc/009-2_Hurnscald/nurse.txt
@@ -10,8 +10,8 @@
 //# used player-variable: QUEST_Forestbow, nibble7
 //# states:
 //# 0    if skills are available, she tells you about her plans of doing the antidote, 
-//#     need black scorpion stingers and grass snake tongues
-//# 1    waits for ingredients: black scorpion stingers and grass snake tongues
+//#     need black scorpion stingers and snake tongues
+//# 1    waits for ingredients: black scorpion stingers and snake tongues
 //# 2    waits for ingredients: acorns, apples, orange, healing potion, when these ingreds are there,
 //#     she mixes the stuff (modify global variable!)
 //# 3    you can start the minigame, 3 tries remaining
@@ -22,16 +22,18 @@
 
 
 //######################################################################################
-009-2.gat,147,65,0    script    Nurse    119,    {
-    set @GSNAKET_AMOUNT, 5;
+009-2.gat,147,65,0	script	Nurse	119,	{
+    set @SNAKET_AMOUNT, 5;
     set @BSCORPIONST_AMOUNT, 10;
-    set @QUEST1_EXP, 5000; 
+    // This quest can be done very often: so give less xp
+    set @QUEST1_EXP, 300; 
     set @ACORNS_AMOUNT, 10;
     set @GREENAPPLE_AMOUNT, 5;
     set @REDAPPLE_AMOUNT, 5;
     set @ORANGE_AMOUNT, 5;
     set @HEALING_AMOUNT, 3;
-    set @QUEST2_EXP, 10000;
+    // This quest can be done very often: so give less xp
+    set @QUEST2_EXP, 700;
     set @ANTIDOTE_EXP, 10000;
 
     set @Q_poison_MASK, NIBBLE_7_MASK;
@@ -45,6 +47,7 @@
     if (@Q_poison == 3) goto state3;
     if (@Q_poison == 2) goto state2;
     if (@Q_poison == 1) goto state1;
+    mes "TODO: remove: skill check: " + getskilllv(SKILL_POOL);
     if (getskilllv(SKILL_POOL)) goto state0;
 
 L_Usual:    
@@ -100,23 +103,24 @@ state0:
     next;
     mes "\"Unfortunaly, some of them are poisonous and it is very difficult for us to help the miners.\"";
     next;
-    mes "\"For this reason, I want to do some research on this subject, to create an anitdote. But I need help to get some ingredients, someone who is able to deal with the dangerous creatures in the mines.\"";
+    mes "\"For that reason, I want to do some research on this subject, to create an anitdote. But I need help to get some ingredients, someone who is able to deal with the dangerous creatures in the mines.\"";
     next;
     menu
-        "I will do what I can. What do you need?", L_, 
+        "I will do what I can. What do you need?", L_firstquest, 
         "I'm really sorry, but I don't think, I can help you.", -;
     
-    mes "\"That is disagreeable to hear. Maybe i can find another person to take this task.\"";
+    mes "\"That is disagreeable to hear. Maybe I can find another person to take this task.\"";
     next;
     goto L_Usual;
 
+L_firstquest:
     set @Q_poison, 1;
         callsub S_Update_Var;
         
     mes "\"That's great! First, I need some parts of the creatures, that cause the poison.\"";
     next;
 L_ExplainAgain1:
-    mes "\"Please bring me five tongues of grass snakes and ten stingers of black scorpions.\"";
+    mes "\"Please bring me five tongues of snakes and ten stingers of black scorpions.\"";
     close;
     
 state1:
@@ -129,8 +133,8 @@ state1:
         "I have what you asked for.", -,
         "I'm still working on that.", quit;    
         
-    if (countitem("GrassSnakeTongue") < @GSNAKET_AMOUNT || countitem("BlackScorpionStinger") < @BSCORPIONST_AMOUNT) goto L_NotEnough;
-    delitem "GrassSnakeTongue", @GSNAKET_AMOUNT;
+    if (countitem("SnakeTongue") < @SNAKET_AMOUNT || countitem("BlackScorpionStinger") < @BSCORPIONST_AMOUNT) goto L_NotEnough;
+    delitem "SnakeTongue", @SNAKET_AMOUNT;
     delitem "BlackScorpionStinger", @BSCORPIONST_AMOUNT;
     getexp @QUEST1_EXP, 0;
     
@@ -204,20 +208,19 @@ L_Exp_Game:
     mes "[Nurse]";
     mes "\"Listen carefully! I will explain, what you need to do.\"";
     next;
-    mes "\"I have here two different distillate. One is the venom extract, the other one a stabilizer.\"";
+    mes "\"I have here two different distillates. One is the venom extract, the other one a stabilizer.\"";
     next;
     mes "\"We also have the healing potion.\"";
     next;
-    mes "\"The problem is, that i can only guess the concentration of the venom and the stabilizer. My equipment isn't good enough to determine it precise.\"";
+    mes "\"The problem is, that I can only guess the concentration of the venom and the stabilizer. My equipment isn't good enough to determine it precise.\"";
     next;
     mes "\"You need to find the right amount of each ingredient. I will tell you, what I can know with my analysis methods.\"";
     next;
-    mes "\"Shall we start? \"";
+    mes "\"Shall we start?\"";
     next;
     menu
         "Please explain it again.", L_Exp_Game,
-        "Allright", -;
-    
+        "Alright.", -;
 L_Game:
     set @Q_poison, @Q_poison + 1;
         callsub S_Update_Var; 
@@ -225,41 +228,65 @@ L_Game:
     callsub L_Load_Need;
     //descriptions
     set @desc_length, 6;
+
     setarray @desc$,"very little","only a little", "little","much", "a lot", "very much", "a huge amount";
-    
+
     set @divisor, @count / @desc_length;
-    set @hlIndex,  (@hl_need-@offset) /@divisor;
-    set @vnIndex,  (@hl_need-@offset) /@divisor;
-    set @stIndex,  (@hl_need-@offset) /@divisor;
-    
+
+    set @hlIndex,  (@hlNeed-@offset) /@divisor;
+    set @vnIndex,  (@vnNeed-@offset) /@divisor;
+    set @stIndex,  (@stNeed-@offset) /@divisor;
+
+    //mes "TODO REMOVE: needs" + @hlNeed + " " + @vnNeed + " " + @stNeed;
+    //mes "TODO REMOVE: @count:" + @count + " @offset: " + @offset + " @desc_length" + @desc_length +" @divisor" +@divisor;
+    //mes "TODO REMOVE: Indices" + @hlIndex + " " + @vnIndex + " " + @stIndex;
+
+    mes "[Nurse]";
     mes "\"I guess you need " + @desc$[@hlIndex] + " of the healing potion.\"";
-    mes "\"I guess you need " + @desc$[@vnIndex] + " of the venom extracts.\"";
-    mes "\"I guess you need " + @desc$[@stIndex] + " of the stabilizer.\"";
-    
-    if(hlNeed/vnNeed > 1 ) mes "\"I see that the healing potions are needed at least " + hlNeed/vnNeed + "times as much as the venom potion. \"";
-    if(vnNeed/hlNeed > 1 ) mes "\"I see that the venom extracts are needed at least " + vnNeed/hlNeed + "times as much as the healing potion.\"";
-   
+    next;
+    mes "\"You need " + @desc$[@vnIndex] + " of the venom extracts, I suppose.\"";
+    next;
+    mes "\"As far as I can tell you will need " + @desc$[@stIndex] + " of the stabilizer.\"";
+    next;
 
-    //the same for vn<->st
-    
-    //the same for vn<->hl
+    if(@hlNeed/@vnNeed > 1 ) mes "\"I see that the healing potions are needed at least " + @hlNeed/@vnNeed + " times as much as the venom.\"";
+    if(@vnNeed/@hlNeed > 1 ) mes "\"I see that the venom extracts are needed at least " + @vnNeed/@hlNeed + " times as much as the healing potions.\"";
+    next; 
+
+    if(@stNeed/@vnNeed > 1 ) mes "\"I see that the stabilizer is needed at least " + @stNeed/@vnNeed + " times as much as the venom extracts.\"";
+    if(@vnNeed/@stNeed > 1 ) mes "\"I see that the venom extracts are needed at least " + @vnNeed/@stNeed + " times as much as the stabilizer.\"";
+    next;
+       
+    if(@stNeed/@hlNeed > 1 ) mes "\"I see that the stabilizer is needed at least " + @stNeed/@hlNeed + " times as much as the healing potions.\"";
+    if(@hlNeed/@stNeed > 1 ) mes "\"I see that the healing potions are needed at least " + @hlNeed/@stNeed + " times as much as the stabilizer.\"";
+    next;
     
     set @max, @count+@offset-1;
     set @min, @offset;
-    mes "\"My scale goes up to" + @max + ". I suggest to put at least " + @min +" drops on the scale.\"";
+    mes "\"My scale goes up to " + @max + ". I suggest to put at least " + @min +" drops on the scale.\"";
+    next;
+
     mes "\"How many drops of the healing potion should we use?\"";
     input @hlPut;
+    if (@hlPut < @offset) goto L_Game_tooless;
+    if (@hlPut > @max) goto L_Game_toomuch;
+
     mes "\"How many drops of the venom extract potion should we use? \"";
     input @vnPut;
+    if (@vnPut < @offset) goto L_Game_tooless;
+    if (@vnPut > @max) goto L_Game_toomuch;
+
     mes "\"How many drops of the stabilizer potion should we use? \"";
     input @stPut;
+    if (@stPut < @offset) goto L_Game_tooless;
+    if (@stPut > @max) goto L_Game_toomuch;
     
     mes "The nurse puts the potions together according to your instructions. Then she takes a spoon and stirs it.";
     next;
     mes "You take the glass and look suspiciously at the liquid, which has changed to an odd colour.";
     next;
     mes "[Nurse]";
-    mes "\"Allright, now i will inject the venom into you, then you should drink the antidote immidiatly. Are you ready?\"";
+    mes "\"Allright, now I will inject the venom into you, then you should drink the antidote immidiatly. Are you ready?\"";
     next;
     mes "You take a deep breath and nod.";
     next;
@@ -270,29 +297,35 @@ L_Game:
     mes "[Nurse]";
     mes "\"Drink the antidote!\"";
     next;
-    mes "You lift the glass to you lips and drink it all at once";
+    mes "You lift the glass to your lips and drink it all at once.";
+    next;
     
     if ( (@hlPut >  @hlNeed) && (@vnPut >  @vnNeed) ) goto m_hl_m_vn;
     if ( (@hlPut >  @hlNeed) && (@vnPut <= @vnNeed) ) goto m_hl_l_vn;
     if ( (@hlPut <= @hlNeed) && (@vnPut >  @vnNeed) ) goto l_hl_m_vn;
     if ( (@hlPut <  @hlNeed) && (@vnPut <  @vnNeed) ) goto l_hl_l_vn;
+
+    mes "You feel quite normal.";
+    mes "[Nurse]";
+    mes "\"Oh yes, the concentration of the healing potions and the venom extracts seem to be right.\"";    
+    next;
     set @hl_vn_ok, 1;
     goto check_st;
 
    
 m_hl_m_vn:
     //poison for 3 minutes
-    sc_start SC_Poison,180000,0;
+    sc_start sc_poison, 1, 20;
     mes "You began to feel really dizzy. And you feel so light - you can't help yourself and burst out with laughter. What a strange feeling!";
     next;
     mes "The nurse looks at you with a really worried look in her face. As you open your mouth to tell her, that you feel allright, the content of your stomache finds its way out through your throat and on the floor.";
     next;
-    "The feeling of happieness disappears, but you seems to be still poisoned.";
+    mes "The feeling of happieness disappears, but you seems to be still poisoned.";
     goto check_st;
     
 m_hl_l_vn:
     //poison for 1 minute
-    sc_start SC_Poison,60000,0;
+    sc_start sc_poison, 1, 20;
     mes "You feel the pain of the poison weaken. This seems promising. The thought, you might have been succesful makes you feel enormously happy.";
     next;
     mes "But a few seconds later, you wonder, what the reason for your happiness was.";
@@ -307,21 +340,21 @@ m_hl_l_vn:
     next;
     mes "As you open your eyes again, the nurse shines in your face with a lamp and pulls your eyelids open. Then she nodds.";
     next; 
-    mes "/"Very well, you are sober again./"";
+    mes "\"Very well, you are sober again.\"";
     next;
     
     goto check_st;
 
 l_hl_m_vn:
     // first poison for 10 minutes, player will die anyway
-    sc_start SC_Poison,600000,0;
+    sc_start sc_poison, 1, 20;
     mes "You feel a sting in your stomach and your heart starts pounding loudly.";
     next;
-    mes "The room is getting dark."
+    mes "The room is getting dark.";
     next;
-    mes "...and darker..."
+    mes "...and darker...";
     next;
-    mes "......."
+    mes ".......";
     // bye bye player!
     heal -Hp, 0;
     // close instead of telling how much stabilizer is needed
@@ -330,8 +363,8 @@ l_hl_m_vn:
 
 l_hl_l_vn:
     //poison for 1 minute
-    sc_start SC_Poison, 60000,0;
-    mes "The antidote seems to have no effect."
+    sc_start sc_poison, 1, 20;
+    mes "The antidote seems to have no effect.";
     goto check_st;    
 
 check_st:
@@ -356,17 +389,20 @@ m_st:
     goto notallcorrect;
         
 allcorrect:
+    mes "You feel totally normal again.";
+    next;
     mes "[Nurse]";
-    mes "\"Wonderfull! You made it! Now i will be able to help all the people, who get poisoned in the mines!\""
+    mes "\"Wonderfull! You made it! Now I will be able to help all the people, who get poisoned in the mines!\"";
     next; 
-    mes "[Nurse]";
     mes "\"Thank you so much! Oh, and it seems, as if you have gained the skill to resist posion someway. This is great.\"";
     next; 
-    mes "[Nurse]";
     mes "\"You should talk to someone, who can help you to focus on your skills.\"";
     next;
     getexp @ANTIDOTE, 0;
     setskill TMW_POISON_RESISTANCE, 1;
+    mes "TODO: set @Q_poison, 7";
+    mes "TODO: make close here:";
+    //close;
 
 notallcorrect:
     mes "[Nurse]";
@@ -395,14 +431,14 @@ state4:
         "I'm ok. We can try, but please explain again.", L_Exp_Game,
         "Let's start right now.", L_Game;
  
- state5: 
+state5: 
      mes "The nurse looks at you pitiful.";
      mes "[Nurse]";
      mes "\"Hello. I'm really sorry for causing you so much pain.\"";
      next;
      mes "\"But if we can suceed, you are a hero! I will be able to help a lot of people.\"";
      next;
-     mes "\"Next time you might remember me to label the distillates right. I am sorry that it screwed up again.\"";
+     mes "\"Next time you might remember me to label the distillates right. I am sorry that it is screwed up again.\"";
      next;
      mes "\"There is enough stuff left for one last try.\"";
      next;
@@ -452,10 +488,14 @@ S_Update_Var:
             (QUEST_Forestbow_state & ~(@Q_poison_MASK)
                 | (@Q_poison << @Q_poison_SHIFT));
         return;
-        
-L_Shuffle_Need:
+
+L_Game_init_vars:
     set @count, 24;
-    set @offset, 1;
+    set @offset, 1;        
+    return;
+
+L_Shuffle_Need:
+    callsub L_Game_init_vars;
     set @hlNeed, @offset + rand(@count);
     set @vnNeed, @offset + rand(@count);
     set @stNeed, @offset + rand(@count);
@@ -468,10 +508,16 @@ L_Shuffle_Need:
     return;
     
 L_Load_Need:
+    callsub L_Game_init_vars;
     set @hlNeed, ($NPC_NURSE & BYTE_0_MASK) >> BYTE_0_SHIFT;
     set @vnNeed, ($NPC_NURSE & BYTE_1_MASK) >> BYTE_1_SHIFT;
     set @stNeed, ($NPC_NURSE & BYTE_2_MASK) >> BYTE_2_SHIFT;
     return;
+
+L_Game_tooless:
+   //TODO
+L_Game_toomuch:
+   //TODO    
 }
 
 
diff --git a/npc/016-1_Woodland/gwendolyn.txt b/npc/016-1_Woodland/gwendolyn.txt
index 8c6728da..6fada83a 100644
--- a/npc/016-1_Woodland/gwendolyn.txt
+++ b/npc/016-1_Woodland/gwendolyn.txt
@@ -142,9 +142,8 @@ state3:
     next;
 
 state4:
-    // TODO
-    // check if skills are enabled, if not, goto not_ready
     if (baselevel < @BASELEVEL_GAME) goto not_ready;
+    if (!getskilllv(SKILL_POOL)) goto not_ready;
     mes "Gwendolyn takes an analyzing look at you. Then she noods.";
     next;
 
@@ -215,9 +214,6 @@ game:
 
     set @wp_sq, (@wdX * @wdX) + (@wdY * @wdY);
 
-//TODO: remove
-//mes "wdX:"+@wdX+"  wdY:"+@wdY+"  wp_sq:"+@wp_sq+"  wdIndex:"+@wdIndex;
-
     if (@wp_sq == 0) goto wp0;
     if (@wp_sq < 3) goto wp1;
     if (@wp_sq < 9) goto wp2;
@@ -346,9 +342,6 @@ choose_shotpower:
     set @pointX, @wdX + @spX;
     set @pointY, @wdY + @sp;
 
-//TODO: remove
-//mes "pointX:"+@pointX+"  pointY:"+@pointY+"  spX:"+@spX+"  sp:"+@sp;
-
     if( @pointX==0 && @pointY==0 ) goto target_hit;
 
     //set @targethit to these numbers:
@@ -436,9 +429,7 @@ target_nohit:
 state6:
     mes "[Gwendolyn Bowmaker]";
     mes "\"You really have a reason to be proud.\"";
-    //close;
-    //TODO: uncomment close!
-    mes "here is an uncommented close; for testing purpose, you can try once more :-D";
+    close;
 
 state1:
     mes "[Gwendoly Bowmaker]";
@@ -522,21 +513,6 @@ S_getDirection:
     //check the origin, because the origin is found by the "straight" lines as well. (should not, but is.. maybe a bug?)
     if( @paramX==0 && @paramY==0 ) set @returnIndex, 5;	
     return;
-
-//TODO: remove:
-testoutput:
-	set @paramX	,-4;
-loopouter:
-	set @paramY	,-4;	
-loopinner:
-callsub S_getDirection;
-mes " "+@paramX+"  /  "+@paramY+"  =  "+@returnIndex;
-set @paramY, @paramY+1;
-if(@paramY<5)goto loopinner;
-next;
-set @paramX, @paramX+1;
-if(@paramX<5)goto loopouter;
-return;
 }
 
 ////////////////////////////////////