From: Mario <zacjardine@y7mail.com>
Date: Sat, 13 Dec 2014 11:38:29 +0000 (+1100)
Subject: Fix shotgun nade damage
X-Git-Tag: xonotic-v0.8.0~70^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=47c02cec495b4188dfc122b77393429ae257e14b;p=xonotic%2Fxonotic-data.pk3dir.git

Fix shotgun nade damage
---

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index 3341d30a7..3a440e28d 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -585,11 +585,14 @@ void nade_damage(entity inflictor, entity attacker, float damage, float deathtyp
 	if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN) || DEATH_ISWEAPON(deathtype, WEP_HMG))
 		damage = self.max_health * 0.1;
 
-	if((DEATH_ISWEAPON(deathtype, WEP_SHOCKWAVE) || DEATH_ISWEAPON(deathtype, WEP_SHOTGUN)) && (deathtype & HITTYPE_SECONDARY)) // WEAPONTODO
+	if(DEATH_ISWEAPON(deathtype, WEP_SHOCKWAVE) || DEATH_ISWEAPON(deathtype, WEP_SHOTGUN)) // WEAPONTODO
+	if(deathtype & HITTYPE_SECONDARY)
 	{
 		damage = self.max_health * 0.1;
 		force *= 10;
 	}
+	else
+		damage = self.max_health * 1.15;
 
 	self.velocity += force;