Merge branch 'master' into player_weapons_update2

Author: satoon101

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

@@ -1,9 +1,8 @@
 [virtual_function]
 
     # _ZN20CBaseCombatCharacter13Weapon_SwitchEP17CBaseCombatWeaponi
-    # TODO: Validate these offsets.
     [[weapon_switch]]
-        offset_linux = 265
-        offset_windows = 264
+        offset_linux = 283
+        offset_windows = 282
         arguments = POINTER, INT
         return_type = BOOL

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

@@ -20,8 +20,5 @@
 # Get the sp.auth logger
 auth_logger = _sp_logger.auth
 
-# Get the auth language strings
-_auth_strings = LangStrings('_core/auth_strings')
-
 if not AUTH_CFG_PATH.exists():
     AUTH_CFG_PATH.mkdir()

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

@@ -5,9 +5,6 @@
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
-# Python Imports
-#   Warnings
-from warnings import warn
 # Source.Python Imports
 #   Commands
 from commands.typed import TypedServerCommand
@@ -29,50 +26,22 @@
 def _sp_plugin_load(command_info, plugin):
     """Load a plugin."""
     _core_command.load_plugin(plugin)
-    
-@_core_command.server_sub_command(['load'])
-def _sp_load(command_info, plugin):
-    """Load a plugin."""
-    warn('"sp load" will be removed soon. Use "sp plugin load" instead.',
-        DeprecationWarning)
-    _core_command.load_plugin(plugin)
 
 @_core_command.server_sub_command(['plugin', 'unload'])
 def _sp_plugin_unload(command_info, plugin):
     """Unload a plugin."""
     _core_command.unload_plugin(plugin)
 
-@_core_command.server_sub_command(['unload'])
-def _sp_unload(command_info, plugin):
-    """Unload a plugin."""
-    warn('"sp unload" will be removed soon. Use "sp plugin unload" instead.',
-        DeprecationWarning)
-    _core_command.unload_plugin(plugin)
-
 @_core_command.server_sub_command(['plugin', 'reload'])
 def _sp_plugin_reload(command_info, plugin):
     """Reload a plugin."""
     _core_command.reload_plugin(plugin)
 
-@_core_command.server_sub_command(['reload'])
-def _sp_reload(command_info, plugin):
-    """Reload a plugin."""
-    warn('"sp reload" will be removed soon. Use "sp plugin reload" instead.',
-        DeprecationWarning)
-    _core_command.reload_plugin(plugin)
-
 @_core_command.server_sub_command(['plugin', 'list'])
 def _sp_plugin_list(command_info):
     """List all currently loaded plugins."""
     _core_command.print_plugins()
 
-@_core_command.server_sub_command(['list'])
-def _sp_list(command_info):
-    """List all currently loaded plugins."""
-    warn('"sp list" will be removed soon. Use "sp plugin list" instead.',
-        DeprecationWarning)
-    _core_command.print_plugins()
-
 
 # =============================================================================
 # >> DESCRIPTIONS

addons/source-python/packages/source-python/core/dumps.py

@@ -181,7 +181,9 @@ def _get_datamap(classname):
 
 def _dump_datamap(open_file, class_name, datamap):
     """Dump a DataMap object to the given file object."""
-    open_file.write('{0}\n'.format(class_name))
+    base = datamap.base
+    open_file.write('{} -> {}\n'.format(
+        class_name, base and base.class_name))
     for desc in datamap:
         _dump_type_description(open_file, desc)
 
@@ -216,11 +218,14 @@ def dump_server_classes(filename):
         # Loop through all server classes
         for server_class in ServerClassGenerator():
 
+            table = server_class.table
+
             # Print the server class' name to file
-            open_file.write('{0}\n'.format(server_class.name))
+            open_file.write('{} -> {}\n'.format(
+                server_class.name, _find_base_server_class_name(table)))
 
             # Get all items in the server class' table
