Merge branch 'master' into mirio/balance

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

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 2d8d54067f17038c15779770e1381e08828c59d1..a4b33b7e21fbbfbb647c9d343cac067a324cc5dd 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -254,9 +254,10 @@ set g_ca_teams 0
 //  capture the flag
 // ==================
 set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
-set g_ctf_oneflag 1 "Allow oneflag CTF mode on maps that support it"
+set g_ctf_oneflag 0 "Allow oneflag CTF mode on maps that support it"
 set g_ctf_oneflag_reverse 0 "apply reverse mode to oneflag CTF (take flag to enemy bases to cap), overrides g_ctf_reverse only in oneflag, g_ctf_reverse still affects oneflag"
 set g_ctf_flag_return 1 "auto return the flag to base when touched by a teammate"
+set g_ctf_flag_return_carrying 0 "(manual return mode) auto return the flag to base if touched by a flag carrier"
 set g_ctf_flag_return_carried_radius 100 "allow flags to be returned by carrier if base is within this radius"
 set g_ctf_flag_return_time 15
 set g_ctf_flag_return_dropped 100
@@ -359,7 +360,7 @@ set g_domination_disable_frags              0 "players can't get frags normally, only get po
 set g_domination_point_amt             0 "override: how many points to get per ping"
 set g_domination_point_fullbright      0 "domination point fullbright"
 set g_domination_point_rate            0 "override: how often to give those points"
-set g_domination_point_capturetime     0.1 "how long it takes to capture a point (given no interference)"
+//set g_domination_point_capturetime   0.1 "how long it takes to capture a point (given no interference)"
 set g_domination_point_glow            0 "domination point glow (warning, slow)"
 set g_domination_roundbased 0 "enable round-based domination (capture all control points to win the round)"
 set g_domination_roundbased_point_limit 5 "capture limit in round-based domination mode"
@@ -501,7 +502,6 @@ set g_onslaught 0 "Onslaught: take control points towards the enemy generator an
 set g_onslaught_point_limit 1 "Onslaught point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 set g_onslaught_warmup 5
 set g_onslaught_round_timelimit 280
-set g_onslaught_debug 0 "show debug prints in onslaught"
 set g_onslaught_teleport_radius 200 "Allows teleporting from a control point to another"
 set g_onslaught_teleport_wait 5 "Time before player can teleport again"
 set g_onslaught_spawn_choose 1 "Allow players to choose the control point to be spawned at"