Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-03 06:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed none checks (lol), fixed getter to return empty dict instead of None

Browse source
This commit is contained in:
Tegiminis 2022-07-27 11:37:39 -07:00
parent 19b498626d
commit a30e152405
1 changed files with 22 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

68
evennia/contrib/game_systems/buffs/buff.py
View file

@ -337,63 +337,51 @@ class BuffHandler(object):
@property @property
def traits(self): def traits(self):
"""All buffs on this handler that modify a stat.""" """All buffs on this handler that modify a stat."""
_t = None
_cache = self.all _cache = self.all
if _cache: _t = {k: buff for k, buff in _cache.items() if buff.mods}
_t = {k: buff for k, buff in _cache.items() if buff.mods}
return _t return _t
@property @property
def effects(self): def effects(self):
"""All buffs on this handler that trigger off an event.""" """All buffs on this handler that trigger off an event."""
_e = None
_cache = self.all _cache = self.all
if _cache: _e = {k: buff for k, buff in _cache.items() if buff.triggers}
_e = {k: buff for k, buff in _cache.items() if buff.triggers}
return _e return _e
@property @property
def playtime(self): def playtime(self):
"""All buffs on this handler that only count down during active playtime.""" """All buffs on this handler that only count down during active playtime."""
_pt = None
_cache = self.all _cache = self.all
if _cache: _pt = {k: buff for k, buff in _cache.items() if buff.playtime}
_pt = {k: buff for k, buff in _cache.items() if buff.playtime}
return _pt return _pt
@property @property
def paused(self): def paused(self):
"""All buffs on this handler that are paused.""" """All buffs on this handler that are paused."""
_p = None
_cache = self.all _cache = self.all
if _cache: _p = {k: buff for k, buff in _cache.items() if buff.paused}
_p = {k: buff for k, buff in _cache.items() if buff.paused}
return _p return _p
@property @property
def expired(self): def expired(self):
"""All buffs on this handler that have expired (no duration or no stacks).""" """All buffs on this handler that have expired (no duration or no stacks)."""
_e = None
_cache = self.all _cache = self.all
if _cache: _e = {
_e = { k: buff
k: buff for k, buff in _cache.items()
for k, buff in _cache.items() if not buff.paused
if not buff.paused if buff.duration > -1
if buff.duration > -1 if buff.duration < time.time() - buff.start
if buff.duration < time.time() - buff.start }
} _nostacks = {k: buff for k, buff in _cache.items() if buff.stacks <= 0}
_nostacks = {k: buff for k, buff in _cache.items() if buff.stacks <= 0} _e.update(_nostacks)
_e.update(_nostacks)
return _e return _e
@property @property
def visible(self): def visible(self):
"""All buffs on this handler that are visible.""" """All buffs on this handler that are visible."""
_v = None
_cache = self.all _cache = self.all
if _cache: _v = {k: buff for k, buff in _cache.items() if buff.visible}
_v = {k: buff for k, buff in _cache.items() if buff.visible}
return _v return _v
@property @property
@ -516,7 +504,7 @@ class BuffHandler(object):
if not context: if not context:
context = {} context = {}
if key not in self.buffcache: if key not in self.buffcache:
return None return
buff: BaseBuff = self.buffcache[key] buff: BaseBuff = self.buffcache[key]
instance: BaseBuff = buff["ref"](self, key, buff) instance: BaseBuff = buff["ref"](self, key, buff)
@ -555,7 +543,7 @@ class BuffHandler(object):
""" """
_remove = self.get_by_type(bufftype) _remove = self.get_by_type(bufftype)
if not _remove: if not _remove:
return None return
self._remove_via_dict(_remove, loud, dispel, expire, context) self._remove_via_dict(_remove, loud, dispel, expire, context)
def remove_by_stat( def remove_by_stat(
@ -577,7 +565,7 @@ class BuffHandler(object):
""" """
_remove = self.get_by_stat(stat) _remove = self.get_by_stat(stat)
if not _remove: if not _remove:
return None return
self._remove_via_dict(_remove, loud, dispel, expire, context) self._remove_via_dict(_remove, loud, dispel, expire, context)
def remove_by_trigger( def remove_by_trigger(
@ -599,7 +587,7 @@ class BuffHandler(object):
""" """
_remove = self.get_by_trigger(trigger) _remove = self.get_by_trigger(trigger)
if not _remove: if not _remove:
return None return
self._remove_via_dict(_remove, loud, dispel, expire, context) self._remove_via_dict(_remove, loud, dispel, expire, context)
def remove_by_source( def remove_by_source(
@ -621,7 +609,7 @@ class BuffHandler(object):
""" """
_remove = self.get_by_source(source) _remove = self.get_by_source(source)
if not _remove: if not _remove:
return None return
self._remove_via_dict(_remove, loud, dispel, expire, context) self._remove_via_dict(_remove, loud, dispel, expire, context)
def remove_by_cachevalue( def remove_by_cachevalue(
@ -645,7 +633,7 @@ class BuffHandler(object):
""" """
_remove = self.get_by_cachevalue(key, value) _remove = self.get_by_cachevalue(key, value)
if not _remove: if not _remove:
return None return
self._remove_via_dict(_remove, loud, dispel, expire, context) self._remove_via_dict(_remove, loud, dispel, expire, context)
def clear(self, loud=True, dispel=False, expire=False, context=None): def clear(self, loud=True, dispel=False, expire=False, context=None):
@ -671,7 +659,7 @@ class BuffHandler(object):
"""Returns a dictionary of instanced buffs (all of them) on this handler in the format {buffkey: instance}""" """Returns a dictionary of instanced buffs (all of them) on this handler in the format {buffkey: instance}"""
_cache = dict(self.buffcache) _cache = dict(self.buffcache)
if not _cache: if not _cache:
return None return {}
return {k: buff["ref"](self, k, buff) for k, buff in _cache.items()} return {k: buff["ref"](self, k, buff) for k, buff in _cache.items()}
def get_by_type(self, buff: BaseBuff, to_filter=None): def get_by_type(self, buff: BaseBuff, to_filter=None):
@ -683,8 +671,6 @@ class BuffHandler(object):
Returns a dictionary of instanced buffs of the specified type in the format {buffkey: instance}.""" Returns a dictionary of instanced buffs of the specified type in the format {buffkey: instance}."""
_cache = self.get_all() if not to_filter else to_filter _cache = self.get_all() if not to_filter else to_filter
if not _cache:
return None
return {k: _buff for k, _buff in _cache.items() if isinstance(_buff, buff)} return {k: _buff for k, _buff in _cache.items() if isinstance(_buff, buff)}
def get_by_stat(self, stat: str, to_filter=None): def get_by_stat(self, stat: str, to_filter=None):
@ -696,8 +682,6 @@ class BuffHandler(object):
Returns a dictionary of instanced buffs which modify the specified stat in the format {buffkey: instance}.""" Returns a dictionary of instanced buffs which modify the specified stat in the format {buffkey: instance}."""
_cache = self.traits if not to_filter else to_filter _cache = self.traits if not to_filter else to_filter
if not _cache:
return None
buffs = {k: buff for k, buff in _cache.items() for m in buff.mods if m.stat == stat} buffs = {k: buff for k, buff in _cache.items() for m in buff.mods if m.stat == stat}
return buffs return buffs
@ -710,8 +694,6 @@ class BuffHandler(object):
Returns a dictionary of instanced buffs which fire off the designated trigger, in the format {buffkey: instance}.""" Returns a dictionary of instanced buffs which fire off the designated trigger, in the format {buffkey: instance}."""
_cache = self.effects if not to_filter else to_filter _cache = self.effects if not to_filter else to_filter
if not _cache:
return None
buffs = {k: buff for k, buff in _cache.items() if trigger in buff.triggers} buffs = {k: buff for k, buff in _cache.items() if trigger in buff.triggers}
return buffs return buffs
@ -724,8 +706,6 @@ class BuffHandler(object):
Returns a dictionary of instanced buffs which came from the provided source, in the format {buffkey: instance}.""" Returns a dictionary of instanced buffs which came from the provided source, in the format {buffkey: instance}."""
_cache = self.all if not to_filter else to_filter _cache = self.all if not to_filter else to_filter
if not _cache:
return None
buffs = {k: buff for k, buff in _cache.items() if buff.source == source} buffs = {k: buff for k, buff in _cache.items() if buff.source == source}
return buffs return buffs
@ -739,8 +719,6 @@ class BuffHandler(object):
Returns a dictionary of instanced buffs with cache values matching the specified value, in the format {buffkey: instance}.""" Returns a dictionary of instanced buffs with cache values matching the specified value, in the format {buffkey: instance}."""
_cache = self.all if not to_filter else to_filter _cache = self.all if not to_filter else to_filter
if not _cache:
return None
if not value: if not value:
buffs = {k: buff for k, buff in _cache.items() if buff.cache.get(key)} buffs = {k: buff for k, buff in _cache.items() if buff.cache.get(key)}
elif value: elif value:
@ -822,7 +800,7 @@ class BuffHandler(object):
self.cleanup() self.cleanup()
_effects = self.get_by_trigger(trigger) _effects = self.get_by_trigger(trigger)
if not _effects: if not _effects:
return None return
if not context: if not context:
context = {} context = {}
@ -927,8 +905,6 @@ class BuffHandler(object):
"""Returns a buff flavor text as a dictionary of tuples in the format {key: (name, flavor)}. Common use for this is a buff readout of some kind.""" """Returns a buff flavor text as a dictionary of tuples in the format {key: (name, flavor)}. Common use for this is a buff readout of some kind."""
self.cleanup() self.cleanup()
_cache = self.visible _cache = self.visible
if not _cache:
return None
_flavor = {k: (buff.name, buff.flavor) for k, buff in _cache.items()} _flavor = {k: (buff.name, buff.flavor) for k, buff in _cache.items()}
return _flavor return _flavor