Merge pull request #361 from nashley/npc/morgan_fix

Remove MorganState and SetMorganMask (non-existent functions)

3 files changed, 7 insertions, 8 deletions

diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt
index 0aa37749..4cde049b 100644
--- a/world/map/npc/029-1/liana.txt
+++ b/world/map/npc/029-1/liana.txt
@@ -8,7 +8,7 @@
 L_Talk:
     mes "[Liana]";
     mes "\"Hurnscald is a large city. I'm sure glad I live in Candor because I know where everything's at.\"";
-    if (@tutorial == 10) goto L_Hasan;
+    if (QL_BEGIN == 10) goto L_Hasan;
     goto L_Close;
 
 L_Hasan:
@@ -31,8 +31,7 @@ L_Next:
     mes "\"If Lieutenant Dausen hadn't have come along that moment, Hasan would have died that day.\"";
     mes "\"However, the scorpions poison caused a bad fever and once Hasan had recovered from that, he was even more malicious than before.\"";
     mes "She sighs.";
-    set @tutorial_tmp, 11;
-    callfunc "SetTutorialMask";
+    set QL_BEGIN, 11;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 085542ce..3f7d3e1e 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -26,7 +26,6 @@ OnInit:
 029-2,101,57,0|script|Morgan#_M|355
 {
     callfunc "PCtoNPCRange";
-    callfunc "MorganState";
     if (Int >= 5)
         goto L_Learn;
     goto L_NotMagic;
@@ -98,6 +97,9 @@ L_CastOnce:
     mes "\"Each time you attack the wand will convert a bit of you mana into a magic bolt.\"";
     mes "\"After so many attacks, you will need to recast the invocation to stay attuned to the wand.\"";
     mes "\"(Logging out will also cancel any spell effects currently active in-game.).\"";
+    next;
+    mes "\"I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.\"";
+    set QL_MORGAN, 4;
     goto L_Close;
 
 L_LearningDone:
diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt
index 43190a85..5a339049 100644
--- a/world/map/npc/items/check_wand.txt
+++ b/world/map/npc/items/check_wand.txt
@@ -48,8 +48,7 @@ L_Loop:
 L_SetWand:
     set @Wand, $@WandsPwr[@wand_loop];
     set @WandID, $@WandsAnim[@wand_loop];
-    callfunc "MorganState";
-    if (@morgan == 2)
+    if (QL_MORGAN == 2)
         goto L_SetCastOnce;
     goto L_Return;
 
@@ -60,8 +59,7 @@ L_LoopAgain:
     goto L_Loop;
 
 L_SetCastOnce:
-    set @morgan_tmp, 3;
-    callfunc "SetMorganMask";
+    set QL_MORGAN, 3;
     goto L_Return;
 
 L_Return: