mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Override startup warnings

Browse source
This commit is contained in:
Antz 2020-02-23 22:45:50 +00:00
parent 1e9fb1715d
commit 4030ac6ec0
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/game/Object/Unit.cpp
View file

@ -10471,32 +10471,32 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
SpellScalingEntry const* scalingEntry = spellProto->GetSpellScaling(); SpellScalingEntry const* scalingEntry = spellProto->GetSpellScaling();
GtSpellScalingEntry const* gtScalingEntry = NULL; GtSpellScalingEntry const* gtScalingEntry = NULL;
if (scalingEntry && scalingEntry->IsScalableEffect(effect_index)) //if (scalingEntry && scalingEntry->IsScalableEffect(effect_index))
{ //{
if (target && IsAuraApplyEffect(spellProto, effect_index) && IsPositiveEffect(spellProto, effect_index)) // if (target && IsAuraApplyEffect(spellProto, effect_index) && IsPositiveEffect(spellProto, effect_index))
level = target->getLevel(); // level = target->getLevel();
uint32 gtSpellScalingId = level - 1; // uint32 gtSpellScalingId = level - 1;
if (scalingEntry->playerClass == -1) // if (scalingEntry->playerClass == -1)
gtSpellScalingId += (MAX_CLASSES - 1) * GT_MAX_LEVEL; // gtSpellScalingId += (MAX_CLASSES - 1) * GT_MAX_LEVEL;
else // else
gtSpellScalingId += (scalingEntry->playerClass - 1) * GT_MAX_LEVEL; // gtSpellScalingId += (scalingEntry->playerClass - 1) * GT_MAX_LEVEL;
gtScalingEntry = sGtSpellScalingStore.LookupEntry(gtSpellScalingId); // gtScalingEntry = sGtSpellScalingStore.LookupEntry(gtSpellScalingId);
} //}
if (gtScalingEntry) if (gtScalingEntry)
{ {
float Scale = gtScalingEntry->value; float Scale = gtScalingEntry->value;
if (uint32(scalingEntry->castTimeMax) > 0 && uint32(scalingEntry->castScalingMaxLevel) > level) if (uint32(scalingEntry->castTimeMax) > 0 && uint32(scalingEntry->castScalingMaxLevel) > level)
Scale *= float(scalingEntry->castTimeMin + float(level - 1) * (scalingEntry->castTimeMax - scalingEntry->castTimeMin) / (scalingEntry->castScalingMaxLevel - 1)) / float(scalingEntry->castTimeMax); Scale *= float(scalingEntry->castTimeMin + float(level - 1) * (scalingEntry->castTimeMax - scalingEntry->castTimeMin) / (scalingEntry->castScalingMaxLevel - 1)) / float(scalingEntry->castTimeMax);
if (uint32(scalingEntry->coefLevelBase) > level) //if (uint32(scalingEntry->coefLevelBase) > level)
Scale *= (1.0f - scalingEntry->coefBase) * (level - 1) / (scalingEntry->coefLevelBase - 1) + scalingEntry->coefBase; // Scale *= (1.0f - scalingEntry->coefBase) * (level - 1) / (scalingEntry->coefLevelBase - 1) + scalingEntry->coefBase;
basePoints = int32(scalingEntry->coeff1[effect_index] * Scale); //basePoints = int32(scalingEntry->coeff1[effect_index] * Scale);
int32 randomPoints = int32(scalingEntry->coeff1[effect_index] * Scale * scalingEntry->coeff2[effect_index]); //int32 randomPoints = int32(scalingEntry->coeff1[effect_index] * Scale * scalingEntry->coeff2[effect_index]);
basePoints += irand(-randomPoints, randomPoints) / 2; //basePoints += irand(-randomPoints, randomPoints) / 2;
comboDamage = uint32(scalingEntry->coeff3[effect_index] * Scale); //comboDamage = uint32(scalingEntry->coeff3[effect_index] * Scale);
} }
else else
{ {