merging updates from previous test repo ta-testing.

9 files changed, 482 insertions, 242 deletions

diff --git a/npc/001-1_Tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index e7fdd883..9de957e1 100644
--- a/npc/001-1_Tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
@@ -52,7 +52,7 @@ L_News:
 
 L_Question:
         callfunc "MagicTalkOptionsSetup";
-        set @ignore, 0;
+        set @ignore, @QQ_ASTRALSOUL;
         callfunc "MagicTalkMenu";
 
         if (@c == 0)		goto L_Main;
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index 701fe2b6..c8941563 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -1,4 +1,4 @@
-//
+// Aisha and Nina
 
 001-1.gat,95,29,0	script	Aisha	108,{
 	set @TEMP,rand(9);
@@ -44,7 +44,7 @@ L_6:
 
 L_7:
 	mes "[Aisha]";
-	mes "\"I want to be a Doctor when i grow up!\"";
+	mes "\"I want to be a Doctor when I grow up!\"";
 	close;
 
 L_8:
@@ -85,7 +85,7 @@ L_4:
 	close;
 
 L_5:
-	mes "\"I always take some spare Cactus Juices with me on the field.  They are heavy, though.\"";
+	mes "\"I always take some spare [Cactus Juice]s with me on the field.  They are heavy, though.\"";
 	close;
 
 L_6:
@@ -101,7 +101,7 @@ L_8:
 	close;
 
 L_9:
-	mes "\"I know a very bad word. But I must not say it, because monsters will come and get me if I do!\"";
+	mes "\"I know a very bad word.  But I must not say it, because monsters will come and get me if I do!\"";
         next;
 	menu
 		"A bad word?", L_tell,
@@ -110,10 +110,10 @@ L_9:
 
 L_tell:
 	mes "[Nina]";
-	mes "\"Yes, I heard my mother say it once. And she made me promise her to never say it. Never.\"";
+	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,
+		"I understand, you do not need to tell me...", L_giveword,
 		"Goodbye!", -;
 	close;
 
@@ -124,8 +124,8 @@ L_keepword:
 
 L_giveword:
 	mes "[Nina]";
-	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") + "'.\"";
+	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 7dea2a32..22f3611e 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -125,7 +125,7 @@ Heal_4:
 	mes "\"Much better, right?!\"";
 	heal 10000,10000;
 	close;
-	
+
 L_NoHeal:
         if (MAGIC_FLAGS)
         	goto L_Chat;
@@ -135,7 +135,7 @@ L_NoHealMessage:
 	mes "\"I'm sorry but unless you are young and in need, I can't help you, and your level is already higher than ten.";
 	mes "With so many people still injured from the earthquake, I really have no time to help.";
 	mes "You can get some rest in the inn near here.\"";
-	
+
 	close;
 
 L_Chat:
@@ -454,7 +454,7 @@ L_3_where:
         mes "\"Kadiya and Omar live relatively close by.  See this corner in the inner city wall east of here?  Turn past it, then go north.  It's the second house.\"";
         next;
         goto L_3_menu;
-        
+
 L_Teach_Explain3_abort:
 	mes "[Elanore the Healer]";
         mes "\"I'm sorry, but you lack the magical power to advance.\"";
@@ -571,6 +571,7 @@ L_Question:
         if (@c == @QQ_SAGATHA)	goto L_Q_sagatha;
         if (@c == @QQ_AULDSBEL)	goto L_Q_auldsbel;
         if (@c == @QQ_OLDWIZ)	goto L_Q_oldwiz;
+        if (@c == @QQ_ASTRALSOUL)goto L_Q_astralsoul;
 
 	mes "[Elanore the Healer]";
         mes "Elanore shakes her head.";
@@ -578,6 +579,12 @@ L_Question:
         next;
         goto L_Main;
 
+L_Q_astralsoul:
+	mes "[Elanore the Healer]";
+        mes "\"The astral soul skill is one of the most important skills for mages. I learned this focus long time ago. Without that skill your magic is quite useless, isn't it? If the rumors are really true, there is an experienced mage in the Woodlands around Hurnscald.\"";
+        next;
+        goto L_Main;
+
 L_Q_oldwiz:
 	mes "[Elanore the Healer]";
         mes "\"He is a kind old man.  He stays mostly with his books and his apprentice, though we have chatted a few times.\"";
diff --git a/npc/001-1_Tulimshar/luca.txt b/npc/001-1_Tulimshar/luca.txt
index bc048e65..f019cd7c 100644
--- a/npc/001-1_Tulimshar/luca.txt
+++ b/npc/001-1_Tulimshar/luca.txt
@@ -2,11 +2,13 @@
 
 001-1.gat,108,55,0	script	Luca	102,{
 
-//	if (BaseLevel >= 45)
-//		goto L_teach_soon;
+	set @EXP_BRAWLING, 2000;
 
-//	if (BaseLevel >= 50)
-//		goto L_teach;
+	if (BaseLevel >= 35)
+		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 +17,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 +37,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,191 +73,344 @@ 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!";
-	close;
+    setarray @choices, 0,0,0,0,0;
+    setarray @choice$, "", "", "", "", "";
+    set @choice_nr, 0;
+
+    set @C_focus, 1;
+    set @C_unfocus, 2;
+    set @C_teachbrawling, 3;
+    set @C_teachnothing, 4;
+    set @C_explainagain, 5;
+    set @C_nvm, 6;
+
+    getactivatedpoolskilllist;
+    if (!((getskilllv(SKILL_POOL) - @skilllist_count) > 0)) goto L_teachmore2_nof;
+    getunactivatedpoolskilllist;
+    if (@skilllist_count == 0) goto L_teachmore2_nof;
+    set @choices[@choice_nr], @C_focus;
+    set @choice$[@choice_nr], "I would like to focus.";
+    set @choice_nr, @choice_nr + 1;
+L_teachmore2_nof:
+
+    getactivatedpoolskilllist;
+    if (@skilllist_count == 0) goto L_teachmore2_nounf;
+    set @choices[@choice_nr], @C_unfocus;
+    set @choice$[@choice_nr], "I would like to unfocus.";
+    set @choice_nr, @choice_nr + 1;
+L_teachmore2_nounf:
+
+    if (!(getskilllv(SKILL_BRAWLING)))
+        set @choices[@choice_nr], @C_teachbrawling;
+    if (getskilllv(SKILL_BRAWLING))
+        set @choices[@choice_nr], @C_teachnothing;
+    set @choice$[@choice_nr], "Can you teach me a skill?";
+    set @choice_nr, @choice_nr + 1;
+
+    set @choices[@choice_nr], @C_explainagain;
+    set @choice$[@choice_nr], "Can you explain skills again?";
+    set @choice_nr, @choice_nr + 1;
+
+    set @choices[@choice_nr], @C_nvm;
+    set @choice$[@choice_nr], "I'm done for now, thanks!";
+    set @choice_nr, @choice_nr + 1;
+
+    menu
+            @choice$[0],-,
+            @choice$[1],-,
+            @choice$[2],-,
+            @choice$[3],-,
+            @choice$[4],-;
+
+    set @menu, @menu - 1;
+    if (@choices[@menu] == 0) close;
+    if (@choices[@menu] == @C_focus)         goto L_focus;
+    if (@choices[@menu] == @C_unfocus)       goto L_unfocus;
+    if (@choices[@menu] == @C_teachbrawling) goto L_teach_brawling;
+    if (@choices[@menu] == @C_teachnothing)  goto L_teach_nothing;
+    if (@choices[@menu] == @C_explainagain)  goto L_teachmore_explain;
+    if (@choices[@menu] == @C_nvm)           close;
+    close;
 
 L_teachmore_explain:
 	callsub S_explain;
-        goto L_teachmore2;
+    goto L_teachmore2;
 
 L_focus:
-//FIXME
+    getunactivatedpoolskilllist;
+    set @skilllist_id[@skilllist_count], 0;
+    set @skilllist_name$[@skilllist_count], "Nevermind";
+    menu
+        @skilllist_name$[0], -,
+        @skilllist_name$[1], -,
+        @skilllist_name$[2], -,
+        @skilllist_name$[3], -,
+        @skilllist_name$[4], -,
+        @skilllist_name$[5], -,
+        @skilllist_name$[6], -,
+        @skilllist_name$[7], -;
+
+    set @menu, @menu - 1;
+    if (@skilllist_id[@menu] == 0)
+        goto L_teachmore2;
+
+    poolskill @skilllist_id[@menu];
+    goto L_teachmore2;
 
 L_unfocus:
-//FIXME
+    if (countitem("DementiaPotion") > 0)
+        goto L_unfocus_menu;
+
+    if (MAGIG_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE)
+        goto L_nopotion;
+
+    mes "[Luca the Hunter]";
+    mes "\"Unfocussing is one of the harder parts though, because it is sunk in. You see?\"";
+    next;
+    mes "\"So to remove that mental focus we will need a special potion.\"";
+    next;
+    mes "\"Maybe you should consult some very skilled alchemists.\"";
+    next;
+    mes "\"Ah yes, of course you will need a recipe. Although the alchemist usually knows it.\"";
+    next;
+    mes "\"The potion is called grimace of dementia. So the alchemist will know for sure.\"";
+    set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_UNFOCUS_RECIPE;
+    menu
+        "Ok, I will get a grimace of dementia potion", -,
+        "Alright, be right back!", -;
+    close;
+
+L_nopotion:
+    mes "[Luca the Hunter]";
+    mes "\"Hey, You really need that dementia potion for unfocussing.\"";
+    next;
+    mes "\"Come back, when you found a suitable alchemist, who can mix such a potion.\"";
+    next;
+    goto L_teachmore2;
+
+L_unfocus_menu:
+    mes "[Luca the Hunter]";
+    mes "\"Ahh, I see you have a dementia potion.\"";
+    next;
+    mes "\"What focus would you like to unfocus?\"";
+
+    if (countitem("DementiaPotion") == 0) goto L_nopotion;
+    delitem "DementiaPotion", 1;
+
+    getactivatedpoolskilllist;
+
+    set @skilllist_id[@skilllist_count], 0;
+    set @skilllist_name$[@skilllist_count], "Nevermind";
+    menu
+        @skilllist_name$[0], -,
+        @skilllist_name$[1], -,
+        @skilllist_name$[2], -,
+        @skilllist_name$[3], -,
+        @skilllist_name$[4], -,
+        @skilllist_name$[5], -,
+        @skilllist_name$[6], -,
+        @skilllist_name$[7], -;
+
+    set @menu, @menu - 1;
+    if (@skilllist_id[@menu] == 0)
+        goto L_teachmore2;
 
-L_teach_brawling:
-//FIXME
-        close;
+    unpoolskill @skilllist_id[@menu];
+    close;
 
+L_teach_brawling:
+    mes "[Luca the Hunter]";
+    mes "\"Well, yes, I can teach you brawling. It's a nice thing, if you have nothing left but your hands to defend yourself.\"";
+    next;
+    mes "He is laughing.";
+    mes "\"And is handy, if some sapling starts getting naughty.\"";
+    next;
+    mes "He rises his hand in front of his face and clenches his fists.";
+    mes "\"Ok, let's go! Hold your hands like this.\"";
+    next;
+    mes ".......";
+    next;
+    mes "Some bruises later.";
+    mes "\"Great! I think, you got it.\"";
+    next;
+    set @SUP_id, SKILL_BRAWLING;
+    set @SUP_lvl, 1;
+    set @SUP_name$, "Brawling";
+    set @SUP_xp, @EXP_BRAWLING;
+    callfunc "SkillUp";
+    close;
+
+L_teach_nothing:
+    mes "[Luca the Hunter]";
+    mes "\"I was able to teach you brawling. For other professions you should visit someone else.\"";
+    next;
+    mes "\"You see, I am an adventurer. Everybody has his tricks. But you really should visit someone, who is a teacher, not an adventurer now.\"";
+    next;
+    goto L_teachmore2;
 }
diff --git a/npc/001-1_Tulimshar/mikhail.txt b/npc/001-1_Tulimshar/mikhail.txt
index 76a1ad59..6514c07d 100644
--- a/npc/001-1_Tulimshar/mikhail.txt
+++ b/npc/001-1_Tulimshar/mikhail.txt
@@ -1,60 +1,68 @@
 //
 
-001-1.gat,50,46,0	script	Mikhail	120,{
-	if (TMW_Quest == 6) goto L_Done;
-	if (TMW_Quest == 5) goto L_Progress;
-	if (TMW_Quest == 4) goto L_Start;
-	
-	mes "[Mikhail]";
-	mes "\"Hello...\"";
-	close;
-
-L_Start:	
-	mes "[Mikhail]";
-	mes "\"My grandma sent me to get five [Maggot Slime]s from the maggots in the desert, but they scare me so bad!\"";
-	next;
-	mes "\"You look like a nice person.  Would you go get them for me?\"";	
-	menu
-		"Of course, I'll go get them for you.", L_accept,
-		"I've got other things to do right now.", L_close;
-	close;
-	
+001-1.gat,50,46,0	script	Mikhail	120,	{
+    if (TMW_Quest >= 6) goto L_Done;
+    if (TMW_Quest == 5) goto L_Progress;
+    if (TMW_Quest == 4) goto L_Start;
+    if (TMW_Quest < 4) goto L_Convince_Mikhail_First;
+
+    // If this happens, something is wrong with the above case handling.
+    mes "Mikhail looks confused.";
+    close;
+
+L_Convince_Mikhail_First:
+    mes "[Mikhail]";
+    mes "\"Hello...\"";
+    mes "";
+    mes "It seems that the boy would like to say more, but does not dare to open up to you. Maybe you should help someone else first, so that he sees your intentions are good.";
+    close;
+
+L_Start:
+    mes "[Mikhail]";
+    mes "\"My grandma sent me to get five [Maggot Slime]s from the maggots in the desert, but they scare me so bad!\"";
+    next;
+    mes "\"You look like a nice person.  Would you go get them for me?\"";
+    menu
+        "Of course, I'll go get them for you.", L_accept,
+        "I've got other things to do right now.", L_close;
+    close;
+
 L_close:
-	close;
-	
+    close;
+
 L_accept:
-	mes "[Mikhail]";
-	mes "\"Thank you so much!  I'll wait for you here.\"";
-	set TMW_Quest, 5;
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Thank you so much!  I'll wait for you here.\"";
+    set TMW_Quest, 5;
+    close;
+
 L_Progress:
-	mes "[Mikhail]";
-	mes "\"Did you bring me the five [Maggot Slime]s i need?\"";
-	next;
-	menu
-		"Yes, here they are, kiddo!", L_try,
-		"Not yet, but I'll be back soon.", L_close;
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Did you bring me the five [Maggot Slime]s i need?\"";
+    next;
+    menu
+        "Yes, here they are, kiddo!", L_try,
+        "Not yet, but I'll be back soon.", L_close;
+    close;
+
 L_try:
-	if countitem("MaggotSlime") >= 5 goto L_get;
-	mes "[Mikhail]";
-	mes "\"It doesn't look like you have them all...\"";
-	close;
-	
+    if countitem("MaggotSlime") >= 5 goto L_get;
+    mes "[Mikhail]";
+    mes "\"It doesn't look like you have them all...\"";
+    close;
+
 L_get:
-	delitem "MaggotSlime", 5;
-	set TMW_Quest, 6;
-	mes "[Mikhail]";
-	mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
-	next;
-	getexp 100, 0;
-	mes "You get 100 xp.";
-	close;
-	
+    delitem "MaggotSlime", 5;
+    set TMW_Quest, 6;
+    mes "[Mikhail]";
+    mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
+    next;
+    getexp 100, 0;
+    mes "You get 100 xp.";
+    close;
+
 L_Done:
-	mes "[Mikhail]";
-	mes "\"Thanks again for helping me get those [Maggot Slime]s!\"";
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Thanks again for helping me get those [Maggot Slime]s!\"";
+    close;
+}
diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt
index 571fe1c8..bd55b0ae 100644
--- a/npc/001-1_Tulimshar/rewards_master.txt
+++ b/npc/001-1_Tulimshar/rewards_master.txt
@@ -5,16 +5,16 @@
 	if (tvis == 0) set tvis, 1;
 	if (Mobpt < tvis) goto L_NotEnough;
 
-	setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye";
+	setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal";
 
 	mes "[Ishi the Rewards Master]";
 	mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\"";
 	next;
-	
+
 	set @i, 0;
 	setarray @Menu$, "", "", "", "", "", "", "", "", "", "", "";
 	callsub SUB_prep_menu;
-	
+
 	menu
 		@Menu$[0], -,
 		@Menu$[1], -,
@@ -26,20 +26,24 @@
 		@Menu$[7], -,
 		@Menu$[8], -,
 		@Menu$[9], -,
-		@Menu$[10], -;
+		@Menu$[10], -,
+		@Menu$[11], -;
 
+	// this is for the last entry "No thanks":
 	if (@menu > @i) close;
-	
+	// this is for the "Give all" entry:
+	if (@menu == @i) goto L_Give_all;
+
 	set @req, @menu;
 	set @rec, 0;
-	
+
 L_Item_Loop:
 	if (@rec == @req || Mobpt < tvis) goto L_Item_Done;
-	
+
 	callsub SUB_give_item;
 	set @rec, @rec + 1;
 	goto L_Item_Loop;
-	
+
 L_Item_Done:
 	if (@rec < @req) mes "It looks like your Monster Points were over estimated.";
 	close;
@@ -54,6 +58,34 @@ L_NotEnough:
 	mes "\"You don't have enough Monster Points for a reward. You'll need to kill some more monsters first.\"";
 	close;
 
+
+
+L_Give_all:
+	// we need to count how many loop iterations are done there,
+	// since the server complains about more than 250 (70 according to Jaxad0127)
+	// gotos without interrupting next statement.
+	set @gotocounter, 50;
+
+L_Give_all_loop:
+	set @gotocounter, @gotocounter - 1;
+	if (@gotocounter < 1) goto L_Give_all_next;
+	set @itemgiveerror, 0;
+	callsub SUB_give_item;
+	if (@itemgiveerror != 0) goto L_Give_all_done;
+	goto L_Give_all_loop;
+
+L_Give_all_next:
+	next;
+	mes "[Ishi the Rewards Master]";
+	mes "\"You have brought lots of items now. You have still " + Mobpt + " monster points. Shall we continue?\"";
+	menu
+		"yes", L_Give_all,
+		"no", L_Give_all_done;
+	close;
+
+L_Give_all_done:
+	close;
+
 //////////////////////////////////////////////////
 // Subroutines
 //////////////////////////////////////////////////
@@ -61,29 +93,49 @@ L_NotEnough:
 SUB_prep_menu:
 	set @pts, Mobpt;
 	set @dif, tvis;
-	
+
 L_Menu_Loop:
-	if (@pts < @dif || @i == 10) goto L_Menu_Done;
-	
+	if (@pts < @dif || @i == 10) goto L_Menu_Check;
+
 	set @Menu$[@i], @i + 1;
-	
+
 	set @i, @i + 1;
 	set @pts, @pts - @dif;
 	set @dif, @dif + 1;
-	
+
 	goto L_Menu_Loop;
+
+L_Menu_Check:
+	// if we are able to give 10, we can enable the option to give all we can have
+	if (@i != 10) goto L_Menu_Done;
+		set @Menu$[@i], "Please give me as many as I deserve!";
+		set @i, @i + 1;
+
 L_Menu_Done:
 	set @Menu$[@i], "No thanks";
 	return;
 
 SUB_give_item:
+	set @itemgiveerror, 0;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto SUB_give_noinv;
+	if (Mobpt < tvis) goto SUB_give_nomobpts;
 	set Mobpt, Mobpt - tvis;
 	set tvis, tvis + 1;
 	set @item$, @Items$[rand(getarraysize(@Items$))];
-	
+
 	getitem @item$, 1;
-	
+
 	mes "You received one " + getitemname(@item$) + "!";
-	
+	return;
+
+SUB_give_noinv:
+	mes "Your inventory is full!";
+	set @itemgiveerror, 1;
+	return;
+
+SUB_give_nomobpts:
+	mes "It looks like your Monster Points were over estimated.";
+	set @itemgiveerror, 1;
 	return;
 }
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 49d47a8a..45b91ab3 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -6,7 +6,7 @@
 	if (TMW_Quest == 10) goto L_Start;
 
 	mes "[Sandra]";
-	mes "\"Hunting monsters for potion ingredients can sometimes be a difficult task.\"";
+	mes "\"Hunting monsters for potion ingredients can sometimes be a difficult task. Maybe you could help me at some point.\"";
 	close;
 
 L_Start:
@@ -19,19 +19,19 @@ L_Start:
 
 L_Opening0:
 	mes "[Sandra]";
-	mes "\"In the outskirts of Tulimshar, there are some scorpions. I need a favor, please help me. Will you?\"";
+	mes "\"In the outskirts of Tulimshar, there are some scorpions...  I need a favor, please help me!  Will you?\"";
 	next;
 	goto L_Ask;
 
 L_Opening1:
 	mes "[Sandra]";
-	mes "\"When you venture in the outskirts of Tulimshar, you can spot scorpions. Will you help me kill some?\"";
+	mes "\"When you venture to the outskirts of Tulimshar, you can spot scorpions.  Will you help me kill some?\"";
 	next;
 	goto L_Ask;
 
 L_Opening2:
 	mes "[Sandra]";
-	mes "\"The scorpion stinger carries many properties used in potions. Will you get some for me?\"";
+	mes "\"The [Scorpion Stinger] carries many properties used in potions.  Would you get some for me?\"";
 	next;
 	goto L_Ask;
 
@@ -43,8 +43,8 @@ L_Opening3:
 
 L_Ask:
 	menu
-		"Yes", L_Yes,
-		"No", L_No;
+		"Yes.", L_Yes,
+		"No.", L_No;
 
 L_Yes:
 	set @TEMP, rand(3);
@@ -60,27 +60,26 @@ L_Req0:
 
 L_Req1:
 	mes "[Sandra]";
-	mes "\"I heard a while ago that scorpion stingers can be used for medical purposes. I need you to help me get 5 [Scorpion Stinger]s.\"";
+	mes "\"I heard a while ago that stingers from scorpions can be used for medical purposes.  I need you to help me get 5 [Scorpion Stinger]s.\"";
 	next;
 	goto L_Set;
 
 L_Req2:
 	mes "[Sandra]";
-	mes "\"Bring me 5 [Scorpion Stinger]s. I'll give you something if you do.\"";
+	mes "\"Bring me 5 [Scorpion Stinger]s.  I'll give you something if you do!\"";
 	next;
 	goto L_Set;
 
 L_Set:
 	set TMW_Quest,11;
 	mes "[Sandra]";
-	mes "\"Please bring me them!\"";
+	mes "\"Please get them for me!\"";
 	close;
 
 L_Progress:
 	if (countitem("ScorpionStinger") < 5) goto L_NotEnough;
 	mes "[Sandra]";
-	mes "\"Excellent!";
-	mes "You brought me 5 [Scorpion Stinger]s!\"";
+	mes "\"Excellent! You brought me 5 [Scorpion Stinger]s!\"";
 	getinventorylist;
 	if (@inventorylist_count + (countitem("ScorpionStinger") == 5) - (countitem("Arrow") == 0) > 99) goto L_TooMany;
 	delitem "ScorpionStinger", 5;
@@ -105,6 +104,6 @@ L_No:
 L_TooMany:
 	next;
 	mes "[Sandra]";
-	mes "\"You don't have room for my reward. I'll wait until you do.\"";
+	mes "\"You don't have room for my reward.  I'll wait until you do.\"";
 	close;
 }
