From 36b15b4ad84621d0cdf53a34dd233fae8f14b32b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 1 May 2012 17:31:16 +0200
Subject: [PATCH] Made some tweaks to some default commands, such as @version,
 which was renamed @about and displays some more info about the system.

---
 src/commands/default/cmdset_default.py |  2 +-
 src/commands/default/system.py         | 47 ++++++++++++++++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/commands/default/cmdset_default.py b/src/commands/default/cmdset_default.py
index 1c56937d0..426647515 100644
--- a/src/commands/default/cmdset_default.py
+++ b/src/commands/default/cmdset_default.py
@@ -39,7 +39,7 @@ class DefaultCmdSet(CmdSet):
         self.add(system.CmdScripts())
         self.add(system.CmdObjects())
         self.add(system.CmdService())
-        self.add(system.CmdVersion())
+        self.add(system.CmdAbout())
         self.add(system.CmdTime())
         self.add(system.CmdServerLoad())
         #self.add(system.CmdPs())
diff --git a/src/commands/default/system.py b/src/commands/default/system.py
index e6d69faf9..a55c8bf29 100644
--- a/src/commands/default/system.py
+++ b/src/commands/default/system.py
@@ -7,6 +7,7 @@ System commands
 import traceback
 import os, datetime, time
 from sys import getsizeof
+import sys
 import django, twisted
 
 from django.conf import settings
@@ -474,27 +475,51 @@ class CmdService(MuxCommand):
             caller.msg("Starting service '%s'." % self.args)
             service.startService()
 
-class CmdVersion(MuxCommand):
+class CmdAbout(MuxCommand):
     """
-    @version - game version
+    @about - game engine info
 
     Usage:
-      @version
+      @about
 
-    Display the game version info.
+    Display info about the game engine.
     """
 
-    key = "@version"
+    key = "@about"
+    aliases = "@version"
+    locks = "cmd:all()"
     help_category = "System"
 
     def func(self):
         "Show the version"
-        version = utils.get_evennia_version()
-        string = "-" * 50 + "\n\r"
-        string += " {cEvennia{n %s\n\r" % version
-        string += " (Django %s, " % (django.get_version())
-        string += " Twisted %s)\n\r" % (twisted.version.short())
-        string += "-" * 50
+        try:
+            import south
+            sversion = "{wSouth{n %s" % south.__version__
+        except ImportError:
+            sversion = "{wSouth{n <not installed>"
+
+        string = """
+         {cEvennia{n %s{n
+         MUD/MUX/MU* development system
+
+         {wLicence{n Artistic Licence/GPL
+         {wWeb{n http://www.evennia.com
+         {wIrc{n #evennia on FreeNode
+         {wForum{n http://www.evennia.com/discussions
+         {wMaintainer{n (2010-)   Griatch (griatch AT gmail DOT com)
+         {wMaintainer{n (2006-10) Greg Taylor
+
+         {wOS{n %s
+         {wPython{n %s
+         {wDjango{n %s
+         {wTwisted{n %s
+         %s
+        """ % (utils.get_evennia_version(),
+               os.name,
+               sys.version.split()[0],
+               django.get_version(),
+               twisted.version.short(),
+               sversion)
         self.caller.msg(string)
 
 class CmdTime(MuxCommand):