You now need Grimace of Dementia to unfocus.

This could deal with #14 but I'm not sure if potion can be make.
i.e. It have a minigame which might be broken =/

1 files changed, 24 insertions, 71 deletions

diff --git a/npc/002-1/luca.txt b/npc/002-1/luca.txt
index 6d402b4c..bcf76c10 100644
--- a/npc/002-1/luca.txt
+++ b/npc/002-1/luca.txt
@@ -266,89 +266,42 @@ L_Teachmore:
         break;
     default:
         if (FOCUSING & getpoolskillFID(@menuret)) {
+            if (!countitem(GrimaceOfDementia)) goto L_Nopotion;
             unpoolskill(@menuret);
-            mesc "Focus removed", 1;
+            delitem GrimaceOfDementia, 1;
+            mesc l("Focus removed"), 1;
         } else {
             .@s = poolskill(@menuret);
             if (.@s)
-                mesc "Focus added", 2;
+                mesc l("Focus added"), 2;
             else
-                mesc sprintf("Impossible to focus. You can only focus %d skills at a time.", .@t), 1;
+                mesc l("Impossible to focus. You can only focus %d skills at a time.", .@t), 1;
         }
     }
     goto L_Teachmore;
-    /*
-L_MenuItems:
-    @menu = @menu - 1;
-    if (@choices[@menu] == 0) goto L_Nev;;
-    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_focusoverview) goto L_Focus_overview;
-    if (@choices[@menu] == @C_nvm) goto L_Nev;;
-    goto L_Nev;;
 
-L_Unfocus:
-    if (countitem("GrimaceOfDementia") > 0) goto L_Unfocus_menu;
-
-    if (MAGIC_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE) goto L_Nopotion;
-
-    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.\"";
-    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.\"";
-    MAGIC_FLAGS = MAGIC_FLAGS | MFLAG_KNOWS_UNFOCUS_RECIPE;
-    menu
-        "Ok, I will get a Grimace of Dementia potion", L_Nev;,
-        "Alright, be right back!", L_Nev;;
 
 L_Nopotion:
-    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.\"";
-    next;
-    goto L_Teachmore2;
-
-L_Unfocus_menu:
-    mesn l("Luca the Hunter");
-    mes "\"Ahh, I see you have a dementia potion.\"";
+    if (MAGIC_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE) {
+        mesn l("Luca the Hunter");
+        mesq l("Hey, you really need that dementia potion for unfocusing.");
+        next;
+        mesq l("Come back when you've found a suitable alchemist who can mix such a potion.");
+    } else {
+        mesn l("Luca the Hunter");
+        mesq l("Unfocusing is one of the harder parts though, because it is sunk in. You see?");
+        next;
+        mesq l("So to remove that mental focus we will need a special potion.");
+        next;
+        mesq l("Maybe you should consult some very skilled alchemists.");
+        next;
+        mesq l("Ah yes, of course you will need a recipe. Although the alchemist usually knows it.");
+        next;
+        mesq l("The potion is called Grimace of Dementia. So the alchemist will know for sure.");
+        MAGIC_FLAGS = MAGIC_FLAGS | MFLAG_KNOWS_UNFOCUS_RECIPE;
+    }
     next;
-    mes "\"What skill would you like to unfocus?\"";
-
-    getactivatedpoolskilllist;
-
-    @skilllist_id[@skilllist_count] = 0;
-    @skilllist_name$[@skilllist_count] = "Nevermind";
-    @skilllist_name$[@skilllist_count + 1] = "";
-    menu
-        @skilllist_name$[0], L_MenuItems2,
-        @skilllist_name$[1], L_MenuItems2,
-        @skilllist_name$[2], L_MenuItems2,
-        @skilllist_name$[3], L_MenuItems2,
-        @skilllist_name$[4], L_MenuItems2,
-        @skilllist_name$[5], L_MenuItems2,
-        @skilllist_name$[6], L_MenuItems2,
-        @skilllist_name$[7], L_MenuItems2;
-
-L_MenuItems2:
-    @menu = @menu - 1;
-    if (@skilllist_id[@menu] == 0) goto L_Teachmore2;
-
-    if (countitem("GrimaceOfDementia") == 0) goto L_Nopotion;
-    delitem "GrimaceOfDementia", 1;
-
-    unpoolskill @skilllist_id[@menu];
-    goto L_Nev;;
-    */
+    goto L_Teachmore;
 
 L_Teach_brawling:
     mesn l("Luca the Hunter");