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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2017-10-03 09:36:42 +02:00
commit 313a907a3a
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/accounts/accounts.py
View file

@ -566,7 +566,8 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
""" """
# A basic security setup # A basic security setup
lockstring = "examine:perm(Admin);edit:perm(Admin);" \ lockstring = "examine:perm(Admin);edit:perm(Admin);" \
"delete:perm(Admin);boot:perm(Admin);msg:all()" "delete:perm(Admin);boot:perm(Admin);msg:all();" \
"noidletimeout:perm(Builder) or perm(noidletimeout)"
self.locks.add(lockstring) self.locks.add(lockstring)
# The ooc account cmdset # The ooc account cmdset
@ -582,8 +583,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
""" """
# set an (empty) attribute holding the characters this account has # set an (empty) attribute holding the characters this account has
lockstring = "attrread:perm(Admins);attredit:perm(Admins);" \ lockstring = "attrread:perm(Admins);attredit:perm(Admins);" \
"attrcreate:perm(Admins);" \ "attrcreate:perm(Admins);"
"noidletimeout:perm(Builder) or perm(noidletimeout)"
self.attributes.add("_playable_characters", [], lockstring=lockstring) self.attributes.add("_playable_characters", [], lockstring=lockstring)
self.attributes.add("_saved_protocol_flags", {}, lockstring=lockstring) self.attributes.add("_saved_protocol_flags", {}, lockstring=lockstring)

6
evennia/commands/default/admin.py
View file

@ -525,13 +525,13 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
return return
if perm in permissions: if perm in permissions:
caller_result.append("\nPermission '%s' is already defined on %s." % (rhs, obj.name)) caller_result.append("\nPermission '%s' is already defined on %s." % (perm, obj.name))
else: else:
obj.permissions.add(perm) obj.permissions.add(perm)
plystring = "the Account" if accountmode else "the Object/Character" plystring = "the Account" if accountmode else "the Object/Character"
caller_result.append("\nPermission '%s' given to %s (%s)." % (rhs, obj.name, plystring)) caller_result.append("\nPermission '%s' given to %s (%s)." % (perm, obj.name, plystring))
target_result.append("\n%s gives you (%s, %s) the permission '%s'." target_result.append("\n%s gives you (%s, %s) the permission '%s'."
% (caller.name, obj.name, plystring, rhs)) % (caller.name, obj.name, plystring, perm))
caller.msg("".join(caller_result).strip()) caller.msg("".join(caller_result).strip())
if target_result: if target_result:
obj.msg("".join(target_result).strip()) obj.msg("".join(target_result).strip())

2
evennia/contrib/rpsystem.py
View file

@ -858,7 +858,7 @@ class CmdSay(RPCommand): # replaces standard say
return return
# calling the speech hook on the location # calling the speech hook on the location
speech = caller.location.at_before_say(caller, self.args) speech = caller.location.at_before_say(self.args)
# preparing the speech with sdesc/speech parsing. # preparing the speech with sdesc/speech parsing.
speech = "/me says, \"{speech}\"".format(speech=speech) speech = "/me says, \"{speech}\"".format(speech=speech)
targets = self.caller.location.contents targets = self.caller.location.contents

2
evennia/web/website/templates/website/registration/logged_out.html
View file

@ -10,7 +10,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<h1 class="card-title">Logged Out</h1> <h1 class="card-title">Logged Out</h1>
<p>You have been logged out.</p> <p>You have been logged out.</p>
<p>Redirecting in 2 seconds...</p> <p>Redirecting in 2 seconds...</p>

2
evennia/web/website/templates/website/registration/login.html
View file

@ -11,7 +11,7 @@ Login
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<h1 class="card-title">Login</h1> <h1 class="card-title">Login</h1>
<hr /> <hr />
{% if user.is_authenticated %} {% if user.is_authenticated %}