Luca: Restore teaching Focus, but not brawling.

Defocusing is still using the debug trick.

1 files changed, 123 insertions, 124 deletions

diff --git a/npc/002-1/luca.txt b/npc/002-1/luca.txt
index 9821ca9a..078cae35 100644
--- a/npc/002-1/luca.txt
+++ b/npc/002-1/luca.txt
@@ -1,97 +1,45 @@
 
 002-1,112,26,0	script	Luca	NPC102,{
-    @Exp_BRAWLING = 2000;
-
     if (BaseLevel >= 35) goto L_Teach;
 
     if (BaseLevel >= 25) goto L_Teach_soon;
 
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Ouch! It hurts, this wound I got from battle.\"";
     next;
     menu "Tell me about it",L_Exp,"Nevermind",L_Nev;
 
 L_Exp:
-    mes "[Luca the Hunter]";
+    mesn l("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 "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Then, out of a cave came a BLACK one! I had NEVER seen it before!\"";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("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...\"";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Oh man! My pockets have been ripped clean off!\"";
     goto L_close;
 
 L_Nev:
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Hmpf!\"";
     goto L_close;
 
 L_Teach_soon:
-    mes "[Luca the Hunter]";
+    mesn l("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?\"";
     goto L_close;
 
-// FIXME Placeholder
 L_Teach:
-    mesn;
-    mesq l("Sorry %%i I am really really REALLY busy right now. Maybe later, when I find my toolset, we can start focusing on something.");
-    if (!getskilllv(SKILL_POOL)) close;
-    .@t=getactivatedpoolskilllist();
-    mes "";
-    mes l("Focus list:");
-    mesc l("%s : %s", l("Mallard's Eye"),
-          (isfocused(SKILL_MALLARDS_EYE) ? l("Yes") : l("No")));
-    mesc l("%s : %s", l("Brawling"),
-          (isfocused(SKILL_BRAWLING) ? l("Yes") : l("No")));
-    mesc l("%s : %s", l("Speed"),
-          (isfocused(SKILL_SPEED) ? l("Yes") : l("No")));
-    mesc l("%s : %s", l("Resist Ailment"),
-          (isfocused(SKILL_RESIST_POISON) ? l("Yes") : l("No")));
-    mesc l("%s : %s", l("Astral Soul"),
-          (isfocused(SKILL_ASTRAL_SOUL) ? l("Yes") : l("No")));
-    mesc l("%s : %s", l("Raging"),
-          (isfocused(SKILL_RAGING) ? l("Yes") : l("No")));
-    menuint
-        l("Back"), -3,
-        rif(getskilllv(SKILL_MALLARDS_EYE),
-            l("Toggle Focus - Mallards Eye")), SKILL_MALLARDS_EYE,
-        rif(getskilllv(SKILL_BRAWLING),
-            l("Toggle Focus - Brawling")), SKILL_BRAWLING,
-        rif(getskilllv(SKILL_SPEED),
-            l("Toggle Focus - Speed")), SKILL_SPEED,
-        rif(getskilllv(SKILL_RESIST_POISON),
-            l("Toggle Focus - Resist Ailment")), SKILL_RESIST_POISON,
-        rif(getskilllv(SKILL_ASTRAL_SOUL),
-            l("Toggle Focus - Astral Soul")), SKILL_ASTRAL_SOUL,
-        rif(getskilllv(SKILL_RAGING),
-            l("Toggle Focus - Raging")), SKILL_RAGING;
-    mes "";
-    switch (@menuret) {
-    case -3: close;
-    default:
-        if (FOCUSING & getpoolskillFID(@menuret)) {
-            unpoolskill(@menuret);
-            mesc "Focus removed", 1;
-        } else {
-            .@s = poolskill(@menuret);
-            if (.@s)
-                mesc "Focus added", 2;
-            else
-                mesc sprintf("Impossible to focus. You can only focus %d skills at a time.", .@t), 1;
-        }
-    }
-    goto L_Teach;
-    /*
     if (getskilllv(SKILL_POOL)) goto L_Teachmore;
 
-    mes "[Luca the Hunter]";
+    mesn l("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 "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"If you want, I can help with that!\"";
     next;
     menu
@@ -99,10 +47,10 @@ L_Teach:
         "I'm not interested.", L_Nev;
 
 L_Next:
-    mes "[Luca the Hunter]";
+    mesn l("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 "[Luca the Hunter]";
+    mesn l("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;
     menu
@@ -115,43 +63,43 @@ L_Next:
 L_Teach0_follow:
     if (getskilllv(SKILL_POOL)) goto L_Teachmore;
 
-    mes "[Luca the Hunter]";
+    mesn l("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 "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"So I'm going to ask you some easy questions.\"";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     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]";
+    input .@answer$;
+    if (.@answer$ != "Phaet" && .@answer$ != "phaet") goto L_wronganswer;
+    mesn l("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 @answer$;
-    if (@answer$ != "Pachua" && @answer$ != "pachua") goto L_wronganswer;
-    mes "[Luca the Hunter]";
+    input .@answer$;
+    if (.@answer$ != "Pachua" && .@answer$ != "pachua") goto L_wronganswer;
+    mesn l("Luca the Hunter");
     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]";
+    input .@answer$;
+    if (.@answer$ != "Merlin" && .@answer$ != "merlin") goto L_wronganswer;
+    mesn l("Luca the Hunter");
     mes "Luca laughs in excitement.";
     mes "\"All right! You're the real thing, my friend!\"";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Now stand over there. This should only take a second...\"";
     mes "He takes off a pendant he is wearing and holds it up.";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"See that fang at the end of the chain? Keep staring at it.\"";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("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 "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "The world slows down around you as you focus on the pendant going back...";
     next;
     mes "and forth...";
@@ -166,27 +114,27 @@ L_Teach0_follow:
     next;
     mes "You feel relaxed.";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("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 "[Luca the Hunter]";
+    mesn l("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]";
-    updateskill SKILL_POOL, 1;
+    learnskill SKILL_POOL, 1;
     getexp 10000, 0;
     next;
     goto L_Teachmore2;
 
 L_wronganswer:
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"No, that was wrong. I suppose you're not as experienced as I thought you'd be.\"";
     goto L_close;
 
 L_Explain:
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Alright, what do you want to know?\"";
     next;
     goto L_Explain_loop;
@@ -199,69 +147,118 @@ L_Explain_loop:
         "Thanks, I think I got it!", L_Next;
 
 L_explain_focus:
-    mes "[Luca the Hunter]";
+    mesn l("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 Auldsbels' head is big enough for that! So you have to focus.\"";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("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]";
+    mesn l("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]";
+    mesn l("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.\"";
+        mesq l("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 what your focus is, you have to forget whatever else you've focused on.\"";
+        mesq l("Right now you can only focus on one thing at a time. So if you want to change what your focus is, 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.\"";
+        mesq l("You can focus on %d skills right now.", getskilllv(SKILL_POOL));
     next;
-    mes "[Luca the Hunter]";
-    mes "\"You can come back to me to focus or unfocus a skill whenever you want, I'm here all day.\"";
+    mesn l("Luca the Hunter");
+    mesq l("You can come back to me to focus or unfocus a skill whenever you want, I'm here all day.");
     next;
-    mes "\"For unfocusing you need to bring a potion; a special potion. That potion is not the easiest to get, but I am sure you are able to.\"";
+    mesq l("For unfocusing you need to bring a potion; a special potion. That potion is not the easiest to get, but I am sure you are able to.");
     next;
     goto L_Explain_loop;
 
 L_explain_skills:
-    mes "[Luca the Hunter]";
+    mesn l("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]";
+    mesn l("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]";
+    mesn l("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]";
+    mesn l("Luca the Hunter");
     mes "\"Other than that, just ask around! There have to be some people who can teach you something...\"";
     next;
     goto L_Explain_loop;
 
 L_explain_work:
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Well, skills allow you to be better in some things, or allow to do what you couldn't do without them. When you've learned a skill and are focusing on it, then it affects what you do.\"";
     next;
-    mes "[Luca the Hunter]";
+    mesn l("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.\"";
+    mesn l("Luca the Hunter");
+    mes "\"My old teacher always called that getting `skill points' and that you can see them with [F5], whoever that is. And something about a limit on how many points can be acquired.\"";
+    next;
+    mesn l("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;
-    //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]";
+    mesn l("Luca the Hunter");
     mes "\"She always would have one cactus potion too many... but she was an amazing teacher.\"";
     mes "He nods emphatically.";
     next;
     goto L_Explain_loop;
 
+// FIXME Placeholder
 L_Teachmore:
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Good to see you again!\"";
     next;
+    mesn;
+    mesq l("Sorry %%i I am really really REALLY busy right now. Maybe later, when I find my toolset, we can start focusing on something.");
+    if (!getskilllv(SKILL_POOL)) close;
+    .@t=getactivatedpoolskilllist();
+    mes "";
+    mes l("Focus list:");
+    mesc l("%s : %s", l("Mallard's Eye"),
+          (isfocused(SKILL_MALLARDS_EYE) ? l("Yes") : l("No")));
+    mesc l("%s : %s", l("Brawling"),
+          (isfocused(SKILL_BRAWLING) ? l("Yes") : l("No")));
+    mesc l("%s : %s", l("Speed"),
+          (isfocused(SKILL_SPEED) ? l("Yes") : l("No")));
+    mesc l("%s : %s", l("Resist Ailment"),
+          (isfocused(SKILL_RESIST_POISON) ? l("Yes") : l("No")));
+    mesc l("%s : %s", l("Astral Soul"),
+          (isfocused(SKILL_ASTRAL_SOUL) ? l("Yes") : l("No")));
+    mesc l("%s : %s", l("Raging"),
+          (isfocused(SKILL_RAGING) ? l("Yes") : l("No")));
+    menuint
+        l("Back"), -3,
+        rif(getskilllv(SKILL_MALLARDS_EYE),
+            l("Toggle Focus - Mallards Eye")), SKILL_MALLARDS_EYE,
+        rif(getskilllv(SKILL_BRAWLING),
+            l("Toggle Focus - Brawling")), SKILL_BRAWLING,
+        rif(getskilllv(SKILL_SPEED),
+            l("Toggle Focus - Speed")), SKILL_SPEED,
+        rif(getskilllv(SKILL_RESIST_POISON),
+            l("Toggle Focus - Resist Ailment")), SKILL_RESIST_POISON,
+        rif(getskilllv(SKILL_ASTRAL_SOUL),
+            l("Toggle Focus - Astral Soul")), SKILL_ASTRAL_SOUL,
+        rif(getskilllv(SKILL_RAGING),
+            l("Toggle Focus - Raging")), SKILL_RAGING;
+    mes "";
+    switch (@menuret) {
+    case -3: close;
+    default:
+        if (FOCUSING & getpoolskillFID(@menuret)) {
+            unpoolskill(@menuret);
+            mesc "Focus removed", 1;
+        } else {
+            .@s = poolskill(@menuret);
+            if (.@s)
+                mesc "Focus added", 2;
+            else
+                mesc sprintf("Impossible to focus. You can only focus %d skills at a time.", .@t), 1;
+        }
+    }
+    goto L_Teachmore;
+    /*
     goto L_Teachmore2;
 
 L_Teachmore2:
@@ -366,7 +363,7 @@ L_Unfocus:
 
     if (MAGIC_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE) goto L_Nopotion;
 
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Unfocusing 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.\"";
@@ -382,7 +379,7 @@ L_Unfocus:
         "Alright, be right back!", L_close;
 
 L_Nopotion:
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Hey, you really need that dementia potion for unfocusing.\"";
     next;
     mes "\"Come back when you've found a suitable alchemist who can mix such a potion.\"";
@@ -390,7 +387,7 @@ L_Nopotion:
     goto L_Teachmore2;
 
 L_Unfocus_menu:
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"Ahh, I see you have a dementia potion.\"";
     next;
     mes "\"What skill would you like to unfocus?\"";
@@ -424,31 +421,31 @@ L_Focus_overview:
     getactivatedpoolskilllist;
 
     if (@skilllist_count != 0) goto L_Focus_overview1;
-    mes "[Luca the Hunter]";
+    mesn l("Luca the Hunter");
     mes "\"You aren't focused on a skill at the moment.\"";
     next;
     goto L_Teachmore2;
 
 L_Focus_overview1:
-    mes "[Luca the Hunter]";
-    @message$ = "\"At the moment you are focused on ";
+    mesn l("Luca the Hunter");
+    .@message$ = "\"At the moment you are focused on ";
     goto L_Focus_overview2;
 
 L_Focus_overview2:
     @skilllist_count = @skilllist_count-1;
-    @message$ = @message$ + @skilllist_name$[@skilllist_count];
+    .@message$ = .@message$ + @skilllist_name$[@skilllist_count];
     if (@skilllist_count == 0) goto L_Focus_overview3;
-    @message$ = @message$ + ", ";
+    .@message$ = .@message$ + ", ";
     goto L_Focus_overview2;
 
 L_Focus_overview3:
-    @message$ = @message$ + ".\"";
-    mes @message$;
+    .@message$ = .@message$ + ".\"";
+    mes .@message$;
     next;
     goto L_Teachmore2;
 
 L_Teach_brawling:
-    mes "[Luca the Hunter]";
+    mesn l("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.";
@@ -465,12 +462,12 @@ L_Teach_brawling:
     @SUP_id = SKILL_BRAWLING;
     @SUP_lvl = 1;
     @SUP_name$ = "Brawling";
-    @SUP_xp = @Exp_BRAWLING;
+    @SUP_xp = .Exp_BRAWLING;
     callfunc "SkillUp";
     goto L_close;
 
 L_Teach_nothing:
-    mes "[Luca the Hunter]";
+    mesn l("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.\"";
@@ -483,9 +480,6 @@ L_close:
     @SUP_lvl = 0;
     @SUP_name$ = "";
     @SUP_xp = 0;
-    @Exp_BRAWLING = 0;
-    @answer$ = "";
-    @message$ = "";
     cleararray @choices[0], 0, 4;
     cleararray @choice$[0], "", 4;
     @choice_nr = 0;
@@ -497,4 +491,9 @@ L_close:
     @C_nvm = 0;
     @C_focusoverview = 0;
     close;
+
+OnInit:
+    .Exp_BRAWLING = 2000;
+    .distance=5;
+    end;
 }