diff --git a/npc/001-1_Tulimshar/sarah.txt b/npc/001-1_Tulimshar/sarah.txt
index bc02bef4..7a109fa6 100644
--- a/npc/001-1_Tulimshar/sarah.txt
+++ b/npc/001-1_Tulimshar/sarah.txt
@@ -4,9 +4,19 @@
 	if (TMW_Quest >= 8) goto L_Done;
 	if (TMW_Quest == 7) goto L_Progress;
 	if (TMW_Quest == 6) goto L_Start;
+	if (TMW_Quest < 6) goto L_Convince_Sarah_First;
 
+	// If this is shown, something is wrong with the above case handling.
+	mes "Sarah looks confused.";
+	close;
+
+L_Convince_Sarah_First:
 	mes "[Sarah]";
 	mes "\"Boy, am I hungry or what!\"";
+	next;
+	mes "\"The girl suddenly looks at you suspiciously.\"";
+	next;
+	mes "\"My mommy says not to talk to strangers!\"";
 	close;
 
 L_Start:
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index b2f2e98b..ffd05162 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -4,10 +4,19 @@
 	if (TMW_Quest >= 10) goto L_Done;
 	if (TMW_Quest == 9) goto L_Progress;
 	if (TMW_Quest == 8) goto L_Start;
+	if (TMW_Quest < 8) goto L_Convince_Vincent_First;
 
+	// If this happens, something is wrong with the above code.
+	mes "Vincent looks confused.";
+	close;
+
+L_Convince_Vincent_First:
 	mes "[Vincent]";
 	mes "\"I'm making an action figure.  I'm almost done with it.\"";
+	mes "";
+	mes "Vincent seems distracted with his near-completed figurine for now.";
 	close;
+	
 
 L_Start: