From: terencehill Date: Thu, 27 May 2021 15:47:49 +0000 (+0200) Subject: Fix indentation in sv_vampire.qc X-Git-Tag: xonotic-v0.8.5~405^2~29 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=3a73c9a8a4c3003ea3076f6b10df546161c326fb;p=xonotic%2Fxonotic-data.pk3dir.git Fix indentation in sv_vampire.qc --- diff --git a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc index f4562a99e..77b95d4c5 100644 --- a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc +++ b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc @@ -11,13 +11,11 @@ MUTATOR_HOOKFUNCTION(vampire, PlayerDamage_SplitHealthArmor) entity frag_attacker = M_ARGV(1, entity); entity frag_target = M_ARGV(2, entity); float health_take = bound(0, M_ARGV(4, float), GetResource(frag_target, RES_HEALTH)); - float armor_take = bound(0, M_ARGV(5, float), GetResource(frag_target, RES_ARMOR)); - float damage_take = (autocvar_g_vampire_use_total_damage) ? health_take + armor_take : health_take; + float armor_take = bound(0, M_ARGV(5, float), GetResource(frag_target, RES_ARMOR)); + float damage_take = (autocvar_g_vampire_use_total_damage) ? health_take + armor_take : health_take; - 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_vampire_factor * damage_take);