Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_druid.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/scripts/Spells/spell_warrior.cpp
This commit is contained in:
commit
da91ae1f22
93 files changed
+2131
-827
No files matched your search
@@ -88,6 +88,14 @@ class spell_pal_ardent_defender : public SpellScriptLoader
|
||||
{
|
||||
PrepareAuraScript(spell_pal_ardent_defender_AuraScript);
|
||||
|
||||
public:
|
||||
spell_pal_ardent_defender_AuraScript()
|
||||
{
|
||||
absorbPct = 0;
|
||||
healPct = 0;
|
||||
}
|
||||
|
||||
private:
|
||||
uint32 absorbPct, healPct;
|
||||
|
||||
enum Spell
|
||||
@@ -459,6 +467,13 @@ class spell_pal_divine_storm : public SpellScriptLoader
|
||||
{
|
||||
PrepareSpellScript(spell_pal_divine_storm_SpellScript);
|
||||
|
||||
public:
|
||||
spell_pal_divine_storm_SpellScript()
|
||||
{
|
||||
healPct = 0;
|
||||
}
|
||||
|
||||
private:
|
||||
uint32 healPct;
|
||||
|
||||
bool Validate(SpellInfo const* /*spellInfo*/) override
|
||||
@@ -502,6 +517,13 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader
|
||||
{
|
||||
PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript);
|
||||
|
||||
public:
|
||||
spell_pal_divine_storm_dummy_SpellScript()
|
||||
{
|
||||
_targetCount = 0;
|
||||
}
|
||||
|
||||
private:
|
||||
bool Validate(SpellInfo const* /*spellInfo*/) override
|
||||
{
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_STORM_HEAL))
|
||||
@@ -693,6 +715,13 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader
|
||||
{
|
||||
PrepareAuraScript(spell_pal_hand_of_sacrifice_AuraScript);
|
||||
|
||||
public:
|
||||
spell_pal_hand_of_sacrifice_AuraScript()
|
||||
{
|
||||
remainingAmount = 0;
|
||||
}
|
||||
|
||||
private:
|
||||
int32 remainingAmount;
|
||||
|
||||
bool Load() override
|
||||
|
||||
Reference in new issue
Block a user