veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-02-20 18:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve gear initialization (#909)

Browse Source 
* Druid and paladin rotation

* Improve spell effect collector for gear init

* Fix mount and hit stat calculator
This commit is contained in:
Yunfan Li 2025-01-25 21:07:36 +08:00 committed by GitHub
parent 84e24306fc
commit f0d4273e4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 468 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/PlayerbotAI.cpp
View File

@ -6,9 +6,9 @@
#include "PlayerbotAI.h" #include "PlayerbotAI.h"
#include <cmath> #include <cmath>
#include <mutex>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <mutex>
#include "AiFactory.h" #include "AiFactory.h"
#include "BudgetValues.h" #include "BudgetValues.h"
@ -18,6 +18,7 @@
#include "EmoteAction.h" #include "EmoteAction.h"
#include "Engine.h" #include "Engine.h"
#include "ExternalEventHelper.h" #include "ExternalEventHelper.h"
#include "GameTime.h"
#include "GuildMgr.h" #include "GuildMgr.h"
#include "GuildTaskMgr.h" #include "GuildTaskMgr.h"
#include "LFGMgr.h" #include "LFGMgr.h"
@ -51,7 +52,6 @@
#include "Unit.h" #include "Unit.h"
#include "UpdateTime.h" #include "UpdateTime.h"
#include "Vehicle.h" #include "Vehicle.h"
#include "GameTime.h"
std::vector<std::string> PlayerbotAI::dispel_whitelist = { std::vector<std::string> PlayerbotAI::dispel_whitelist = {
"mutating injection", "mutating injection",
@ -232,11 +232,13 @@ void PlayerbotAI::UpdateAI(uint32 elapsed, bool minimal)
nextAICheckDelay = 0; nextAICheckDelay = 0;
// Early return if bot is in invalid state // Early return if bot is in invalid state
if (!bot || !bot->IsInWorld() || !bot->GetSession() || bot->GetSession()->isLogingOut() || bot->IsDuringRemoveFromWorld()) if (!bot || !bot->IsInWorld() || !bot->GetSession() || bot->GetSession()->isLogingOut() ||
bot->IsDuringRemoveFromWorld())
return; return;
// Handle cheat options (set bot health and power if cheats are enabled) // Handle cheat options (set bot health and power if cheats are enabled)
if (bot->IsAlive() && (static_cast<uint32>(GetCheat()) > 0 || static_cast<uint32>(sPlayerbotAIConfig->botCheatMask) > 0)) if (bot->IsAlive() &&
(static_cast<uint32>(GetCheat()) > 0 || static_cast<uint32>(sPlayerbotAIConfig->botCheatMask) > 0))
{ {
if (HasCheat(BotCheatMask::health)) if (HasCheat(BotCheatMask::health))
bot->SetFullHealth(); bot->SetFullHealth();
@ -287,8 +289,10 @@ void PlayerbotAI::UpdateAI(uint32 elapsed, bool minimal)
isHeal = true; isHeal = true;
// Check if spell is single-target // Check if spell is single-target
if ((spellInfo->Effects[i].TargetA.GetTarget() && spellInfo->Effects[i].TargetA.GetTarget() != TARGET_UNIT_TARGET_ALLY) || if ((spellInfo->Effects[i].TargetA.GetTarget() &&
(spellInfo->Effects[i].TargetB.GetTarget() && spellInfo->Effects[i].TargetB.GetTarget() != TARGET_UNIT_TARGET_ALLY)) spellInfo->Effects[i].TargetA.GetTarget() != TARGET_UNIT_TARGET_ALLY) ||
(spellInfo->Effects[i].TargetB.GetTarget() &&
spellInfo->Effects[i].TargetB.GetTarget() != TARGET_UNIT_TARGET_ALLY))
{ {
isSingleTarget = false; isSingleTarget = false;
} }
@ -303,7 +307,8 @@ void PlayerbotAI::UpdateAI(uint32 elapsed, bool minimal)
} }
// Ensure bot is facing target if necessary // Ensure bot is facing target if necessary
if (spellTarget && !bot->HasInArc(CAST_ANGLE_IN_FRONT, spellTarget) && (spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT)) if (spellTarget && !bot->HasInArc(CAST_ANGLE_IN_FRONT, spellTarget) &&
(spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT))
{ {
sServerFacade->SetFacingTo(bot, spellTarget); sServerFacade->SetFacingTo(bot, spellTarget);
} }
@ -1344,7 +1349,8 @@ void PlayerbotAI::DoNextAction(bool min)
for (GroupReference* gref = group->GetFirstMember(); gref; gref = gref->next()) for (GroupReference* gref = group->GetFirstMember(); gref; gref = gref->next())
{ {
Player* member = gref->GetSource(); Player* member = gref->GetSource();
if (!member || member == bot || member == newMaster || !member->IsInWorld() || !member->IsInSameRaidWith(bot)) if (!member || member == bot || member == newMaster || !member->IsInWorld() ||
!member->IsInSameRaidWith(bot))
continue; continue;
PlayerbotAI* memberBotAI = GET_PLAYERBOT_AI(member); PlayerbotAI* memberBotAI = GET_PLAYERBOT_AI(member);
@ -1699,7 +1705,10 @@ bool PlayerbotAI::IsRanged(Player* player, bool bySpec)
bool PlayerbotAI::IsMelee(Player* player, bool bySpec) { return !IsRanged(player, bySpec); } bool PlayerbotAI::IsMelee(Player* player, bool bySpec) { return !IsRanged(player, bySpec); }
bool PlayerbotAI::IsCaster(Player* player, bool bySpec) { return IsRanged(player, bySpec) && player->getClass() != CLASS_HUNTER; } bool PlayerbotAI::IsCaster(Player* player, bool bySpec)
{
return IsRanged(player, bySpec) && player->getClass() != CLASS_HUNTER;
}
bool PlayerbotAI::IsCombo(Player* player, bool bySpec) bool PlayerbotAI::IsCombo(Player* player, bool bySpec)
{ {
@ -1838,7 +1847,7 @@ int32 PlayerbotAI::GetRangedIndex(Player* player)
return 0; return 0;
} }
int32 PlayerbotAI::GetClassIndex(Player* player, uint8_t cls) int32 PlayerbotAI::GetClassIndex(Player* player, uint8 cls)
{ {
if (player->getClass() != cls) if (player->getClass() != cls)
{ {
@ -3277,9 +3286,7 @@ bool PlayerbotAI::CastSpell(uint32 spellId, Unit* target, Item* itemTarget)
// WaitForSpellCast(spell); // WaitForSpellCast(spell);
aiObjectContext->GetValue<LastSpellCast&>("last spell cast") aiObjectContext->GetValue<LastSpellCast&>("last spell cast")->Get().Set(spellId, target->GetGUID(), time(nullptr));
->Get()
.Set(spellId, target->GetGUID(), time(nullptr));
aiObjectContext->GetValue<PositionMap&>("position")->Get()["random"].Reset(); aiObjectContext->GetValue<PositionMap&>("position")->Get()["random"].Reset();
@ -4267,12 +4274,18 @@ uint32 PlayerbotAI::AutoScaleActivity(uint32 mod)
double spreadSize = (double)(diffLimitCeiling - diffLimitFloor) / 6; double spreadSize = (double)(diffLimitCeiling - diffLimitFloor) / 6;
// apply scaling // apply scaling
if (maxDiff > diffLimitCeiling) return 0; if (maxDiff > diffLimitCeiling)
if (maxDiff > diffLimitFloor + (4 * spreadSize)) return (mod * 1) / 10; return 0;
if (maxDiff > diffLimitFloor + (3 * spreadSize)) return (mod * 3) / 10; if (maxDiff > diffLimitFloor + (4 * spreadSize))
if (maxDiff > diffLimitFloor + (2 * spreadSize)) return (mod * 5) / 10; return (mod * 1) / 10;
if (maxDiff > diffLimitFloor + (1 * spreadSize)) return (mod * 7) / 10; if (maxDiff > diffLimitFloor + (3 * spreadSize))
if (maxDiff > diffLimitFloor) return (mod * 9) / 10; return (mod * 3) / 10;
if (maxDiff > diffLimitFloor + (2 * spreadSize))
return (mod * 5) / 10;
if (maxDiff > diffLimitFloor + (1 * spreadSize))
return (mod * 7) / 10;
if (maxDiff > diffLimitFloor)
return (mod * 9) / 10;
return mod; return mod;
} }
@ -4497,7 +4510,8 @@ void PlayerbotAI::_fillGearScoreData(Player* player, Item* item, std::vector<uin
return; return;
uint8 type = proto->InventoryType; uint8 type = proto->InventoryType;
uint32 level = mixed ? proto->ItemLevel * PlayerbotAI::GetItemScoreMultiplier(ItemQualities(proto->Quality)) : proto->ItemLevel; uint32 level = mixed ? proto->ItemLevel * PlayerbotAI::GetItemScoreMultiplier(ItemQualities(proto->Quality))
: proto->ItemLevel;
switch (type) switch (type)
{ {
@ -4849,25 +4863,27 @@ Item* PlayerbotAI::FindItemInInventory(std::function<bool(ItemTemplate const*)>
// Find Poison // Find Poison
Item* PlayerbotAI::FindPoison() const Item* PlayerbotAI::FindPoison() const
{ {
return FindItemInInventory([](ItemTemplate const* pItemProto) -> bool { return FindItemInInventory([](ItemTemplate const* pItemProto) -> bool
return pItemProto->Class == ITEM_CLASS_CONSUMABLE && pItemProto->SubClass == 6; { return pItemProto->Class == ITEM_CLASS_CONSUMABLE && pItemProto->SubClass == 6; });
});
} }
// Find Consumable // Find Consumable
Item* PlayerbotAI::FindConsumable(uint32 displayId) const Item* PlayerbotAI::FindConsumable(uint32 displayId) const
{ {
return FindItemInInventory([displayId](ItemTemplate const* pItemProto) -> bool { return FindItemInInventory(
return (pItemProto->Class == ITEM_CLASS_CONSUMABLE || pItemProto->Class == ITEM_CLASS_TRADE_GOODS) && pItemProto->DisplayInfoID == displayId; [displayId](ItemTemplate const* pItemProto) -> bool
{
return (pItemProto->Class == ITEM_CLASS_CONSUMABLE || pItemProto->Class == ITEM_CLASS_TRADE_GOODS) &&
pItemProto->DisplayInfoID == displayId;
}); });
} }
// Find Bandage // Find Bandage
Item* PlayerbotAI::FindBandage() const Item* PlayerbotAI::FindBandage() const
{ {
return FindItemInInventory([](ItemTemplate const* pItemProto) -> bool { return FindItemInInventory(
return pItemProto->Class == ITEM_CLASS_CONSUMABLE && pItemProto->SubClass == ITEM_SUBCLASS_BANDAGE; [](ItemTemplate const* pItemProto) -> bool
}); { return pItemProto->Class == ITEM_CLASS_CONSUMABLE && pItemProto->SubClass == ITEM_SUBCLASS_BANDAGE; });
} }
static const uint32 uPriorizedSharpStoneIds[8] = {ADAMANTITE_SHARPENING_DISPLAYID, FEL_SHARPENING_DISPLAYID, static const uint32 uPriorizedSharpStoneIds[8] = {ADAMANTITE_SHARPENING_DISPLAYID, FEL_SHARPENING_DISPLAYID,
@ -5323,9 +5339,8 @@ bool PlayerbotAI::CanMove()
return false; return false;
if (bot->isFrozen() || bot->IsPolymorphed() || (bot->isDead() && !bot->HasPlayerFlag(PLAYER_FLAGS_GHOST)) || if (bot->isFrozen() || bot->IsPolymorphed() || (bot->isDead() && !bot->HasPlayerFlag(PLAYER_FLAGS_GHOST)) ||
bot->IsBeingTeleported() || bot->HasRootAura() || bot->HasSpiritOfRedemptionAura() || bot->IsBeingTeleported() || bot->HasRootAura() || bot->HasSpiritOfRedemptionAura() || bot->HasConfuseAura() ||
bot->HasConfuseAura() || bot->IsCharmed() || bot->HasStunAura() || bot->IsCharmed() || bot->HasStunAura() || bot->IsInFlight() || bot->HasUnitState(UNIT_STATE_LOST_CONTROL))
bot->IsInFlight() || bot->HasUnitState(UNIT_STATE_LOST_CONTROL))
return false; return false;
return bot->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLIGHT_MOTION_TYPE; return bot->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLIGHT_MOTION_TYPE;
@ -5988,3 +6003,80 @@ float PlayerbotAI::GetItemScoreMultiplier(ItemQualities quality)
} }
return 1.0f; return 1.0f;
} }
bool PlayerbotAI::IsHealingSpell(uint32 spellFamilyName, flag96 spellFalimyFlags)
{
if (!spellFamilyName)
return false;
flag96 healingFlags;
switch (spellFamilyName)
{
case SPELLFAMILY_DRUID:
{
uint32 healingFlagsA = 0x10 | 0x40 | 0x20 | 0x80; // rejuvenation | regrowth | healing touch | tranquility
uint32 healingFlagsB = 0x4000000 | 0x2000000 | 0x2 | 0x10; // wild growth | nourish | swiftmend | lifebloom
uint32 healingFlagsC = 0x0;
healingFlags = {healingFlagsA, healingFlagsB, healingFlagsC};
break;
}
case SPELLFAMILY_PALADIN:
{
uint32 healingFlagsA = 0x80000000 | 0x40000000 | 0x8000 |
0x80000; // holy light | flash of light | lay on hands | judgement of light
uint32 healingFlagsB = 0x10000; // holy shock
uint32 healingFlagsC = 0x0;
healingFlags = {healingFlagsA, healingFlagsB, healingFlagsC};
break;
}
case SPELLFAMILY_SHAMAN:
{
uint32 healingFlagsA = 0x80 | 0x40 | 0x100; // lesser healing wave | healing wave | chain heal
uint32 healingFlagsB = 0x400; // earth shield
uint32 healingFlagsC = 0x10; // riptide
healingFlags = {healingFlagsA, healingFlagsB, healingFlagsC};
break;
}
case SPELLFAMILY_PRIEST:
{
uint32 healingFlagsA = 0x40 | 0x200 | 0x40000 | 0x1000 | 0x800 | 0x400 |
0x10000000; // renew | prayer of healing | lesser heal | greater heal | flash heal |
// heal | circle of healing
uint32 healingFlagsB = 0x800000 | 0x20 | 0x4; // penance | prayer of mending | binding heal
uint32 healingFlagsC = 0x0;
healingFlags = {healingFlagsA, healingFlagsB, healingFlagsC};
break;
}
default:
break;
}
return spellFalimyFlags & healingFlags;
}
SpellFamilyNames PlayerbotAI::Class2SpellFamilyName(uint8 cls) {
switch (cls) {
case CLASS_WARRIOR:
return SPELLFAMILY_WARRIOR;
case CLASS_PALADIN:
return SPELLFAMILY_PALADIN;
case CLASS_HUNTER:
return SPELLFAMILY_HUNTER;
case CLASS_ROGUE:
return SPELLFAMILY_ROGUE;
case CLASS_PRIEST:
return SPELLFAMILY_PRIEST;
case CLASS_DEATH_KNIGHT:
return SPELLFAMILY_DEATHKNIGHT;
case CLASS_SHAMAN:
return SPELLFAMILY_SHAMAN;
case CLASS_MAGE:
return SPELLFAMILY_MAGE;
case CLASS_WARLOCK:
return SPELLFAMILY_WARLOCK;
case CLASS_DRUID:
return SPELLFAMILY_DRUID;
default:
break;
}
return SPELLFAMILY_GENERIC;
}

7
src/PlayerbotAI.h
View File

@ -15,13 +15,14 @@
#include "Common.h" #include "Common.h"
#include "Event.h" #include "Event.h"
#include "Item.h" #include "Item.h"
#include "NewRpgStrategy.h"
#include "PlayerbotAIBase.h" #include "PlayerbotAIBase.h"
#include "PlayerbotAIConfig.h" #include "PlayerbotAIConfig.h"
#include "PlayerbotSecurity.h" #include "PlayerbotSecurity.h"
#include "PlayerbotTextMgr.h" #include "PlayerbotTextMgr.h"
#include "SpellAuras.h" #include "SpellAuras.h"
#include "Util.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "NewRpgStrategy.h"
class AiObjectContext; class AiObjectContext;
class Creature; class Creature;
@ -419,7 +420,7 @@ public:
bool HasAggro(Unit* unit); bool HasAggro(Unit* unit);
int32 GetGroupSlotIndex(Player* player); int32 GetGroupSlotIndex(Player* player);
int32 GetRangedIndex(Player* player); int32 GetRangedIndex(Player* player);
int32 GetClassIndex(Player* player, uint8_t cls); int32 GetClassIndex(Player* player, uint8 cls);
int32 GetRangedDpsIndex(Player* player); int32 GetRangedDpsIndex(Player* player);
int32 GetMeleeIndex(Player* player); int32 GetMeleeIndex(Player* player);
@ -573,6 +574,8 @@ public:
std::set<uint32> GetCurrentIncompleteQuestIds(); std::set<uint32> GetCurrentIncompleteQuestIds();
void PetFollow(); void PetFollow();
static float GetItemScoreMultiplier(ItemQualities quality); static float GetItemScoreMultiplier(ItemQualities quality);
static bool IsHealingSpell(uint32 spellFamilyName, flag96 spelFalimyFlags);
static SpellFamilyNames Class2SpellFamilyName(uint8 cls);
NewRpgInfo rpgInfo; NewRpgInfo rpgInfo;
private: private:

84
src/factory/PlayerbotFactory.cpp
View File

@ -38,8 +38,6 @@
#include "StatsWeightCalculator.h" #include "StatsWeightCalculator.h"
#include "World.h" #include "World.h"
#define PLAYER_SKILL_INDEX(x) (PLAYER_SKILL_INFO_1_1 + ((x)*3))
const uint64 diveMask = (1LL << 7) | (1LL << 44) | (1LL << 37) | (1LL << 38) | (1LL << 26) | (1LL << 30) | (1LL << 27) | const uint64 diveMask = (1LL << 7) | (1LL << 44) | (1LL << 37) | (1LL << 38) | (1LL << 26) | (1LL << 30) | (1LL << 27) |
(1LL << 33) | (1LL << 24) | (1LL << 34); (1LL << 33) | (1LL << 24) | (1LL << 34);
uint32 PlayerbotFactory::tradeSkills[] = {SKILL_ALCHEMY, SKILL_ENCHANTING, SKILL_SKINNING, SKILL_TAILORING, uint32 PlayerbotFactory::tradeSkills[] = {SKILL_ALCHEMY, SKILL_ENCHANTING, SKILL_SKINNING, SKILL_TAILORING,
@ -86,7 +84,9 @@ void PlayerbotFactory::Init()
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId);
if (!spellInfo) if (!spellInfo)
continue; continue;
} else if (quest->GetRewSpell() > 0) { }
else if (quest->GetRewSpell() > 0)
{
int32 spellId = quest->GetRewSpell(); int32 spellId = quest->GetRewSpell();
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId);
if (!spellInfo) if (!spellInfo)
@ -271,7 +271,8 @@ void PlayerbotFactory::Randomize(bool incremental)
pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Talents"); pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Talents");
LOG_DEBUG("playerbots", "Initializing talents..."); LOG_DEBUG("playerbots", "Initializing talents...");
if (!incremental || !sPlayerbotAIConfig->equipmentPersistence || bot->GetLevel() < sPlayerbotAIConfig->equipmentPersistenceLevel) if (!incremental || !sPlayerbotAIConfig->equipmentPersistence ||
bot->GetLevel() < sPlayerbotAIConfig->equipmentPersistenceLevel)
{ {
InitTalentsTree(); InitTalentsTree();
} }
@ -306,7 +307,8 @@ void PlayerbotFactory::Randomize(bool incremental)
pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Equip"); pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Equip");
LOG_DEBUG("playerbots", "Initializing equipmemt..."); LOG_DEBUG("playerbots", "Initializing equipmemt...");
if (!incremental || !sPlayerbotAIConfig->equipmentPersistence || bot->GetLevel() < sPlayerbotAIConfig->equipmentPersistenceLevel) if (!incremental || !sPlayerbotAIConfig->equipmentPersistence ||
bot->GetLevel() < sPlayerbotAIConfig->equipmentPersistenceLevel)
{ {
InitEquipment(incremental, incremental ? false : sPlayerbotAIConfig->twoRoundsGearInit); InitEquipment(incremental, incremental ? false : sPlayerbotAIConfig->twoRoundsGearInit);
} }
@ -1559,27 +1561,16 @@ void PlayerbotFactory::InitEquipment(bool incremental, bool second_chance)
// int tab = AiFactory::GetPlayerSpecTab(bot); // int tab = AiFactory::GetPlayerSpecTab(bot);
uint32 blevel = bot->GetLevel(); uint32 blevel = bot->GetLevel();
int32 delta = 2; int32 delta = std::min(blevel, 10u);
if (blevel < 15)
delta = std::min(blevel, 15u);
else if (blevel < 40)
delta = 10;
else if (blevel < 60)
delta = 6;
else if (blevel < 70)
delta = 9;
else if (blevel < 80)
delta = 9;
else if (blevel == 80)
delta = 9;
StatsWeightCalculator calculator(bot); StatsWeightCalculator calculator(bot);
for (uint8 slot = 0; slot < EQUIPMENT_SLOT_END; ++slot) // Reverse order may work better
for (int32 slot = (int32)EQUIPMENT_SLOT_TABARD; slot >= (int32)EQUIPMENT_SLOT_START; slot--)
{ {
if (slot == EQUIPMENT_SLOT_TABARD || slot == EQUIPMENT_SLOT_BODY) if (slot == EQUIPMENT_SLOT_TABARD || slot == EQUIPMENT_SLOT_BODY)
continue; continue;
if (level < 40 && (slot == EQUIPMENT_SLOT_TRINKET1 || slot == EQUIPMENT_SLOT_TRINKET2)) if (level < 50 && (slot == EQUIPMENT_SLOT_TRINKET1 || slot == EQUIPMENT_SLOT_TRINKET2))
continue; continue;
if (level < 30 && slot == EQUIPMENT_SLOT_NECK) if (level < 30 && slot == EQUIPMENT_SLOT_NECK)
@ -1670,8 +1661,6 @@ void PlayerbotFactory::InitEquipment(bool incremental, bool second_chance)
items[slot].push_back(itemId); items[slot].push_back(itemId);
} }
} }
if (items[slot].size() >= 25)
break;
} }
} while (items[slot].size() < 25 && desiredQuality-- > ITEM_QUALITY_NORMAL); } while (items[slot].size() < 25 && desiredQuality-- > ITEM_QUALITY_NORMAL);
@ -1719,8 +1708,6 @@ void PlayerbotFactory::InitEquipment(bool incremental, bool second_chance)
if (bestScoreForSlot < 1.2f * old_score) if (bestScoreForSlot < 1.2f * old_score)
continue; continue;
} }
if (oldItem) if (oldItem)
{ {
uint8 bagIndex = oldItem->GetBagSlot(); uint8 bagIndex = oldItem->GetBagSlot();
@ -1749,12 +1736,12 @@ void PlayerbotFactory::InitEquipment(bool incremental, bool second_chance)
/// @todo: clean up duplicate code /// @todo: clean up duplicate code
if (second_chance) if (second_chance)
{ {
for (uint8 slot = 0; slot < EQUIPMENT_SLOT_END; ++slot) for (int32 slot = (int32)EQUIPMENT_SLOT_TABARD; slot >= (int32)EQUIPMENT_SLOT_START; slot--)
{ {
if (slot == EQUIPMENT_SLOT_TABARD || slot == EQUIPMENT_SLOT_BODY) if (slot == EQUIPMENT_SLOT_TABARD || slot == EQUIPMENT_SLOT_BODY)
continue; continue;
if (level < 40 && (slot == EQUIPMENT_SLOT_TRINKET1 || slot == EQUIPMENT_SLOT_TRINKET2)) if (level < 50 && (slot == EQUIPMENT_SLOT_TRINKET1 || slot == EQUIPMENT_SLOT_TRINKET2))
continue; continue;
if (level < 30 && slot == EQUIPMENT_SLOT_NECK) if (level < 30 && slot == EQUIPMENT_SLOT_NECK)
@ -2177,18 +2164,15 @@ void PlayerbotFactory::InitSkills()
uint32 maxValue = level * 5; uint32 maxValue = level * 5;
bot->UpdateSkillsForLevel(); bot->UpdateSkillsForLevel();
uint16 step = bot->GetSkillValue(SKILL_RIDING) ? bot->GetSkillStep(SKILL_RIDING) : 1;
if (bot->GetLevel() >= 70)
bot->SetSkill(SKILL_RIDING, step, 300, 300);
else if (bot->GetLevel() >= 60)
bot->SetSkill(SKILL_RIDING, step, 225, 225);
else if (bot->GetLevel() >= 40)
bot->SetSkill(SKILL_RIDING, step, 150, 150);
else if (bot->GetLevel() >= 20)
bot->SetSkill(SKILL_RIDING, step, 75, 75);
else
bot->SetSkill(SKILL_RIDING, 0, 0, 0); bot->SetSkill(SKILL_RIDING, 0, 0, 0);
if (bot->GetLevel() >= sPlayerbotAIConfig->useGroundMountAtMinLevel)
bot->learnSpell(33388);
if (bot->GetLevel() >= sPlayerbotAIConfig->useFastGroundMountAtMinLevel)
bot->learnSpell(33391);
if (bot->GetLevel() >= sPlayerbotAIConfig->useFlyMountAtMinLevel)
bot->learnSpell(34090);
if (bot->GetLevel() >= sPlayerbotAIConfig->useFastFlyMountAtMinLevel)
bot->learnSpell(34091);
uint32 skillLevel = bot->GetLevel() < 40 ? 0 : 1; uint32 skillLevel = bot->GetLevel() < 40 ? 0 : 1;
uint32 dualWieldLevel = bot->GetLevel() < 20 ? 0 : 1; uint32 dualWieldLevel = bot->GetLevel() < 20 ? 0 : 1;
@ -2360,8 +2344,6 @@ void PlayerbotFactory::InitAvailableSpells()
trainerIdCache.push_back(trainerId); trainerIdCache.push_back(trainerId);
} }
} }
// uint32 learnedCounter = 0;
// uint32 oktest = 0;
for (uint32 trainerId : trainerIdCache) for (uint32 trainerId : trainerIdCache)
{ {
TrainerSpellData const* trainer_spells = sObjectMgr->GetNpcTrainerSpells(trainerId); TrainerSpellData const* trainer_spells = sObjectMgr->GetNpcTrainerSpells(trainerId);
@ -2379,7 +2361,7 @@ void PlayerbotFactory::InitAvailableSpells()
if (!tSpell) if (!tSpell)
continue; continue;
if (!tSpell->learnedSpell[0] && !bot->IsSpellFitByClassAndRace(tSpell->learnedSpell[0])) if (tSpell->learnedSpell[0] && !bot->IsSpellFitByClassAndRace(tSpell->learnedSpell[0]))
continue; continue;
TrainerSpellState state = bot->GetTrainerSpellState(tSpell); TrainerSpellState state = bot->GetTrainerSpellState(tSpell);
@ -2394,7 +2376,8 @@ void PlayerbotFactory::InitAvailableSpells()
continue; continue;
if (spellInfo->Effects[j].Effect == SPELL_EFFECT_PROFICIENCY || if (spellInfo->Effects[j].Effect == SPELL_EFFECT_PROFICIENCY ||
spellInfo->Effects[j].Effect == SPELL_EFFECT_SKILL_STEP || (spellInfo->Effects[j].Effect == SPELL_EFFECT_SKILL_STEP &&
spellInfo->Effects[j].MiscValue != SKILL_RIDING) ||
spellInfo->Effects[j].Effect == SPELL_EFFECT_DUAL_WIELD) spellInfo->Effects[j].Effect == SPELL_EFFECT_DUAL_WIELD)
{ {
learn = false; learn = false;
@ -2405,19 +2388,12 @@ void PlayerbotFactory::InitAvailableSpells()
{ {
continue; continue;
} }
// oktest++;
if (tSpell->learnedSpell[0]) if (tSpell->IsCastable())
{ bot->CastSpell(bot, tSpell->spell, true);
else
bot->learnSpell(tSpell->learnedSpell[0], false); bot->learnSpell(tSpell->learnedSpell[0], false);
} }
// else
// {
// botAI->CastSpell(tSpell->spell, bot);
// }
}
// LOG_INFO("playerbots", "C: {}, ok: {}", ++learnedCounter, oktest);
// if (++learnedCounter > 20)
// break;
} }
} }
@ -2460,6 +2436,8 @@ void PlayerbotFactory::InitClassSpells()
// to leave DK starting area // to leave DK starting area
bot->learnSpell(53428, false); bot->learnSpell(53428, false);
bot->learnSpell(50977, false); bot->learnSpell(50977, false);
bot->learnSpell(49142, false);
bot->learnSpell(48778, false);
break; break;
case CLASS_HUNTER: case CLASS_HUNTER:
bot->learnSpell(2973, true); bot->learnSpell(2973, true);
@ -3866,7 +3844,7 @@ void PlayerbotFactory::ApplyEnchantAndGemsNew(bool destoryOld)
float bestGemScore[4] = {0, 0, 0, 0}; float bestGemScore[4] = {0, 0, 0, 0};
std::vector<uint32> curCount = GetCurrentGemsCount(); std::vector<uint32> curCount = GetCurrentGemsCount();
uint8 jewelersCount = 0; uint8 jewelersCount = 0;
int requiredActive = bot->GetLevel() <= 70 ? 2 : 1; int requiredActive = 2;
std::vector<uint32> availableGems; std::vector<uint32> availableGems;
for (const uint32& enchantGem : enchantGemIdCache) for (const uint32& enchantGem : enchantGemIdCache)
{ {

215
src/factory/StatsCollector.cpp
View File

@ -5,11 +5,14 @@
#include "DBCStores.h" #include "DBCStores.h"
#include "ItemTemplate.h" #include "ItemTemplate.h"
#include "ObjectMgr.h" #include "ObjectMgr.h"
#include "PlayerbotAI.h"
#include "PlayerbotAIAware.h"
#include "SharedDefines.h" #include "SharedDefines.h"
#include "SpellAuraDefines.h" #include "SpellAuraDefines.h"
#include "SpellInfo.h" #include "SpellInfo.h"
#include "SpellMgr.h" #include "SpellMgr.h"
#include "UpdateFields.h" #include "UpdateFields.h"
#include "Util.h"
StatsCollector::StatsCollector(CollectorType type, int32 cls) : type_(type), cls_(cls) { Reset(); } StatsCollector::StatsCollector(CollectorType type, int32 cls) : type_(type), cls_(cls) { Reset(); }
@ -52,7 +55,7 @@ void StatsCollector::CollectItemStats(ItemTemplate const* proto)
CollectSpellStats(proto->Spells[j].SpellId, 1.0f, 0); CollectSpellStats(proto->Spells[j].SpellId, 1.0f, 0);
break; break;
case ITEM_SPELLTRIGGER_CHANCE_ON_HIT: case ITEM_SPELLTRIGGER_CHANCE_ON_HIT:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
{ {
if (proto->Spells[j].SpellPPMRate > 0.01f) if (proto->Spells[j].SpellPPMRate > 0.01f)
CollectSpellStats(proto->Spells[j].SpellId, 1.0f, 60000 / proto->Spells[j].SpellPPMRate); CollectSpellStats(proto->Spells[j].SpellId, 1.0f, 60000 / proto->Spells[j].SpellPPMRate);
@ -107,21 +110,37 @@ void StatsCollector::CollectSpellStats(uint32 spellId, float multiplier, int32 s
if (spellInfo->StackAmount) if (spellInfo->StackAmount)
{ {
// Heuristic multiplier for spell with stackAmount since high stackAmount may not be available // Heuristic multiplier for spell with stackAmount since high stackAmount may not be available
if (spellInfo->StackAmount <= 10) if (spellInfo->StackAmount <= 1)
multiplier *= spellInfo->StackAmount * 0.6; multiplier *= spellInfo->StackAmount * 1;
else if (spellInfo->StackAmount <= 5)
multiplier *= 1 + (spellInfo->StackAmount - 1) * 0.75;
else if (spellInfo->StackAmount <= 10)
multiplier *= 4 + (spellInfo->StackAmount - 5) * 0.6;
else if (spellInfo->StackAmount <= 20) else if (spellInfo->StackAmount <= 20)
multiplier *= 6 + (spellInfo->StackAmount - 10) * 0.4; multiplier *= 7 + (spellInfo->StackAmount - 10) * 0.4;
else else
multiplier *= 10; multiplier *= 11;
} }
for (int i = 0; i < MAX_SPELL_EFFECTS; i++) for (int i = 0; i < MAX_SPELL_EFFECTS; i++)
{ {
const SpellEffectInfo& effectInfo = spellInfo->Effects[i]; const SpellEffectInfo& effectInfo = spellInfo->Effects[i];
if (!effectInfo.Effect)
continue;
switch (effectInfo.Effect) switch (effectInfo.Effect)
{ {
case SPELL_EFFECT_APPLY_AURA: case SPELL_EFFECT_APPLY_AURA:
{ {
if (spellInfo->SpellFamilyName && /*effectInfo.ApplyAuraName != SPELL_AURA_DUMMY &&*/
effectInfo.ApplyAuraName != SPELL_AURA_PROC_TRIGGER_SPELL)
{
if (!CheckSpellValidation(spellInfo->SpellFamilyName, effectInfo.SpellClassMask))
return;
// Some dummy effects cannot be recognized, make some bonus to identify
stats[STATS_TYPE_BONUS] += 1;
}
/// @todo Handle negative spell /// @todo Handle negative spell
if (!spellInfo->IsPositive()) if (!spellInfo->IsPositive())
break; break;
@ -130,7 +149,8 @@ void StatsCollector::CollectSpellStats(uint32 spellId, float multiplier, int32 s
if (spellCooldown <= 2000 || spellInfo->GetDuration() == -1) if (spellCooldown <= 2000 || spellInfo->GetDuration() == -1)
coverage = 1.0f; coverage = 1.0f;
else else
coverage = std::min(1.0f, (float)spellInfo->GetDuration() / (spellInfo->GetDuration() + spellCooldown)); coverage =
std::min(1.0f, (float)spellInfo->GetDuration() / (spellInfo->GetDuration() + spellCooldown));
multiplier *= coverage; multiplier *= coverage;
HandleApplyAura(effectInfo, multiplier, canNextTrigger, triggerCooldown); HandleApplyAura(effectInfo, multiplier, canNextTrigger, triggerCooldown);
@ -167,12 +187,12 @@ void StatsCollector::CollectSpellStats(uint32 spellId, float multiplier, int32 s
break; break;
float normalizedCd = std::max((float)spellCooldown / 1000, 5.0f); float normalizedCd = std::max((float)spellCooldown / 1000, 5.0f);
int32 val = AverageValue(effectInfo); int32 val = AverageValue(effectInfo);
if (type_ == CollectorType::MELEE || type_ == CollectorType::RANGED) if (type_ & (CollectorType::MELEE | CollectorType::RANGED))
{ {
float transfer_multiplier = 1; float transfer_multiplier = 1;
stats[STATS_TYPE_ATTACK_POWER] += (float)val / normalizedCd * multiplier * transfer_multiplier; stats[STATS_TYPE_ATTACK_POWER] += (float)val / normalizedCd * multiplier * transfer_multiplier;
} }
else if (type_ == CollectorType::SPELL_DMG) else if (type_ & CollectorType::SPELL_DMG)
{ {
float transfer_multiplier = 0.5; float transfer_multiplier = 0.5;
stats[STATS_TYPE_SPELL_POWER] += (float)val / normalizedCd * multiplier * transfer_multiplier; stats[STATS_TYPE_SPELL_POWER] += (float)val / normalizedCd * multiplier * transfer_multiplier;
@ -200,7 +220,7 @@ void StatsCollector::CollectEnchantStats(SpellItemEnchantmentEntry const* enchan
{ {
case ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL: case ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL:
{ {
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
CollectSpellStats(enchant_spell_id, 0.25f); CollectSpellStats(enchant_spell_id, 0.25f);
break; break;
} }
@ -225,10 +245,15 @@ void StatsCollector::CollectEnchantStats(SpellItemEnchantmentEntry const* enchan
} }
/// @todo Special case for some spell that hard to calculate, like trinket, relic, etc. /// @todo Special case for some spell that hard to calculate, like trinket, relic, etc.
bool StatsCollector::SpecialSpellFilter(uint32 spellId) { bool StatsCollector::SpecialSpellFilter(uint32 spellId)
{
// trinket // trinket
switch (spellId) switch (spellId)
{ {
case 60764: // Totem of Splintering
if (type_ & (CollectorType::SPELL))
return true;
break;
case 27521: // Insightful Earthstorm Diamond case 27521: // Insightful Earthstorm Diamond
stats[STATS_TYPE_MANA_REGENERATION] += 20; stats[STATS_TYPE_MANA_REGENERATION] += 20;
return true; return true;
@ -236,11 +261,11 @@ bool StatsCollector::SpecialSpellFilter(uint32 spellId) {
stats[STATS_TYPE_MANA_REGENERATION] += 40; stats[STATS_TYPE_MANA_REGENERATION] += 40;
return true; return true;
case 39442: // Darkmoon Card: Wrath case 39442: // Darkmoon Card: Wrath
if (type_ != CollectorType::SPELL_HEAL) if (!(type_ & CollectorType::SPELL_HEAL))
stats[STATS_TYPE_CRIT] += 50; stats[STATS_TYPE_CRIT] += 50;
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 67702: // Death's Verdict case 67702: // Death's Verdict
@ -270,7 +295,7 @@ bool StatsCollector::SpecialSpellFilter(uint32 spellId) {
case 71602: // Dislodged Foreign Object case 71602: // Dislodged Foreign Object
/// @todo The item can be triggered by heal spell, which mismatch with it's description /// @todo The item can be triggered by heal spell, which mismatch with it's description
/// Noticing that heroic item can not be triggered, probably a bug to report to AC /// Noticing that heroic item can not be triggered, probably a bug to report to AC
if (type_ == CollectorType::SPELL_HEAL) if (type_ & CollectorType::SPELL_HEAL)
return true; return true;
break; break;
case 71903: // Shadowmourne case 71903: // Shadowmourne
@ -295,26 +320,26 @@ bool StatsCollector::SpecialEnchantFilter(uint32 enchantSpellId)
switch (enchantSpellId) switch (enchantSpellId)
{ {
case 64440: case 64440:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
{ {
stats[STATS_TYPE_PARRY] += 50; stats[STATS_TYPE_PARRY] += 50;
} }
return true; return true;
case 53365: // Rune of the Fallen Crusader case 53365: // Rune of the Fallen Crusader
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
{ {
stats[STATS_TYPE_STRENGTH] += 75; stats[STATS_TYPE_STRENGTH] += 75;
} }
return true; return true;
case 62157: // Rune of the Stoneskin Gargoyle case 62157: // Rune of the Stoneskin Gargoyle
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
{ {
stats[STATS_TYPE_DEFENSE] += 25; stats[STATS_TYPE_DEFENSE] += 25;
stats[STATS_TYPE_STAMINA] += 50; stats[STATS_TYPE_STAMINA] += 50;
} }
return true; return true;
case 64571: // Blood draining case 64571: // Blood draining
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
{ {
stats[STATS_TYPE_STAMINA] += 50; stats[STATS_TYPE_STAMINA] += 50;
} }
@ -325,18 +350,34 @@ bool StatsCollector::SpecialEnchantFilter(uint32 enchantSpellId)
return false; return false;
} }
bool StatsCollector::CanBeTriggeredByType(SpellInfo const* spellInfo, uint32 procFlags) bool StatsCollector::CanBeTriggeredByType(SpellInfo const* spellInfo, uint32 procFlags, bool strict)
{ {
const SpellProcEventEntry* eventEntry = sSpellMgr->GetSpellProcEvent(spellInfo->Id); const SpellProcEventEntry* eventEntry = sSpellMgr->GetSpellProcEvent(spellInfo->Id);
uint32 spellFamilyName = eventEntry ? eventEntry->spellFamilyName : 0; uint32 spellFamilyName = 0;
if (eventEntry)
{
spellFamilyName = eventEntry->spellFamilyName;
flag96 spellFamilyMask = eventEntry->spellFamilyMask;
if (spellFamilyName != 0) if (spellFamilyName != 0)
/// @todo Check specific trigger spell by spellFamilyMask {
return true; if (!CheckSpellValidation(spellFamilyName, spellFamilyMask, strict))
return false;
}
}
uint32 triggerMask = TAKEN_HIT_PROC_FLAG_MASK; // Generic trigger mask uint32 triggerMask = TAKEN_HIT_PROC_FLAG_MASK; // Generic trigger mask
switch (type_) { switch (type_)
case CollectorType::MELEE: {
case CollectorType::MELEE_DMG:
{
triggerMask |= MELEE_PROC_FLAG_MASK;
triggerMask |= SPELL_PROC_FLAG_MASK;
triggerMask |= PROC_FLAG_DONE_PERIODIC;
if (procFlags & triggerMask)
return true;
break;
}
case CollectorType::MELEE_TANK:
{ {
triggerMask |= MELEE_PROC_FLAG_MASK; triggerMask |= MELEE_PROC_FLAG_MASK;
triggerMask |= SPELL_PROC_FLAG_MASK; triggerMask |= SPELL_PROC_FLAG_MASK;
@ -349,7 +390,7 @@ bool StatsCollector::CanBeTriggeredByType(SpellInfo const* spellInfo, uint32 pro
{ {
triggerMask |= RANGED_PROC_FLAG_MASK; triggerMask |= RANGED_PROC_FLAG_MASK;
triggerMask |= SPELL_PROC_FLAG_MASK; triggerMask |= SPELL_PROC_FLAG_MASK;
triggerMask |= PERIODIC_PROC_FLAG_MASK; triggerMask |= PROC_FLAG_DONE_PERIODIC;
if (procFlags & triggerMask) if (procFlags & triggerMask)
return true; return true;
break; break;
@ -357,6 +398,7 @@ bool StatsCollector::CanBeTriggeredByType(SpellInfo const* spellInfo, uint32 pro
case CollectorType::SPELL_DMG: case CollectorType::SPELL_DMG:
{ {
triggerMask |= SPELL_PROC_FLAG_MASK; triggerMask |= SPELL_PROC_FLAG_MASK;
triggerMask |= PROC_FLAG_DONE_PERIODIC;
// Healing spell cannot trigger // Healing spell cannot trigger
triggerMask &= ~PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_POS; triggerMask &= ~PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_POS;
triggerMask &= ~PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_POS; triggerMask &= ~PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_POS;
@ -367,10 +409,13 @@ bool StatsCollector::CanBeTriggeredByType(SpellInfo const* spellInfo, uint32 pro
case CollectorType::SPELL_HEAL: case CollectorType::SPELL_HEAL:
{ {
triggerMask |= SPELL_PROC_FLAG_MASK; triggerMask |= SPELL_PROC_FLAG_MASK;
triggerMask |= PROC_FLAG_DONE_PERIODIC;
// Dmg spell should not trigger // Dmg spell should not trigger
triggerMask &= ~PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_NEG; triggerMask &= ~PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_NEG;
triggerMask &= ~PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG; triggerMask &= ~PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG;
triggerMask &= ~PROC_FLAG_DONE_PERIODIC; // spellFamilyName = 0 and PROC_FLAG_DONE_PERIODIC -> it is a dmg spell if (!spellFamilyName)
triggerMask &=
~PROC_FLAG_DONE_PERIODIC; // spellFamilyName = 0 and PROC_FLAG_DONE_PERIODIC -> it is a dmg spell
if (procFlags & triggerMask) if (procFlags & triggerMask)
return true; return true;
break; break;
@ -419,39 +464,39 @@ void StatsCollector::CollectByItemStatType(uint32 itemStatType, int32 val)
stats[STATS_TYPE_BLOCK_RATING] += val; stats[STATS_TYPE_BLOCK_RATING] += val;
break; break;
case ITEM_MOD_HIT_MELEE_RATING: case ITEM_MOD_HIT_MELEE_RATING:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
stats[STATS_TYPE_HIT] += val; stats[STATS_TYPE_HIT] += val;
break; break;
case ITEM_MOD_HIT_RANGED_RATING: case ITEM_MOD_HIT_RANGED_RATING:
if (type_ == CollectorType::RANGED) if (type_ & CollectorType::RANGED)
stats[STATS_TYPE_HIT] += val; stats[STATS_TYPE_HIT] += val;
break; break;
case ITEM_MOD_HIT_SPELL_RATING: case ITEM_MOD_HIT_SPELL_RATING:
if (type_ == CollectorType::SPELL) if (type_ & CollectorType::SPELL)
stats[STATS_TYPE_HIT] += val; stats[STATS_TYPE_HIT] += val;
break; break;
case ITEM_MOD_CRIT_MELEE_RATING: case ITEM_MOD_CRIT_MELEE_RATING:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
stats[STATS_TYPE_CRIT] += val; stats[STATS_TYPE_CRIT] += val;
break; break;
case ITEM_MOD_CRIT_RANGED_RATING: case ITEM_MOD_CRIT_RANGED_RATING:
if (type_ == CollectorType::RANGED) if (type_ & CollectorType::RANGED)
stats[STATS_TYPE_CRIT] += val; stats[STATS_TYPE_CRIT] += val;
break; break;
case ITEM_MOD_CRIT_SPELL_RATING: case ITEM_MOD_CRIT_SPELL_RATING:
if (type_ == CollectorType::SPELL) if (type_ & CollectorType::SPELL)
stats[STATS_TYPE_CRIT] += val; stats[STATS_TYPE_CRIT] += val;
break; break;
case ITEM_MOD_HASTE_MELEE_RATING: case ITEM_MOD_HASTE_MELEE_RATING:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
stats[STATS_TYPE_HASTE] += val; stats[STATS_TYPE_HASTE] += val;
break; break;
case ITEM_MOD_HASTE_RANGED_RATING: case ITEM_MOD_HASTE_RANGED_RATING:
if (type_ == CollectorType::RANGED) if (type_ & CollectorType::RANGED)
stats[STATS_TYPE_HASTE] += val; stats[STATS_TYPE_HASTE] += val;
break; break;
case ITEM_MOD_HASTE_SPELL_RATING: case ITEM_MOD_HASTE_SPELL_RATING:
if (type_ == CollectorType::SPELL) if (type_ & CollectorType::SPELL)
stats[STATS_TYPE_HASTE] += val; stats[STATS_TYPE_HASTE] += val;
break; break;
case ITEM_MOD_HIT_RATING: case ITEM_MOD_HIT_RATING:
@ -502,7 +547,8 @@ void StatsCollector::CollectByItemStatType(uint32 itemStatType, int32 val)
} }
} }
void StatsCollector::HandleApplyAura(const SpellEffectInfo& effectInfo, float multiplier, bool canNextTrigger, uint32 triggerCooldown) void StatsCollector::HandleApplyAura(const SpellEffectInfo& effectInfo, float multiplier, bool canNextTrigger,
uint32 triggerCooldown)
{ {
if (effectInfo.Effect != SPELL_EFFECT_APPLY_AURA) if (effectInfo.Effect != SPELL_EFFECT_APPLY_AURA)
return; return;
@ -534,11 +580,11 @@ void StatsCollector::HandleApplyAura(const SpellEffectInfo& effectInfo, float mu
break; break;
} }
case SPELL_AURA_MOD_ATTACK_POWER: case SPELL_AURA_MOD_ATTACK_POWER:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
stats[STATS_TYPE_ATTACK_POWER] += val * multiplier; stats[STATS_TYPE_ATTACK_POWER] += val * multiplier;
break; break;
case SPELL_AURA_MOD_RANGED_ATTACK_POWER: case SPELL_AURA_MOD_RANGED_ATTACK_POWER:
if (type_ == CollectorType::RANGED) if (type_ & CollectorType::RANGED)
stats[STATS_TYPE_ATTACK_POWER] += val * multiplier; stats[STATS_TYPE_ATTACK_POWER] += val * multiplier;
break; break;
case SPELL_AURA_MOD_SHIELD_BLOCKVALUE: case SPELL_AURA_MOD_SHIELD_BLOCKVALUE:
@ -604,39 +650,39 @@ void StatsCollector::HandleApplyAura(const SpellEffectInfo& effectInfo, float mu
stats[STATS_TYPE_BLOCK_RATING] += val * multiplier; stats[STATS_TYPE_BLOCK_RATING] += val * multiplier;
break; break;
case CR_HIT_MELEE: case CR_HIT_MELEE:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
stats[STATS_TYPE_HIT] += val * multiplier; stats[STATS_TYPE_HIT] += val * multiplier;
break; break;
case CR_HIT_RANGED: case CR_HIT_RANGED:
if (type_ == CollectorType::RANGED) if (type_ & CollectorType::RANGED)
stats[STATS_TYPE_HIT] += val * multiplier; stats[STATS_TYPE_HIT] += val * multiplier;
break; break;
case CR_HIT_SPELL: case CR_HIT_SPELL:
if (type_ == CollectorType::SPELL) if (type_ & CollectorType::SPELL)
stats[STATS_TYPE_HIT] += val * multiplier; stats[STATS_TYPE_HIT] += val * multiplier;
break; break;
case CR_CRIT_MELEE: case CR_CRIT_MELEE:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
stats[STATS_TYPE_CRIT] += val * multiplier; stats[STATS_TYPE_CRIT] += val * multiplier;
break; break;
case CR_CRIT_RANGED: case CR_CRIT_RANGED:
if (type_ == CollectorType::RANGED) if (type_ & CollectorType::RANGED)
stats[STATS_TYPE_CRIT] += val * multiplier; stats[STATS_TYPE_CRIT] += val * multiplier;
break; break;
case CR_CRIT_SPELL: case CR_CRIT_SPELL:
if (type_ == CollectorType::SPELL) if (type_ & CollectorType::SPELL)
stats[STATS_TYPE_CRIT] += val * multiplier; stats[STATS_TYPE_CRIT] += val * multiplier;
break; break;
case CR_HASTE_MELEE: case CR_HASTE_MELEE:
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
stats[STATS_TYPE_HASTE] += val * multiplier; stats[STATS_TYPE_HASTE] += val * multiplier;
break; break;
case CR_HASTE_RANGED: case CR_HASTE_RANGED:
if (type_ == CollectorType::RANGED) if (type_ & CollectorType::RANGED)
stats[STATS_TYPE_HASTE] += val * multiplier; stats[STATS_TYPE_HASTE] += val * multiplier;
break; break;
case CR_HASTE_SPELL: case CR_HASTE_SPELL:
if (type_ == CollectorType::SPELL) if (type_ & CollectorType::SPELL)
stats[STATS_TYPE_HASTE] += val * multiplier; stats[STATS_TYPE_HASTE] += val * multiplier;
break; break;
case CR_EXPERTISE: case CR_EXPERTISE:
@ -675,6 +721,12 @@ void StatsCollector::HandleApplyAura(const SpellEffectInfo& effectInfo, float mu
CollectSpellStats(effectInfo.TriggerSpell, multiplier, triggerCooldown); CollectSpellStats(effectInfo.TriggerSpell, multiplier, triggerCooldown);
break; break;
} }
case SPELL_AURA_ADD_TARGET_TRIGGER:
{
if (canNextTrigger)
CollectSpellStats(effectInfo.TriggerSpell, multiplier, triggerCooldown);
break;
}
case SPELL_AURA_MOD_CRIT_DAMAGE_BONUS: case SPELL_AURA_MOD_CRIT_DAMAGE_BONUS:
{ {
if (type_ != CollectorType::SPELL_HEAL) if (type_ != CollectorType::SPELL_HEAL)
@ -710,3 +762,72 @@ int32 StatsCollector::AverageValue(const SpellEffectInfo& effectInfo)
} }
return basePoints; return basePoints;
} }
bool StatsCollector::CheckSpellValidation(uint32 spellFamilyName, flag96 spelFalimyFlags, bool strict)
{
if (PlayerbotAI::Class2SpellFamilyName(cls_) != spellFamilyName)
return false;
bool isHealingSpell = PlayerbotAI::IsHealingSpell(spellFamilyName, spelFalimyFlags);
// strict to healer
if (strict && (type_ & CollectorType::SPELL_HEAL))
{
return isHealingSpell;
}
if (!(type_ & CollectorType::SPELL_HEAL) && isHealingSpell)
return false;
// spells for caster/melee/tank are ambiguous
if (cls_ == CLASS_DRUID && spellFamilyName == SPELLFAMILY_DRUID && (type_ & CollectorType::MELEE))
{
uint32 castingFlagsA = 0x4 | 0x2 | 0x1 | 0x200000; // starfire | moonfire | wrath | insect swarm
uint32 castingFlagsB = 0x0;
uint32 castingFlagsC = 0x0;
flag96 invalidFlags = {castingFlagsA, castingFlagsB, castingFlagsC};
if (spelFalimyFlags & invalidFlags)
return false;
}
if (cls_ == CLASS_PALADIN && spellFamilyName == SPELLFAMILY_PALADIN && (type_ & CollectorType::MELEE_TANK))
{
uint32 retributionFlagsA = 0x0;
uint32 retributionFlagsB = 0x8000; // crusader strike
uint32 retributionFlagsC = 0x0;
flag96 invalidFlags = {retributionFlagsA, retributionFlagsB, retributionFlagsC};
if (spelFalimyFlags & invalidFlags)
return false;
}
if (cls_ == CLASS_PALADIN && spellFamilyName == SPELLFAMILY_PALADIN && (type_ & CollectorType::MELEE_DMG))
{
uint32 retributionFlagsA = 0x0;
uint32 retributionFlagsB = 0x100000; // shield of righteouness
uint32 retributionFlagsC = 0x0;
flag96 invalidFlags = {retributionFlagsA, retributionFlagsB, retributionFlagsC};
if (spelFalimyFlags & invalidFlags)
return false;
}
if (cls_ == CLASS_SHAMAN && spellFamilyName == SPELLFAMILY_SHAMAN && (type_ & CollectorType::SPELL_DMG))
{
uint32 meleeFlagsA = 0x0;
uint32 meleeFlagsB = 0x1000010; // stromstrike
uint32 meleeFlagsC = 0x4; // lava lash
flag96 invalidFlags = {meleeFlagsA, meleeFlagsB, meleeFlagsC};
if (spelFalimyFlags & invalidFlags)
return false;
}
if (cls_ == CLASS_SHAMAN && spellFamilyName == SPELLFAMILY_SHAMAN && (type_ & CollectorType::MELEE_DMG))
{
uint32 casterFlagsA = 0x0;
uint32 casterFlagsB = 0x1000; // lava burst
uint32 casterFlagsC = 0x0;
flag96 invalidFlags = {casterFlagsA, casterFlagsB, casterFlagsC};
if (spelFalimyFlags & invalidFlags)
return false;
}
return true;
}

20
src/factory/StatsCollector.h
View File

@ -42,15 +42,19 @@ enum StatsType : uint8
// Stats for weapon dps // Stats for weapon dps
STATS_TYPE_MELEE_DPS, STATS_TYPE_MELEE_DPS,
STATS_TYPE_RANGED_DPS, STATS_TYPE_RANGED_DPS,
STATS_TYPE_MAX = 25 // Bonus for unrecognized stats
STATS_TYPE_BONUS,
STATS_TYPE_MAX = 26
}; };
enum CollectorType : uint8 enum CollectorType : uint8
{ {
MELEE = 1, MELEE_DMG = 1,
RANGED = 2, MELEE_TANK = 2,
SPELL_DMG = 4, RANGED = 4,
SPELL_HEAL = 8, SPELL_DMG = 8,
SPELL_HEAL = 16,
MELEE = MELEE_DMG | MELEE_TANK,
SPELL = SPELL_DMG | SPELL_HEAL SPELL = SPELL_DMG | SPELL_HEAL
}; };
@ -63,17 +67,19 @@ public:
void CollectItemStats(ItemTemplate const* proto); void CollectItemStats(ItemTemplate const* proto);
void CollectSpellStats(uint32 spellId, float multiplier = 1.0f, int32 spellCooldown = -1); void CollectSpellStats(uint32 spellId, float multiplier = 1.0f, int32 spellCooldown = -1);
void CollectEnchantStats(SpellItemEnchantmentEntry const* enchant); void CollectEnchantStats(SpellItemEnchantmentEntry const* enchant);
bool CanBeTriggeredByType(SpellInfo const* spellInfo, uint32 procFlags, bool strict = true);
bool CheckSpellValidation(uint32 spellFamilyName, flag96 spelFalimyFlags, bool strict = true);
public: public:
int32 stats[STATS_TYPE_MAX]; int32 stats[STATS_TYPE_MAX];
private: private:
bool CanBeTriggeredByType(SpellInfo const* spellInfo, uint32 procFlags);
void CollectByItemStatType(uint32 itemStatType, int32 val); void CollectByItemStatType(uint32 itemStatType, int32 val);
bool SpecialSpellFilter(uint32 spellId); bool SpecialSpellFilter(uint32 spellId);
bool SpecialEnchantFilter(uint32 enchantSpellId); bool SpecialEnchantFilter(uint32 enchantSpellId);
void HandleApplyAura(const SpellEffectInfo& effectInfo, float multiplier, bool canNextTrigger, uint32 triggerCooldown); void HandleApplyAura(const SpellEffectInfo& effectInfo, float multiplier, bool canNextTrigger,
uint32 triggerCooldown);
int32 AverageValue(const SpellEffectInfo& effectInfo); int32 AverageValue(const SpellEffectInfo& effectInfo);
private: private:

54
src/factory/StatsWeightCalculator.cpp
View File

@ -14,6 +14,8 @@
#include "PlayerbotAI.h" #include "PlayerbotAI.h"
#include "PlayerbotFactory.h" #include "PlayerbotFactory.h"
#include "SharedDefines.h" #include "SharedDefines.h"
#include "SpellAuraDefines.h"
#include "SpellMgr.h"
#include "StatsCollector.h" #include "StatsCollector.h"
#include "Unit.h" #include "Unit.h"
@ -23,15 +25,16 @@ StatsWeightCalculator::StatsWeightCalculator(Player* player) : player_(player)
type_ = CollectorType::SPELL_HEAL; type_ = CollectorType::SPELL_HEAL;
else if (PlayerbotAI::IsCaster(player)) else if (PlayerbotAI::IsCaster(player))
type_ = CollectorType::SPELL_DMG; type_ = CollectorType::SPELL_DMG;
else if (PlayerbotAI::IsTank(player))
type_ = CollectorType::MELEE_TANK;
else if (PlayerbotAI::IsMelee(player)) else if (PlayerbotAI::IsMelee(player))
type_ = CollectorType::MELEE; type_ = CollectorType::MELEE_DMG;
else else
type_ = CollectorType::RANGED; type_ = CollectorType::RANGED;
cls = player->getClass(); cls = player->getClass();
tab = AiFactory::GetPlayerSpecTab(player); tab = AiFactory::GetPlayerSpecTab(player);
collector_ = std::make_unique<StatsCollector>(type_, cls); collector_ = std::make_unique<StatsCollector>(type_, cls);
if (cls == CLASS_DEATH_KNIGHT && tab == DEATHKNIGHT_TAB_UNHOLY) if (cls == CLASS_DEATH_KNIGHT && tab == DEATHKNIGHT_TAB_UNHOLY)
hitOverflowType_ = CollectorType::SPELL; hitOverflowType_ = CollectorType::SPELL;
else if (cls == CLASS_SHAMAN && tab == SHAMAN_TAB_ENHANCEMENT) else if (cls == CLASS_SHAMAN && tab == SHAMAN_TAB_ENHANCEMENT)
@ -79,7 +82,7 @@ float StatsWeightCalculator::CalculateItem(uint32 itemId)
CalculateItemTypePenalty(proto); CalculateItemTypePenalty(proto);
if (enable_item_set_bonus_) if (enable_item_set_bonus_)
CalculateItemSetBonus(player_, proto); CalculateItemSetMod(player_, proto);
CalculateSocketBonus(player_, proto); CalculateSocketBonus(player_, proto);
@ -125,6 +128,7 @@ void StatsWeightCalculator::GenerateBasicWeights(Player* player)
// Basic weights // Basic weights
stats_weights_[STATS_TYPE_STAMINA] += 0.01f; stats_weights_[STATS_TYPE_STAMINA] += 0.01f;
stats_weights_[STATS_TYPE_ARMOR] += 0.001f; stats_weights_[STATS_TYPE_ARMOR] += 0.001f;
stats_weights_[STATS_TYPE_BONUS] += 1.0f;
if (cls == CLASS_HUNTER && (tab == HUNTER_TAB_BEASTMASTER || tab == HUNTER_TAB_SURVIVAL)) if (cls == CLASS_HUNTER && (tab == HUNTER_TAB_BEASTMASTER || tab == HUNTER_TAB_SURVIVAL))
{ {
@ -311,7 +315,7 @@ void StatsWeightCalculator::GenerateBasicWeights(Player* player)
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;
stats_weights_[STATS_TYPE_DODGE] += 2.0f; stats_weights_[STATS_TYPE_DODGE] += 2.0f;
stats_weights_[STATS_TYPE_RESILIENCE] += 2.0f; // stats_weights_[STATS_TYPE_RESILIENCE] += 2.0f;
stats_weights_[STATS_TYPE_BLOCK_RATING] += 1.0f; stats_weights_[STATS_TYPE_BLOCK_RATING] += 1.0f;
stats_weights_[STATS_TYPE_BLOCK_VALUE] += 0.5f; stats_weights_[STATS_TYPE_BLOCK_VALUE] += 0.5f;
stats_weights_[STATS_TYPE_ARMOR] += 0.15f; stats_weights_[STATS_TYPE_ARMOR] += 0.15f;
@ -330,7 +334,7 @@ void StatsWeightCalculator::GenerateBasicWeights(Player* player)
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;
stats_weights_[STATS_TYPE_DODGE] += 2.0f; stats_weights_[STATS_TYPE_DODGE] += 2.0f;
stats_weights_[STATS_TYPE_RESILIENCE] += 2.0f; // stats_weights_[STATS_TYPE_RESILIENCE] += 2.0f;
stats_weights_[STATS_TYPE_ARMOR] += 0.15f; stats_weights_[STATS_TYPE_ARMOR] += 0.15f;
stats_weights_[STATS_TYPE_HIT] += 2.0f; stats_weights_[STATS_TYPE_HIT] += 2.0f;
stats_weights_[STATS_TYPE_CRIT] += 0.5f; stats_weights_[STATS_TYPE_CRIT] += 0.5f;
@ -347,7 +351,7 @@ void StatsWeightCalculator::GenerateBasicWeights(Player* player)
stats_weights_[STATS_TYPE_ATTACK_POWER] += 1.0f; stats_weights_[STATS_TYPE_ATTACK_POWER] += 1.0f;
stats_weights_[STATS_TYPE_DEFENSE] += 0.3f; stats_weights_[STATS_TYPE_DEFENSE] += 0.3f;
stats_weights_[STATS_TYPE_DODGE] += 0.7f; stats_weights_[STATS_TYPE_DODGE] += 0.7f;
stats_weights_[STATS_TYPE_RESILIENCE] += 1.0f; // stats_weights_[STATS_TYPE_RESILIENCE] += 1.0f;
stats_weights_[STATS_TYPE_ARMOR] += 0.15f; stats_weights_[STATS_TYPE_ARMOR] += 0.15f;
stats_weights_[STATS_TYPE_HIT] += 3.0f; stats_weights_[STATS_TYPE_HIT] += 3.0f;
stats_weights_[STATS_TYPE_CRIT] += 1.3f; stats_weights_[STATS_TYPE_CRIT] += 1.3f;
@ -380,7 +384,7 @@ void StatsWeightCalculator::GenerateAdditionalWeights(Player* player)
} }
} }
void StatsWeightCalculator::CalculateItemSetBonus(Player* player, ItemTemplate const* proto) void StatsWeightCalculator::CalculateItemSetMod(Player* player, ItemTemplate const* proto)
{ {
uint32 itemSet = proto->ItemSet; uint32 itemSet = proto->ItemSet;
if (!itemSet) if (!itemSet)
@ -466,7 +470,7 @@ void StatsWeightCalculator::CalculateItemTypePenalty(ItemTemplate const* proto)
// enhancement, rogue, ice dk, unholy dk, shield tank, fury warrior without titan's grip but with duel wield // enhancement, rogue, ice dk, unholy dk, shield tank, fury warrior without titan's grip but with duel wield
if (isDoubleHand && if (isDoubleHand &&
((cls == CLASS_SHAMAN && tab == SHAMAN_TAB_ENHANCEMENT && player_->CanDualWield()) || ((cls == CLASS_SHAMAN && tab == SHAMAN_TAB_ENHANCEMENT && player_->CanDualWield()) ||
(cls == CLASS_ROGUE) || (cls == CLASS_DEATH_KNIGHT && tab != DEATHKNIGHT_TAB_BLOOD) || (cls == CLASS_ROGUE) || (cls == CLASS_DEATH_KNIGHT && tab == DEATHKNIGHT_TAB_FROST) ||
(cls == CLASS_WARRIOR && tab == WARRIOR_TAB_FURY && !player_->CanTitanGrip() && player_->CanDualWield()) || (cls == CLASS_WARRIOR && tab == WARRIOR_TAB_FURY && !player_->CanTitanGrip() && player_->CanDualWield()) ||
(cls == CLASS_WARRIOR && tab == WARRIOR_TAB_PROTECTION) || (cls == CLASS_WARRIOR && tab == WARRIOR_TAB_PROTECTION) ||
(cls == CLASS_PALADIN && tab == PALADIN_TAB_PROTECTION))) (cls == CLASS_PALADIN && tab == PALADIN_TAB_PROTECTION)))
@ -486,14 +490,12 @@ void StatsWeightCalculator::CalculateItemTypePenalty(ItemTemplate const* proto)
weight_ *= 0.1; weight_ *= 0.1;
} }
// fury with titan's grip // fury with titan's grip
if ((!isDoubleHand || proto->SubClass == ITEM_SUBCLASS_WEAPON_POLEARM || proto->SubClass == ITEM_SUBCLASS_WEAPON_STAFF) && if ((!isDoubleHand || proto->SubClass == ITEM_SUBCLASS_WEAPON_POLEARM ||
proto->SubClass == ITEM_SUBCLASS_WEAPON_STAFF) &&
(cls == CLASS_WARRIOR && tab == WARRIOR_TAB_FURY && player_->CanTitanGrip())) (cls == CLASS_WARRIOR && tab == WARRIOR_TAB_FURY && player_->CanTitanGrip()))
{ {
weight_ *= 0.1; weight_ *= 0.1;
} }
}
if (proto->Class == ITEM_CLASS_WEAPON)
{
if (cls == CLASS_HUNTER && proto->SubClass == ITEM_SUBCLASS_WEAPON_THROWN) if (cls == CLASS_HUNTER && proto->SubClass == ITEM_SUBCLASS_WEAPON_THROWN)
{ {
weight_ *= 0.1; weight_ *= 0.1;
@ -512,6 +514,10 @@ void StatsWeightCalculator::CalculateItemTypePenalty(ItemTemplate const* proto)
{ {
weight_ *= 1.1; weight_ *= 1.1;
} }
if (cls == CLASS_DEATH_KNIGHT && player_->HasAura(50138) && !isDoubleHand)
{
weight_ *= 1.3;
}
bool slowDelay = proto->Delay > 2500; bool slowDelay = proto->Delay > 2500;
if (cls == CLASS_SHAMAN && tab == SHAMAN_TAB_ENHANCEMENT && slowDelay) if (cls == CLASS_SHAMAN && tab == SHAMAN_TAB_ENHANCEMENT && slowDelay)
weight_ *= 1.1; weight_ *= 1.1;
@ -540,11 +546,10 @@ void StatsWeightCalculator::ApplyOverflowPenalty(Player* player)
{ {
float hit_current, hit_overflow; float hit_current, hit_overflow;
float validPoints; float validPoints;
// m_modMeleeHitChance = (float)GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE); if (hitOverflowType_ & CollectorType::SPELL)
// m_modMeleeHitChance += GetRatingBonusValue(CR_HIT_MELEE);
if (hitOverflowType_ == CollectorType::SPELL)
{ {
hit_current = player->GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_HIT_CHANCE); hit_current = player->GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_HIT_CHANCE);
hit_current += player->GetTotalAuraModifier(SPELL_AURA_MOD_INCREASES_SPELL_PCT_TO_HIT); // suppression (18176)
hit_current += player->GetRatingBonusValue(CR_HIT_SPELL); hit_current += player->GetRatingBonusValue(CR_HIT_SPELL);
hit_overflow = SPELL_HIT_OVERFLOW; hit_overflow = SPELL_HIT_OVERFLOW;
if (hit_overflow > hit_current) if (hit_overflow > hit_current)
@ -552,7 +557,7 @@ void StatsWeightCalculator::ApplyOverflowPenalty(Player* player)
else else
validPoints = 0; validPoints = 0;
} }
else if (hitOverflowType_ == CollectorType::MELEE) else if (hitOverflowType_ & CollectorType::MELEE)
{ {
hit_current = player->GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE); hit_current = player->GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
hit_current += player->GetRatingBonusValue(CR_HIT_MELEE); hit_current += player->GetRatingBonusValue(CR_HIT_MELEE);
@ -576,7 +581,7 @@ void StatsWeightCalculator::ApplyOverflowPenalty(Player* player)
} }
{ {
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
{ {
float expertise_current, expertise_overflow; float expertise_current, expertise_overflow;
expertise_current = player->GetUInt32Value(PLAYER_EXPERTISE); expertise_current = player->GetUInt32Value(PLAYER_EXPERTISE);
@ -589,12 +594,13 @@ void StatsWeightCalculator::ApplyOverflowPenalty(Player* player)
else else
validPoints = 0; validPoints = 0;
collector_->stats[STATS_TYPE_EXPERTISE] = std::min(collector_->stats[STATS_TYPE_EXPERTISE], (int)validPoints); collector_->stats[STATS_TYPE_EXPERTISE] =
std::min(collector_->stats[STATS_TYPE_EXPERTISE], (int)validPoints);
} }
} }
{ {
if (type_ == CollectorType::MELEE) if (type_ & CollectorType::MELEE)
{ {
float defense_current, defense_overflow; float defense_current, defense_overflow;
defense_current = player->GetRatingBonusValue(CR_DEFENSE_SKILL); defense_current = player->GetRatingBonusValue(CR_DEFENSE_SKILL);
@ -611,7 +617,7 @@ void StatsWeightCalculator::ApplyOverflowPenalty(Player* player)
} }
{ {
if (type_ == CollectorType::MELEE || type_ == CollectorType::RANGED) if (type_ & (CollectorType::MELEE | CollectorType::RANGED))
{ {
float armor_penetration_current, armor_penetration_overflow; float armor_penetration_current, armor_penetration_overflow;
armor_penetration_current = player->GetRatingBonusValue(CR_ARMOR_PENETRATION); armor_penetration_current = player->GetRatingBonusValue(CR_ARMOR_PENETRATION);
@ -619,11 +625,13 @@ void StatsWeightCalculator::ApplyOverflowPenalty(Player* player)
float validPoints; float validPoints;
if (armor_penetration_overflow > armor_penetration_current) if (armor_penetration_overflow > armor_penetration_current)
validPoints = (armor_penetration_overflow - armor_penetration_current) / player->GetRatingMultiplier(CR_ARMOR_PENETRATION); validPoints = (armor_penetration_overflow - armor_penetration_current) /
player->GetRatingMultiplier(CR_ARMOR_PENETRATION);
else else
validPoints = 0; validPoints = 0;
collector_->stats[STATS_TYPE_ARMOR_PENETRATION] = std::min(collector_->stats[STATS_TYPE_ARMOR_PENETRATION], (int)validPoints); collector_->stats[STATS_TYPE_ARMOR_PENETRATION] =
std::min(collector_->stats[STATS_TYPE_ARMOR_PENETRATION], (int)validPoints);
} }
} }
} }
@ -631,7 +639,7 @@ void StatsWeightCalculator::ApplyOverflowPenalty(Player* player)
void StatsWeightCalculator::ApplyWeightFinetune(Player* player) void StatsWeightCalculator::ApplyWeightFinetune(Player* player)
{ {
{ {
if (type_ == CollectorType::MELEE || type_ == CollectorType::RANGED) if (type_ & (CollectorType::MELEE | CollectorType::RANGED))
{ {
float armor_penetration_current, armor_penetration_overflow; float armor_penetration_current, armor_penetration_overflow;
armor_penetration_current = player->GetRatingBonusValue(CR_ARMOR_PENETRATION); armor_penetration_current = player->GetRatingBonusValue(CR_ARMOR_PENETRATION);

2
src/factory/StatsWeightCalculator.h
View File

@ -40,7 +40,7 @@ private:
void GenerateBasicWeights(Player* player); void GenerateBasicWeights(Player* player);
void GenerateAdditionalWeights(Player* player); void GenerateAdditionalWeights(Player* player);
void CalculateItemSetBonus(Player* player, ItemTemplate const* proto); void CalculateItemSetMod(Player* player, ItemTemplate const* proto);
void CalculateSocketBonus(Player* player, ItemTemplate const* proto); void CalculateSocketBonus(Player* player, ItemTemplate const* proto);
void CalculateItemTypePenalty(ItemTemplate const* proto); void CalculateItemTypePenalty(ItemTemplate const* proto);

18
src/strategy/druid/CasterDruidStrategy.cpp
View File

@ -115,7 +115,9 @@ CasterDruidStrategy::CasterDruidStrategy(PlayerbotAI* botAI) : GenericDruidStrat
NextAction** CasterDruidStrategy::getDefaultActions() NextAction** CasterDruidStrategy::getDefaultActions()
{ {
return NextAction::array(0, new NextAction("starfall", ACTION_DEFAULT + 0.2f), return NextAction::array(0,
new NextAction("starfall", ACTION_HIGH + 1.0f),
new NextAction("force of nature", ACTION_DEFAULT + 1.0f),
new NextAction("wrath", ACTION_DEFAULT + 0.1f), new NextAction("wrath", ACTION_DEFAULT + 0.1f),
// new NextAction("starfire", ACTION_NORMAL), // new NextAction("starfire", ACTION_NORMAL),
nullptr); nullptr);
@ -127,20 +129,19 @@ void CasterDruidStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
// triggers.push_back(new TriggerNode("enemy out of spell", NextAction::array(0, new NextAction("reach spell", // triggers.push_back(new TriggerNode("enemy out of spell", NextAction::array(0, new NextAction("reach spell",
// ACTION_MOVE), nullptr))); // ACTION_MOVE), nullptr)));
triggers.push_back(new TriggerNode("eclipse (lunar) cooldown",
NextAction::array(0, new NextAction("starfire", ACTION_DEFAULT + 0.2f), nullptr)));
triggers.push_back(new TriggerNode("eclipse (solar) cooldown",
NextAction::array(0, new NextAction("wrath", ACTION_DEFAULT + 0.2f), nullptr)));
triggers.push_back(new TriggerNode( triggers.push_back(new TriggerNode(
"insect swarm", NextAction::array(0, new NextAction("insect swarm", ACTION_NORMAL + 5), nullptr))); "insect swarm", NextAction::array(0, new NextAction("insect swarm", ACTION_NORMAL + 5), nullptr)));
triggers.push_back( triggers.push_back(
new TriggerNode("moonfire", NextAction::array(0, new NextAction("moonfire", ACTION_NORMAL + 4), nullptr))); new TriggerNode("moonfire", NextAction::array(0, new NextAction("moonfire", ACTION_NORMAL + 4), nullptr)));
triggers.push_back( triggers.push_back(
new TriggerNode("eclipse (solar)", NextAction::array(0, new NextAction("wrath", ACTION_NORMAL + 6), nullptr))); new TriggerNode("eclipse (solar)", NextAction::array(0, new NextAction("wrath", ACTION_NORMAL + 6), nullptr)));
triggers.push_back(new TriggerNode("eclipse (lunar) cooldown",
NextAction::array(0, new NextAction("starfire", ACTION_NORMAL + 2), nullptr)));
triggers.push_back(new TriggerNode("eclipse (lunar)", triggers.push_back(new TriggerNode("eclipse (lunar)",
NextAction::array(0, new NextAction("starfire", ACTION_NORMAL + 6), nullptr))); NextAction::array(0, new NextAction("starfire", ACTION_NORMAL + 6), nullptr)));
triggers.push_back(new TriggerNode("eclipse (solar) cooldown",
NextAction::array(0, new NextAction("wrath", ACTION_NORMAL + 2), nullptr)));
triggers.push_back(
new TriggerNode("moonfire", NextAction::array(0, new NextAction("moonfire", ACTION_NORMAL + 4), nullptr)));
triggers.push_back( triggers.push_back(
new TriggerNode("medium mana", NextAction::array(0, new NextAction("innervate", ACTION_HIGH + 9), NULL))); new TriggerNode("medium mana", NextAction::array(0, new NextAction("innervate", ACTION_HIGH + 9), NULL)));
triggers.push_back(new TriggerNode("enemy too close for spell", triggers.push_back(new TriggerNode("enemy too close for spell",
@ -152,8 +153,7 @@ void CasterDruidAoeStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
triggers.push_back( triggers.push_back(
new TriggerNode("medium aoe", NextAction::array(0, new NextAction("hurricane", ACTION_HIGH + 1), nullptr))); new TriggerNode("medium aoe", NextAction::array(0, new NextAction("hurricane", ACTION_HIGH + 1), nullptr)));
triggers.push_back(new TriggerNode( triggers.push_back(new TriggerNode(
"light aoe", NextAction::array(0, new NextAction("starfall", ACTION_NORMAL + 5), "light aoe", NextAction::array(0, new NextAction("insect swarm on attacker", ACTION_NORMAL + 3),
new NextAction("insect swarm on attacker", ACTION_NORMAL + 3),
new NextAction("moonfire on attacker", ACTION_NORMAL + 3), NULL))); new NextAction("moonfire on attacker", ACTION_NORMAL + 3), NULL)));
} }

6
src/strategy/druid/DruidActions.h
View File

@ -323,4 +323,10 @@ public:
Unit* GetTarget() override; Unit* GetTarget() override;
}; };
class CastForceOfNatureAction : public CastSpellAction
{
public:
CastForceOfNatureAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "force of nature") {}
};
#endif #endif

2
src/strategy/druid/DruidAiObjectContext.cpp
View File

@ -233,6 +233,7 @@ public:
creators["insect swarm on attacker"] = &DruidAiObjectContextInternal::insect_swarm_on_attacker; creators["insect swarm on attacker"] = &DruidAiObjectContextInternal::insect_swarm_on_attacker;
creators["moonfire on attacker"] = &DruidAiObjectContextInternal::moonfire_on_attacker; creators["moonfire on attacker"] = &DruidAiObjectContextInternal::moonfire_on_attacker;
creators["enrage"] = &DruidAiObjectContextInternal::enrage; creators["enrage"] = &DruidAiObjectContextInternal::enrage;
creators["force of nature"] = &DruidAiObjectContextInternal::force_of_nature;
} }
private: private:
@ -317,6 +318,7 @@ private:
static Action* insect_swarm_on_attacker(PlayerbotAI* ai) { return new CastInsectSwarmOnAttackerAction(ai); } static Action* insect_swarm_on_attacker(PlayerbotAI* ai) { return new CastInsectSwarmOnAttackerAction(ai); }
static Action* moonfire_on_attacker(PlayerbotAI* ai) { return new CastMoonfireOnAttackerAction(ai); } static Action* moonfire_on_attacker(PlayerbotAI* ai) { return new CastMoonfireOnAttackerAction(ai); }
static Action* enrage(PlayerbotAI* ai) { return new CastEnrageAction(ai); } static Action* enrage(PlayerbotAI* ai) { return new CastEnrageAction(ai); }
static Action* force_of_nature(PlayerbotAI* ai) { return new CastForceOfNatureAction(ai); }
}; };
DruidAiObjectContext::DruidAiObjectContext(PlayerbotAI* botAI) : AiObjectContext(botAI) DruidAiObjectContext::DruidAiObjectContext(PlayerbotAI* botAI) : AiObjectContext(botAI)

4
src/strategy/paladin/DpsPaladinStrategy.cpp
View File

@ -84,8 +84,8 @@ NextAction** DpsPaladinStrategy::getDefaultActions()
{ {
return NextAction::array(0, return NextAction::array(0,
new NextAction("hammer of wrath", ACTION_DEFAULT + 0.6f), new NextAction("hammer of wrath", ACTION_DEFAULT + 0.6f),
new NextAction("crusader strike", ACTION_DEFAULT + 0.5f), new NextAction("judgement of wisdom", ACTION_DEFAULT + 0.5f),
new NextAction("judgement of wisdom", ACTION_DEFAULT + 0.4f), new NextAction("crusader strike", ACTION_DEFAULT + 0.4f),
new NextAction("divine storm", ACTION_DEFAULT + 0.3f), new NextAction("divine storm", ACTION_DEFAULT + 0.3f),
new NextAction("consecration", ACTION_DEFAULT + 0.1f), new NextAction("consecration", ACTION_DEFAULT + 0.1f),
new NextAction("melee", ACTION_DEFAULT), nullptr); new NextAction("melee", ACTION_DEFAULT), nullptr);