Make sure base Entity/Player/Weapon classes always resolve to their game/engine overrides.

Author: jordanbriere

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

@@ -5,9 +5,17 @@
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
+# Python Imports
+#   Importlib
 from importlib import import_module
+
+# Source.Python Imports
+#   Core
 from core import GAME_NAME
 from core import SOURCE_ENGINE
+#   Entities
+import entities._base
+#   Paths
 from paths import SP_PACKAGES_PATH
 
 
@@ -35,7 +43,7 @@
 ).isfile():
 
     # Import the game-specific 'Entity' class
-    Entity = import_module(
+    Entity = entities._base = import_module(
         'entities.engines.{engine}.{game}'.format(
             engine=SOURCE_ENGINE,
             game=GAME_NAME,
@@ -47,7 +55,7 @@
 ).isfile():
 
     # Import the engine-specific 'Entity' class
-    Entity = import_module(
+    Entity = entities._base = import_module(
         'entities.engines.{engine}'.format(
             engine=SOURCE_ENGINE,
         )
@@ -56,4 +64,4 @@
 else:
 
     # Import the base 'Entity' class
-    from entities._base import Entity
+    Entity = entities._base.Entity

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

@@ -5,10 +5,18 @@
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
+# Python Imports
+#   Importlib
 from importlib import import_module
+
+# Source.Python Imports
+#   Core
 from core import GAME_NAME
 from core import SOURCE_ENGINE
+#   Paths
 from paths import SP_PACKAGES_PATH
+#   Players
+import players._base
 
 
 # =============================================================================
@@ -26,7 +34,7 @@
 ).isfile():
 
     # Import the game-specific 'Player' class
-    Player = import_module(
+    Player = players._base.Player = import_module(
         'players.engines.{engine}.{game}'.format(
             engine=SOURCE_ENGINE,
             game=GAME_NAME,
@@ -38,7 +46,7 @@
 ).isfile():
 
     # Import the engine-specific 'Player' class
-    Player = import_module(
+    Player = players._base.Player = import_module(
         'players.engines.{engine}'.format(
             engine=SOURCE_ENGINE,
         )
@@ -47,4 +55,4 @@
 else:
 
     # Import the base 'Player' class
-    from players._base import Player
+    Player = players._base.Player

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

@@ -5,10 +5,18 @@
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
+# Python Imports
+#   Importlib
 from importlib import import_module
+
+# Source.Python Imports
+#   Core
 from core import GAME_NAME
 from core import SOURCE_ENGINE
+#   Paths
 from paths import SP_PACKAGES_PATH
+#   Weapons
+import weapons._base
 
 
 # =============================================================================
@@ -26,7 +34,7 @@
 ).isfile():
 
     # Import the game-specific 'Weapon' class
-    Weapon = import_module(
+    Weapon = weapons._base = import_module(
         'weapons.engines.{engine}.{game}'.format(
             engine=SOURCE_ENGINE,
             game=GAME_NAME,
@@ -38,7 +46,7 @@
 ).isfile():
 
     # Import the engine-specific 'Weapon' class
-    Weapon = import_module(
+    Weapon = weapons._base = import_module(
         'weapons.engines.{engine}'.format(
             engine=SOURCE_ENGINE,
         )
@@ -47,4 +55,4 @@
 else:
 
     # Import the base 'Weapon' class
-    from weapons._base import Weapon
+    Weapon = weapons._base.Weapon