11 files changed, 16 insertions, 12 deletions
diff --git a/world/map/conf/magic-level1.sex b/world/map/conf/magic-level1.sex
index 88478c82..3e673170 100644
--- a/world/map/conf/magic-level1.sex
+++ b/world/map/conf/magic-level1.sex
@@ -19,7 +19,7 @@
                     (/ spellpower 10))
                 1200
                 3
-                33)
+                (script_int caster "@WandID"))
             (CALL gain_xp 1 3)
             (ATTRIGGER
                 (CALL attack_check target)
diff --git a/world/map/data/022-1.wlk b/world/map/data/022-1.wlk
index 0ad7c21c..f84df1d7 100644
--- a/world/map/data/022-1.wlk
+++ b/world/map/data/022-1.wlk
diff --git a/world/map/data/023-1.wlk b/world/map/data/023-1.wlk
index ba88328c..e6e8cc22 100644
--- a/world/map/data/023-1.wlk
+++ b/world/map/data/023-1.wlk
diff --git a/world/map/data/023-3.wlk b/world/map/data/023-3.wlk
index 805a8bfc..b18db04b 100644
--- a/world/map/data/023-3.wlk
+++ b/world/map/data/023-3.wlk
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index b5244244..c25624cc 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -48,8 +48,9 @@ L_NotInspector:
     next;
     if (@Q_Forestbow < 1)
         goto L_Close;
-    menu
-        "I heard you aren't delivering any more living wood. Why not?", L_Next;
+    mes "I heard you aren't delivering any more living wood. Why not?";
+    next;
+    goto L_Next;
 
 L_Next:
     mes "[Jack Lumber]";
@@ -249,6 +250,7 @@ L_Shield_state_3:
 L_NohMask_Ask:
     menu
         "I'll keep that in mind.", L_Close,
+        "I heard you aren't delivering any more living wood. Why not?", L_Next,
         "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
 
 L_NohMask_Answer:
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 939f4ae2..f3f2e085 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -35,7 +35,7 @@ L_Error2:
 
 
 // Starting Barrier / Quest Entrance
-009-4.gat,37,120,0|script|#OrumCaveStartBarrier|0,1,0,
+009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0,
 {
     if (OrumQuest >= 3) close;
     if (OrumQuest == 2) goto L_Started;
@@ -51,7 +51,7 @@ L_Started:
 }
 
 // First Barrier
-009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|0,1,0,
+009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0,
 {
     if (OrumQuest >= 5) close;
 
@@ -61,7 +61,7 @@ L_Started:
 }
 
 // Second Barrier
-009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|0,1,0,
+009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0,
 {
     if (OrumQuest == 3) set OrumQuest, 4;
 
@@ -90,7 +90,7 @@ L_Advance_Quest:
 }
 
 // Third Barrier
-009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|0,1,0,
+009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0,
 {
     if (OrumQuest == 3) set OrumQuest, 4;
 
@@ -134,7 +134,7 @@ L_Advance_Quest:
 }
 
 // Ending Barrier
-009-4.gat,48,38,0|script|#OrumCaveEndBarrier|0,1,0,
+009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,1,0,
 {
     if (OrumQuest >= 11) close;
     if (OrumQuest == 3) set OrumQuest, 4;
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index 778c5111..ca28d2f7 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -1,6 +1,6 @@
 //# see detailed description at orum.txt
 
-009-4.gat,99,33,0|script|#WizardTrap|0,2,1,
+009-4.gat,99,33,0|script|#WizardTrap|127,2,1,
 {
     set @gender$, "They're";
     if (Sex == 0)
diff --git a/world/map/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt
index 0bf5d7e1..6b451f42 100644
--- a/world/map/npc/015-1/barrier.txt
+++ b/world/map/npc/015-1/barrier.txt
@@ -1,7 +1,7 @@
 // This barrier is for checking whether the player went outside after
 // progressing with the cat quest.
 
-015-1.gat,59,32,0|script|#CatOutsideBarrier|0,1,1,
+015-1.gat,59,32,0|script|#CatOutsideBarrier|127,1,1,
 {
     set @catNeedsAlone, 0;
     end;
diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt
index 4894dad8..aef0b938 100644
--- a/world/map/npc/024-2/barrier.txt
+++ b/world/map/npc/024-2/barrier.txt
@@ -1,6 +1,6 @@
 // A barrier in the magic school to keep less experienced players out of the canyon
 
-024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|0,1,1,
+024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|127,1,1,
 {
     callfunc "MorganState";
     if (@morgan >= 4)
diff --git a/world/map/npc/024-2/tyer_trigger.txt b/world/map/npc/024-2/tyer_trigger.txt
index 45218430..0feafd99 100644
--- a/world/map/npc/024-2/tyer_trigger.txt
+++ b/world/map/npc/024-2/tyer_trigger.txt
@@ -1,6 +1,6 @@
 // A man in the magic school
 
-024-2.gat,33,24,0|script|#Tyer_Trigger|0,0,1,
+024-2.gat,33,24,0|script|#Tyer_Trigger|127,0,1,
 {
     callfunc "MorganState";
     if (@morgan >= 4)
diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt
index 1b11dfc2..4d8016bb 100644
--- a/world/map/npc/items/check_wand.txt
+++ b/world/map/npc/items/check_wand.txt
@@ -33,6 +33,7 @@ function|script|CheckWand|,
 {
     setarray $@Wands, 758, 1171;
     setarray $@WandsPwr, 2, 1;
+    setarray $@WandsAnim, 35, 33;
     set @Wand, 0;
     set @wand_loop, 0;
     goto L_Loop;
@@ -44,6 +45,7 @@ L_Loop:
 
 L_SetWand:
     set @Wand, $@WandsPwr[@wand_loop];
+    set @WandID, $@WandsAnim[@wand_loop];
     callfunc "MorganState";
     if (@morgan == 2)
         goto L_SetCastOnce;