diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index ce5ff03453..87b2c7dc4d 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -618,6 +618,17 @@ def error_check_python_modules(): if hasattr(settings, "CHARACTER_DEFAULT_HOME"): raise DeprecationWarning("settings.CHARACTER_DEFAULT_HOME should be renamed to DEFAULT_HOME. " \ "See also settings.START_LOCATION (see evennia/settings_default.py).") + deprstring = "settings.%s is now merged into settings.TYPECLASS_PATHS. Update your settings file." + if hasattr(settings, "OBJECT_TYPECLASS_PATHS"): + raise DeprecationWarning(deprstring % "OBJECT_TYPECLASS_PATHS") + if hasattr(settings, "SCRIPT_TYPECLASS_PATHS"): + raise DeprecationWarning(deprstring % "SCRIPT_TYPECLASS_PATHS") + if hasattr(settings, "PLAYER_TYPECLASS_PATHS"): + raise DeprecationWarning(deprstring % "PLAYER_TYPECLASS_PATHS") + if hasattr(settings, "CHANNEL_TYPECLASS_PATHS"): + raise DeprecationWarning(deprstring % "CHANNEL_TYPECLASS_PATHS") + + from evennia.commands import cmdsethandler if not cmdsethandler.import_cmdset(settings.CMDSET_UNLOGGEDIN, None): print "Warning: CMDSET_UNLOGGED failed to load!" diff --git a/evennia/settings_default.py b/evennia/settings_default.py index b328920998..c132e92838 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -284,13 +284,10 @@ CMDSET_PATHS = ["commands"] # Server-side session class used. SERVER_SESSION_CLASS = "evennia.server.serversession.ServerSession" -# Base paths for typeclassed object classes. These paths must be -# defined relatively to Evennia's root directory. They will be searched in -# order to find relative typeclass paths. -OBJECT_TYPECLASS_PATHS = ["typeclasses", "evennia.contrib", "evennia.contrib.tutorial_examples"] -SCRIPT_TYPECLASS_PATHS = ["typeclasses", "evennia.contrib", "evennia.contrib.tutorial_examples"] -PLAYER_TYPECLASS_PATHS = ["typeclasses", "evennia.contrib", "evennia.contrib.tutorial_examples"] -CHANNEL_TYPECLASS_PATHS = ["typeclasses", "evennia.contrib", "evennia.contrib.tutorial_examples"] +# These are paths that will be prefixed to the paths given if the +# immediately entered path fail to find a typeclass. It allows for +# shorter input strings. They must either base off the game directory +# or start from the evennia library. TYPECLASS_PATHS = ["typeclasses", "evennia.contrib", "evennia.contrib.tutorial_examples"] # Typeclass for player objects (linked to a character) (fallback)