Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Implemented evoker empower spell mechanic

Browse Source
This commit is contained in:
Shauren
2024-05-01 22:26:53 +02:00
parent cdc6719b83
commit a39d0db9ec
27 changed files with 733 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/server/game/Spells/SpellMgr.cpp
View File

@@ -2548,6 +2548,18 @@ void SpellMgr::LoadSpellInfoStore()
for (SpellCooldownsEntry const* cooldowns : sSpellCooldownsStore)
loadData[{ cooldowns->SpellID, Difficulty(cooldowns->DifficultyID) }].Cooldowns = cooldowns;
for (SpellEmpowerStageEntry const* empowerStage : sSpellEmpowerStageStore)
{
if (SpellEmpowerEntry const* empower = sSpellEmpowerStore.LookupEntry(empowerStage->SpellEmpowerID))
{
std::vector<SpellEmpowerStageEntry const*>& empowerStages = loadData[{empower->SpellID, DIFFICULTY_NONE}].EmpowerStages;
auto where = std::ranges::lower_bound(empowerStages, empowerStage->Stage, std::ranges::less(), &SpellEmpowerStageEntry::Stage);
empowerStages.insert(where, empowerStage);
}
}
for (SpellEquippedItemsEntry const* equippedItems : sSpellEquippedItemsStore)
loadData[{ equippedItems->SpellID, DIFFICULTY_NONE }].EquippedItems = equippedItems;
@@ -2598,98 +2610,98 @@ void SpellMgr::LoadSpellInfoStore()
{
SpellVisualVector& visuals = loadData[{ visual->SpellID, Difficulty(visual->DifficultyID) }].Visuals;
auto where = std::lower_bound(visuals.begin(), visuals.end(), visual, [](SpellXSpellVisualEntry const* first, SpellXSpellVisualEntry const* second)
{
return first->CasterPlayerConditionID > second->CasterPlayerConditionID;
});
auto where = std::ranges::lower_bound(visuals, visual->CasterPlayerConditionID, std::ranges::greater(), &SpellXSpellVisualEntry::CasterPlayerConditionID);
// sorted with unconditional visuals being last
visuals.insert(where, visual);
}
for (std::pair<std::pair<uint32, Difficulty> const, SpellInfoLoadHelper>& data : loadData)
for (auto& [key, data] : loadData)
{
SpellNameEntry const* spellNameEntry = sSpellNameStore.LookupEntry(data.first.first);
SpellNameEntry const* spellNameEntry = sSpellNameStore.LookupEntry(key.first);
if (!spellNameEntry)
continue;
// fill blanks
if (DifficultyEntry const* difficultyEntry = sDifficultyStore.LookupEntry(data.first.second))
if (DifficultyEntry const* difficultyEntry = sDifficultyStore.LookupEntry(key.second))
{
do
{
if (SpellInfoLoadHelper const* fallbackData = Trinity::Containers::MapGetValuePtr(loadData, { data.first.first, Difficulty(difficultyEntry->FallbackDifficultyID) }))
if (SpellInfoLoadHelper const* fallbackData = Trinity::Containers::MapGetValuePtr(loadData, { key.first, Difficulty(difficultyEntry->FallbackDifficultyID) }))
{
if (!data.second.AuraOptions)
data.second.AuraOptions = fallbackData->AuraOptions;
if (!data.AuraOptions)
data.AuraOptions = fallbackData->AuraOptions;
if (!data.second.AuraRestrictions)
data.second.AuraRestrictions = fallbackData->AuraRestrictions;
if (!data.AuraRestrictions)
data.AuraRestrictions = fallbackData->AuraRestrictions;
if (!data.second.CastingRequirements)
data.second.CastingRequirements = fallbackData->CastingRequirements;
if (!data.CastingRequirements)
data.CastingRequirements = fallbackData->CastingRequirements;
if (!data.second.Categories)
data.second.Categories = fallbackData->Categories;
if (!data.Categories)
data.Categories = fallbackData->Categories;
if (!data.second.ClassOptions)
data.second.ClassOptions = fallbackData->ClassOptions;
if (!data.ClassOptions)
data.ClassOptions = fallbackData->ClassOptions;
if (!data.second.Cooldowns)
data.second.Cooldowns = fallbackData->Cooldowns;
if (!data.Cooldowns)
data.Cooldowns = fallbackData->Cooldowns;
for (std::size_t i = 0; i < data.second.Effects.size(); ++i)
if (!data.second.Effects[i])
data.second.Effects[i] = fallbackData->Effects[i];
for (std::size_t i = 0; i < data.Effects.size(); ++i)
if (!data.Effects[i])
data.Effects[i] = fallbackData->Effects[i];
if (!data.second.EquippedItems)
data.second.EquippedItems = fallbackData->EquippedItems;
if (data.EmpowerStages.empty())
data.EmpowerStages = fallbackData->EmpowerStages;
if (!data.second.Interrupts)
data.second.Interrupts = fallbackData->Interrupts;
if (!data.EquippedItems)
data.EquippedItems = fallbackData->EquippedItems;
if (data.second.Labels.empty())
data.second.Labels = fallbackData->Labels;
if (!data.Interrupts)
data.Interrupts = fallbackData->Interrupts;
if (!data.second.Levels)
data.second.Levels = fallbackData->Levels;
if (data.Labels.empty())
data.Labels = fallbackData->Labels;
if (!data.second.Misc)
data.second.Misc = fallbackData->Misc;
if (!data.Levels)
data.Levels = fallbackData->Levels;
if (!data.Misc)
data.Misc = fallbackData->Misc;
for (std::size_t i = 0; i < fallbackData->Powers.size(); ++i)
if (!data.second.Powers[i])
data.second.Powers[i] = fallbackData->Powers[i];
if (!data.Powers[i])
data.Powers[i] = fallbackData->Powers[i];
if (!data.second.Reagents)
data.second.Reagents = fallbackData->Reagents;
if (!data.Reagents)
data.Reagents = fallbackData->Reagents;
if (data.second.ReagentsCurrency.empty())
data.second.ReagentsCurrency = fallbackData->ReagentsCurrency;
if (data.ReagentsCurrency.empty())
data.ReagentsCurrency = fallbackData->ReagentsCurrency;
if (!data.second.Scaling)
data.second.Scaling = fallbackData->Scaling;
if (!data.Scaling)
data.Scaling = fallbackData->Scaling;
if (!data.second.Shapeshift)
data.second.Shapeshift = fallbackData->Shapeshift;
if (!data.Shapeshift)
data.Shapeshift = fallbackData->Shapeshift;
if (!data.second.TargetRestrictions)
data.second.TargetRestrictions = fallbackData->TargetRestrictions;
if (!data.TargetRestrictions)
data.TargetRestrictions = fallbackData->TargetRestrictions;
if (!data.second.Totems)
data.second.Totems = fallbackData->Totems;
if (!data.Totems)
data.Totems = fallbackData->Totems;
// visuals fall back only to first difficulty that defines any visual
// they do not stack all difficulties in fallback chain
if (data.second.Visuals.empty())
data.second.Visuals = fallbackData->Visuals;
if (data.Visuals.empty())
data.Visuals = fallbackData->Visuals;
}
difficultyEntry = sDifficultyStore.LookupEntry(difficultyEntry->FallbackDifficultyID);
} while (difficultyEntry);
}
mSpellInfoMap.emplace(spellNameEntry, data.first.second, data.second);
mSpellInfoMap.emplace(spellNameEntry, key.second, data);
}
TC_LOG_INFO("server.loading", ">> Loaded SpellInfo store in {} ms", GetMSTimeDiffToNow(oldMSTime));