X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=xonotic-server.cfg;h=956fb215548c55d20e9a62bd27cc2d0e31942901;hp=240a2254c6afde8f941640426a4dcdeb3132ca0e;hb=16e64ff58cf65d7b3e0815aadb530580a6aa251b;hpb=b2e3660c5c919d8be9594934e8f6eec9b82346a3

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 240a2254c..956fb2155 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -10,7 +10,7 @@ set sv_autotaunt 1 "allow autotaunts on the server"
 // server settings
 hostname "Xonotic $g_xonoticversion Server"
 set sv_mapchange_delay 5
-set minplayers 0 "number of players playing at the same time (if not enough real players are there the remaining slots are filled with bots)"
+set minplayers 0 "fill server with bots to reach this number of players (if bot_number is not enough)"
 
 // restart server if all players hit "ready"-button
 set sv_ready_restart 0 "allow a map to be restarted once all players pressed the \"ready\" button"
@@ -25,7 +25,7 @@ set g_maxplayers_spectator_blocktime 5	"if the players voted for the \"nospectat
 
 // tournament mod
 set g_warmup 0	"split the game into a warmup- and match-stage"
-set g_warmup_limit 0	"limit warmup-stage to this time (in seconds); if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage"
+set g_warmup_limit 180	"limit warmup-stage to this time (in seconds); if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage"
 set g_warmup_allow_timeout 0	"allow calling timeouts in the warmup-stage (if sv_timeout is set to 1)"
 set g_warmup_allguns 1	"provide more weapons on start while in warmup: 0 = normal start weapons, 1 = all guns available on the map, 2 = all normal weapons"
 set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end"
@@ -43,7 +43,7 @@ set sv_timeout_number 2	"how many timeouts one player is allowed to call (gets r
 set sv_timeout_leadtime 4	"how long the players will be informed that a timeout was called before it starts, in seconds"
 set sv_timeout_resumetime 3	"how long the remaining timeout-time will be after a player called the timein command"
 
-set g_allow_oldvortexbeam 0 "If enabled, clients are allowed to use old v2.3 Vortex beam"
+set g_allow_oldvortexbeam 1 "If enabled, clients are allowed to use old v2.3 Vortex beam"
 
 set g_telefrags 1 "telefragging, i.e. killing someone who stands in the way of someone who is teleporting"
 set g_telefrags_teamplay 1 "never telefrag team mates"
@@ -80,8 +80,6 @@ set sv_track_canjump 0 "track if the player released the jump key between 2 jump
 set sv_jumpvelocity_crouch 0 "jump height while crouching, set to 0 to use regular jump height"
 
 set sv_precacheplayermodels 1
-set sv_precacheweapons 0
-set sv_precacheitems 0
 set sv_spectator_speed_multiplier 1.5
 set sv_spectator_speed_multiplier_min 1
 set sv_spectator_speed_multiplier_max 5
@@ -243,8 +241,6 @@ set timelimit_overtimes 0 "how many overtimes to add at max"
 set timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all overtimes were added and still no winner was found"
 
 // common team values
-set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
-set g_tdm_on_dm_maps 0 "when this is set, all DM maps automatically support TDM"
 
 set teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the cvars g_mirrordamage*, g_friendlyfire* and g_teamdamage*"
 set g_mirrordamage 0.7              "for teamplay_mode 4: mirror damage factor"
@@ -258,9 +254,7 @@ set g_teamdamage_resetspeed 20      "for teamplay_mode 4: how fast player's team
 
 set g_balance_teams 1	"automatically balance out players entering instead of asking them for their preferred team"
 set g_balance_teams_prevent_imbalance	1	"prevent players from changing to larger teams"
-set g_balance_teams_scorefactor 0.25 "at the end of the game, take score into account instead of team size by this amount (beware: values over 0.5 mean that a x:0 score imbalance will cause ALL new players to prefer the losing team at the end, despite numbers)"
 set g_changeteam_banned 0	"not allowed to change team"
-set g_changeteam_fragtransfer 0	"% of frags you get to keep when you change teams (rounded down)"
 
 set sv_teamnagger 1 "enable a nag message when the teams are unbalanced"
 
@@ -345,7 +339,7 @@ set g_maplist_votable_screenshot_dir "maps levelshots"	"where to look for map sc
 
 set sv_vote_gametype 0 "show a vote screen for gametypes before map vote screen"
 set sv_vote_gametype_keeptwotime 10 "show only 2 options after this amount of time during gametype vote screen"
-set sv_vote_gametype_options "dm tdm ctf"
+set sv_vote_gametype_options "dm tdm ctf" "Keep the identifiers short, otherwise you'll run into issues with too long alias names (max is 31 characters) when using sv_vote_gametype_hook_*"
 set sv_vote_gametype_timeout 20
 set sv_vote_gametype_default_current 1 "Keep the current gametype if no one votes"
 
@@ -374,6 +368,7 @@ set sv_itemstime 1 "enable networking of time left until respawn for items such
 
 set g_ban_default_bantime 5400	"90 minutes"
 set g_ban_default_masksize 3	"masksize 0 means banning by UID only, 1 means banning by /8 (IPv6: /32) network, 2 means banning by /16 (IPv6: /48) network, 3 means banning by /24 (IPv6: /56) network, 4 means banning by single IP (IPv6: /64 network)"
+set g_ban_telluser 1 "notify the banned player about it when they try to join"
 set g_banned_list ""	"format: IP remainingtime IP remainingtime ..."
 set g_banned_list_idmode "1"	"when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)"
 
@@ -440,6 +435,7 @@ set g_jetpack 0 "Jetpack mutator"
 set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used"
 set g_hitplots_individuals "" "the individuals, by IP, that should have their hitplots recorded"
 
+// set it to 1 to "fix bot moveto command and routing... now all bots can get to their seats" (Nexuiz repo, commit 2c9873e6)
 set bot_navigation_ignoreplayers 0 // FIXME remove this once the issue is solved
 set bot_sound_monopoly 0 "when enabled, only bots can make any noise"
 
@@ -483,6 +479,7 @@ sv_gameplayfix_gravityunaffectedbyticrate 1
 sv_gameplayfix_nogravityonground 1
 
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping machinegun and shotgun (for Q3A map compatibility in mapinfo files)"
+set sv_vq3compat 0 "toggle for some compatibility hacks (for VQ3 and CPM map compatibility in mapinfo files)"
 
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
 
@@ -543,11 +540,13 @@ set g_mod_config  "" "Current config mod name"
 exec balance-xonotic.cfg
 exec physicsX.cfg
 exec turrets.cfg
+exec vehicles.cfg
 exec gamemodes-server.cfg
 exec mutators.cfg
 exec monsters.cfg
 exec minigames.cfg
 exec physics.cfg
+if_dedicated exec help-xonotic.cfg
 
 set sv_join_notices ""
 set sv_join_notices_time 15