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

Replace {character} by {object} in mapping of announce_move_*

Browse source
This commit is contained in:
Vincent Le Goff 2017-03-28 10:22:23 -07:00 • committed by Griatch
parent f1d34a28aa
commit 3811c074c6
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
evennia/objects/objects.py
View file

@ -1176,10 +1176,10 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
You can override this method and call its parent with a You can override this method and call its parent with a
message to simply change the default message. In the string, message to simply change the default message. In the string,
you can use the following as mappings (between braces): you can use the following as mappings (between braces):
character: the character who is moving. object: the object which is moving.
exit: the exit from which the character is moving (if found). exit: the exit from which the object is moving (if found).
origin: the location of the character before the move. origin: the location of the object before the move.
destination: the location of the character after moving. destination: the location of the object after moving.
""" """
if not self.location: if not self.location:
@ -1187,7 +1187,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
if msg: if msg:
string = msg string = msg
else: else:
string = "{character} is leaving {origin}, heading for {destination}." string = "{object} is leaving {origin}, heading for {destination}."
location = self.location location = self.location
exits = [o for o in location.contents if o.location is location and o.destination is destination] exits = [o for o in location.contents if o.location is location and o.destination is destination]
@ -1195,7 +1195,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
mapping = {} mapping = {}
mapping.update({ mapping.update({
"character": self, "object": self,
"exit": exits[0] if exits else "somwhere", "exit": exits[0] if exits else "somwhere",
"origin": location or "nowhere", "origin": location or "nowhere",
"destination": destination or "nowhere", "destination": destination or "nowhere",
@ -1216,10 +1216,10 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
You can override this method and call its parent with a You can override this method and call its parent with a
message to simply change the default message. In the string, message to simply change the default message. In the string,
you can use the following as mappings (between braces): you can use the following as mappings (between braces):
character: the character who is moving. object: the object which is moving.
exit: the exit from which the character is moving (if found). exit: the exit from which the object is moving (if found).
origin: the location of the character before the move. origin: the location of the object before the move.
destination: the location of the character after moving. destination: the location of the object after moving.
""" """
@ -1234,9 +1234,9 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
if msg: if msg:
string = msg string = msg
else: else:
string = "{character} arrives to {destination} from {origin}." string = "{object} arrives to {destination} from {origin}."
else: else:
string = "{character} arrives to {destination}." string = "{object} arrives to {destination}."
origin = source_location origin = source_location
destination = self.location destination = self.location
@ -1248,7 +1248,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
mapping = {} mapping = {}
mapping.update({ mapping.update({
"character": self, "object": self,
"exit": exits[0] if exits else "somewhere", "exit": exits[0] if exits else "somewhere",
"origin": origin or "nowhere", "origin": origin or "nowhere",
"destination": destination or "nowhere", "destination": destination or "nowhere",