From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 28 Feb 2011 21:25:42 +0000 (+0200)
Subject: Recoil for the grabber
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=fa0b0f7444376458bdf83e261bc65b03c2ef03b4;p=voretournament%2Fvoretournament.git

Recoil for the grabber
---

diff --git a/data/balance.cfg b/data/balance.cfg
index b028fc53..2bb8232a 100644
--- a/data/balance.cfg
+++ b/data/balance.cfg
@@ -172,12 +172,14 @@ set g_balance_grabber_primary_animtime 0.3 // good shoot anim
 set g_balance_grabber_primary_grabbered_time_max 0 // infinite
 set g_balance_grabber_primary_grabbered_time_free 2 // 2s being grabbered are free
 set g_balance_grabber_primary_grabbered_fuel 4 // fuel per second grabbered
+set g_balance_grabber_primary_recoil 2;
 set g_balance_grabber_secondary_ammo 10
 set g_balance_grabber_secondary_refire 0.5
 set g_balance_grabber_secondary_animtime 0.3 // good shoot anim
 set g_balance_grabber_secondary_damage 45
 set g_balance_grabber_secondary_force 175
 set g_balance_grabber_secondary_radius 75
+set g_balance_grabber_secondary_recoil 4;
 set g_balance_grabber_reload_ammo 35
 set g_balance_grabber_reload_time 2
 // }}}
diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 047f0066..92a12238 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -49,6 +49,9 @@ void W_Grabber_Attack2()
 		W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above
 	}
 
+	if (!g_norecoil)
+		self.punchangle_x -= cvar("g_balance_grabber_secondary_recoil");
+
 	W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_secondary_ammo"), cvar("g_balance_grabber_reload_ammo"));
 }
 
@@ -95,6 +98,8 @@ float w_grabber(float req)
 				if (time > self.grabber_refire)
 				if (weapon_prepareattack(0, -1))
 				{
+					if (!g_norecoil)
+						self.punchangle_x -= cvar("g_balance_grabber_primary_recoil");
 					W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_reload_ammo"));
 					self.grabber_state |= GRABBER_FIRING;
 					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);