initial commit for magic v3

Fix Druid Tree and add hug to TMW

1 files changed, 10 insertions, 6 deletions

diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt
index 129aa5c0..dfd114d2 100644
--- a/world/map/npc/items/magic_gm_top_hat.txt
+++ b/world/map/npc/items/magic_gm_top_hat.txt
@@ -1,21 +1,25 @@
-function|script|ActivateMagicGMTophat
+-|script|ActivateMagicGMTophat|32767
 {
-    if (getgmlevel() < 60) goto L_Return;
+    if (GM < get(.killthegm, "GM") && GM < G_SYSOP) end;
+    if (getequipid(equip_head) != 888) end;
     getinventorylist;
     if ((checkweight("MurdererCrown", 1) == 0) || (@inventorylist_count == 100))
         goto L_Inventory;
     // Get the current reward of the event. This may be changed later
     getitem "MurdererCrown", 1;
+    // Set HP and SP to max
+    heal MaxHp, MaxSp;
     // Display an effect
     misceffect FX_CHANNELLING_CAST, strcharinfo(0);
     // Log the usage of this spell
     gmlog strcharinfo(0)+" used the Magic GM Top Hat.";
-    return;
+    end;
 
 L_Inventory:
     message strcharinfo(0), "You cannot create this item. You're too heavy or you don't have a free slot.";
-    return;
+    end;
 
-L_Return:
-    return;
+OnInit:
+    registercmd "#pullrabbit", strnpcinfo(0);
+    end;
 }