Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-25 09:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolves issue 155. Cleaned up the copy functionality and a few minor bugs at the same time. Copying an active character is somewhat confusing though (and deleting a character will currently make the player unable to log back in).

Browse source
This commit is contained in:
Griatch 2011-04-07 22:10:51 +00:00
parent 4519169e1c
commit 695317e699
8 changed files with 82 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/objects/manager.py
View file

@ -269,7 +269,8 @@ class ObjectManager(TypedObjectManager):
#
def copy_object(self, original_object, new_name=None,
new_location=None, new_home=None, new_aliases=None):
new_location=None, new_player=None, new_home=None,
new_permissions=None, new_locks=None, new_aliases=None):
"""
Create and return a new object as a copy of the source object. All will
be identical to the original except for the arguments given specifically
@ -289,19 +290,38 @@ class ObjectManager(TypedObjectManager):
if not new_location:
new_location = original_object.location
if not new_home:
new_home = original_object.new_home
new_home = original_object.home
if not new_player:
new_player = original_object.player
if not new_aliases:
new_aliases = original_object.aliases
if not new_locks:
new_locks = original_object.db_lock_storage
if not new_permissions:
new_permissions = original_object.permissions
# create new object
from src import create
new_object = create.create_object(new_name, typeclass_path, new_location,
new_home, user=None, aliases=new_aliases)
from src.utils import create
from src.scripts.models import ScriptDB
new_object = create.create_object(typeclass_path, new_name, new_location,
new_home, new_player, new_permissions,
new_locks, new_aliases)
if not new_object:
return None
for attr in original_object.attr():
# copy over all attributes from old to new.
new_object.attr(attr.attr_name, attr.value)
# copy over all attributes from old to new.
for attr in original_object.get_all_attributes():
new_object.set_attribute(attr.key, attr.value)
# copy over all cmdsets, if any
for icmdset, cmdset in enumerate(original_object.cmdset.all()):
if icmdset == 0:
new_object.cmdset.add_default(cmdset)
else:
new_object.cmdset.add(cmdset)
# copy over all scripts, if any
for script in original_object.scripts.all():
ScriptDB.objects.copy_script(script, new_obj=new_object.dbobj)
return new_object

8
src/objects/models.py
View file

@ -748,12 +748,8 @@ class ObjectDB(TypedObject):
# See if we need to kick the player off.
for session in self.sessions:
session.msg("Your character %s has been destroyed. Goodbye." % self.name)
session.handle_close()
# # If the object is a player, set the player account
# # object to inactive. We generally avoid deleting a
# # player completely in case it messes with things
# # like sent-message memory etc in some games.
session.session_disconnect()
# if self.player:
# self.player.user.is_active = False
# self.player.user.save()