initial commit for magic v3

Fix Druid Tree and add hug to TMW

1 files changed, 4 insertions, 4 deletions

diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 1f8f19f4..d5604f93 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -78,7 +78,7 @@ L_Start:
     mes "\"Various wands and staffs are found throughout the land with many different strengths and weaknesses.\"";
     mes "\"To use the wand you need to have it equipped and speak the incantation to let it tap into your mana.\"";
     mes "\"As the power of your magic grows so will the spells you can cast.\"";
-    mes "\"Lets start with a basic wand attack. " + getspellinvocation("wand") + "\"";
+    mes "\"Lets start with a basic wand attack. " + get(.invocation$, "spell-wand") + "\"";
     mes "\"Equip the wand and lets try out that spell.\"";
     mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
     mes "\"Speak to me again once you've cast the spell.\"";
@@ -86,7 +86,7 @@ L_Start:
 
 L_Started:
     mes "[Morgan]";
-    mes "\"Lets start with a basic wand attack. " + getspellinvocation("wand") + "\"";
+    mes "\"Lets start with a basic wand attack. " + get(.invocation$, "spell-wand") + "\"";
     mes "\"Equip the wand and lets try out that spell.\"";
     mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
     mes "\"Speak to me again once you've cast the spell.\"";
@@ -95,7 +95,7 @@ L_Started:
 L_CastOnce:
     mes "[Morgan]";
     mes "\"Ok, good job! Looks like you have good mana flow.\"";
-    mes "\"Onto the next lesson. Now that you have " + getspellinvocation("wand") + " cast,\"";
+    mes "\"Onto the next lesson. Now that you have " + get(.invocation$, "spell-wand") + " cast,\"";
     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.).\"";
@@ -106,7 +106,7 @@ L_CastOnce:
 
 L_LearningDone:
     mes "[Morgan]";
-    mes "\"" + getspellinvocation("wand") + " is a basic wand attack.\"";
+    mes "\"" + get(.invocation$, "spell-wand") + " is a basic wand attack.\"";
     mes "\"A Wand must be equipped to use the spell.\"";
     mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
     mes "\"I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.\"";