Merge remote branch 'origin/master' into samual/mutator_ctf

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9e78f94534250bc32f88b310d971be71f3dbac2d..34ebb314213a64716843b249b8e6024cd312940d 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -604,6 +604,12 @@ set g_ctf_flag_health 0
 set g_ctf_flag_take_damage 0
 set g_ctf_flag_dropped_waypoint 2 "show dropped flag waypointsprite when a flag is lost. 1 = team only, 2 = for all players"
 set g_ctf_flag_pickup_verbosename 1 "show the name of the person who picked up the flag too"
+set g_ctf_flag_return_when_unreachable 1 "automatically return the flag if it falls into lava/slime/trigger hurt"
+set g_ctf_throw_velocity 500 "how far a player can throw the flag"
+set g_ctf_allow_pass 1 "allow passing of flags to nearby team mates"
+set g_ctf_pass_radius 200 "maximum radius that you can pass to a team mate in"
+set g_ctf_dropped_capture_radius 100 "allow dropped flags to be automatically captured by base flags if the dropped flag is within this radius of it"
+
 
 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"