Skip to content

Fix TANK morph vampire #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ig10 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix TANK morph vampire #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/combat/common/g_combat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,8 @@ qboolean CanUseVampire (edict_t *targ, edict_t *attacker, int dflags, int mod)
return false;

// can't vamp from yourself
if (targ == attacker)
return false;
if (targ == attacker || targ == attacker->owner)
return false;

// flag carrier can't use abilities in CTF mode
if (ctf->value && ctf_enable_balanced_fc->value && vrx_has_flag(attacker))
Expand Down Expand Up @@ -724,17 +724,22 @@ void G_ApplyVampire(edict_t *attacker, float take)
if (delta < 0) // players sometimes go over maximum health
steal = 0;

if (attacker->mtype) // morphs don't use healthcache
// Strenx: Fix for tank VAMP
if (attacker->mtype || attacker->owner->mtype) {// morphs don't use healthcache or armor
attacker->health += steal;
else
// Sync TANK health with owner
if(attacker->owner->mtype == P_TANK) {
attacker->owner->health = attacker->health;
}
} else {
attacker->health_cache += steal;

//Talent: Armor Vampire
if (*armor < MAX_ARMOR(attacker) && vrx_get_talent_level(attacker, TALENT_ARMOR_VAMP) > 0)
{
//16.6% per point of health stolen gives armor as a bonus.
float mult = 0.1666 * vrx_get_talent_level(attacker, TALENT_ARMOR_VAMP);
attacker->armor_cache += (int)(mult * (float)armorVampBase);
//Talent: Armor Vampire
if (*armor < MAX_ARMOR(attacker) && vrx_get_talent_level(attacker, TALENT_ARMOR_VAMP) > 0)
{
//16.6% per point of health stolen gives armor as a bonus.
float mult = 0.1666 * vrx_get_talent_level(attacker, TALENT_ARMOR_VAMP);
attacker->armor_cache += (int)(mult * (float)armorVampBase);
}
}
}

Expand Down Expand Up @@ -1221,8 +1226,10 @@ int T_Damage (edict_t *targ, edict_t *inflictor, edict_t *attacker,
}

// vampire effect
if (CanUseVampire(targ, attacker, dflags, mod))
G_ApplyVampire(attacker, take);
edict_t* real_attacker = attacker_has_pilot ? attacker->activator : attacker;

if (CanUseVampire(targ, real_attacker, dflags, mod))
G_ApplyVampire(real_attacker, take);

//4.1 Players with fury might get their ability triggered
ability = &attacker->myskills.abilities[FURY];
Expand Down