BEAST_AFFINITY merit, pet shall exceed master lvl.

[benfolka]

I have:

• searched existing issues (http://github.com/darkstarproject/darkstar/issues/) to see if the issue I am posting has already been addressed or opened by another contributor
• checked the commit log to see if my issue has been resolved since my server was last updated

Client Version (type /ver in game) : 30191004_0

Source Branch (master/stable) : master

Additional Information (Steps to reproduce/Expected behavior) : Since pet not reciving any exp fix has been implemented, This wont cause any problems. This behaviour is retail and shall be same in DSP servers. Pets shall exceed master level with beast affinity merits.

[zynjec]

I'm not sure I follow the issue, BEAST_AFFINITY already allows the pet to go above the masters level unless you've experienced it not working?

darkstar/src/map/utils/petutils.cpp

Line 1652 in 4369854

highestLvl += PChar->PMeritPoints->GetMeritValue(MERIT_BEAST_AFFINITY, PChar);

[gori123]

// And cap it to the master's level.
if (highestLvl > PMaster->GetMLevel())
{
highestLvl = PMaster->GetMLevel();
}

[gori123]

merit works but then there are lines that drops pet level again to masters level,
which is not retail default

[zynjec]

Fair enough, just grepped for BEAST_AFFINITY and didn't see the code under it. Seems easy enough to fix.

[TeoTwawki]

there is supposed to be some capping, but its need to be done before merit and other mods apply, not after.

got stuffed in wrong place.