X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fsv_buffs.qc;h=3433aad9db634f0e4513d860e519ac807b7c480b;hp=6fa6e8d054c50785a5971e02e685d6e98bacabcc;hb=287de7c2d29d39f6d14698c08a324230d4978175;hpb=3a73c9a8a4c3003ea3076f6b10df546161c326fb diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc index 6fa6e8d05..3433aad9d 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc @@ -532,19 +532,17 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate) MUTATOR_HOOKFUNCTION(buffs, PlayerDamage_SplitHealthArmor) { + // NOTE: vampire PlayerDamage_SplitHealthArmor code is similar entity frag_attacker = M_ARGV(1, entity); entity frag_target = M_ARGV(2, entity); if(!(STAT(BUFFS, frag_attacker) & BUFF_VAMPIRE.m_itemid)) return; float health_take = bound(0, M_ARGV(4, float), GetResource(frag_target, RES_HEALTH)); - if(time >= frag_target.spawnshieldtime && - frag_target != frag_attacker && - IS_PLAYER(frag_attacker) && - !IS_DEAD(frag_target) && !STAT(FROZEN, frag_target)) + if (time >= frag_target.spawnshieldtime && frag_target != frag_attacker + && IS_PLAYER(frag_attacker) && !IS_DEAD(frag_target) && !STAT(FROZEN, frag_target)) { - GiveResource(frag_attacker, RES_HEALTH, - autocvar_g_buffs_vampire_damage_steal * health_take); + GiveResource(frag_attacker, RES_HEALTH, autocvar_g_buffs_vampire_damage_steal * health_take); } }