Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_vampire.qc

diff --git a/qcsrc/server/mutators/mutator_vampire.qc b/qcsrc/server/mutators/mutator_vampire.qc
index 1aa293b39ea260efd53f3c7a80cf1325ea749d32..6b2859f440b17ec46b042e8d850c51f0fb231eb1 100644 (file)
--- a/qcsrc/server/mutators/mutator_vampire.qc
+++ b/qcsrc/server/mutators/mutator_vampire.qc
@@ -1,19 +1,18 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
 MUTATOR_HOOKFUNCTION(vampire_PlayerDamage)
 {
-       if(time < self.spawnshieldtime)
-               return 0;
-       if(g_minstagib)
-       {
-               // minstagib: each hit means +1 ammo
-               if(frag_attacker != frag_target)
-                       frag_attacker.ammo_cells += 2; // note: 1 cell was deducted for the shot
-       }
-       else
+       if(time >= frag_target.spawnshieldtime)
+       if(frag_target != frag_attacker)
+       if(frag_target.deadflag == DEAD_NO)
        {
-               // otherwise: each hit gets damage back
-               frag_attacker.health = frag_attacker.health + bound(0, damage_take, self.health);
+               frag_attacker.health += bound(0, damage_take, frag_target.health);
+               frag_attacker.health = bound(0, frag_attacker.health, autocvar_g_balance_health_limit);
        }
-       return 0;
+
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(vampire_BuildMutatorsString)