Core/Datastores: updated DBC structure names to generated member format
This commit is contained in:
1 parent
06ffa70afc
commit
fcb79fee07
105 files changed
+2301
-2328
No files matched your search
@@ -1852,7 +1852,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
|
||||
// however so far noone found a generic check to find all of those (there's no related data in summonproperties.dbc
|
||||
// and in spell attributes, possibly we need to add a table for those)
|
||||
// so here's a list of MiscValueB values, which is currently most generic check
|
||||
switch (properties->Id)
|
||||
switch (properties->ID)
|
||||
{
|
||||
case 64:
|
||||
case 61:
|
||||
@@ -1878,7 +1878,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
|
||||
break;
|
||||
}
|
||||
|
||||
switch (properties->Category)
|
||||
switch (properties->Control)
|
||||
{
|
||||
case SUMMON_CATEGORY_WILD:
|
||||
case SUMMON_CATEGORY_ALLY:
|
||||
@@ -1888,7 +1888,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
|
||||
SummonGuardian(effIndex, entry, properties, numSummons);
|
||||
break;
|
||||
}
|
||||
switch (properties->Type)
|
||||
switch (properties->Title)
|
||||
{
|
||||
case SUMMON_TYPE_PET:
|
||||
case SUMMON_TYPE_GUARDIAN:
|
||||
@@ -1952,7 +1952,7 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
|
||||
if (!summon)
|
||||
continue;
|
||||
|
||||
if (properties->Category == SUMMON_CATEGORY_ALLY)
|
||||
if (properties->Control == SUMMON_CATEGORY_ALLY)
|
||||
{
|
||||
summon->SetOwnerGUID(m_originalCaster->GetGUID());
|
||||
summon->SetFaction(m_originalCaster->GetFaction());
|
||||
@@ -2266,12 +2266,12 @@ void Spell::EffectLearnSkill(SpellEffIndex effIndex)
|
||||
if (!rcEntry)
|
||||
return;
|
||||
|
||||
SkillTiersEntry const* tier = sSkillTiersStore.LookupEntry(rcEntry->SkillTier);
|
||||
SkillTiersEntry const* tier = sSkillTiersStore.LookupEntry(rcEntry->SkillTierID);
|
||||
if (!tier)
|
||||
return;
|
||||
|
||||
uint16 skillval = unitTarget->ToPlayer()->GetPureSkillValue(skillid);
|
||||
unitTarget->ToPlayer()->SetSkill(skillid, m_spellInfo->Effects[effIndex].CalcValue(), std::max<uint16>(skillval, 1), tier->MaxSkill[damage - 1]);
|
||||
unitTarget->ToPlayer()->SetSkill(skillid, m_spellInfo->Effects[effIndex].CalcValue(), std::max<uint16>(skillval, 1), tier->Value[damage - 1]);
|
||||
}
|
||||
|
||||
void Spell::EffectPlayMovie(SpellEffIndex effIndex)
|
||||
@@ -2390,7 +2390,7 @@ void Spell::EffectEnchantItemPrismatic(SpellEffIndex effIndex)
|
||||
bool add_socket = false;
|
||||
for (uint8 i = 0; i < MAX_ITEM_ENCHANTMENT_EFFECTS; ++i)
|
||||
{
|
||||
if (enchant->type[i] == ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET)
|
||||
if (enchant->Effect[i] == ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET)
|
||||
{
|
||||
add_socket = true;
|
||||
break;
|
||||
@@ -3877,7 +3877,7 @@ void Spell::EffectApplyGlyph(SpellEffIndex effIndex)
|
||||
{
|
||||
if (GlyphSlotEntry const* newGlyphSlot = sGlyphSlotStore.LookupEntry(player->GetGlyphSlot(m_glyphIndex)))
|
||||
{
|
||||
if (newGlyphProperties->TypeFlags != newGlyphSlot->TypeFlags)
|
||||
if (newGlyphProperties->GlyphSlotFlags != newGlyphSlot->Type)
|
||||
{
|
||||
SendCastResult(SPELL_FAILED_INVALID_GLYPH);
|
||||
return; // glyph slot mismatch
|
||||
@@ -3889,12 +3889,12 @@ void Spell::EffectApplyGlyph(SpellEffIndex effIndex)
|
||||
{
|
||||
if (GlyphPropertiesEntry const* oldGlyphProperties = sGlyphPropertiesStore.LookupEntry(oldGlyph))
|
||||
{
|
||||
player->RemoveAurasDueToSpell(oldGlyphProperties->SpellId);
|
||||
player->RemoveAurasDueToSpell(oldGlyphProperties->SpellID);
|
||||
player->SetGlyph(m_glyphIndex, 0);
|
||||
}
|
||||
}
|
||||
|
||||
player->CastSpell(m_caster, newGlyphProperties->SpellId, true);
|
||||
player->CastSpell(m_caster, newGlyphProperties->SpellID, true);
|
||||
player->SetGlyph(m_glyphIndex, newGlyph);
|
||||
player->SendTalentsInfoData(false);
|
||||
}
|
||||
@@ -3903,7 +3903,7 @@ void Spell::EffectApplyGlyph(SpellEffIndex effIndex)
|
||||
{
|
||||
if (GlyphPropertiesEntry const* oldGlyphProperties = sGlyphPropertiesStore.LookupEntry(oldGlyph))
|
||||
{
|
||||
player->RemoveAurasDueToSpell(oldGlyphProperties->SpellId);
|
||||
player->RemoveAurasDueToSpell(oldGlyphProperties->SpellID);
|
||||
player->SetGlyph(m_glyphIndex, 0);
|
||||
player->SendTalentsInfoData(false);
|
||||
}
|
||||
@@ -5366,7 +5366,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const*
|
||||
summon->SetFullHealth();
|
||||
}
|
||||
|
||||
if (properties && properties->Category == SUMMON_CATEGORY_ALLY)
|
||||
if (properties && properties->Control == SUMMON_CATEGORY_ALLY)
|
||||
summon->SetFaction(caster->GetFaction());
|
||||
|
||||
if (summon->HasUnitTypeMask(UNIT_MASK_MINION) && m_targets.HasDst())
|
||||
|
||||
Reference in new issue
Block a user