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

Some minor language fixes.

Browse source
This commit is contained in:
Griatch 2017-03-01 08:08:19 +01:00
parent 23a053c213
commit b73a0f8f8c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/commands/default/general.py
View file

@ -424,7 +424,8 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
Usage: Usage:
whisper <player> = <message> whisper <player> = <message>
Talk privately to those in your current location. Talk privately to those in your current location, without
others being informed.
""" """
key = "whisper" key = "whisper"
@ -438,13 +439,12 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
if not self.lhs or not self.rhs: if not self.lhs or not self.rhs:
caller.msg("Usage: whisper <player> = <message>") caller.msg("Usage: whisper <player> = <message>")
return return
receiver = caller.search(self.lhs) receiver = caller.search(self.lhs)
if not receiver: if not receiver:
caller.msg("Usage: whisper <player> = <message>")
return return
if caller == receiver: if caller == receiver:
caller.msg("You can't whisper to yourself.") caller.msg("You can't whisper to yourself.")
return return
@ -452,7 +452,7 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
speech = self.rhs speech = self.rhs
# Feedback for the object doing the talking. # Feedback for the object doing the talking.
caller.msg('You whisper %s, "%s|n"' % (receiver.key, speech)) caller.msg('You whisper to %s, "%s|n"' % (receiver.key, speech))
# Build the string to emit to receiver. # Build the string to emit to receiver.
emit_string = '%s whispers, "%s|n"' % (caller.name, speech) emit_string = '%s whispers, "%s|n"' % (caller.name, speech)

2
evennia/commands/default/tests.py
View file

@ -118,7 +118,7 @@ class TestGeneral(CommandTest):
self.call(general.CmdSay(), "Testing", "You say, \"Testing\"") self.call(general.CmdSay(), "Testing", "You say, \"Testing\"")
def test_whisper(self): def test_whisper(self):
self.call(general.CmdWhisper(), "Obj = Testing", "You whisper Obj, \"Testing\"") self.call(general.CmdWhisper(), "Obj = Testing", "You whisper to Obj, \"Testing\"")
def test_access(self): def test_access(self):
self.call(general.CmdAccess(), "", "Permission Hierarchy (climbing):") self.call(general.CmdAccess(), "", "Permission Hierarchy (climbing):")