Added 'entity' return_type for EntityIter that returns the BaseEntity instance for the entity.

Removed most of the _return_<type> functions in filters.weapons and replaced them with lambda functions.

Added missing __all__ declaration in 2 modules.

Author: satoon101

addons/source-python/packages/source-python/filters/entities.py

@@ -6,6 +6,7 @@
 # Source.Python Imports
 #   Entities
 from entities import EntityGenerator
+from entities.entity import BaseEntity
 from entities.helpers import basehandle_from_edict
 from entities.helpers import index_from_edict
 from entities.helpers import inthandle_from_edict
@@ -108,5 +109,7 @@ def _is_valid(self, edict):
 _EntityIterManagerInstance.register_return_type(
     'inthandle', inthandle_from_edict)
 _EntityIterManagerInstance.register_return_type('pointer', pointer_from_edict)
+_EntityIterManagerInstance.register_return_type(
+    'entity', lambda edict: BaseEntity(index_from_edict(edict)))
 _EntityIterManagerInstance.register_return_type(
     'classname', lambda edict: edict.get_class_name())

addons/source-python/packages/source-python/filters/weapons.py

@@ -96,7 +96,7 @@ def iterator():
 # =============================================================================
 # >> WEAPON TAG CLASSES
 # =============================================================================
-class __WeaponTagsInstance(dict):
+class _WeaponTags(dict):
     '''Class used to store weapon tags for the current game'''
 
     def __missing__(self, item):
@@ -108,8 +108,8 @@ def __missing__(self, item):
         # Return the instance
         return instance
 
-# Get the __WeaponTagsInstance instance
-_WeaponTagsInstance = __WeaponTagsInstance()
+# Get the _WeaponTags instance
+_WeaponTagsInstance = _WeaponTags()
 
 
 class _Tag(object):
@@ -147,13 +147,8 @@ def _class_weapon_contains_tag(self, weapon):
 
 
 # =============================================================================
-# >> WEAPON EDICT RETURN TYPE FUNCTIONS
+# >> WEAPON EDICT RETURN TYPES
 # =============================================================================
-def _return_edict(edict):
-    '''Returns the weapon's edict'''
-    return edict
-
-
 def _return_instance(edict):
     '''Returns the weapon's BaseEntity instance'''
     from entities.entity import BaseEntity
@@ -167,63 +162,29 @@ def _return_instance(edict):
     'inthandle', inthandle_from_edict)
 _WeaponEdictIterManagerInstance.register_return_type(
     'pointer', pointer_from_edict)
-_WeaponEdictIterManagerInstance.register_return_type('edict', _return_edict)
+_WeaponEdictIterManagerInstance.register_return_type(
+    'edict', lambda edict: edict)
 _WeaponEdictIterManagerInstance.register_return_type(
     'weapon', _return_instance)
 
 
 # =============================================================================
-# >> WEAPON CLASS RETURN TYPE FUNCTIONS
+# >> WEAPON CLASS RETURN TYPES
 # =============================================================================
-def _return_weapon(weapon):
-    '''Returns the weapon type's WeaponManager item'''
-    return weapon
-
-
-def _return_classname(weapon):
-    '''Returns the weapon type's classname'''
-    return weapon.name
-
-
-def _return_basename(weapon):
-    '''Returns the weapon type's basename'''
-    return weapon.basename
-
-
-def _return_slot(weapon):
-    '''Returns the weapon type's slot'''
-    return weapon.slot
-
-
-def _return_maxammo(weapon):
-    '''Returns the weapon type's maxammo'''
-    return weapon.maxammo
-
-
-def _return_ammoprop(weapon):
-    '''Returns the weapon type's ammoprop'''
-    return weapon.ammoprop
-
-
-def _return_clip(weapon):
-    '''Returns the weapon type's clip'''
-    return weapon.clip
-
-
-def _return_tags(weapon):
-    '''Returns the weapon type's tags'''
-    return weapon.tags
-
 # Register the return type functions
-_WeaponClassIterManagerInstance.register_return_type('weapon', _return_weapon)
 _WeaponClassIterManagerInstance.register_return_type(
-    'classname', _return_classname)
+    'weapon', lambda weapon: weapon)
+_WeaponClassIterManagerInstance.register_return_type(
+    'classname', lambda weapon: weapon.name)
+_WeaponClassIterManagerInstance.register_return_type(
+    'basename', lambda weapon: weapon.basename)
+_WeaponClassIterManagerInstance.register_return_type(
+    'slot', lambda weapon: weapon.slot)
+_WeaponClassIterManagerInstance.register_return_type(
+    'maxammo', lambda weapon: weapon.maxammo)
 _WeaponClassIterManagerInstance.register_return_type(
-    'basename', _return_basename)
-_WeaponClassIterManagerInstance.register_return_type('slot', _return_slot)
+    'ammoprop', lambda weapon: weapon.ammoprop)
 _WeaponClassIterManagerInstance.register_return_type(
-    'maxammo', _return_maxammo)
+    'clip', lambda weapon: weapon.clip)
 _WeaponClassIterManagerInstance.register_return_type(
-    'ammoprop', _return_ammoprop)
-_WeaponClassIterManagerInstance.register_return_type('clip', _return_clip)
-_WeaponClassIterManagerInstance.register_return_type('tags', _return_tags)
+    'tags', lambda weapon: weapon.tags)

addons/source-python/packages/source-python/players/weapons/__init__.py

@@ -36,7 +36,7 @@
 except ImportError:
 
     # Set the game's _GameWeapons class to the basic "object" type
-    _GameWeapons = set()
+    _GameWeapons = object
 
 # Was no ImportError encountered?
 else:

addons/source-python/packages/source-python/players/weapons/projectiles.py

@@ -1,5 +1,11 @@
 # ../players/weapons/projectiles.py
 
+# =============================================================================
+# >> ALL DECLARATION
+# =============================================================================
+# Set __all__ to an empty list
+__all__ = []
+
 
 # =============================================================================
 # >> CLASSES

addons/source-python/packages/source-python/players/weapons/types.py

@@ -10,6 +10,13 @@
 from entities.helpers import index_from_edict
 
 
+# =============================================================================
+# >> ALL DECLARATION
+# =============================================================================
+# Set __all__ to an empty list
+__all__ = []
+
+
 # =============================================================================
 # >> CLASSES
 # =============================================================================