-            _dump_server_class_table(server_class.table, open_file)
+            _dump_server_class_table(table, open_file)
 
             # Move to the next server class
             server_class = server_class.next
@@ -232,6 +237,22 @@ def dump_server_classes(filename):
                 open_file.write('\n')
 
 
+def _find_base_server_class_name(table):
+    """Return the name of table's base server class."""
+    for prop in table:
+        if prop.name != 'baseclass':
+            continue
+
+        base_name = prop.data_table.name
+        for server_class in ServerClassGenerator():
+            if server_class.table.name == base_name:
+                return server_class.name
+
+        return None
+
+    return None
+
+
 def _dump_server_class_table(table, open_file, level=1, offset=0):
     """Dump all items in the given table to the given file."""
     # Loop through the send props in the table

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

@@ -80,7 +80,7 @@
            'OnEntitySpawned',
            'OnLevelInit',
            'OnLevelShutdown',
-           'OnMapEnd',
+           'OnLevelEnd',
            'OnNetworkidValidated',
            'OnPluginLoaded',
            'OnPluginUnloaded',
@@ -358,7 +358,7 @@ class OnPluginUnloaded(ListenerManagerDecorator):
     manager = on_plugin_unloaded_manager
 
 
-class OnMapEnd(ListenerManagerDecorator):
+class OnLevelEnd(ListenerManagerDecorator):
     """Register/unregister a map end listener."""
 
     manager = on_map_end_listener_manager
@@ -373,7 +373,7 @@ class OnMapEnd(ListenerManagerDecorator):
 @OnLevelInit
 def _on_level_init(map_name):
     """Called when a new map gets initialized."""
-    OnMapEnd._level_initialized = True
+    OnLevelEnd._level_initialized = True
 
     if not _check_for_update.get_int():
         return
@@ -399,14 +399,14 @@ def _on_level_init(map_name):
 def _on_level_shutdown():
     """Called on level end."""
     # Was no map initialized?
-    if not OnMapEnd._level_initialized:
+    if not OnLevelEnd._level_initialized:
         return
 
     # Notify all registred callbacks
     on_map_end_listener_manager.notify()
 
     # Make sure we don't get called more than once per map change
-    OnMapEnd._level_initialized = False
+    OnLevelEnd._level_initialized = False
 
 
 @PreHook(memory.get_virtual_function(cvar, 'CallGlobalChangeCallbacks'))

addons/source-python/packages/source-python/messages/dialog.py

@@ -16,7 +16,7 @@
 #   KeyValues
 from keyvalues import KeyValues
 #   Listeners
-from listeners import OnLevelShutdown
+from listeners import OnLevelEnd
 from listeners.tick import Delay
 #   Messages
 from _messages import DialogType
@@ -315,7 +315,7 @@ def _set_keyvalues(self, keyvalues, player, **tokens):
 # ============================================================================
 # >> LISTENERS
 # ============================================================================
-@OnLevelShutdown
-def _level_shutdown():
+@OnLevelEnd
+def _level_end():
     """Clear the player levels dictionary."""
     _player_levels.clear()

readme.md

@@ -20,7 +20,7 @@ Source.Python is an open-source project that uses boost::python to allow scripte
       * __../custom/__ - Custom Packages
       * __../site-packages/__ - included site-packages
       * __../source-python/__ - Source.Python Python API
-    * __../plugins/__ - plugins (use "sp load <plugin>" in server console to load)
+    * __../plugins/__ - plugins (use "sp plugin load <plugin>" in server console to load)
     * __../Python3/__ - Python3.x base
 * __cfg/__
   * __../source-python/__ - configuration files

resource/source-python/translations/_core/auth_strings.ini

@@ -4,3 +4,4 @@ de = "Standardwert:"
 fr = "Valeur par défaut:"
 nl = "Standaardwaarde:"
 ru = "Стандартное значение:"
+es = "Valor por defecto:"