X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hook.qc;h=695ac381fe55afcaeb750f2890e313addb6ef915;hb=40cc357c2c4732d3d035240cfab34b9097f51f34;hp=bce4aad8fa11da202542e8e11449e4dafe521334;hpb=dc0822c46acae059e6469278e5f801b9fe5e5ffb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index bce4aad8f..695ac381f 100644
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -52,6 +52,20 @@ void W_Hook_Explode2 (void)
 	self.movetype = MOVETYPE_NONE;
 }
 
+void W_Hook_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+{
+	if (self.health <= 0)
+		return;
+		
+	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
+		return; // g_projectiles_damage says to halt	
+	
+	self.health = self.health - damage;
+	
+	if (self.health <= 0)
+		W_PrepareExplosionByDamage(self.realowner, W_Hook_Explode2);
+}
+
 void W_Hook_Touch2 (void)
 {
 	PROJECTILE_TOUCH;
@@ -60,10 +74,10 @@ void W_Hook_Touch2 (void)
 
 void W_Hook_Attack2()
 {
-	local entity gren;
+	entity gren;
 
 	W_DecreaseAmmo(ammo_cells, autocvar_g_balance_hook_secondary_ammo, FALSE);
-	W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", CHAN_WEAPON, autocvar_g_balance_hook_secondary_damage);
+	W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", CH_WEAPON_A, autocvar_g_balance_hook_secondary_damage);
 
 	gren = spawn ();
 	gren.owner = gren.realowner = self;
@@ -80,6 +94,12 @@ void W_Hook_Attack2()
 	gren.think = adaptor_think2use_hittype_splash;
 	gren.use = W_Hook_Explode2;
 	gren.touch = W_Hook_Touch2;
+	
+	gren.takedamage = DAMAGE_YES;
+	gren.health = autocvar_g_balance_hook_secondary_health;
+	gren.damageforcescale = autocvar_g_balance_hook_secondary_damageforcescale;
+	gren.event_damage = W_Hook_Damage;
+	gren.damagedbycontents = TRUE;
 
 	gren.velocity = '0 0 1' * autocvar_g_balance_hook_secondary_speed;
 	if(autocvar_g_projectiles_newton_style)
@@ -143,7 +163,7 @@ float w_hook(float req)
 		if(self.hook)
 		{
 			// if hooked, no bombs, and increase the timer
-			self.hook_refire = max(self.hook_refire, time + autocvar_g_balance_hook_primary_refire);
+			self.hook_refire = max(self.hook_refire, time + autocvar_g_balance_hook_primary_refire * W_WeaponRateFactor());
 
 			// hook also inhibits health regeneration, but only for 1 second
 			if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
@@ -245,7 +265,7 @@ float w_hook(float req)
 		self.hook_refire = time;
 	}
 	return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_hook(float req)
@@ -256,7 +276,7 @@ float w_hook(float req)
 		org2 = w_org + w_backoff * 2;
 		pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1);
 		if(!w_issilent)
-			sound(self, CHAN_PROJECTILE, "weapons/hookbomb_impact.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "weapons/hookbomb_impact.wav", VOL_BASE, ATTN_NORM);
 	}
 	else if(req == WR_PRECACHE)
 	{
@@ -265,7 +285,7 @@ float w_hook(float req)
 	else if (req == WR_SUICIDEMESSAGE)
 		w_deathtypestring = _("%s did the impossible");
 	else if (req == WR_KILLMESSAGE)
-		w_deathtypestring = _("%s has run into %s's gravity bomb");
+		w_deathtypestring = _("%s was caught in %s's hook gravity bomb");
 	return TRUE;
 }
 #endif