yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stats collector for more spell

Browse Source
This commit is contained in:
Yunfan Li
2024-08-09 02:40:03 +08:00
parent 52bd378719
commit eef88c7276
3 changed files with 141 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
src/factory/StatsCollector.cpp
View File

@@ -5,8 +5,11 @@
#include "DBCStores.h" #include "DBCStores.h"
#include "ItemTemplate.h" #include "ItemTemplate.h"
#include "ObjectMgr.h" #include "ObjectMgr.h"
#include "SharedDefines.h"
#include "SpellAuraDefines.h"
#include "SpellInfo.h" #include "SpellInfo.h"
#include "SpellMgr.h" #include "SpellMgr.h"
#include "UpdateFields.h"
StatsCollector::StatsCollector(CollectorType type) : type_(type) { Reset(); } StatsCollector::StatsCollector(CollectorType type) : type_(type) { Reset(); }
@@ -40,7 +43,7 @@ void StatsCollector::CollectItemStats(ItemTemplate const* proto)
} }
for (uint8 j = 0; j < MAX_ITEM_PROTO_SPELLS; j++) for (uint8 j = 0; j < MAX_ITEM_PROTO_SPELLS; j++)
{ {
CollectSpellStats(proto->Spells[j].SpellId, proto->Spells[j].SpellTrigger); CollectSpellStats(proto->Spells[j].SpellId, proto->Spells[j].SpellTrigger != ITEM_SPELLTRIGGER_ON_EQUIP);
} }
if (proto->socketBonus) if (proto->socketBonus)
@@ -50,7 +53,7 @@ void StatsCollector::CollectItemStats(ItemTemplate const* proto)
} }
} }
void StatsCollector::CollectSpellStats(uint32 spellId, uint32 trigger) void StatsCollector::CollectSpellStats(uint32 spellId, bool isTrigger)
{ {
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId);
@@ -59,20 +62,30 @@ void StatsCollector::CollectSpellStats(uint32 spellId, uint32 trigger)
if (CollectSpecialCaseSpellStats(spellId)) if (CollectSpecialCaseSpellStats(spellId))
return; return;
float multiplier = isTrigger ? 0.25f : 1.0f;
if (spellInfo->StackAmount)
multiplier *= spellInfo->StackAmount;
// spellInfo->ProcFlags
// const SpellProcEntry* procEntry = sSpellMgr->GetSpellProcEntry(spellId);
// spellInfo->SpellFamilyFlags
// spellInfo->ProcFlags
// procEntry->SpellTypeMask
for (int i = 0; i < MAX_SPELL_EFFECTS; i++) for (int i = 0; i < MAX_SPELL_EFFECTS; i++)
{ {
float multiplier = trigger == ITEM_SPELLTRIGGER_ON_EQUIP ? 1.0f : 0.2f; if (spellInfo->IsPositive())
CollectSpellEffectStats(spellInfo->Effects[i], multiplier); CollectPositiveSpellEffectStats(spellInfo->Effects[i], multiplier);
} }
} }
void StatsCollector::CollectSpellEffectStats(const SpellEffectInfo& effectInfo, float multiplier) void StatsCollector::CollectPositiveSpellEffectStats(const SpellEffectInfo& effectInfo, float multiplier)
{ {
if (effectInfo.Effect != SPELL_EFFECT_APPLY_AURA) if (effectInfo.Effect != SPELL_EFFECT_APPLY_AURA)
return; return;
int32 val = effectInfo.BasePoints + 1; int32 val = effectInfo.CalcValue();
switch (effectInfo.ApplyAuraName) switch (effectInfo.ApplyAuraName)
{ {
case SPELL_AURA_MOD_DAMAGE_DONE: case SPELL_AURA_MOD_DAMAGE_DONE:
@@ -85,6 +98,45 @@ void StatsCollector::CollectSpellEffectStats(const SpellEffectInfo& effectInfo,
case SPELL_AURA_MOD_SHIELD_BLOCKVALUE: case SPELL_AURA_MOD_SHIELD_BLOCKVALUE:
stats[STATS_TYPE_BLOCK_VALUE] += val * multiplier; stats[STATS_TYPE_BLOCK_VALUE] += val * multiplier;
break; break;
case SPELL_AURA_MOD_STAT:
{
uint32 statType = effectInfo.MiscValue;
switch (statType)
{
case STAT_STRENGTH:
stats[STATS_TYPE_STRENGTH] += val * multiplier;
break;
case STAT_AGILITY:
stats[STATS_TYPE_AGILITY] += val * multiplier;
break;
case STAT_STAMINA:
stats[STATS_TYPE_STAMINA] += val * multiplier;
break;
case STAT_INTELLECT:
stats[STATS_TYPE_INTELLECT] += val * multiplier;
break;
case STAT_SPIRIT:
stats[STATS_TYPE_SPIRIT] += val * multiplier;
break;
case -1: // Stat all
stats[STATS_TYPE_STRENGTH] += val * multiplier;
stats[STATS_TYPE_AGILITY] += val * multiplier;
stats[STATS_TYPE_STAMINA] += val * multiplier;
stats[STATS_TYPE_INTELLECT] += val * multiplier;
stats[STATS_TYPE_SPIRIT] += val * multiplier;
break;
default:
break;
}
break;
}
case SPELL_AURA_MOD_RESISTANCE:
{
uint32 statType = effectInfo.MiscValue;
if (statType & SPELL_SCHOOL_MASK_NORMAL) // physical
stats[STATS_TYPE_ARMOR] += val * multiplier;
break;
}
case SPELL_AURA_MOD_RATING: case SPELL_AURA_MOD_RATING:
{ {
for (uint32 rating = CR_WEAPON_SKILL; rating < MAX_COMBAT_RATING; ++rating) for (uint32 rating = CR_WEAPON_SKILL; rating < MAX_COMBAT_RATING; ++rating)
@@ -156,17 +208,12 @@ void StatsCollector::CollectSpellEffectStats(const SpellEffectInfo& effectInfo,
} }
case SPELL_AURA_PROC_TRIGGER_SPELL: case SPELL_AURA_PROC_TRIGGER_SPELL:
{ {
multiplier = 0.2f; CollectSpellStats(effectInfo.TriggerSpell, true);
if (effectInfo.TriggerSpell) break;
{ }
SpellInfo const* triggerSpellInfo = sSpellMgr->GetSpellInfo(effectInfo.TriggerSpell); case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
if (!triggerSpellInfo) {
return; CollectSpellStats(effectInfo.TriggerSpell, true);
for (uint8 k = 0; k < MAX_SPELL_EFFECTS; k++)
{
CollectSpellEffectStats(triggerSpellInfo->Effects[k], multiplier);
}
}
break; break;
} }
default: default:
@@ -187,6 +234,16 @@ void StatsCollector::CollectEnchantStats(SpellItemEnchantmentEntry const* enchan
switch (enchant_display_type) switch (enchant_display_type)
{ {
case ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL:
{
CollectSpellStats(enchant_spell_id, true);
break;
}
case ITEM_ENCHANTMENT_TYPE_EQUIP_SPELL:
{
CollectSpellStats(enchant_spell_id, false);
break;
}
case ITEM_ENCHANTMENT_TYPE_STAT: case ITEM_ENCHANTMENT_TYPE_STAT:
{ {
if (!enchant_amount) if (!enchant_amount)
@@ -202,37 +259,59 @@ void StatsCollector::CollectEnchantStats(SpellItemEnchantmentEntry const* enchan
} }
} }
/// @todo Special case for trinket /// @todo Special case for some spell that hard to calculate, like trinket, libram, etc.
bool StatsCollector::CollectSpecialCaseSpellStats(uint32 spellId) { return false; } bool StatsCollector::CollectSpecialCaseSpellStats(uint32 spellId) {
// trinket
switch (spellId)
{
case 71519: // Deathbringer's Will
stats[STATS_TYPE_ATTACK_POWER] += 400;
return true;
case 71562: // Deathbringer's Will
stats[STATS_TYPE_ATTACK_POWER] += 450;
return true;
default:
break;
}
// switch (spellId)
// {
// case 50457: // Idol of the Lunar Eclipse
// stats[STATS_TYPE_CRIT] += 150;
// return true;
// default:
// break;
// }
return false;
}
bool StatsCollector::CollectSpecialEnchantSpellStats(uint32 enchantSpellId) bool StatsCollector::CollectSpecialEnchantSpellStats(uint32 enchantSpellId)
{ {
switch (enchantSpellId) switch (enchantSpellId)
{ {
case 28093: // mongoose // case 28093: // mongoose
if (type_ == CollectorType::MELEE) // if (type_ == CollectorType::MELEE)
{ // {
stats[STATS_TYPE_AGILITY] += 40; // stats[STATS_TYPE_AGILITY] += 40;
} // }
return true; // return true;
case 20007: // crusader // case 20007: // crusader
if (type_ == CollectorType::MELEE) // if (type_ == CollectorType::MELEE)
{ // {
stats[STATS_TYPE_STRENGTH] += 30; // stats[STATS_TYPE_STRENGTH] += 30;
} // }
return true; // return true;
case 59620: // Berserk // case 59620: // Berserk
if (type_ == CollectorType::MELEE) // if (type_ == CollectorType::MELEE)
{ // {
stats[STATS_TYPE_ATTACK_POWER] += 120; // stats[STATS_TYPE_ATTACK_POWER] += 120;
} // }
return true; // return true;
case 64440: // Blade Warding // case 64440: // Blade Warding
if (type_ == CollectorType::MELEE) // if (type_ == CollectorType::MELEE)
{ // {
stats[STATS_TYPE_PARRY] += 50; // stats[STATS_TYPE_PARRY] += 50;
} // }
return true; // return true;
case 64571: case 64571:
if (type_ == CollectorType::MELEE) if (type_ == CollectorType::MELEE)
{ {

6
src/factory/StatsCollector.h
View File

@@ -57,12 +57,12 @@ public:
StatsCollector(StatsCollector& stats) = default; StatsCollector(StatsCollector& stats) = default;
void Reset(); void Reset();
void CollectItemStats(ItemTemplate const* proto); void CollectItemStats(ItemTemplate const* proto);
void CollectSpellStats(uint32 spellId, uint32 trigger = ITEM_SPELLTRIGGER_ON_EQUIP); void CollectSpellStats(uint32 spellId, bool isTrigger = false);
void CollectSpellEffectStats(const SpellEffectInfo& effectInfo, float multiplier = 1.0f); void CollectPositiveSpellEffectStats(const SpellEffectInfo& effectInfo, float multiplier = 1.0f);
void CollectEnchantStats(SpellItemEnchantmentEntry const* enchant); void CollectEnchantStats(SpellItemEnchantmentEntry const* enchant);
public: public:
uint32 stats[STATS_TYPE_MAX]; int32 stats[STATS_TYPE_MAX];
private: private:
void CollectByItemStatType(uint32 itemStatType, int32 val); void CollectByItemStatType(uint32 itemStatType, int32 val);

30
src/factory/StatsWeightCalculator.cpp
View File

@@ -189,7 +189,7 @@ void StatsWeightCalculator::GenerateBasicWeights(Player* player)
{ {
stats_weights_[STATS_TYPE_AGILITY] += 2.0f; stats_weights_[STATS_TYPE_AGILITY] += 2.0f;
stats_weights_[STATS_TYPE_STRENGTH] += 1.0f; stats_weights_[STATS_TYPE_STRENGTH] += 1.0f;
stats_weights_[STATS_TYPE_STAMINA] += 3.0f; stats_weights_[STATS_TYPE_STAMINA] += 3.5f;
stats_weights_[STATS_TYPE_ATTACK_POWER] += 0.2f; stats_weights_[STATS_TYPE_ATTACK_POWER] += 0.2f;
stats_weights_[STATS_TYPE_DEFENSE] += 2.5f; stats_weights_[STATS_TYPE_DEFENSE] += 2.5f;
stats_weights_[STATS_TYPE_PARRY] += 2.0f; stats_weights_[STATS_TYPE_PARRY] += 2.0f;
@@ -208,7 +208,7 @@ void StatsWeightCalculator::GenerateBasicWeights(Player* player)
{ {
stats_weights_[STATS_TYPE_AGILITY] += 2.0f; stats_weights_[STATS_TYPE_AGILITY] += 2.0f;
stats_weights_[STATS_TYPE_STRENGTH] += 1.0f; stats_weights_[STATS_TYPE_STRENGTH] += 1.0f;
stats_weights_[STATS_TYPE_STAMINA] += 2.5f; stats_weights_[STATS_TYPE_STAMINA] += 3.5f;
stats_weights_[STATS_TYPE_ATTACK_POWER] += 0.2f; stats_weights_[STATS_TYPE_ATTACK_POWER] += 0.2f;
stats_weights_[STATS_TYPE_DEFENSE] += 3.5f; stats_weights_[STATS_TYPE_DEFENSE] += 3.5f;
stats_weights_[STATS_TYPE_PARRY] += 2.0f; stats_weights_[STATS_TYPE_PARRY] += 2.0f;
@@ -224,19 +224,19 @@ void StatsWeightCalculator::GenerateBasicWeights(Player* player)
else else
{ {
// BEAR DRUID TANK // BEAR DRUID TANK
stats_weights_[STATS_TYPE_AGILITY] += 1.5f; stats_weights_[STATS_TYPE_AGILITY] += 2.2f;
stats_weights_[STATS_TYPE_STRENGTH] += 1.0f; stats_weights_[STATS_TYPE_STRENGTH] += 2.4f;
stats_weights_[STATS_TYPE_STAMINA] += 1.5f; stats_weights_[STATS_TYPE_STAMINA] += 4.0f;
stats_weights_[STATS_TYPE_ATTACK_POWER] += 0.2f; stats_weights_[STATS_TYPE_ATTACK_POWER] += 1.0f;
stats_weights_[STATS_TYPE_DEFENSE] += 2.0f; stats_weights_[STATS_TYPE_DEFENSE] += 0.3f;
stats_weights_[STATS_TYPE_DODGE] += 2.0f; stats_weights_[STATS_TYPE_DODGE] += 0.7f;
stats_weights_[STATS_TYPE_RESILIENCE] += 2.0f; stats_weights_[STATS_TYPE_RESILIENCE] += 1.0f;
stats_weights_[STATS_TYPE_ARMOR] += 0.3f; stats_weights_[STATS_TYPE_ARMOR] += 0.15f;
stats_weights_[STATS_TYPE_HIT] += 2.0f; stats_weights_[STATS_TYPE_HIT] += 3.0f;
stats_weights_[STATS_TYPE_CRIT] += 0.5f; stats_weights_[STATS_TYPE_CRIT] += 1.3f;
stats_weights_[STATS_TYPE_HASTE] += 0.5f; stats_weights_[STATS_TYPE_HASTE] += 2.3f;
stats_weights_[STATS_TYPE_EXPERTISE] += 3.0f; stats_weights_[STATS_TYPE_EXPERTISE] += 3.7f;
stats_weights_[STATS_TYPE_MELEE_DPS] += 2.0f; stats_weights_[STATS_TYPE_MELEE_DPS] += 3.0f;
} }
} }