Rename all instances of Player->Account.

This commit is contained in:
Griatch 2017-07-07 23:47:21 +02:00
parent a14e11640b
commit 5590ee2258
94 changed files with 1316 additions and 2327 deletions

View file

@ -25,7 +25,7 @@ from builtins import object
# Typeclasses
DefaultPlayer = None
DefaultAccount = None
DefaultGuest = None
DefaultObject = None
DefaultCharacter = None
@ -36,7 +36,7 @@ DefaultScript = None
# Database models
ObjectDB = None
PlayerDB = None
AccountDB = None
ScriptDB = None
ChannelDB = None
Msg = None
@ -51,7 +51,7 @@ InterruptCommand = None
# search functions
search_object = None
search_script = None
search_player = None
search_account = None
search_channel = None
search_message = None
search_help = None
@ -60,7 +60,7 @@ search_tag = None
# create functions
create_object = None
create_script = None
create_player = None
create_account = None
create_channel = None
create_message = None
create_help_entry = None
@ -117,17 +117,17 @@ def _init():
Evennia has fully initialized all its models. It sets up the API
in a safe environment where all models are available already.
"""
global DefaultPlayer, DefaultObject, DefaultGuest, DefaultCharacter
global DefaultAccount, DefaultObject, DefaultGuest, DefaultCharacter
global DefaultRoom, DefaultExit, DefaultChannel, DefaultScript
global ObjectDB, PlayerDB, ScriptDB, ChannelDB, Msg
global ObjectDB, AccountDB, ScriptDB, ChannelDB, Msg
global Command, CmdSet, default_cmds, syscmdkeys, InterruptCommand
global search_object, search_script, search_player, search_channel, search_help, search_tag
global create_object, create_script, create_player, create_channel, create_message, create_help_entry
global search_object, search_script, search_account, search_channel, search_help, search_tag
global create_object, create_script, create_account, create_channel, create_message, create_help_entry
global settings,lockfuncs, logger, utils, gametime, ansi, spawn, managers
global contrib, TICKER_HANDLER, MONITOR_HANDLER, SESSION_HANDLER, CHANNEL_HANDLER
from .players.players import DefaultPlayer
from .players.players import DefaultGuest
from .accounts.accounts import DefaultAccount
from .accounts.accounts import DefaultGuest
from .objects.objects import DefaultObject
from .objects.objects import DefaultCharacter
from .objects.objects import DefaultRoom
@ -137,7 +137,7 @@ def _init():
# Database models
from .objects.models import ObjectDB
from .players.models import PlayerDB
from .accounts.models import AccountDB
from .scripts.models import ScriptDB
from .comms.models import ChannelDB
from .comms.models import Msg
@ -149,7 +149,7 @@ def _init():
# search functions
from .utils.search import search_object
from .utils.search import search_script
from .utils.search import search_player
from .utils.search import search_account
from .utils.search import search_message
from .utils.search import search_channel
from .utils.search import search_help
@ -158,7 +158,7 @@ def _init():
# create functions
from .utils.create import create_object
from .utils.create import create_script
from .utils.create import create_player
from .utils.create import create_account
from .utils.create import create_channel
from .utils.create import create_message
from .utils.create import create_help_entry
@ -202,7 +202,7 @@ def _init():
Links to instantiated database managers.
helpentry - HelpEntry.objects
players - PlayerDB.objects
accounts - AccountDB.objects
scripts - ScriptDB.objects
msgs - Msg.objects
channels - Channel.objects
@ -213,7 +213,7 @@ def _init():
"""
from .help.models import HelpEntry
from .players.models import PlayerDB
from .accounts.models import AccountDB
from .scripts.models import ScriptDB
from .comms.models import Msg, ChannelDB
from .objects.models import ObjectDB
@ -223,7 +223,7 @@ def _init():
# create container's properties
helpentries = HelpEntry.objects
players = PlayerDB.objects
accounts = AccountDB.objects
scripts = ScriptDB.objects
msgs = Msg.objects
channels = ChannelDB.objects
@ -232,7 +232,7 @@ def _init():
attributes = Attribute.objects
tags = Tag.objects
# remove these so they are not visible as properties
del HelpEntry, PlayerDB, ScriptDB, Msg, ChannelDB
del HelpEntry, AccountDB, ScriptDB, Msg, ChannelDB
#del ExternalChannelConnection
del ObjectDB, ServerConfig, Tag, Attribute
@ -250,10 +250,10 @@ def _init():
"""
from .commands.default.cmdset_character import CharacterCmdSet
from .commands.default.cmdset_player import PlayerCmdSet
from .commands.default.cmdset_account import AccountCmdSet
from .commands.default.cmdset_unloggedin import UnloggedinCmdSet
from .commands.default.cmdset_session import SessionCmdSet
from .commands.default.muxcommand import MuxCommand, MuxPlayerCommand
from .commands.default.muxcommand import MuxCommand, MuxAccountCommand
def __init__(self):
"populate the object with commands"
@ -265,14 +265,14 @@ def _init():
from .commands.default import (admin, batchprocess,
building, comms, general,
player, help, system, unloggedin)
account, help, system, unloggedin)
add_cmds(admin)
add_cmds(building)
add_cmds(batchprocess)
add_cmds(building)
add_cmds(comms)
add_cmds(general)
add_cmds(player)
add_cmds(account)
add_cmds(help)
add_cmds(system)
add_cmds(unloggedin)
@ -293,7 +293,7 @@ def _init():
CMD_MULTIMATCH - multiple command matches were found
CMD_CHANNEL - the command name is a channel name
CMD_LOGINSTART - this command will be called as the very
first command when a player connects to
first command when an account connects to
the server.
To access in code, do 'from evennia import syscmdkeys' then