r6018 - in trunk: data server

[DONOTREPLY at icculus.org]

Author: m0rfar
Date: 2009-02-28 06:16:17 -0500 (Sat, 28 Feb 2009)
New Revision: 6018

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/server/server.cfg
Log:
synced the default maplist (excluded turret_test)

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-28 11:05:12 UTC (rev 6017)
+++ trunk/data/defaultNexuiz.cfg	2009-02-28 11:16:17 UTC (rev 6018)
@@ -426,7 +426,7 @@
 set g_throughfloor 1
 set g_maplist_mostrecent ""
 seta g_maplist_mostrecent_count 3	"number of most recent maps that are blocked from being played again"
-seta g_maplist "aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone dieselpower dismal downer evilspace farewell final_rage reslimed ruiner runningman_1on1remix runningman runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
+seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone desertfactory dieselpower dismal downer eggandbacon evilspace farewell final_rage ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
 seta g_maplist_index 0	"this is used internally for saving position in maplist cycle"
 seta g_maplist_selectrandom 0	"if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"
 seta g_maplist_shuffle 1	"new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"

Modified: trunk/server/server.cfg
===================================================================
--- trunk/server/server.cfg	2009-02-28 11:05:12 UTC (rev 6017)
+++ trunk/server/server.cfg	2009-02-28 11:16:17 UTC (rev 6018)
@@ -18,7 +18,7 @@
 //log_file server.log       // server console output will also be copied to this file
 
 // List of maps to play on the server.  Set to "" to autodetect (which would enumerate ALL maps.  Maps that don't support the current game mode will be skipped, so you don't need to remove them here.
-//g_maplist "aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone dieselpower dismal downer evilspace farewell final_rage reslimed ruiner runningman_1on1remix runningman runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
+//g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone desertfactory dieselpower dismal downer eggandbacon evilspace farewell final_rage ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
 //g_maplist_shuffle 1           // 0 always selects the next map out of g_maplist (but then better set g_maplist_votable 0 below to prevent repetitive votes), 1 will select random maps each time
 //g_maplist_mostrecent_count 3  // number of maps that have to be played before a map can be repeated