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

Merge pull request #1377 from vlegoff/ingame_python

Browse source 
Allow contrib.ingame_python.scripts.EventHandler.get_events to work w…
This commit is contained in:
Griatch 2017-08-13 15:56:23 +02:00 • committed by GitHub
commit 8b63fd7564
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
evennia/contrib/ingame_python/scripts.py
View file

@ -10,7 +10,7 @@ import traceback
from django.conf import settings from django.conf import settings
from evennia import DefaultObject, DefaultScript, ChannelDB, ScriptDB from evennia import DefaultObject, DefaultScript, ChannelDB, ScriptDB
from evennia import logger from evennia import logger, ObjectDB
from evennia.utils.ansi import raw from evennia.utils.ansi import raw
from evennia.utils.create import create_channel from evennia.utils.create import create_channel
from evennia.utils.dbserialize import dbserialize from evennia.utils.dbserialize import dbserialize
@ -101,21 +101,29 @@ class EventHandler(DefaultScript):
Return a dictionary of events on this object. Return a dictionary of events on this object.
Args: Args:
obj (Object): the connected object. obj (Object or typeclass): the connected object or a general typeclass.
Returns: Returns:
A dictionary of the object's events. A dictionary of the object's events.
Note: Notes:
Events would define what the object can have as Events would define what the object can have as
callbacks. Note, however, that chained callbacks will not callbacks. Note, however, that chained callbacks will not
appear in events and are handled separately. appear in events and are handled separately.
You can also request the events of a typeclass, not a
connected object. This is useful to get the global list
of events for a typeclass that has no object yet.
""" """
events = {} events = {}
all_events = self.ndb.events all_events = self.ndb.events
classes = Queue() classes = Queue()
classes.put(type(obj)) if isinstance(obj, type):
classes.put(obj)
else:
classes.put(type(obj))
invalid = [] invalid = []
while not classes.empty(): while not classes.empty():
typeclass = classes.get() typeclass = classes.get()