]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
OK weapons: Fixed nade damage.
authorLyberta <lyberta@lyberta.net>
Mon, 12 Feb 2018 00:31:20 +0000 (03:31 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 12 Feb 2018 00:31:20 +0000 (03:31 +0300)
qcsrc/common/mutators/mutator/nades/nades.qc

index 3dc7e4e0e3e050c4eb7e72d838945492aa552750..d4b061044ec617fca8ca8f99ca9151d6839f290a 100644 (file)
@@ -1,5 +1,7 @@
 #include "nades.qh"
 
+#include "../overkill/okmachinegun.qh"
+
 #ifdef SVQC
 bool autocvar_g_nades_nade_small;
 float autocvar_g_nades_spread = 0.04;
@@ -838,12 +840,12 @@ void nade_damage(entity this, entity inflictor, entity attacker, float damage, i
                force *= 0.5; // too much
                damage = 0;
        }
-       else if(DEATH_ISWEAPON(deathtype, WEP_VORTEX) || DEATH_ISWEAPON(deathtype, WEP_VAPORIZER))
+       else if(DEATH_ISWEAPON(deathtype, WEP_VORTEX) || DEATH_ISWEAPON(deathtype, WEP_VAPORIZER) || DEATH_ISWEAPON(deathtype, WEP_OVERKILL_NEX))
        {
                force *= 6;
                damage = this.max_health * 0.55;
        }
-       else if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN))
+       else if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN) || DEATH_ISWEAPON(deathtype, WEP_OVERKILL_MACHINEGUN))
                damage = this.max_health * 0.1;
        else if(DEATH_ISWEAPON(deathtype, WEP_SHOCKWAVE) || DEATH_ISWEAPON(deathtype, WEP_SHOTGUN)) // WEAPONTODO
        {