Merge pull request #1 from coyotte508/master

Merge

Author: JonahStanley

scripts.js

@@ -1,5 +1,5 @@
 function require(file) {
-	return sys.eval(sys.getFileContent(file));
+    return sys["import"](file);
 }
 
 function User(id)
@@ -9,8 +9,9 @@ function User(id)
     this.channel = null;
 }
 
-require ("scripts/printer.js");
-commands = require ("scripts/commands.js");
+require ("utilities.js");
+require ("printer.js");
+commands = require ("commands.js");
 
 SESSION.identifyScriptAs("RPG Script");
 
@@ -31,7 +32,9 @@ function testClearChat() {
 poScripts = ({
 
 afterLogIn : function(source) {
-
+    var user = SESSION.users(source);
+    user.print("Abra", "Type /commands to get a list of commands!");
+    user.print("blank", "");
 }
 ,
 beforeBattleMatchup : function() {
@@ -41,7 +44,7 @@ beforeBattleMatchup : function() {
 beforeChatMessage : function(src, msg, chan) {
     SESSION.users(src).channel = chan;
 
-    if (msg.substr(0, 1) == "/") {
+    if (msg.substr(0, 1) === "/") {
         sys.stopEvent();
         testClearChat();
 
@@ -60,4 +63,4 @@ beforeChatMessage : function(src, msg, chan) {
     }
 }
 
-});
+});

scripts/commands.js

@@ -4,13 +4,26 @@ var handleCommand = function(src, command, data, tar, channel) {
     var user = SESSION.users(src);
 
     if (command in commands) {
-        commands[command]({"user":user, "data":data, "target":tar, "channel":channel});
+        commands[command][1]({"user":user, "data":data, "target":tar, "channel":channel});
     }
 };
 
-commands['help'] = function(params) {
+commands['commands'] = ["get a list of commands.", function(params) {
+    var user = params.user;
+    //user.print("blank","");
+    user.print("***", "Commands");
+    user.print("blank","");
+
+    for(var command in commands) {
+        user.print("/"+command, commands[command][0]);
+    }
+
+    user.print("blank", "");
+}];
+
+commands['help'] = ["get started.", function(params) {
     var user = params.user;
     user.print("Meowth", "This is a RPG server in construction! Nothing to see just yet, be patient ~");
-};
+}];
 
 ret = ({handleCommand: handleCommand});

scripts/printer.js

@@ -24,17 +24,30 @@ function is_undefined(val) {
 };
 
 User.prototype.print = function(bot, message) {
-    var pokemon = sys.pokemon(bot);
+    if (bot === "blank") {
+        sys.sendMessage(this.id, message);
+        return;
+    }
+    if (bot === "***") {
+        sys.sendMessage(this.id, "*** " + message + " ***");
+        return;
+    }
+
+    var pokemon = sys.pokeNum(bot);
     var color;
 
     if (!is_undefined(pokemon)) {
         color = colors[sys.pokeType1(pokemon)];
     }
 
+    if (bot.startsWithLetter()) {
+        bot = "±" + bot;
+    }
+
     if (is_undefined(color)) {
-        sys.sendMessage(this.id, "±" + bot + ": " + message, this.channel);
+        sys.sendMessage(this.id, bot + ": " + message, this.channel);
     } else {
         sys.sendHtmlMessage(this.id, "<span style='color: " + color + "'><timestamp/>"
-                            + "<b>±" + bot +  ":</b></span> " + message);
+                            + "<b>" + bot +  ":</b></span> " + message);
     }
 };

scripts/utilities.js

@@ -0,0 +1,3 @@
+String.prototype.startsWithLetter = function() {
+    return this[0].toLowerCase() !== this[0].toUpperCase();
+}