r2617 - in trunk: Docs/server data misc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-19 15:22:50 -0400 (Sat, 19 May 2007)
New Revision: 2617

Modified:
   trunk/Docs/server/server.cfg
   trunk/data/default.cfg
   trunk/misc/makebuild.sh
Log:
update server.cfg; enable random map selection by default; allow build script to make more than one build per day


Modified: trunk/Docs/server/server.cfg
===================================================================
--- trunk/Docs/server/server.cfg	2007-05-19 18:40:42 UTC (rev 2616)
+++ trunk/Docs/server/server.cfg	2007-05-19 19:22:50 UTC (rev 2617)
@@ -16,8 +16,12 @@
 // for more g_maplist examples.
 
 //g_maplist 'dm_aggressor''dm_aneurysm''dm_basement''dm_bleach''dm_bluesky''dm_bloodprison''dm_darkzone''dm_downer''dm_evilspace''dm_farewell''dm_runningman''dm_runningman_1on1remix''dm_silvercity''dm_skyway''dm_slimepit''dm_soylent''dm_starship''dm_stormkeep''dm_toxic''dm_warfare' // the map cycle for the server
-//g_maplist_shuffle 0 // 1 will choose a random map as next map
+//g_maplist_shuffle 1 // 0 always selects the next map out of g_maplist (but then set better set g_maplist_votable 0 below to prevent repetitive votes), 1 will select random maps each time
 
+//g_maplist_votable 5 // number of maps to vote between; set to 0 to disable the map voting screen (please enable g_maplist_shuffle above when this is enabled, or votes will be repetitive)
+//g_maplist_votable_suggestions 2 // number of suggestions to accept using the suggestmap command
+//g_maplist_votable_suggestions_change_gametype 1 // 0 will forbid suggestmap to change the game type
+
 //maxplayers 8 // number of players allowed on the server
 //port 26000 // the port used by the server
 //sv_public 1 // 0 if the server should not be on the public servers list
@@ -42,8 +46,10 @@
 //sv_vote_commands "restart timelimit fraglimit chmap g_grappling_hook sv_defaultplayer_fbskin_green sv_defaultplayer_fbskin_red sv_defaultplayer_fbskin_orange sv_defaultplayer_fbskin_off" // players can vote for those commands or use them if they are masters
 //sv_vote_call 1 // 0 will disable the normal voting
 //sv_vote_master 1 // 0 will disable voting to become masters
+//sv_vote_master_password "" // when set, vdo login master will allow you to run votable commands directly using vdo
+//sv_vote_simple_majority 0 // 1 will make votes succeed if there are more yes than no votes; with 0 (default), more than half of the players have to say yes
+//sv_vote_change_gametype 1 // 0 will forbid changing the game type by map votes
 
-
 //sv_defaultcharacter 0 // 1 will force a specific model for all players
 //sv_defaultplayermodel models/player/nexus.zym // this model will be used
 //sv_defaultplayerskin 0 // this skin number will be forced for all players

Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2007-05-19 18:40:42 UTC (rev 2616)
+++ trunk/data/default.cfg	2007-05-19 19:22:50 UTC (rev 2617)
@@ -220,7 +220,7 @@
 seta g_maplist $g_maplist_defaultlist
 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 0 // 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.
+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.
 // timeout for kill credit when your damage knocks someone into a death trap
 set g_maxpushtime 8.0
 

Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh	2007-05-19 18:40:42 UTC (rev 2616)
+++ trunk/misc/makebuild.sh	2007-05-19 19:22:50 UTC (rev 2617)
@@ -38,6 +38,19 @@
 osxtemp=/Users/rpolzer/Darkplaces.build
 osxsave=/tmp/Nexuiz.osx
 
+i=
+while [ -f "$zipdir/nexuiz$date$i$ext.zip" ]; do
+	if [ -z "$i" ]; then
+		i=a
+	else
+		i=`echo "$i" | tr a-y b-z`
+	fi
+done
+date=$date$i
+
+echo "Using build name nexuiz$date$ext"
+sleep 3
+
 if [ -n "$1" ]; then
 	osxhost="$1"
 fi