diff options
| -rw-r--r-- | src/server/game/DataStores/DB2Structure.h | 8 | ||||
| -rw-r--r-- | src/server/game/DataStores/DB2fmt.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h index e74a4a5e26c..de5436860a6 100644 --- a/src/server/game/DataStores/DB2Structure.h +++ b/src/server/game/DataStores/DB2Structure.h @@ -336,8 +336,8 @@ struct SpellPowerEntry { uint32 ID; // 0 uint32 SpellID; // 1 - //uint32 Unk2; // 2 - //uint32 Unk3; // 3 + uint32 PowerIndex; // 2 + uint32 PowerType; // 3 uint32 ManaCost; // 4 uint32 ManaCostPerLevel; // 5 uint32 ManaCostPerSecond; // 6 @@ -345,8 +345,8 @@ struct SpellPowerEntry //uint32 Unk5; // 8 //uint32 Unk6; // 9 float ManaCostPercentage; // 10 - //float Unk7; // 11 - //uint32 Unk8; // 12 + float ManaCostPercentagePerSecond; // 11 + uint32 RequiredAura; // 12 //uint32 Unk9; // 13 }; diff --git a/src/server/game/DataStores/DB2fmt.h b/src/server/game/DataStores/DB2fmt.h index 4c08496f91a..5d2f374f2a7 100644 --- a/src/server/game/DataStores/DB2fmt.h +++ b/src/server/game/DataStores/DB2fmt.h @@ -32,7 +32,7 @@ char const SpellAuraRestrictionsEntryfmt[] = "diiiiiiii"; char const SpellCastingRequirementsEntryfmt[] = "dixxixi"; char const SpellClassOptionsEntryfmt[] = "niiiiii"; char const SpellMiscEntryfmt[] = "niiiiiiiiiiiiiiiiifiiiiix"; -char const SpellPowerEntryfmt[] = "nixxiiixxxfxxx"; +char const SpellPowerEntryfmt[] = "niiiiiixxxffix"; char const SpellReagentsEntryfmt[] = "niiiiiiiiiiiiiiiixx"; char const SpellRuneCostEntryfmt[] = "niiixi"; char const SpellTotemsEntryfmt[] = "niiii"; diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 0baab94d88e..cc88cc41e5a 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -909,7 +909,7 @@ SpellInfo::SpellInfo(SpellEntry const* spellEntry, SpellEffectEntry const** effe Speed = _misc ? _misc->Speed : 0; SchoolMask = _misc ? _misc->SchoolMask : 0; AttributesCu = 0; - //PowerType = _misc ? _misc->powerType : 0; + for (uint8 i = 0; i < 2; ++i) SpellVisual[i] = _misc ? _misc->SpellVisualID[i] : 0; @@ -998,6 +998,7 @@ SpellInfo::SpellInfo(SpellEntry const* spellEntry, SpellEffectEntry const** effe ManaCostPerlevel = _power ? _power->ManaCostPerLevel : 0; ManaCostPercentage = _power ? _power->ManaCostPercentage : 0; ManaPerSecond = _power ? _power->ManaCostPerSecond : 0; + PowerType = _power ? _power->PowerType : 0; // SpellReagentsEntry SpellReagentsEntry const* _reagents = GetSpellReagents(); |