Some bugfixes and cleanup.

game/gamesrc/commands/default/admin.py

@@ -459,8 +459,7 @@ class CmdPuppet(MuxCommand):
         if player.swap_character(new_character):
             new_character.msg("You now control %s." % new_character.name)
         else:
-            caller.msg("You couldn't control %s." % new_character.name)
-
+            caller.msg("You cannot control %s." % new_character.name)
 
 class CmdWall(MuxCommand):
     """

game/gamesrc/commands/default/building.py

@@ -1111,7 +1111,8 @@ class CmdTypeclass(MuxCommand):
     Switch:
       reset - clean out *all* the attributes on the object - 
               basically making this a new clean object. 
-
+      force - change to the typeclass also if the object
+              already has a typeclass of the same name.      
     Example:
       @type button = examples.red_button.RedButton
       
@@ -1174,18 +1175,20 @@ class CmdTypeclass(MuxCommand):
 
         reset = "reset" in self.switches
         
-        old_typeclass = obj.typeclass
-        obj.swap_typeclass(typeclass, clean_attributes=reset)        
-        new_typeclass = obj.typeclass
-
-        string = "%s's type is now %s (instead of %s).\n\r" % (obj.name, 
-                                                               new_typeclass, 
-                                                               old_typeclass)
-        if reset:
-            string += "All attributes where reset."
-        else:    
-            string += "Note that the new class type could have overwritten "
-            string += "same-named attributes on the existing object."            
+        old_typeclass = obj.typeclass_path
+        if old_typeclass == typeclass and not 'force' in self.switches:
+            string = "%s already has the typeclass '%s'." % (obj.name, typeclass)
+        else:
+            obj.swap_typeclass(typeclass, clean_attributes=reset)        
+            new_typeclass = obj.typeclass
+            string = "%s's type is now %s (instead of %s).\n\r" % (obj.name, 
+                                                                   new_typeclass, 
+                                                                   old_typeclass)            
+            if reset:
+                string += "All attributes where reset."                                                               
+            else:    
+                string += "Note that the new class type could have overwritten "
+                string += "same-named attributes on the existing object."            
         caller.msg(string)
 
 

src/permissions/default_permissions.py

@@ -39,6 +39,7 @@ PERMS = [
     'typeclass',
     'debug',
     'puppet',
+    'typeclass',
     
     'batchcommands',
     'batchcodes',
@@ -79,6 +80,7 @@ GROUPS = {
                                 'reload', 
                                 'service', 
                                 'perm',
+                                'typeclass',
                                 'batchcommands',
                                 'batchcodes']],
     

src/utils/create.py

@@ -417,7 +417,7 @@ def create_player(name, email, password,
             new_user = User.objects.create_user(name, email, password) 
 
     # create the associated Player for this User, and tie them together
-    new_player = PlayerDB(db_key=name, user=new_user, db_typeclass_path=typeclass)        
+    new_player = PlayerDB(db_key=name, user=new_user)        
     new_player.save()        
 
     # assign mud permissions