Made changes to idmapper that might help alleviate issue101 (more people need to run it to make sure). Moved around default command modules to be more logically named and distributed.

game/gamesrc/commands/default/general.py

@@ -12,6 +12,29 @@ from src.utils import utils
 
 from game.gamesrc.commands.default.muxcommand import MuxCommand
 
+class CmdHome(MuxCommand):
+    """
+    home
+
+    Usage:
+      home 
+
+    Teleports the player to their home.
+    """
+    
+    key = "home"
+    permissions = "cmd:home"
+
+    def func(self):
+        "Implement the command"
+        caller = self.caller        
+        home = caller.home
+        if not home:
+            caller.msg("You have no home set.")
+        else:
+            caller.move_to(home)
+            caller.msg("There's no place like home ...")
+
 class CmdLook(MuxCommand):
     """
     look
@@ -107,8 +130,8 @@ class CmdNick(MuxCommand):
     if you want to change the inherent aliases of an object,
     use the @alias command instead. 
     """
-    key = "alias"
-    aliases = ["nick"]
+    key = "nickname"
+    aliases = ["nick, @nick, alias"]
     
     def func(self):
         "Create the nickname"
@@ -164,104 +187,6 @@ class CmdNick(MuxCommand):
             err = "Set %salias '%s' = '%s'" % (atype, alias, rstring)
         caller.msg(err.capitalize())
 
-class CmdEmit(MuxCommand):                    
-    """
-    @emit
-
-    Usage:
-      @emit[/switches] [<obj>, <obj>, ... =] <message>
-      @remit           [<obj>, <obj>, ... =] <message> 
-      @pemit           [<obj>, <obj>, ... =] <message> 
-
-    Switches:
-      room : limit emits to rooms only 
-      players : limit emits to players only 
-      contents : send to the contents of matched objects too
-      
-    Emits a message to the selected objects or to
-    your immediate surroundings. If the object is a room,
-    send to its contents. @remit and @pemit are just 
-    limited forms of @emit, for sending to rooms and 
-    to players respectively.
-    """
-    key = "@emit"
-    aliases = ["@pemit", "@remit"]
-    permissions = "cmd:emit"
-    help_category = "Comms"
-
-    def func(self):
-        "Implement the command"
-        
-        caller = self.caller
-        args = self.args
-
-        if not args:
-            string = "Usage: "
-            string += "\n@emit[/switches] [<obj>, <obj>, ... =] <message>"
-            string += "\n@remit           [<obj>, <obj>, ... =] <message>"
-            string += "\n@pemit           [<obj>, <obj>, ... =] <message>"
-            caller.msg(string)
-            return 
-
-        rooms_only = 'rooms' in self.switches
-        players_only = 'players' in self.switches
-        send_to_contents = 'contents' in self.switches
-        
-        # we check which command was used to force the switches
-        if self.cmdstring == '@remit':
-            rooms_only = True
-        elif self.cmdstring == '@pemit':
-            players_only = True
-
-        if not self.rhs:
-            message = self.args
-            objnames = [caller.location.key]
-        else:
-            message = self.rhs
-            objnames = self.lhslist
-            
-        # send to all objects
-        for objname in objnames:
-            obj = caller.search(objname, global_search=True)
-            if not obj:
-                return 
-            if rooms_only and not obj.location == None:
-                caller.msg("%s is not a room. Ignored." % objname)
-                continue
-            if players_only and not obj.has_player:
-                caller.msg("%s has no active player. Ignored." % objname)
-                continue
-            if has_perm(caller, obj, 'send_to'):
-                obj.msg(message)
-                if send_to_contents:
-                    for content in obj.contents:
-                        content.msg(message)
-                    caller.msg("Emitted to %s and its contents." % objname)
-                else:
-                    caller.msg("Emitted to %s." % objname)
-            else:
-                caller.msg("You are not allowed to send to %s." % objname)
-
-class CmdWall(MuxCommand):
-    """
-    @wall
-
-    Usage:
-      @wall <message>
-      
-    Announces a message to all connected players.
-    """
-    key = "@wall"
-    permissions = "cmd:wall"
-
-    def func(self):
-        "Implements command"
-        if not self.args:
-            self.caller.msg("Usage: @wall <message>")
-            return
-        message = "%s shouts \"%s\"" % (self.caller.name, self.args)
-        sessionhandler.announce_all(message)
-
 
 class CmdInventory(MuxCommand):
     """
@@ -383,11 +308,11 @@ class CmdQuit(MuxCommand):
     quit
 
     Usage:
-      quit 
+      @quit 
 
     Gracefully disconnect from the game.
     """
-    key = "quit"
+    key = "@quit"
     
     def func(self):
         "hook function"  
@@ -716,8 +641,8 @@ class CmdGroup(MuxCommand):
     This command shows you which user permission groups
     you are a member of, if any. 
     """
-    key = "group"
-    aliases = "groups"
+    key = "access"
+    aliases = "groups"    
 
     def func(self):
         "Load the permission groups"