server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ammo damage modifiers (#170)

Browse Source
This commit is contained in:
Elmsroth 2021-12-30 00:52:01 +01:00 committed by GitHub
parent 7bc78be84c
commit 730108010c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/game/Object/Player.cpp
View File

@ -540,7 +540,8 @@ Player::Player(WorldSession* session): Unit(), m_mover(this), m_camera(this), m_
m_canParry = false; m_canParry = false;
m_canBlock = false; m_canBlock = false;
m_canDualWield = false; m_canDualWield = false;
m_ammoDPS = 0.0f; m_ammoDPSMin = 0.0f;
m_ammoDPSMax = 0.0f;
m_temporaryUnsummonedPetNumber = 0; m_temporaryUnsummonedPetNumber = 0;
@ -8284,24 +8285,28 @@ void Player::_ApplyAmmoBonuses()
return; return;
} }
float currentAmmoDPS; float currentAmmoDPSMin;
float currentAmmoDPSMax;
ItemPrototype const* ammo_proto = ObjectMgr::GetItemPrototype(ammo_id); ItemPrototype const* ammo_proto = ObjectMgr::GetItemPrototype(ammo_id);
if (!ammo_proto || ammo_proto->Class != ITEM_CLASS_PROJECTILE || !CheckAmmoCompatibility(ammo_proto)) if (!ammo_proto || ammo_proto->Class != ITEM_CLASS_PROJECTILE || !CheckAmmoCompatibility(ammo_proto))
{ {
currentAmmoDPS = 0.0f; currentAmmoDPSMin = 0.f;
currentAmmoDPSMax = 0.f;
} }
else else
{ {
currentAmmoDPS = ammo_proto->Damage[0].DamageMin; currentAmmoDPSMin = ammo_proto->Damage[0].DamageMin;
currentAmmoDPSMax = ammo_proto->Damage[0].DamageMax;
} }
if (currentAmmoDPS == GetAmmoDPS()) if (std::make_pair(currentAmmoDPSMin, currentAmmoDPSMax) == GetAmmoDPS())
{ {
return; return;
} }
m_ammoDPS = currentAmmoDPS; m_ammoDPSMin = currentAmmoDPSMin;
m_ammoDPSMax = currentAmmoDPSMax;
if (CanModifyStats()) if (CanModifyStats())
{ {
@ -11621,7 +11626,8 @@ void Player::RemoveAmmo()
{ {
SetUInt32Value(PLAYER_AMMO_ID, 0); SetUInt32Value(PLAYER_AMMO_ID, 0);
m_ammoDPS = 0.0f; m_ammoDPSMin = 0.0f;
m_ammoDPSMax = 0.0f;
if (CanModifyStats()) if (CanModifyStats())
{ {

9
src/game/Object/Player.h
View File

@ -1235,10 +1235,8 @@ class Player : public Unit
void ApplyEquipCooldown(Item* pItem); void ApplyEquipCooldown(Item* pItem);
void SetAmmo(uint32 item); void SetAmmo(uint32 item);
void RemoveAmmo(); void RemoveAmmo();
float GetAmmoDPS() const std::pair<float, float> GetAmmoDPS() const { return { m_ammoDPSMin, m_ammoDPSMax }; }
{
return m_ammoDPS;
}
bool CheckAmmoCompatibility(const ItemPrototype* ammo_proto) const; bool CheckAmmoCompatibility(const ItemPrototype* ammo_proto) const;
void QuickEquipItem(uint16 pos, Item* pItem); void QuickEquipItem(uint16 pos, Item* pItem);
void VisualizeItem(uint8 slot, Item* pItem); void VisualizeItem(uint8 slot, Item* pItem);
@ -2570,7 +2568,8 @@ class Player : public Unit
bool m_canBlock; bool m_canBlock;
bool m_canDualWield; bool m_canDualWield;
uint8 m_swingErrorMsg; uint8 m_swingErrorMsg;
float m_ammoDPS; float m_ammoDPSMin;
float m_ammoDPSMax;
//////////////////// Rest System///////////////////// //////////////////// Rest System/////////////////////
time_t time_inn_enter; time_t time_inn_enter;

5
src/game/Object/StatSystem.cpp
View File

@ -374,8 +374,9 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, fl
} }
else if (attType == RANGED_ATTACK) // add ammo DPS to ranged damage else if (attType == RANGED_ATTACK) // add ammo DPS to ranged damage
{ {
weapon_mindamage += GetAmmoDPS() * att_speed; std::pair<float,float> ammoDps = GetAmmoDPS();
weapon_maxdamage += GetAmmoDPS() * att_speed; weapon_mindamage += ammoDps.first * att_speed;
weapon_maxdamage += ammoDps.second * att_speed;
} }
min_damage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct; min_damage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct;