Merge branch 'master' into TimePath/gametypes/infection

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

diff --git a/gamemodes.cfg b/gamemodes.cfg
index a4b33b7e21fbbfbb647c9d343cac067a324cc5dd..6bf264fd42321b6bc6d7eb1c3a33fe6eae6eb026 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -37,6 +37,7 @@ alias cl_hook_gamestart_nb
 alias cl_hook_gamestart_cts
 alias cl_hook_gamestart_ka
 alias cl_hook_gamestart_ft
+alias cl_hook_gamestart_inf
 alias cl_hook_gamestart_inv
 alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
 alias cl_hook_activeweapon
@@ -58,6 +59,7 @@ alias sv_hook_gamestart_nb
 alias sv_hook_gamestart_cts
 alias sv_hook_gamestart_ka
 alias sv_hook_gamestart_ft
+alias sv_hook_gamestart_inf
 alias sv_hook_gamestart_inv
 alias sv_hook_gamerestart
 alias sv_hook_gameend
@@ -78,6 +80,7 @@ alias sv_vote_gametype_hook_cts
 alias sv_vote_gametype_hook_dm
 alias sv_vote_gametype_hook_dom
 alias sv_vote_gametype_hook_ft
+alias sv_vote_gametype_hook_inf
 alias sv_vote_gametype_hook_inv
 alias sv_vote_gametype_hook_ka
 alias sv_vote_gametype_hook_kh
@@ -220,6 +223,13 @@ set g_ft_respawn_delay_large_count 0
 set g_ft_respawn_delay_max 0
 set g_ft_respawn_waves 0
 set g_ft_weapon_stay 0
+set g_inf_respawn_delay_small 0
+set g_inf_respawn_delay_small_count 0
+set g_inf_respawn_delay_large 0
+set g_inf_respawn_delay_large_count 0
+set g_inf_respawn_delay_max 0
+set g_inf_respawn_waves 0
+set g_inf_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
@@ -533,6 +543,17 @@ 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)"
 
+
+// ===========
+//  infection
+// ===========
+set g_infection 0 "Infection: Infect everyone with your color"
+set g_infection_round_timelimit 180 "round time limit in seconds"
+set g_infection_warmup 5 "Time players get to run around before the round starts"
+set g_infection_teams 4 "Maximum number of teams (from 2 to 15 inclusive)"
+set g_infection_conversions 1 "Enable stealing when killing an alpha"
+
+
 // ==========
 //  invasion
 // ==========