4 files changed, 27 insertions, 2 deletions
diff --git a/world/map/npc/commands/_import.txt b/world/map/npc/commands/_import.txt
index 6e2f0cc2..0b28a3ea 100644
--- a/world/map/npc/commands/_import.txt
+++ b/world/map/npc/commands/_import.txt
@@ -22,3 +22,4 @@ npc: npc/commands/divorce.txt
 npc: npc/commands/exp.txt
 npc: npc/commands/dailypoints.txt
 npc: npc/commands/mobpoints.txt
+npc: npc/commands/labyrinth-reset.txt
diff --git a/world/map/npc/commands/destroynpc.txt b/world/map/npc/commands/destroynpc.txt
index 1ebede9e..552f9693 100644
--- a/world/map/npc/commands/destroynpc.txt
+++ b/world/map/npc/commands/destroynpc.txt
@@ -22,7 +22,7 @@ L_Confirm:
     end;
 
 L_Failed:
-    message strcharinfo(0), "destroynpc : Impossible to find the target npc. Did you try putting the name in \"quotation marks\"? Some npcs also have an invisible postfix in their name, ie `#_M`.";
+    message strcharinfo(0), "destroynpc : Impossible to find the target npc. Did you try putting the name in \"quotation marks\"? Some npcs also have an invisible postfix in their name, ie `#barrier`.";
     end;
 
 L_GM:
diff --git a/world/map/npc/commands/hug.txt b/world/map/npc/commands/hug.txt
index f97c81e4..af8bd6e1 100644
--- a/world/map/npc/commands/hug.txt
+++ b/world/map/npc/commands/hug.txt
@@ -18,8 +18,9 @@
     close;
 
 OnInit:
-    set .tree_id, getnpcid("#DruidTree0#_M");
+    set .tree_id, getnpcid("#DruidTree0");
     registercmd "*hugs", strnpcinfo(0); // eq: /me hugs (target)
     registercmd "*hugs*", strnpcinfo(0); // eq: /me hugs
+    set .IS_MAGIC, 1;
     end;
 }
diff --git a/world/map/npc/commands/labyrinth-reset.txt b/world/map/npc/commands/labyrinth-reset.txt
new file mode 100644
index 00000000..e95eb3ee
--- /dev/null
+++ b/world/map/npc/commands/labyrinth-reset.txt
@@ -0,0 +1,23 @@
+-|script|labyrinth-reset|32767
+{
+    if (GM < 60) goto L_GM;
+    gmlog "(Labyrinth XP Chest state reset) @labyrinth-reset " + @args$;
+    wgm "labyrinth-reset : " + strcharinfo(0) + " invoked @labyrinth-reset (Labyrinth XP Chest state cleaner) " + @args$;
+    set .@i, 0;
+    goto L_CleanSlot;
+
+L_CleanSlot:
+    set $DD5A_EXPCHEST$[.@i], "";
+    set .@i, (.@i + 1);
+    if (.@i > 99) message strcharinfo(0), "labyrinth-reset : complete!";
+    if (.@i > 99) end;
+    goto L_CleanSlot;
+
+L_GM:
+    message strcharinfo(0), "labyrinth-reset : GM command is level 60, but you are level " + GM;
+    end;
+
+OnInit:
+    registercmd chr(ATCMD_SYMBOL) + "labyrinth-reset", strnpcinfo(0);
+    end;
+}