--- deliantra/server/include/config.h	2009/11/09 18:47:56	1.57
+++ deliantra/server/include/config.h	2012/10/29 23:55:53	1.66
@@ -1,24 +1,24 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
- * 
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -105,7 +105,7 @@
  * 15, the chance not to lose the stat is 4/(4+3) or 4/7.  The higher the
  * level, the more likely it is a stat can get really depleted, but
  * this gets more offset as the stat gets more depleted.
- * 
+ *
  */
 /* GD */
 
@@ -117,22 +117,21 @@
 /* Don't edit these values.  They are configured in lib/settings.  These are
    Simply the defaults. */
 
-#define BALANCED_STAT_LOSS FALSE
-#define PERMANENT_EXPERIENCE_RATIO 25
-#define DEATH_PENALTY_RATIO 20
-#define DEATH_PENALTY_LEVEL 3
+#define BALANCED_STAT_LOSS TRUE
+#define PERMANENT_EXPERIENCE_RATIO 30
+#define DEATH_PENALTY_RATIO 10
+#define DEATH_PENALTY_LEVEL 2
 #define SET_TITLE TRUE
 #define SIMPLE_EXP TRUE
 #define SPELLPOINT_LEVEL_DEPEND TRUE
-#define SPELL_ENCUMBRANCE TRUE
+#define SPELL_ENCUMBRANCE FALSE
 #define SPELL_FAILURE_EFFECTS FALSE
 #define RESURRECTION FALSE
 #define SEARCH_ITEMS TRUE
 #define NOT_PERMADETH TRUE
-#define EXPLORE_MODE FALSE
 #define STAT_LOSS_ON_DEATH FALSE
-#define PK_LUCK_PENALTY 1
-#define SET_FRIENDLY_FIRE 5
+#define PK_LUCK_PENALTY 0
+#define SET_FRIENDLY_FIRE 0
 #define ARMOR_MAX_ENCHANT   5
 #define ARMOR_WEIGHT_REDUCTION  10
 #define ARMOR_WEIGHT_LINEAR TRUE
@@ -251,7 +250,6 @@
  *
  * Values:
  *
- * CSPORT - port to use for new client/server
  * DMFILE - file with dm/wizard access lists
  * LOGFILE - where to log if using -daemon option
  * MAP_ - various map timeout and swapping parameters
@@ -266,11 +264,6 @@
  ***********************************************************************
  */
 
-/* CSPORT is the port used for the new client/server code.  Change
- * if desired.  Only of relevance if ERIC_SERVER is set above
- */
-#define CSPORT 13327 /* old port + 1 */
-
 /*
  * DMFILE
  * A file containing valid names that can be dm, one on each line.  See
@@ -331,15 +324,7 @@
  * These defines tells where, relative to LIBDIR, the maps, the map-index,
  * archetypes highscore and treaures files and directories can be found.
  */
-
 #define MAPDIR		"maps"
-#define TEMPLATE_DIR	"template-maps"
-#define ARCHETYPES	"archetypes"
-#define REGIONS	"regions"
-#define HIGHSCORE	"highscore"
-#define TREASURES	"treasures"
-
-#define HIGHSCORE_LENGTH 1000	/* How many entries there are room for */
 
 #define MAXSTRING 20