Merge branch 'player_weapons_update2'

Author: satoon101

addons/source-python/data/source-python/entities/CBaseCombatCharacter.ini

@@ -13,4 +13,4 @@
 
     gun_offset = m_HackedGunPos
     hitgroup = m_LastHitGroup
-    active_weapon = m_hActiveWeapon
+    active_weapon_handle = m_hActiveWeapon

addons/source-python/data/source-python/entities/CBaseCombatWeapon.ini

@@ -9,7 +9,7 @@
     next_secondary_fire_attack = LocalActiveWeaponData.m_flNextSecondaryAttack
     ammoprop = LocalWeaponData.m_iPrimaryAmmoType
     secondary_fire_ammoprop = LocalWeaponData.m_iSecondaryAmmoType
-    owner = m_hOwner
-    clip = m_iClip1
-    secondary_fire_clip = m_iClip2
+    owner_handle = m_hOwner
+    _clip = m_iClip1
+    _secondary_fire_clip = m_iClip2
     flip_view_model = LocalWeaponData.m_bFlipViewModel

addons/source-python/data/source-python/entities/CBaseEntity.ini

@@ -77,7 +77,7 @@
     render = m_clrRender
     elasticity = m_flElasticity
     ground_entity = m_hGroundEntity
-    owner = m_hOwnerEntity
+    owner_handle = m_hOwnerEntity
     team = m_iTeamNum
     render_fx = m_nRenderFX
     render_mode_prop = m_nRenderMode

addons/source-python/data/source-python/entities/csgo/CBaseCombatWeapon.ini

@@ -0,0 +1,6 @@
+[property]
+
+    primary_ammo_count = m_iPrimaryReserveAmmoCount
+    secondary_ammo_count = m_iSecondaryReserveAmmoCount
+    ammoprop = m_iPrimaryAmmoType
+    secondary_fire_ammoprop = m_iSecondaryAmmoType

addons/source-python/packages/source-python/commands/typed.py

@@ -1,3 +1,5 @@
+# ../commands/typed.py
+
 #: .. todo:: Add the ability to define prefixes for messages.
 #: .. todo:: Add callback to the Node class. It could be called when a sub-command is required.
 

addons/source-python/packages/source-python/core/command/__init__.py

@@ -1,4 +1,4 @@
-# ../core/commands/command.py
+# ../core/command/__init__.py
 
 """Registers the "sp" server command and all of its sub-commands."""
 

addons/source-python/packages/source-python/effects/__init__.py

@@ -1,4 +1,4 @@
-# ../effects.py
+# ../effects/__init__.py
 
 """Provides access to all effects within the engine."""
 

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

@@ -193,6 +193,18 @@ def _obj(cls, ptr):
     def index(self):
         """Return the entity's index."""
         return self._index
+        
+    @property
+    def owner(self):
+        """Return the entity's owner.
+        
+        :return: None if the entity has no owner.
+        :rtype: Entity
+        """
+        try:
+            return Entity(index_from_inthandle(self.owner_handle))
+        except (ValueError, OverflowError):
+            return None
 
     @property
     def server_classes(self):
@@ -316,6 +328,10 @@ def get_property_string_pointer(self, name):
         """Return the string property."""
         return self._get_property(name, 'string_pointer')
 
+    def get_property_char(self, name):
+        """Return the char property."""
+        return self._get_property(name, 'char')
+
     def get_property_uchar(self, name):
         """Return the uchar property."""
         return self._get_property(name, 'uchar')
@@ -399,6 +415,10 @@ def set_property_string_pointer(self, name, value):
         """Set the string property."""
         self._set_property(name, 'string_pointer', value)
 
+    def set_property_char(self, name, value):
+        """Set the char property."""
+        self._set_property(name, 'char', value)
+
     def set_property_uchar(self, name, value):
         """Set the uchar property."""
         self._set_property(name, 'uchar', value)
@@ -536,15 +556,15 @@ def take_damage(
 
             # Try to get the attacker based off of the weapon's owner
             with suppress(ValueError, OverflowError):
-                attacker_index = index_from_inthandle(weapon.current_owner)
+                attacker_index = index_from_inthandle(weapon.owner_handle)
                 attacker = Entity(attacker_index)
 
         # Is there an attacker but no weapon?
         if attacker is not None and weapon is None:
 
             # Try to use the attacker's active weapon
-            with suppress(AttributeError, ValueError, OverflowError):
-                weapon = Weapon(index_from_inthandle(attacker.active_weapon))
+            with suppress(AttributeError):
+                weapon = attacker.active_weapon
 
         # Try to set the hitgroup
         with suppress(AttributeError):