From 5725eae5835550a541d798f9732992b970cf55f5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 10 Jul 2014 21:07:03 +0200
Subject: [PATCH] Some restructuring of settings_default, moving guests into a
 separate section.

---
 src/settings_default.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/settings_default.py b/src/settings_default.py
index fd7c25e591..7db5e43c72 100644
--- a/src/settings_default.py
+++ b/src/settings_default.py
@@ -287,8 +287,6 @@ CHANNEL_TYPECLASS_PATHS = ["game.gamesrc.conf", "contrib"]
 
 # Typeclass for player objects (linked to a character) (fallback)
 BASE_PLAYER_TYPECLASS = "src.players.player.Player"
-# Typeclass for guest player objects (linked to a character)
-BASE_GUEST_TYPECLASS = "src.players.player.Guest"
 # Typeclass and base for all objects (fallback)
 BASE_OBJECT_TYPECLASS = "src.objects.objects.Object"
 # Typeclass for character objects linked to a player (fallback)
@@ -310,16 +308,6 @@ DEFAULT_HOME = "#2"
 #  MULTISESSION_MODE = 0, 1 - used by default unloggedin create command
 #  MULTISESSION_MODE = 2 - used by default character_create command
 START_LOCATION = "#2"
-# This enables guest logins.
-GUEST_ENABLED = True
-# The default home location used for guests.
-GUEST_HOME = "#2"
-# The start position used for guest characters.
-GUEST_START_LOCATION = "#2"
-# The naming convention for guest players/characters. The size of this list
-# also detemines how many guests may be on the game at once. The default is
-# a maximum of nine guests, named Guest1 through Guest9.
-GUEST_LIST = ["Guest" + str(s+1) for s in range(9)]
 # Lookups of Attributes, Tags, Nicks, Aliases can be aggressively
 # cached to avoid repeated database hits. This often gives noticeable
 # performance gains since they are called so often. Drawback is that
@@ -389,8 +377,26 @@ PERMISSION_HIERARCHY = ("Guests",
                         "Immortals")
 # The default permission given to all new players
 PERMISSION_PLAYER_DEFAULT = "Players"
+
+######################################################################
+# Guest accounts
+######################################################################
+
+# This enables guest logins, by default via "connect guest"
+GUEST_ENABLED = True
+# Typeclass for guest player objects (linked to a character)
+BASE_GUEST_TYPECLASS = "src.players.player.Guest"
 # The permission given to guests
 PERMISSION_GUEST_DEFAULT = "Guests"
+# The default home location used for guests.
+GUEST_HOME = "#2"
+# The start position used for guest characters.
+GUEST_START_LOCATION = "#2"
+# The naming convention used for creating new guest
+# players/characters. The size of this list also detemines how many
+# guests may be on the game at once. The default is a maximum of nine
+# guests, named Guest1 through Guest9.
+GUEST_LIST = ["Guest" + str(s+1) for s in range(9)]
 
 ######################################################################
 # In-game Channels created from server start