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

Add the @event/tasks switch to follow differed tasks

Browse source
This commit is contained in:
Vincent Le Goff 2017-03-18 18:15:26 -07:00 • committed by Griatch
parent 9fc163df57
commit 629ac73f2b
1 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
evennia/contrib/events/commands.py
View file

@ -28,12 +28,14 @@ BASIC_USAGES = [
"@event/add object name = event name [parameters]", "@event/add object name = event name [parameters]",
"@event/edit object name = event name [event number]", "@event/edit object name = event name [event number]",
"@event/del object name = event name [event number]", "@event/del object name = event name [event number]",
"@event/tasks [object name [= event name [event number]]]",
] ]
BASIC_SWITCHES = [ BASIC_SWITCHES = [
"add - add and edit a new event", "add - add and edit a new event",
"edit - edit an existing event", "edit - edit an existing event",
"del - delete an existing event", "del - delete an existing event",
"tasks - show the list of differed tasks",
] ]
VALIDATOR_USAGES = [ VALIDATOR_USAGES = [
@ -52,7 +54,11 @@ switches to see what event are active on an object:
You can also specify an event name if you want the list of events associated You can also specify an event name if you want the list of events associated
with this object of this name: with this object of this name:
@event north = can_traverse @event north = can_traverse
You might need to specify a number after the event if there are more than one:
@event here = say 2
You can also add, edit or remove events using the add, edit or del switches. You can also add, edit or remove events using the add, edit or del switches.
Additionally, you can see the list of differed tasks created by events
(chained events to be called) using the /tasks switch.
""" """
VALIDATOR_TEXT = """ VALIDATOR_TEXT = """
@ -174,6 +180,8 @@ class CmdEvent(COMMAND_DEFAULT_CLASS):
self.del_event() self.del_event()
elif switch == "accept" and validator: elif switch == "accept" and validator:
self.accept_event() self.accept_event()
elif switch in ["tasks", "task"]:
self.list_tasks()
else: else:
caller.msg("Mutually exclusive or invalid switches were " \ caller.msg("Mutually exclusive or invalid switches were " \
"used, cannot proceed.") "used, cannot proceed.")
@ -500,6 +508,28 @@ class CmdEvent(COMMAND_DEFAULT_CLASS):
self.msg("The event {} {} of {} has been accepted.".format( self.msg("The event {} {} of {} has been accepted.".format(
event_name, parameters, obj)) event_name, parameters, obj))
def list_tasks(self):
"""List the active tasks."""
obj = self.obj
event_name = self.event_name
handler = self.handler
tasks = [(k, v[0], v[1], v[2]) for k, v in handler.db.tasks.items()]
if obj:
tasks = [task for task in tasks if task[2] is obj]
if event_name:
tasks = [task for task in tasks if task[3] == event_name]
tasks.sort()
table = EvTable("ID", "Object", "Event", "In", width=78)
table.reformat_column(0, align="r")
now = datetime.now()
for task_id, future, obj, event_name in tasks:
key = obj.get_display_name(self.caller)
delta = time_format((future - now).total_seconds(), 1)
table.add_row(task_id, key, event_name, delta)
self.msg(table)
# Private functions to handle editing # Private functions to handle editing
def _ev_load(caller): def _ev_load(caller):
return caller.db._event and caller.db._event.get("code", "") or "" return caller.db._event and caller.db._event.get("code", "") or ""