Merge remote-tracking branch 'origin/Mario/teams_override'

# By Mario
# Via Mario
* origin/Mario/teams_override:
  Remove keepaway team cvars from config

diff --combined gamemodes.cfg
index bf6ba106d30da188e22f48db1c904a9cb5d89408,45b8c388f878c10810df68ec1520b30c6a7bf70a..30352bba7be4bbeef4a341674f5151d4dfb030da
--- 1/gamemodes.cfg
--- 2/gamemodes.cfg
+++ b/gamemodes.cfg
@@@ -36,7 -36,6 +36,7 @@@ alias cl_hook_gamestart_n
  alias cl_hook_gamestart_cts
  alias cl_hook_gamestart_ka
  alias cl_hook_gamestart_ft
 +alias cl_hook_gamestart_inv
  alias cl_hook_gameend
  alias cl_hook_activeweapon
  
@@@ -57,7 -56,6 +57,7 @@@ alias sv_hook_gamestart_n
  alias sv_hook_gamestart_cts
  alias sv_hook_gamestart_ka
  alias sv_hook_gamestart_ft
 +alias sv_hook_gamestart_inv
  alias sv_hook_gamerestart
  alias sv_hook_gameend
  
@@@ -80,118 -78,55 +80,118 @@@ seta g_keyhunt_point_leadlimit -1        "Keyh
  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_round_limit -1 "Invasion round limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  
  
  // =================================
  //  respawn delay/waves/weapon_stay
  // =================================
 -// when variables are set to anything other than 0, they take over the global setting...
 -// to force disable delay or waves, set them to 0.125
 -set g_ctf_respawn_delay 5
 +// when variables are set to anything other than 0, they take over the global setting. Negative values force an output value of zero.
 +set g_ctf_respawn_delay_small 1
 +set g_ctf_respawn_delay_small_count 1
 +set g_ctf_respawn_delay_large 5
 +set g_ctf_respawn_delay_large_count 5
 +set g_ctf_respawn_delay_max 0
  set g_ctf_respawn_waves 0
  set g_ctf_weapon_stay 0
 -set g_dm_respawn_delay 0
 +set g_dm_respawn_delay_small 0
 +set g_dm_respawn_delay_small_count 0
 +set g_dm_respawn_delay_large 0
 +set g_dm_respawn_delay_large_count 0
 +set g_dm_respawn_delay_max 0
  set g_dm_respawn_waves 0
  set g_dm_weapon_stay 0
 -set g_dom_respawn_delay 0
 +set g_dom_respawn_delay_small 0
 +set g_dom_respawn_delay_small_count 0
 +set g_dom_respawn_delay_large 0
 +set g_dom_respawn_delay_large_count 0
 +set g_dom_respawn_delay_max 0
  set g_dom_respawn_waves 0
  set g_dom_weapon_stay 0
 -set g_lms_respawn_delay 0
 +set g_lms_respawn_delay_small 0
 +set g_lms_respawn_delay_small_count 0
 +set g_lms_respawn_delay_large 0
 +set g_lms_respawn_delay_large_count 0
 +set g_lms_respawn_delay_max 0
  set g_lms_respawn_waves 0
  set g_lms_weapon_stay 0
 -set g_tdm_respawn_delay 0
 +set g_tdm_respawn_delay_small 0
 +set g_tdm_respawn_delay_small_count 0
 +set g_tdm_respawn_delay_large 0
 +set g_tdm_respawn_delay_large_count 0
 +set g_tdm_respawn_delay_max 0
  set g_tdm_respawn_waves 0
  set g_tdm_weapon_stay 0
 -set g_ka_respawn_delay 0
 +set g_ka_respawn_delay_small 0
 +set g_ka_respawn_delay_small_count 0
 +set g_ka_respawn_delay_large 0
 +set g_ka_respawn_delay_large_count 0
 +set g_ka_respawn_delay_max 0
  set g_ka_respawn_waves 0
  set g_ka_weapon_stay 0
 -set g_kh_respawn_delay 0
 +set g_kh_respawn_delay_small 0
 +set g_kh_respawn_delay_small_count 0
 +set g_kh_respawn_delay_large 0
 +set g_kh_respawn_delay_large_count 0
 +set g_kh_respawn_delay_max 0
  set g_kh_respawn_waves 0
  set g_kh_weapon_stay 0
 -set g_ca_respawn_delay 0
 +set g_ca_respawn_delay_small 0
 +set g_ca_respawn_delay_small_count 0
 +set g_ca_respawn_delay_large 0
 +set g_ca_respawn_delay_large_count 0
 +set g_ca_respawn_delay_max 0
  set g_ca_respawn_waves 0
  set g_ca_weapon_stay 0
 -set g_nb_respawn_delay 0
 +set g_nb_respawn_delay_small 0
 +set g_nb_respawn_delay_small_count 0
 +set g_nb_respawn_delay_large 0
 +set g_nb_respawn_delay_large_count 0
 +set g_nb_respawn_delay_max 0
  set g_nb_respawn_waves 0
  set g_nb_weapon_stay 0
 -set g_as_respawn_delay 0
 +set g_as_respawn_delay_small 0
 +set g_as_respawn_delay_small_count 0
 +set g_as_respawn_delay_large 0
 +set g_as_respawn_delay_large_count 0
 +set g_as_respawn_delay_max 0
  set g_as_respawn_waves 0
  set g_as_weapon_stay 0
 -set g_ons_respawn_delay 0
 +set g_ons_respawn_delay_small 0
 +set g_ons_respawn_delay_small_count 0
 +set g_ons_respawn_delay_large 0
 +set g_ons_respawn_delay_large_count 0
 +set g_ons_respawn_delay_max 0
  set g_ons_respawn_waves 0
  set g_ons_weapon_stay 0
 +set g_rc_respawn_delay_small 0
 +set g_rc_respawn_delay_small_count 0
 +set g_rc_respawn_delay_large 0
 +set g_rc_respawn_delay_large_count 0
 +set g_rc_respawn_delay_max 0
  set g_rc_respawn_waves 0
 -set g_rc_respawn_delay 0
  set g_rc_weapon_stay 0
 +set g_cts_respawn_delay_small -1  // CTS shall have instant respawn.
 +set g_cts_respawn_delay_small_count 0
 +set g_cts_respawn_delay_large -1  // CTS shall have instant respawn.
 +set g_cts_respawn_delay_large_count 0
 +set g_cts_respawn_delay_max 0
  set g_cts_respawn_waves 0
 -set g_cts_respawn_delay 0
  set g_cts_weapon_stay 2
 +set g_ft_respawn_delay_small 0
 +set g_ft_respawn_delay_small_count 0
 +set g_ft_respawn_delay_large 0
 +set g_ft_respawn_delay_large_count 0
 +set g_ft_respawn_delay_max 0
  set g_ft_respawn_waves 0
 -set g_ft_respawn_delay 0
  set g_ft_weapon_stay 0
 +set g_inv_respawn_delay_small 0
 +set g_inv_respawn_delay_small_count 0
 +set g_inv_respawn_delay_large 0
 +set g_inv_respawn_delay_large_count 0
 +set g_inv_respawn_delay_max 0
 +set g_inv_respawn_waves 0
 +set g_inv_weapon_stay 0
  
  
  // =========
