Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
UpdateFields Unit: Replace enum value UNIT_FIELD_RANGED_ATTACK_POWER_…
…MULTIPLIER
  • Loading branch information
Zyres committed Oct 13, 2018
1 parent 09e1c1e commit 677aafa
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/world/Spell/SpellAuras.Legacy.cpp
Expand Up @@ -7570,7 +7570,7 @@ void Aura::SpellAuraModRangedAttackPowerPct(bool apply)
{
if (m_target->isPlayer())
{
m_target->ModRangedAttackPowerMultiplier(((apply) ? 1 : -1) * (float)mod->m_amount / 100);
m_target->modRangedAttackPowerMultiplier(((apply) ? 1 : -1) * (float)mod->m_amount / 100);
m_target->CalcDamage();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/world/Units/Creatures/Creature.cpp
Expand Up @@ -95,7 +95,7 @@ Creature::Creature(uint64 guid)
m_spawn = 0;
auctionHouse = 0;
SetAttackPowerMultiplier(0.0f);
SetRangedAttackPowerMultiplier(0.0f);
setRangedAttackPowerMultiplier(0.0f);
m_custom_waypoint_map = nullptr;
m_escorter = NULL;
m_limbostate = false;
Expand Down
2 changes: 1 addition & 1 deletion src/world/Units/Players/Player.Legacy.cpp
Expand Up @@ -11437,7 +11437,7 @@ void Player::EventTalentHearthOfWildChange(bool apply)
else if (SS == FORM_CAT)
{
SetAttackPowerMultiplier(getFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER) + tval / 200.0f);
SetRangedAttackPowerMultiplier(GetRangedAttackPowerMultiplier() + tval / 200.0f);
setRangedAttackPowerMultiplier(getRangedAttackPowerMultiplier() + tval / 200.0f);
UpdateStats();
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/world/Units/Players/Player.cpp
Expand Up @@ -139,8 +139,6 @@ void Player::setFreePrimaryProfessionPoints(uint32_t points) { write(playerData(

void Player::setAttackPowerMultiplier(float val) { write(playerData()->attack_power_multiplier, val); }

void Player::setRangedAttackPowerMultiplier(float val) { write(playerData()->ranged_attack_power_multiplier, val); }

void Player::setExploredZone(uint32_t idx, uint32_t data)
{
ARCEMU_ASSERT(idx < WOWPLAYER_EXPLORED_ZONES_COUNT)
Expand Down
1 change: 0 additions & 1 deletion src/world/Units/Players/Player.h
Expand Up @@ -494,7 +494,6 @@ class SERVER_DECL Player : public Unit
void setFreePrimaryProfessionPoints(uint32_t points);

void setAttackPowerMultiplier(float val);
void setRangedAttackPowerMultiplier(float val);
void setExploredZone(uint32_t idx, uint32_t data);

uint32_t getSelfResurrectSpell() const;
Expand Down
2 changes: 1 addition & 1 deletion src/world/Units/Unit.Legacy.cpp
Expand Up @@ -12242,7 +12242,7 @@ int32 Unit::GetAP()
int32 Unit::GetRAP()
{
int32 baseap = GetRangedAttackPower() + GetRangedAttackPowerMods();
float totalap = baseap * (GetRangedAttackPowerMultiplier() + 1);
float totalap = baseap * (getRangedAttackPowerMultiplier() + 1);
if (totalap >= 0)
return float2int32(totalap);
return 0;
Expand Down
9 changes: 9 additions & 0 deletions src/world/Units/Unit.cpp
Expand Up @@ -235,6 +235,15 @@ void Unit::modPowerCostMultiplier(uint16_t school, float multiplier)
setPowerCostMultiplier(school, currentMultiplier);
}

float Unit::getRangedAttackPowerMultiplier() const { return unitData()->ranged_attack_power_multiplier; }
void Unit::setRangedAttackPowerMultiplier(float multiplier) { write(unitData()->ranged_attack_power_multiplier, multiplier); }
void Unit::modRangedAttackPowerMultiplier(float multiplier)
{
float currentMultiplier = getRangedAttackPowerMultiplier();
currentMultiplier += multiplier;
setRangedAttackPowerMultiplier(currentMultiplier);
}

#if VERSION_STRING >= WotLK
float Unit::getHoverHeight() const { return unitData()->hover_height; }
void Unit::setHoverHeight(float height) { write(unitData()->hover_height, height); }
Expand Down
8 changes: 4 additions & 4 deletions src/world/Units/Unit.h
Expand Up @@ -429,6 +429,10 @@ class SERVER_DECL Unit : public Object
void setPowerCostMultiplier(uint16_t school, float multiplier);
void modPowerCostMultiplier(uint16_t school, float multiplier);

float getRangedAttackPowerMultiplier() const;
void setRangedAttackPowerMultiplier(float multiplier);
void modRangedAttackPowerMultiplier(float multiplier);

#if VERSION_STRING >= WotLK
float getHoverHeight() const;
void setHoverHeight(float height);
Expand Down Expand Up @@ -1270,10 +1274,6 @@ class SERVER_DECL Unit : public Object
#endif
}

void SetRangedAttackPowerMultiplier(float amt) { setFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER, amt); }
float GetRangedAttackPowerMultiplier() { return getFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER); }
void ModRangedAttackPowerMultiplier(float amt) { modFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER, amt); }

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////

void ModHealth(int32 val) { modUInt32Value(UNIT_FIELD_HEALTH, val); }
Expand Down

0 comments on commit 677aafa

Please sign in to comment.