From b2d91d9bb5249f6d0b90a1e5038f4dc9fa54e541 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 25 Mar 2012 17:13:39 +0200 Subject: [PATCH] Switched settings_default to use src/ base modules instead of modules in game/gamesrc/ as default (these will be removed) --- game/gamesrc/commands/examples/cmdset.py | 10 ++++++++-- src/settings_default.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/game/gamesrc/commands/examples/cmdset.py b/game/gamesrc/commands/examples/cmdset.py index 0ffb2b9d85..b429a8f71e 100644 --- a/game/gamesrc/commands/examples/cmdset.py +++ b/game/gamesrc/commands/examples/cmdset.py @@ -11,11 +11,17 @@ To extend the default command set: DefaultCmdSet - import/add commands at the end of DefaultCmdSet's add() method. -To add a new command set +To extend OOC cmdset: + - like default set, but point settings.CMDSET_OOC on your new cmdset. + +To extend Unloggedin cmdset: + - like default set, but point settings.CMDSET_UNLOGGEDIN on your new cmdset. + +To add a wholly new command set: - copy this file up one level to gamesrc/commands and name it something fitting. - add a new cmdset class - - add it objects with obj.cmdset.add(path.to.the.module.and.class) + - add it to objects e.g. with obj.cmdset.add(path.to.the.module.and.class) """ diff --git a/src/settings_default.py b/src/settings_default.py index b2f21c06c7..7dc00797c2 100644 --- a/src/settings_default.py +++ b/src/settings_default.py @@ -182,11 +182,11 @@ OOB_FUNC_MODULE = "game.gamesrc.conf.oobfuncs" # these existing sets instead. # Command set used before player has logged in -CMDSET_UNLOGGEDIN = "game.gamesrc.commands.basecmdset.UnloggedinCmdSet" +CMDSET_UNLOGGEDIN = "src.commands.default.cmdset_unloggedin.UnloggedinCmdSet" # Default set for logged in player with characters (fallback) -CMDSET_DEFAULT = "game.gamesrc.commands.basecmdset.DefaultCmdSet" +CMDSET_DEFAULT = "src.commands.default.cmdset_default.DefaultCmdSet" # Command set for players without a character (ooc) -CMDSET_OOC = "game.gamesrc.commands.basecmdset.OOCCmdSet" +CMDSET_OOC = "src.commands.default.cmdset_ooc.OOCCmdSet" ################################################### # Typeclasses @@ -200,15 +200,15 @@ SCRIPT_TYPECLASS_PATHS = ["game.gamesrc.scripts", "game.gamesrc.scripts.examples PLAYER_TYPECLASS_PATHS = ["game.gamesrc.objects", "contrib"] # Typeclass for player objects (linked to a character) (fallback) -BASE_PLAYER_TYPECLASS = "game.gamesrc.objects.baseobjects.Player" +BASE_PLAYER_TYPECLASS = "src.objects.players.Player" # Typeclass and base for all objects (fallback) -BASE_OBJECT_TYPECLASS = "game.gamesrc.objects.baseobjects.Object" +BASE_OBJECT_TYPECLASS = "src.objects.objects.Object" # Typeclass for character objects linked to a player (fallback) -BASE_CHARACTER_TYPECLASS = "game.gamesrc.objects.baseobjects.Character" +BASE_CHARACTER_TYPECLASS = "src.objects.objects.Character" # Typeclass for rooms (fallback) -BASE_ROOM_TYPECLASS = "game.gamesrc.objects.baseobjects.Room" +BASE_ROOM_TYPECLASS = "src.objects.objects.Room" # Typeclass for Exit objects (fallback) -BASE_EXIT_TYPECLASS = "game.gamesrc.objects.baseobjects.Exit" +BASE_EXIT_TYPECLASS = "src.objects.objects.Exit" # Typeclass for Scripts (fallback) BASE_SCRIPT_TYPECLASS = "src.scripts.scripts.DoNothing" # The home location for new characters. This must be a unique