Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made tutorial_world run on devel, it had a few deprecated imports and also the path to the build file given in the limbo desc was not right anymore.

Browse source
This commit is contained in:
Griatch 2015-02-10 10:26:08 +01:00
parent ec4e985c39
commit eb738ebad8
4 changed files with 54 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

59
evennia/server/initial_setup.py
View file

@ -13,6 +13,39 @@ from evennia.players.models import PlayerDB
from evennia.server.models import ServerConfig
from evennia.utils import create
ERROR_NO_SUPERUSER = \
"""
No superuser exists yet. The superuser is the 'owner' account on
the Evennia server. Create a new superuser using the command
evennia createsuperuser
Follow the prompts, then restart the server.
"""
LIMBO_DESC = \
_("""
Welcome to your new {wEvennia{n-based game. From here you are
ready to begin development. Visit http://evennia.com if you should
need help or would like to participate in community discussions.
If you are logged in as user #1 you can create a demo/tutorial
area with {w@batchcommand tutorial_world.build{n. Use {w@quell{n
or login as normal player to play the demo properly.
""")
WARNING_POSTGRESQL_FIX = \
"""
PostgreSQL-psycopg2 compatability fix:
The in-game channels {chan1}, {chan2} and {chan3} were created,
but the superuser was not yet connected to them. Please use in
game commands to connect Player #1 to those channels when first
logging in.
"""
def create_config_values():
"""
Creates the initial config values.
@ -27,12 +60,7 @@ def get_god_player():
try:
god_player = PlayerDB.objects.get(id=1)
except PlayerDB.DoesNotExist:
txt = "\n\nNo superuser exists yet. The superuser is the 'owner'\n" \
"account on the Evennia server. Create a new superuser using\n" \
"the command\n\n" \
" evennia createsuperuser\n\n" \
"Follow the prompts, then restart the server."
raise Exception(txt)
raise PlayerDB.DoesNotExist(ERROR_NO_SUPERUSER)
return god_player
@ -83,15 +111,7 @@ def create_objects():
limbo_obj = create.create_object(room_typeclass, _('Limbo'), nohome=True)
limbo_obj.id = 2
limbo_obj.save()
string = \
"Welcome to your new {wEvennia{n-based game. From here you are ready " \
"to begin development. Visit http://evennia.com if you should need " \
"help or would like to participate in community discussions. If you " \
"are logged in as user #1 you can create a demo/tutorial area with " \
"{w@batchcommand contrib.tutorial_world.build{n. Use {w@quell{n or login " \
"as normal player to play the demo properly."
string = _(string)
limbo_obj.db.desc = string
limbo_obj.db.desc = LIMBO_DESC.strip()
limbo_obj.save()
# Now that Limbo exists, try to set the user up in Limbo (unless
@ -127,14 +147,7 @@ def create_channels():
or (hasattr(settings, 'DATABASES')
and settings.DATABASES.get("default", {}).get('ENGINE', None)
== 'django.db.backends.postgresql_psycopg2')):
warning = """
PostgreSQL-psycopg2 compatability fix:
The in-game channels %s, %s and %s were created,
but the superuser was not yet connected to them. Please use in
game commands to onnect Player #1 to those channels when first
logging in.
""" % (key1, key2, key3)
print warning
print WARNING_POSTGRESQL_FIX.format(chan1=key1, chan2=key2, chan3=key3)
return
# connect the god user to all these channels by default.