Merge branch 'martin-t/seta' into 'master'

Seta -> set in server configs

See merge request xonotic/xonotic-data.pk3dir!700

diff --combined gamemodes-server.cfg
index c6e1e30a3adc3b2f2508f1aceae349185d460288,fc441af951e38d758cdad0b923a646f55aff44af..548a512234f7afce4c83377131fc383592a7375c
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -74,19 -74,19 +74,19 @@@ alias sv_vote_gametype_hook_due
  // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF, and Runematch.
  set leadlimit 0
  set leadlimit_and_fraglimit 0 "if set, leadlimit is ANDed with fraglimit (otherwise ORed)"
- seta timelimit_override -1    "Time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta fraglimit_override -1    "Frag limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta leadlimit_override -1    "Lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta capturelimit_override -1 "Capture limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta captureleadlimit_override -1     "Capture llead imit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_domination_point_limit -1      "Domination point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_domination_point_leadlimit -1  "Domination point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_keyhunt_point_limit -1 "Keyhunt point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_keyhunt_point_leadlimit -1     "Keyhunt point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_race_laps_limit -1     "Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_nexball_goallimit -1 "Nexball goal limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_invasion_point_limit -1 "Invasion point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set timelimit_override -1     "Time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set fraglimit_override -1     "Frag limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set leadlimit_override -1     "Lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set capturelimit_override -1  "Capture limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set captureleadlimit_override -1      "Capture llead imit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_domination_point_limit -1       "Domination point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_domination_point_leadlimit -1   "Domination point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_keyhunt_point_limit -1  "Keyhunt point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_keyhunt_point_leadlimit -1      "Keyhunt point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_race_laps_limit -1      "Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_nexball_goallimit -1 "Nexball goal limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_invasion_point_limit -1 "Invasion point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  
  
  // =================================
@@@ -217,16 -217,15 +217,16 @@@ set g_assault 0 "Assault: attack the en
  //  clan arena
  // ============
  set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round"
- seta g_ca_point_limit -1 "Clan Arena point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_ca_point_leadlimit -1 "Clan Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_ca_point_limit -1 "Clan Arena point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_ca_point_leadlimit -1 "Clan Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games"
  set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
  set g_ca_damage2score_multiplier 0.01
  set g_ca_round_timelimit 180 "round time limit in seconds"
- seta g_ca_teams_override 0
+ set g_ca_teams_override 0
  set g_ca_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
  set g_ca_teams 0
 +set g_ca_weaponarena "most" "starting weapons - takes the same options as g_weaponarena"
  
  
  // ==================
@@@ -308,7 -307,7 +308,7 @@@ set g_ctf_flag_glowtrails 
  set g_ctf_fullbrightflags 0
  set g_ctf_dynamiclights 0
  
- seta g_ctf_ignore_frags 0     "1: regular frags give no points"
+ set g_ctf_ignore_frags 0      "1: regular frags give no points"
  exec ctfscoring-samual.cfg
  
  
@@@ -330,7 -329,7 +330,7 @@@ set g_tdm 0 "Team Deathmatch: the team 
  set g_tdm_on_dm_maps 0 "when this is set, all DM maps automatically support TDM"
  set g_tdm_teams 2 "how many teams are in team deathmatch (set by mapinfo)"
  set g_tdm_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
- seta g_tdm_teams_override 0   "how many teams are in team deathmatch"
+ set g_tdm_teams_override 0    "how many teams are in team deathmatch"
  set g_tdm_point_limit -1 "TDM point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_tdm_point_leadlimit -1 "TDM point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  
@@@ -340,7 -339,7 +340,7 @@@
  // ============
  set g_domination                      0 "Domination: capture and hold control points to gain points"
  set g_domination_default_teams                2 "default number of teams for maps that aren't domination-specific"
- seta g_domination_teams_override              0 "use a specific number of teams in domination games (minimum 2), disables dom_team entities"
+ set g_domination_teams_override               0 "use a specific number of teams in domination games (minimum 2), disables dom_team entities"
  set g_domination_disable_frags                0 "players can't get frags normally, only get points from kills"
  set g_domination_point_amt            0 "override: how many points to get per ping"
  set g_domination_point_fullbright     0 "domination point fullbright"
