Tweak test and bugfix

1 files changed, 7 insertions, 2 deletions

diff --git a/npc/025-2-4/tree.txt b/npc/025-2-4/tree.txt
index 3a3f22173..08dc03f1c 100644
--- a/npc/025-2-4/tree.txt
+++ b/npc/025-2-4/tree.txt
@@ -14,23 +14,24 @@
     next;
     mesc l("This might be the place of a great secret, but yet, all you can do is stare.");
     next;
-    if (!true) manatreeOff(); // TODO: Official rumors about the Mana Tree
+    if (getq(FortressQuest_ManaTree) < 2) manatreeOff();
     else if ($AEGIS_HOLDER$ == "" && @manacool < gettimetick(2)) manatreeAegis();
     else manatreeAgain();
 
-    next;
     setpcblock(PCBLOCK_HARD, false);
     closeclientdialog;
     close;
 
 function manatreeOff {
     mesc l("...for now.");
+    next;
     return;
 }
 
 function manatreeAgain {
     mesc l("...for now.");
     // TODO: getitem Manapple, 1; // Maybe can obtain one daily/weekly?
+    next;
     return;
 }
 
@@ -43,6 +44,10 @@ function manatreeAegis {
         percentheal -20, -50;
         return;
     }
+    if (.@prayer$ == "") {
+        mesc l("...Alright then.");
+        return;
+    }
     @manacool=gettimetick(2)+30;
     .@cid=getcharid(3, .@prayer$);
     if (.@cid < 1) {