C++ Fix critical damage not being applied before health & mana drain

[Mariuskens]

void Combat::doCombat(Creature* caster, Creature* target) const
{
//target combat callback function
if (params.combatType != COMBAT_NONE) {
CombatDamage damage = getCombatDamage(caster, target);
if (damage.primary.value < 0 && caster && caster->getPlayer()) {
caster->getPlayer()->doCriticalDamage(damage);
}
if (damage.primary.type != COMBAT_MANADRAIN) {
doCombatHealth(caster, target, damage, params);
} else {
doCombatMana(caster, target, damage, params);
}
} else {
doCombatDefault(caster, target, params);
}
}
void Combat::doCombat(Creature* caster, const Position& position) const
{
//area combat callback function
if (params.combatType != COMBAT_NONE) {
CombatDamage damage = getCombatDamage(caster, nullptr);
if (damage.primary.value < 0 && caster && caster->getPlayer()) {
caster->getPlayer()->doCriticalDamage(damage);
}
if (damage.primary.type != COMBAT_MANADRAIN) {
doCombatHealth(caster, position, area.get(), damage, params);
} else {
doCombatMana(caster, position, area.get(), damage, params);
}
} else {
CombatFunc(caster, position, area.get(), params, CombatNullFunc, nullptr);
}
}

here how can I put that sucks only 1 creature and not all those that receive the damage?

 

[Mariuskens]

i think is here on combat.cpp, any idea or fuction to copy paste and test? thnx snyway

 

[Fresh]

I think you must use function for draining health in LUA spell.
Why you going to add this requirement in C++(Sources) while you got entire function to drainHealth that can handle caster, target, etc.?

Use these functions (TFS 1.X+) and brain:

COMBAT_LIFEDRAIN
creature:getTarget()

You should make spell that doing damage and drains health only from selected target by monster/caster.

 

[Mariuskens]

mmmh i think is not posible, because when you use life leech on your weapon can you recover all damage from monsters to drainhealth, so i need only for target...

idnow how to change it :/

 

[Mariuskens]

is dat? Fix critical damage not being applied before health & mana drain by Vulcanx · Pull Request #2492 · otland/forgottenserver

 

[Infernum]

mine's broken and i never bothered to fix it
use this: Combat and boosts changes by nekiro · Pull Request #2497 · otland/forgottenserver
the builds only failed because he used the wrong enum names for special skills, look for SpecialSkills_t and swap the wrong enums for the correct ones in SpecialSkills_t in enums.h

 

[Mariuskens]

mmmmmmmmmmmh ok i gona try dat