@@@ -359,8 -358,8 +359,8 @@@ set g_domination_warmup 
  // ===========
  set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them"
  set g_freezetag_warmup 5 "Time players get to run around before the round starts"
- seta g_freezetag_point_limit -1       "Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
- seta g_freezetag_point_leadlimit -1   "Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_freezetag_point_limit -1        "Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+ set g_freezetag_point_leadlimit -1    "Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_freezetag_revive_speed 0.4 "Speed for reviving a frozen teammate"
  set g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lost when out of range"
  set g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
@@@ -368,10 -367,9 +368,10 @@@ set g_freezetag_revive_nade 1 "Enable r
  set g_freezetag_revive_nade_health 40 "Amount of health player has if they revived from their own nade explosion"
  set g_freezetag_round_timelimit 180 "round time limit in seconds"
  set g_freezetag_frozen_maxtime 60 "frozen players will be automatically unfrozen after this time in seconds"
- seta g_freezetag_teams_override 0
+ set g_freezetag_teams_override 0
  set g_freezetag_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
  set g_freezetag_teams 0
 +set g_freezetag_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"
  
  
  // ==========
@@@ -421,7 -419,7 +421,7 @@@ set g_balance_keyhunt_dropvelocity 30
  set g_balance_keyhunt_throwvelocity 400
  set g_balance_keyhunt_protecttime 0.8
  set g_balance_keyhunt_damageforcescale 1
- seta g_keyhunt_teams_override 0
+ set g_keyhunt_teams_override 0
  set g_keyhunt_teams 0
  set g_keyhunt_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
  
@@@ -435,7 -433,6 +435,7 @@@ set g_lms_extra_lives 
  set g_lms_regenerate 0
  set g_lms_last_join 3 "if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives"
  set g_lms_join_anytime 1      "if true, new players can join, but get same amount of lives as the worst player"
 +set g_lms_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"
  
  
  // =========
@@@ -479,12 -476,12 +479,12 @@@ set g_nexball_football_trail    0  "1 t
  set g_nexball_trail_color     254  "1-256 for different colors (Quake palette, 254 is white)"
  set g_nexball_playerclip_collisions 1 "make the ball bounce off clips"
  set g_nexball_radar_showallplayers 1  "1: show every player and the ball on the radar  0: only show teammates and the ball on the radar"
- seta g_nexball_safepass_maxdist 5000 "Max distance to allow save fassping (0 to turn off safe passing)"
- seta g_nexball_safepass_turnrate 0.1 "How fast the safe-pass ball can habge direction"
- seta g_nexball_safepass_holdtime 0.75 "How long to remeber last teammate you pointed at"
- seta g_nexball_viewmodel_scale 0.25 "How large the ball for the carrier"
- seta g_nexball_viewmodel_offset "8 8 0" "Where the ball is located on carrier forward right up"
- seta g_nexball_tackling 1 "Allow ball theft?"
+ set g_nexball_safepass_maxdist 5000 "Max distance to allow save fassping (0 to turn off safe passing)"
+ set g_nexball_safepass_turnrate 0.1 "How fast the safe-pass ball can habge direction"
+ set g_nexball_safepass_holdtime 0.75 "How long to remeber last teammate you pointed at"
+ set g_nexball_viewmodel_scale 0.25 "How large the ball for the carrier"
+ set g_nexball_viewmodel_offset "8 8 0" "Where the ball is located on carrier forward right up"
+ set g_nexball_tackling 1 "Allow ball theft?"
  
  
  // ===========
@@@ -545,4 -542,3 +545,4 @@@ set g_invasion_type 0 "type of invasio
  set g_duel 0 "Duel: frag the opponent more in a one versus one arena battle"
  //set g_duel_warmup 180 "Have a short warmup period before beginning the actual duel"
  set g_duel_with_powerups 0 "Enable powerups to spawn in the duel gamemode"
 +set g_duel_not_dm_maps 0 "when this is set, DM maps will NOT be listed in duel"