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

Allow 3 flag throws in ctf

See merge request !470

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 684edb3a83c64c73776554c649dcbdc3d5e0ea8b..cfe8e319e52abeaf75cbe1f865d407dfa62589f8 100644 (file)
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -256,9 +256,9 @@ set g_ctf_flag_dropped_floatinwater 200 "move upwards while in water at this vel
 set g_ctf_throw 1 "throwing allows circumventing carrierkill score, so enable this with care!"
 set g_ctf_throw_angle_max 90 "maximum upwards angle you can throw the flag"
 set g_ctf_throw_angle_min -90 "minimum downwards angle you can throw the flag"
-set g_ctf_throw_punish_count 2
+set g_ctf_throw_punish_count 3
 set g_ctf_throw_punish_delay 30
-set g_ctf_throw_punish_time 5
+set g_ctf_throw_punish_time 10
 set g_ctf_throw_strengthmultiplier 2 "multiplier for velocity when you have the strength... essentially, throw the flag REALLY hard when you have the strength :D"
 set g_ctf_throw_velocity_forward 500 "how fast or far a player can throw the flag"
 set g_ctf_throw_velocity_up 200 "upwards velocity added upon initial throw"