mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 08:55:32 +01:00
*Update creature damamge formula. Use damage mod in config as total_pct modifier.
--HG-- branch : trunk
This commit is contained in:
@@ -1393,7 +1393,7 @@ void Creature::SelectLevel(const CreatureInfo *cinfo)
|
||||
|
||||
|
||||
//damage
|
||||
float damagemod = _GetDamageMod(rank);
|
||||
float damagemod = 1.0f;//_GetDamageMod(rank);
|
||||
|
||||
SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, cinfo->mindmg * damagemod);
|
||||
SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, cinfo->maxdmg * damagemod);
|
||||
|
||||
@@ -160,7 +160,7 @@ class TRINITY_DLL_SPEC Object
|
||||
uint32 GetEntry() const { return GetUInt32Value(OBJECT_FIELD_ENTRY); }
|
||||
void SetEntry(uint32 entry) { SetUInt32Value(OBJECT_FIELD_ENTRY, entry); }
|
||||
|
||||
uint8 GetTypeId() const { return m_objectTypeId; }
|
||||
TypeID GetTypeId() const { return m_objectTypeId; }
|
||||
bool isType(uint16 mask) const { return (mask & m_objectType); }
|
||||
|
||||
virtual void BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
|
||||
@@ -337,7 +337,7 @@ class TRINITY_DLL_SPEC Object
|
||||
|
||||
uint16 m_objectType;
|
||||
|
||||
uint8 m_objectTypeId;
|
||||
TypeID m_objectTypeId;
|
||||
uint16 m_updateFlag;
|
||||
|
||||
union
|
||||
|
||||
@@ -798,7 +798,7 @@ void ObjectMgr::LoadCreatureTemplates()
|
||||
const_cast<CreatureInfo*>(cInfo)->scale = 1.0f;
|
||||
}
|
||||
|
||||
//const_cast<CreatureInfo*>(cInfo)->dmg_multiplier *= Creature::_GetDamageMod(cInfo->rank);
|
||||
const_cast<CreatureInfo*>(cInfo)->dmg_multiplier *= Creature::_GetDamageMod(cInfo->rank);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user