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

Rename all at_before/after hooks to at_pre/post. Old names still work but are deprecated. Resolves #1454.

Browse source
This commit is contained in:
Griatch 2021-10-31 22:18:58 +01:00
parent 7b25299be4
commit 36e985557f
21 changed files with 106 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -427,8 +427,8 @@ class CmdGet(COMMAND_DEFAULT_CLASS):
caller.msg("You can't get that.")
return
# calling at_before_get hook method
if not obj.at_before_get(caller):
# calling at_pre_get hook method
if not obj.at_pre_get(caller):
return
success = obj.move_to(caller, quiet=True)
@ -477,8 +477,8 @@ class CmdDrop(COMMAND_DEFAULT_CLASS):
if not obj:
return
# Call the object script's at_before_drop() method.
if not obj.at_before_drop(caller):
# Call the object script's at_pre_drop() method.
if not obj.at_pre_drop(caller):
return
success = obj.move_to(caller.location, quiet=True)
@ -530,8 +530,8 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
caller.msg("You are not holding %s." % to_give.key)
return
# calling at_before_give hook method
if not to_give.at_before_give(caller, target):
# calling at_pre_give hook method
if not to_give.at_pre_give(caller, target):
return
# give object
@ -597,14 +597,14 @@ class CmdSay(COMMAND_DEFAULT_CLASS):
speech = self.args
# Calling the at_before_say hook on the character
speech = caller.at_before_say(speech)
# Calling the at_pre_say hook on the character
speech = caller.at_pre_say(speech)
# If speech is empty, stop here
if not speech:
return
# Call the at_after_say hook on the character
# Call the at_post_say hook on the character
caller.at_say(speech, msg_self=True)
@ -643,7 +643,7 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
return
# Call a hook to change the speech before whispering
speech = caller.at_before_say(speech, whisper=True, receivers=receivers)
speech = caller.at_pre_say(speech, whisper=True, receivers=receivers)
# no need for self-message if we are whispering to ourselves (for some reason)
msg_self = None if caller in receivers else True