1 files changed, 23 insertions, 13 deletions

diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index 30877bce8..faf6e5c89 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -519,17 +519,32 @@ function luaAssignTask5 {
     next;
     mesn;
     mesq l("The Professor is so wise that even if you fall asleep while listening to his invisible speech, you'll still learn!!");
-    tutmes l("The professor is always on the Magic Council, the northmost building. If you sit on the area in front of him (marked with a red rug), you'll gain Experience, even while AFK.");
     next;
 
-    mesc l("Who is the Professor? I've heard he was the father of a certain Arthur... No idea.");
-    mesc l("But who cares? We need to save the Professor! During night, monsters are stronger, so they'll probably attack at night time!");
-    mesc l("During night the professor also goes to the Magic Academy, using the hidden north port, on the building to left of the Magic Council...");
+    select
+        l("Who is this professor?"),
+        l("What can I do?");
+    mes "";
+    if (@menu == 1) {
+        mesn;
+        mesq l("Who is the Professor? I've heard he was the father of a certain Arthur... No idea.");
+        tutmes l("The professor is always on the Magic Council, the northmost building. If you sit on the area in front of him (marked with a red rug), you'll gain Experience, even while AFK.");
+        next;
+        mesn;
+        mesq l("But who cares? We need to save the Professor! During night, monsters are stronger, so they'll probably attack at night time!");
+    } else {
+        mesn;
+        mesq l("You need to save the Professor! During night, monsters are stronger, so they'll probably attack at night time!");
+    }
+    next;
+    mesn;
+    mesq l("During night the professor also goes to the Magic Academy, using the hidden north port, on the building to left of the Magic Council...");
     if (!is_night())
         mesc l("However, it's also possible they're there already.");
     next;
 
-    mesc l("Here, I'll give you a Mercenary Box. Open it, get the mercenary card, and summon it when needed. You absolutely CANNOT let the Professor be assassinated!");
+    mesn;
+    mesq l("Here, I'll give you a Mercenary Box. Open it, get the mercenary card, and summon it when needed. You absolutely CANNOT let the Professor be assassinated!");
     tutmes l("Explain briefly about mercenaries... I mean, we have a Mercenaries section on @tutorial right?"); // <-- TODO and add on the wiki as well!
     tutmes l("You can only have one mercenary active at a time, they die and will leave after 10 minutes - logged in or not.");
     tutmes l("Still, they can be useful when you're trying to solo a boss and need help. The number of stars on the card is the strength and rarity. Use them wisely.");
@@ -540,16 +555,17 @@ function luaAssignTask5 {
 
     next;
     getitem MercBoxAA, 1;
+    LUA_ASKED_TO_SAVE_PROFESSOR=true;
     return;
 } // Your Report, the plan
 
 function luaTask5 {
-    msObjective(false, l("* Defeat the Assassin"));
+    msObjective(!LUA_ASKED_TO_SAVE_PROFESSOR, l("* Defeat the Assassin"));
     return;
 }
 
 function luaCheckTask5 {
-    return (false);
+    return (!LUA_ASKED_TO_SAVE_PROFESSOR);
 }
 
 
@@ -571,12 +587,6 @@ L_Finish:
     mesq l("I'll also give you a @@. Open it to get a random Mercenary Card.", getitemlink(MercBoxAA));
     next;
     mesn;
-    mesq l("You can only have one mercenary active at a time, they die and will leave after 10 minutes - logged in or not.");
-    next;
-    mesn;
-    mesq l("Still, they can be useful when you're trying to solo a boss and need help. The number of stars on the card is the strength and rarity. Use them wisely.");
-    next;
-    mesn;
     mesq l("Ah, you might have seen a treasure chest on the mines. There are several of these chests to loot, and loot again! Here is a @@. Try it!", getitemlink(TreasureKey));
     next;
 L_Complete: