From 901650012b58bae0a6696a469862780fdd55246c Mon Sep 17 00:00:00 2001 From: Nevan Date: Sun, 4 Sep 2011 17:11:08 +0200 Subject: [PATCH] Twins Valk - Cleanup --- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 6d1c2b5d99..e464c41d51 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -104,7 +104,10 @@ enum BossSpells #define SPELL_DARK_ESSENCE_HELPER RAID_MODE(65684, 67176, 67177, 67178) #define SPELL_LIGHT_ESSENCE_HELPER RAID_MODE(65686, 67222, 67223, 67224) -#define SPELL_POWERING_UP_HELPER RAID_MODE(67590, 67602, 67603, 67604) +#define SPELL_POWERING_UP_HELPER RAID_MODE(67590, 67602, 67603, 67604) + +#define SPELL_UNLEASHED_DARK_HELPER RAID_MODE(65808, 67172, 67173, 67174) +#define SPELL_UNLEASHED_LIGHT_HELPER RAID_MODE(65795, 67238, 67239, 67240) #define SPELL_EMPOWERED_DARK_HELPER RAID_MODE(65724,67213,67214,67215) #define SPELL_EMPOWERED_LIGHT_HELPER RAID_MODE(65748, 67216, 67217, 67218) @@ -315,7 +318,7 @@ struct boss_twin_baseAI : public ScriptedAI } } - void EnableDualWield(bool mode) + void EnableDualWield(bool mode = true) { SetEquipmentSlots(false, m_uiWeapon, mode ? m_uiWeapon : EQUIP_UNEQUIP, EQUIP_UNEQUIP); me->SetCanDualWield(mode); @@ -650,8 +653,11 @@ public: void SpellHitTarget(Unit* who, const SpellInfo* spell) { - if (who->HasAura(SPELL_DARK_ESSENCE_HELPER)) - who->CastSpell(who, SPELL_POWERING_UP, true); + if(spell->Id == SPELL_UNLEASHED_DARK_HELPER) + { + if (who->HasAura(SPELL_DARK_ESSENCE_HELPER)) + who->CastSpell(who, SPELL_POWERING_UP, true); + } } }; @@ -689,8 +695,11 @@ public: void SpellHitTarget(Unit* who, const SpellInfo* spell) { - if (who->HasAura(SPELL_LIGHT_ESSENCE_HELPER)) - who->CastSpell(who, SPELL_POWERING_UP, true); + if(spell->Id == SPELL_UNLEASHED_LIGHT_HELPER) + { + if (who->HasAura(SPELL_LIGHT_ESSENCE_HELPER)) + who->CastSpell(who, SPELL_POWERING_UP, true); + } } }; @@ -821,7 +830,7 @@ class spell_power_of_the_twins : public SpellScriptLoader return GetCaster()->GetTypeId() == TYPEID_UNIT; } - void HandleEffectApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) {