@@@ -209,9 -144,8 +209,9 @@@ set g_ca_point_leadlimit 
  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
 +set g_ca_round_timelimit 180 "round time limit in seconds"
  seta 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
  
  
@@@ -266,7 -200,6 +266,7 @@@ set g_ctf_pass_timelimit 2 "how long a 
  set g_ctf_pass_velocity 750 "how fast or far a player can pass the flag"
  set g_ctf_allow_vehicle_touch 0 "allow flags to be picked up/captured/returned without even leaving the vehicle"
  set g_ctf_allow_vehicle_carry 1 "allow players to hold flags inside a vehicle"
 +set g_ctf_allow_monster_touch 0 "allow flags to be returned by monsters"
  
  set g_ctf_shield_max_ratio 0  "shield at most this percentage of a team from the enemy flag (try: 0.4 for 40%)"
  set g_ctf_shield_min_negscore 20      "shield the player from the flag if he's got this negative amount of points or less"
@@@ -298,7 -231,7 +298,7 @@@ set g_cts_finish_kill_delay 10 "preven
  // ==========================
  set g_dm 1 "Deathmatch: killing any other player is one frag, player with most frags wins"
  set g_tdm_teams 2 "how many teams are in team deathmatch (set by mapinfo)"
 -set g_tdm_team_spawns 0 "when 1, a map can define team spawnpoints for TDM"
 +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"
  
  
@@@ -329,11 -262,10 +329,11 @@@ set g_freezetag_revive_clearspeed 1.6 "
  set g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
  set g_freezetag_revive_falldamage 0 "Enable reviving from this amount of fall damage"
  set g_freezetag_revive_falldamage_health 40 "Amount of health player has if they revived from falling"
 -set g_freezetag_round_timelimit 180
 +set g_freezetag_round_timelimit 180 "round time limit in seconds"
  set g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with"
  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_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
  set g_freezetag_teams 0
  
  
@@@ -360,8 -292,6 +360,6 @@@ set g_keepawayball_effects 0 "Add toget
  set g_keepawayball_trail_color        254     "particle trail color from player/ball"
  set g_keepawayball_damageforcescale   3 "Scale of force which is applied to the ball by weapons/explosions/etc"
  set g_keepawayball_respawntime        10      "if no one picks up the ball, how long to wait until the ball respawns"
- seta g_keepaway_teams_override 0
- set g_keepaway_teams 0
  
  
  // ==========
@@@ -468,13 -398,3 +466,13 @@@ set g_race 0 "Race: be faster than you
  set g_race_qualifying_timelimit 0
  set g_race_qualifying_timelimit_override -1
  set g_race_teams 0    "when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)"
 +
 +// ==========
 +//  invasion
 +// ==========
 +set g_invasion 0 "Invasion: survive against waves of monsters"
 +set g_invasion_round_timelimit 120 "maximum time to kill all monsters"
 +set g_invasion_warmup 10 "time between waves to prepare for battle"
 +set g_invasion_monster_count 10 "number of monsters on first wave (increments)"
 +set g_invasion_zombies_only 0 "only spawn zombies"
 +set g_invasion_spawn_delay 2 "spawn more monsters after this delay"