Improve @music

1 files changed, 9 insertions, 7 deletions

diff --git a/npc/commands/music.txt b/npc/commands/music.txt
index 023a2b098..a89e00b22 100644
--- a/npc/commands/music.txt
+++ b/npc/commands/music.txt
@@ -28,24 +28,26 @@ OnCall:
 
     if (.@m$ == "Not found")
     {
-        .@m$ = implode(.@atcmd_parameters$[0], " ");
+        //.@m$ = implode(.@atcmd_parameters$[0], " ");
+        dispbottom "Invalid music key. Current accepted values are:";
+        dispbottom "ship, city, fun, surreal, magic, forest, mythica, acid, misuse, prelude, sunrise, peace";
+    } else {
+        changemusic .@map$, .@m$;
     }
-
-    changemusic .@map$, .@m$;
     end;
 
 OnInit:
     bindatcmd "music", "@music::OnCall", 80, 80, 1;
 
     .hash = htnew; // create hashtable
-    htput(.hash, "forest",     "bartk - in the forest of the birches.ogg");
-    htput(.hash, "adventure",  "bartk - the adventure begins.ogg");
+    htput(.hash, "ship",       "bartk - in the forest of the birches.ogg");
+    htput(.hash, "city",       "bartk - the adventure begins.ogg");
     htput(.hash, "fun",        "eric matyas - ghoulish fun.ogg");
     htput(.hash, "surreal",    "eric matyas - surreal place.ogg");
     htput(.hash, "magic",      "magick - real.ogg");
-    htput(.hash, "forest2",    "dariunas - the forest.ogg");
+    htput(.hash, "forest",     "dariunas - the forest.ogg");
     htput(.hash, "mythica",    "mythica.ogg");
-    htput(.hash, "3b5",        "3b5.ogg");
+    htput(.hash, "acid",       "3b5.ogg");
     htput(.hash, "misuse",     "misuse.ogg");
     htput(.hash, "prelude",    "water_prelude.ogg");
     htput(.hash, "sunrise",    "tws_birds_in_the_sunrise.ogg");