Merge branch 'master' into martin-t/mg-solidpen

[xonotic/xonotic-data.pk3dir.git] / xonotic-server.cfg

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 6aa5844b7d871ae817ffba57801e2b1d319014d6..525c589f9289d08b85deb8cf9ff01887a92ef783 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -10,7 +10,8 @@ set sv_autotaunt 1 "allow autotaunts on the server"
 // server settings
 hostname "Xonotic $g_xonoticversion Server"
 set sv_mapchange_delay 5
 // server settings
 hostname "Xonotic $g_xonoticversion Server"
 set sv_mapchange_delay 5

-set minplayers 0 "fill server with bots to reach this number of players (if bot_number is not enough)"
+set minplayers 0 "fill server with bots to reach this number of players in teamless games (if bot_number is not enough)"
+set minplayers_per_team 0 "fill server with bots to reach this number of players per team (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"
 
 // 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 +26,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"
 
 // 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"
 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"


@@ -381,6 +382,7 @@ set timelimit_max 60
 sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
 sv_gameplayfix_stepmultipletimes 1
 sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
 sv_gameplayfix_stepmultipletimes 1

+sv_gameplayfix_stepdown 2

 
 // delay for "kill" to prevent abuse
 set g_balance_kill_delay 2
 
 // delay for "kill" to prevent abuse
 set g_balance_kill_delay 2


@@ -414,15 +416,11 @@ set g_ban_sync_trusted_servers_verify 0   "when set to 1, additional bans sent by
 
 set g_showweaponspawns 1 "1: display waypoints for weapon spawns found on the map when a weapon key is pressed and the weapon is not owned; 2: for dropped weapons too; 3: for all the weapons sharing the same impulse"
 
 
 set g_showweaponspawns 1 "1: display waypoints for weapon spawns found on the map when a weapon key is pressed and the weapon is not owned; 2: for dropped weapons too; 3: for all the weapons sharing the same impulse"
 

-// ballistics use physical units, but qu based
-//   Quake-Newton: 1 qN  = 1 qu * 1 g / 1 s^2
-//   Quake-Joule:  1 qJ  = 1 qN * 1 qu
-//   Quake-Pascal: 1 qPa = 1 qN / 1 qu^2
-
-set g_ballistics_mindistance 2 // enable ballistics starting from 2 qu
-set g_ballistics_density_player 0.50 // players are 2x as easy to pass as walls
-set g_ballistics_density_corpse 0.10 // corpses are 10x as easy to pass as walls
-set g_ballistics_penetrate_clips 0 "allow ballistics to pass through weapon clips"
+set g_ballistics_mindistance 2 "when shooting through walls thinner than this, treat them as this thick (useful because patches (curved surfaces) have no thickness)"
+set g_ballistics_density_player 0.50 "how hard players are to shoot through compared to walls"
+set g_ballistics_density_corpse 0.10 "how hard corpses are to shoot through compared to walls"
+set g_ballistics_penetrate_clips 1 "allow ballistics to pass through weapon clips"
+set g_ballistics_solidpenetration_exponent 0.25 "how fast damage falls off when bullets pass through walls - 1 means linear, lower values mean slower initial falloff but faster once there's little solidpenetration left (damage_fraction = solidpen_fraction^exp for solidpen_fraction between 0 and 1)"

 
 sv_status_show_qcstatus 1      "Xonotic uses this field instead of frags"
 set g_full_getstatus_responses 0       "this currently breaks qstat"
 
 sv_status_show_qcstatus 1      "Xonotic uses this field instead of frags"
 set g_full_getstatus_responses 0       "this currently breaks qstat"


@@ -540,12 +538,13 @@ set g_mod_config  "" "Current config mod name"
 exec balance-xonotic.cfg
 exec physicsX.cfg
 exec turrets.cfg
 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
 exec gamemodes-server.cfg
 exec mutators.cfg
 exec monsters.cfg
 exec minigames.cfg
 exec physics.cfg

-exec help-xonotic.cfg
+if_dedicated exec help-xonotic.cfg

 
 set sv_join_notices ""
 set sv_join_notices_time 15
 
 set sv_join_notices ""
 set sv_join_notices_time 15