Skip to content

2 T10 Bonus fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
johnholiver wants to merge 5 commits into from
Closed

2 T10 Bonus fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6670716
Scripts/Trial of the Crusader:
Dec 31, 2010
396a5a8
Merge remote branch 'trinitycore/master'
Dec 31, 2010
f04e32b
Merge remote branch 'trinitycore/master'
Dec 31, 2010
7c278c6
Merge remote branch 'trinitycore/master'
Dec 31, 2010
9afc153
Fix T10 Bonus for:
Dec 31, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/server/game/Entities/Unit/Unit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8548,6 +8548,14 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
// Maelstrom Weapon
case 53817:
{
// Item - Shaman T10 Enhancement 4P Bonus
if (AuraEffect * aurEff = ToPlayer()->GetAuraEffect(70832, 0))
{
if (Aura *maelstrom = GetAura(53817))
if ((maelstrom->GetStackAmount() == maelstrom->GetSpellProto()->StackAmount) && roll_chance_i(aurEff->GetAmount()))
CastSpell(this, 70831, true, castItem, triggeredByAura);
}

// have rank dependent proc chance, ignore too often cases
// PPM = 2.5 * (rank of talent),
uint32 rank = sSpellMgr->GetSpellRank(auraSpellInfo->Id);
Expand Down
44 changes: 44 additions & 0 deletions src/server/scripts/Spells/spell_generic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,49 @@ class spell_gen_shroud_of_death : public SpellScriptLoader
}
};

enum DivineStormSpell
{
SPELL_DIVINE_STORM = 53385,
};

// 70769 Divine Storm!
class spell_gen_divine_storm_cd_reset : public SpellScriptLoader
{
public:
spell_gen_divine_storm_cd_reset() : SpellScriptLoader("spell_gen_divine_storm_cd_reset") {}

class spell_gen_divine_storm_cd_reset_SpellScript : public SpellScript
{
PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript)
bool Validate(SpellEntry const * /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_DIVINE_STORM))
return false;
return true;
}

void HandleScript(SpellEffIndex /*effIndex*/)
{
Player *caster = GetCaster()->ToPlayer();
if (caster->GetTypeId() != TYPEID_PLAYER)
return;

if (caster->HasSpellCooldown(SPELL_DIVINE_STORM))
caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true);
}

void Register()
{
OnEffect += SpellEffectFn(spell_gen_divine_storm_cd_reset_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};

SpellScript* GetSpellScript() const
{
return new spell_gen_divine_storm_cd_reset_SpellScript();
}
};

void AddSC_generic_spell_scripts()
{
new spell_gen_absorb0_hitlimit1();
Expand All @@ -610,4 +653,5 @@ void AddSC_generic_spell_scripts()
new spell_pvp_trinket_wotf_shared_cd();
new spell_gen_animal_blood();
new spell_gen_shroud_of_death();
new spell_gen_divine_storm_cd_reset();
}