]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Apply a difference force modifier on vaporizer secondary
authorMario <zacjardine@y7mail.com>
Thu, 18 Dec 2014 10:55:45 +0000 (21:55 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 18 Dec 2014 10:55:45 +0000 (21:55 +1100)
qcsrc/server/mutators/mutator_nades.qc

index b5e1559988c39bed59860284a1e4f08ae727ced6..96c7c9e101786353ef5d6f4a5a75b4cb3474fe56 100644 (file)
@@ -595,12 +595,18 @@ void nade_damage(entity inflictor, entity attacker, float damage, float deathtyp
        if(self.nade_type == NADE_TYPE_TRANSLOCATE || self.nade_type == NADE_TYPE_SPAWN)
                return;
 
-       if(DEATH_ISWEAPON(deathtype, WEP_BLASTER) || (DEATH_ISWEAPON(deathtype, WEP_VAPORIZER) && (deathtype & HITTYPE_SECONDARY)))
+       if(DEATH_ISWEAPON(deathtype, WEP_BLASTER))
        {
                force *= 1.5;
                damage = 0;
        }
 
+       if(DEATH_ISWEAPON(deathtype, WEP_VAPORIZER) && (deathtype & HITTYPE_SECONDARY))
+       {
+               force *= 0.85; // too much
+               frag_damage = 0;
+       }
+
        if(DEATH_ISWEAPON(deathtype, WEP_VORTEX) || DEATH_ISWEAPON(deathtype, WEP_VAPORIZER))
        {
                force *= 6;