sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix import BG rate exp

Browse Source
This commit is contained in:
Yehonal
2016-08-07 12:00:52 +02:00
parent 2fc723e92c
commit b91b679669
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Miscellaneous/Formulas.h
+18 -12
View File
@@ -160,27 +160,33 @@ namespace Trinity
inline uint32 Gain(Player* player, Unit* u) inline uint32 Gain(Player* player, Unit* u)
{ {
uint32 gain; Creature* creature = u->ToCreature();
uint32 gain = 0;
if (u->GetTypeId() == TYPEID_UNIT && if (!creature || (!creature->IsTotem() && !creature->IsPet() && !creature->IsCritter() &&
(((Creature*)u)->IsTotem() || ((Creature*)u)->IsPet() || !(creature->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)))
(((Creature*)u)->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) ||
u->IsCritter()))
gain = 0;
else
{ {
float xpMod = 1.0f;
gain = BaseGain(player->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(u->GetMapId(), u->GetZoneId())); gain = BaseGain(player->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(u->GetMapId(), u->GetZoneId()));
if (gain != 0 && u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->isElite()) if (gain && creature)
{
if (creature->isElite())
{ {
// Elites in instances have a 2.75x XP bonus instead of the regular 2x world bonus. // Elites in instances have a 2.75x XP bonus instead of the regular 2x world bonus.
if (u->GetMap()->IsDungeon()) if (u->GetMap() && u->GetMap()->IsDungeon())
gain = uint32(gain * 2.75); xpMod *= 2.75f;
else else
gain *= 2; xpMod *= 2.0f;
} }
gain = uint32(gain * sWorld->getRate(RATE_XP_KILL)); // This requires TrinityCore creature_template.ExperienceModifier feature
// xpMod *= creature->GetCreatureTemplate()->ModExperience;
}
xpMod *= isBattleGround ? sWorld->getRate(RATE_XP_BG_KILL) : sWorld->getRate(RATE_XP_KILL);
gain = uint32(gain * xpMod);
} }
//sScriptMgr->OnGainCalculation(gain, player, u); // pussywizard: optimization //sScriptMgr->OnGainCalculation(gain, player, u); // pussywizard: optimization