]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix shotgun nade damage
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 11:38:29 +0000 (22:38 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 11:38:29 +0000 (22:38 +1100)
qcsrc/server/mutators/mutator_nades.qc

index 3341d30a7ffeb244d4aec34ba7d3e29bad940faf..3a440e28df82630f3ecb052500076deb49274fc1 100644 (file)
@@ -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;