1 files changed, 9 insertions, 6 deletions

diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index e975ff98c..3513fcb5e 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -306,8 +306,11 @@ L_Task:
             goto L_Task;
         }
     } else if (.@q2 == 9) {
-        luaTask5();
-        next;
+        // Task 5 is special
+        if (!luaCheckTask5()) {
+            luaTask5();
+            next;
+        }
         if (luaCheckTask5()) {
             setq2 General_Narrator, 10;
             goto L_Finish;
@@ -548,14 +551,14 @@ function luaAssignTask5 {
 
     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("Explain briefly about mercenaries... I mean, we have a Mercenaries section on @tutorial right? I don't know much myself!"); // <-- 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.");
 
     next;
     mesn;
     mesq l("Now go! Lives are at stack!");
-    mesc l("NOTE: The Energy Ball explodes and Kills. Very. Well. Make them a priority!"), 1;
+    mesc l("NOTE: The Energy Ball explosion may instantly kill you. Make it a priority!"), 1;
 
     next;
     getitem MercBoxAA, 1;
@@ -564,12 +567,12 @@ function luaAssignTask5 {
 } // Your Report, the plan
 
 function luaTask5 {
-    mesc l("NOTE: This quest is still a work in progress. \"Bugs\" will show up on purpose.");
+    //mesc l("NOTE: This quest is still a work in progress. \"Bugs\" will show up on purpose.");
     mes "";
 
     msObjective(!LUA_ASKED_TO_SAVE_PROFESSOR, l("* Defeat the Assassin"));
     mes "";
-    mesc l("NOTE: The Energy Ball explodes and Kills. Very. Well. Make them a priority!");
+    mesc l("NOTE: The Energy Ball explosion may instantly kill you. Make it a priority!");
     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...");