3 files changed, 45 insertions, 3 deletions
diff --git a/npc/commands/exp.txt b/npc/commands/exp.txt
index 763653f94..7f9d15d6f 100644
--- a/npc/commands/exp.txt
+++ b/npc/commands/exp.txt
@@ -18,6 +18,18 @@ OnCall:
     getexp .@d, 0;
     end;
 
+OnHomun:
+    if (!gethominfo(0)) {
+        dispbottom l("No homunculus found!");
+        end;
+    }
+    .@delta$ = .@atcmd_parameters$[0];
+    .@d = atoi(.@delta$);
+
+    gethomunexp .@d;
+    end;
+
 OnInit:
     bindatcmd "getexp", "@getexp::OnCall", 5, 99, 1;
+    bindatcmd "gethexp", "@getexp::OnHomun", 99, 99, 1;
 }
diff --git a/npc/commands/ipcheck.txt b/npc/commands/ipcheck.txt
index a610c84cd..a1f9345c2 100644
--- a/npc/commands/ipcheck.txt
+++ b/npc/commands/ipcheck.txt
@@ -20,6 +20,34 @@ OnCall:
     end;
 
 OnInit:
-    bindatcmd "ipcheck", "@ipcheck::OnCall", 80, 80, 1;
+    bindatcmd "ipcheck", "@ipcheck::OnCall", 80, 100, 1;
     end;
 }
+
+// TMW2 script
+// Author: Jesusalva <admin@tmw2.org>
+//
+// @checkidle <player_name>
+// #checkidle <player_name>
+//
+// Returns user idle time in seconds.
+// Useful when the game prohibits warping to player.
+
+
+-	script	@checkidle	32767,{
+    end;
+
+OnCall:
+    if (.@atcmd_numparameters == 0)
+    	.@request$ = strcharinfo(0);
+    else
+    	.@request$ = implode(.@atcmd_parameters$, " ");
+    dispbottom strip(.@request$)+" idle time: "+checkidle(.@request$);
+    //dispbottom strcharinfo(0)+": IP "+getcharip(.@request$);
+    end;
+
+OnInit:
+    bindatcmd "checkidle", "@checkidle::OnCall", 60, 80, 1;
+    end;
+}
+
diff --git a/npc/commands/music.txt b/npc/commands/music.txt
index e419487c8..410a24421 100644
--- a/npc/commands/music.txt
+++ b/npc/commands/music.txt
@@ -29,8 +29,8 @@ OnCall:
     if (.@m$ == "Not found") {
         //.@m$ = implode(.@atcmd_parameters$[0], " ");
         dispbottom "Invalid music key. Current accepted values are:";
-        dispbottom "ship, city, ghoul, surreal, magic, forest, mythica, acid, misuse, prelude, sunrise, peace, peace2, toast, woodland2";
-        dispbottom "unforgiving, deepcave, 8bit, action, hurns, fields, tulim, candor, lof, icecave, manacave, adventure, dance";
+        dispbottom "ship, city, ghoul, surreal, magic, forest, mythica, acid, misuse, prelude, sunrise, peace, peace2, peace3, toast, woodland2";
+        dispbottom "unforgiving, deepcave, 8bit, action, hurns, fields, tulim, candor, lof, icecave, manacave, adventure, dance, academy";
     } else {
         changemusic .@map$, .@m$;
     }
@@ -53,6 +53,7 @@ OnInit:
     htput(.hash, "sunrise",    "tws_birds_in_the_sunrise.ogg");
     htput(.hash, "peace",      "peace.ogg");
     htput(.hash, "peace2",     "peace2.ogg");
+    htput(.hash, "peace3",     "peace3.ogg");
     htput(.hash, "toast",      "dragon_and_toast.ogg");
     htput(.hash, "woodland2",  "New_Woodlands.ogg");
     htput(.hash, "unforgiving","Unforgiving_Lands.ogg");
@@ -68,4 +69,5 @@ OnInit:
     htput(.hash, "adventure",  "tmw_adventure.ogg");
     htput(.hash, "manacave",   "tws_green_island.ogg");
     htput(.hash, "dance",      "dance_monster.ogg");
+    htput(.hash, "academy",    "academy_bells.ogg");
 }