From: Samual Lenks <samual@xonotic.org>
Date: Fri, 7 Sep 2012 07:12:28 +0000 (-0400)
Subject: better calculation/settings for strength flag throwing
X-Git-Tag: xonotic-v0.7.0~240^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6489661db2c047cec096d2f938110bda57e51017;p=xonotic%2Fxonotic-data.pk3dir.git

better calculation/settings for strength flag throwing
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 3b8a646fd..eec4b4907 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -194,7 +194,7 @@ set g_ctf_flag_dropped_waypoint 2 "show dropped flag waypointsprite when a flag
 set g_ctf_flag_dropped_floatinwater 200 "move upwards while in water at this velocity"
 set g_ctf_flag_pickup_verbosename 0 "show the name of the person who picked up the flag too"
 set g_ctf_drop 1 "dropping allows circumventing carrierkill score, so enable this with care!"
-set g_ctf_drop_strengthmultiplier 3 "multiplier for velocity when you have the strength... essentially, throw the flag REALLY hard when you have the strength :D"
+set g_ctf_drop_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_drop_velocity 500 "how fast or far a player can throw the flag"
 set g_ctf_pass 1 "allow passing of flags to nearby team mates"
 set g_ctf_pass_radius 500 "maximum radius that you can pass to a team mate in"
diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index fef968985..2a060396e 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -273,7 +273,7 @@ void ctf_Handle_Throw(entity player, entity receiver, float droptype)
 		case DROP_THROW:
 		{
 			makevectors((player.v_angle_y * '0 1 0') + (player.v_angle_x * '0.5 0 0'));
-			flag_velocity = (('0 0 200' + (v_forward * autocvar_g_ctf_drop_velocity)) * ((player.items & IT_STRENGTH) ? autocvar_g_ctf_drop_strengthmultiplier : 1));
+			flag_velocity = ('0 0 200' + ((v_forward * autocvar_g_ctf_drop_velocity) * ((player.items & IT_STRENGTH) ? autocvar_g_ctf_drop_strengthmultiplier : 1)));
 			flag.velocity = W_CalculateProjectileVelocity(player.velocity, flag_velocity, FALSE);
 			break;
 		}