From 44815a83c492452e9ed99e5146878ff676bd583b Mon Sep 17 00:00:00 2001 From: thenecromancer Date: Tue, 30 Jun 2009 10:26:27 +0200 Subject: [PATCH] *Fix Unrelenting Assault --HG-- branch : trunk --- sql/updates/4321_world.sql | 70 ++++---- src/game/SpellEffects.cpp | 29 ++++ win/VC90/shared.vcproj | 347 +++++++++++++++++++------------------ 3 files changed, 238 insertions(+), 208 deletions(-) diff --git a/sql/updates/4321_world.sql b/sql/updates/4321_world.sql index 16c2fe3304..55f600907e 100644 --- a/sql/updates/4321_world.sql +++ b/sql/updates/4321_world.sql @@ -1,36 +1,36 @@ -DELETE FROM `creature_questrelation` WHERE `quest`=12701; -INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28377, 12701); -DELETE FROM `creature_involvedrelation` WHERE `quest`=12701; -INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28377, 12701); -DELETE FROM `creature_involvedrelation` WHERE `quest`=12723; -INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12723); -DELETE FROM `creature_questrelation` WHERE `quest`=12724; -INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12724); -DELETE FROM `creature_involvedrelation` WHERE `quest`=12724; -INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12724); -DELETE FROM `creature_questrelation` WHERE `quest`=12725; -INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28913, 12725); -DELETE FROM `creature_involvedrelation` WHERE `quest`=12725; -INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28912, 12725); -DELETE FROM `creature_questrelation` WHERE `quest`=12727; -INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28912, 12727); -DELETE FROM `creature_involvedrelation` WHERE `quest`=12727; -INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727); - -DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806); -INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES -('48714', '2', '27237'), -('48714', '2', '27235'), -('48714', '2', '27234'), -('48714', '2', '27236'), -('57806', '2', '31043'); - -UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627); - -DELETE FROM `spell_target_position` WHERE `id`=51852; -INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES -(51852, 609, 2361.21, -5660.45, 503.828, 4.49); - -DELETE FROM `spell_bonus_data` WHERE `entry` IN (20187); -INSERT INTO `spell_bonus_data` (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES +DELETE FROM `creature_questrelation` WHERE `quest`=12701; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28377, 12701); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12701; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28377, 12701); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12723; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12723); +DELETE FROM `creature_questrelation` WHERE `quest`=12724; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12724); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12724; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12724); +DELETE FROM `creature_questrelation` WHERE `quest`=12725; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28913, 12725); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12725; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28912, 12725); +DELETE FROM `creature_questrelation` WHERE `quest`=12727; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28912, 12727); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12727; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727); + +DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806); +INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES +('48714', '2', '27237'), +('48714', '2', '27235'), +('48714', '2', '27234'), +('48714', '2', '27236'), +('57806', '2', '31043'); + +UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627); + +DELETE FROM `spell_target_position` WHERE `id`=51852; +INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES +(51852, 609, 2361.21, -5660.45, 503.828, 4.49); + +DELETE FROM `spell_bonus_data` WHERE `entry` IN (20187); +INSERT INTO `spell_bonus_data` (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES (20187, 0.4, 0, 0.25, 'Judgement of Righteousness'); \ No newline at end of file diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 0f25602fb2..6c261c586c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1397,6 +1397,35 @@ void Spell::EffectDummy(uint32 i) m_damage+= uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100); return; } + // Overpower + if(m_spellInfo->SpellFamilyFlags[0] & 0x4) + { + // Must be casting target + if (!unitTarget->IsNonMeleeSpellCasted(false)) + return; + // Find Unrelenting Assault + Unit::AuraEffectList const& modifierAuras = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER); + for(Unit::AuraEffectList::const_iterator itr = modifierAuras.begin(); itr != modifierAuras.end(); ++itr) + { + if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARRIOR && (*itr)->GetSpellProto()->SpellIconID == 2775) + { + switch ((*itr)->GetSpellProto()->Id) + { + // Unrelenting Assault, rank 1 + case 46859: + m_caster->CastSpell(unitTarget,64849,true,0,(*itr)); + break; + // Unrelenting Assault, rank 2 + case 46860: + m_caster->CastSpell(unitTarget,64850,true,0,(*itr)); + break; + default: + break; + } + } + } + return; + } switch(m_spellInfo->Id) { // Warrior's Wrath diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index 721b3ffd5c..aa0d061648 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -6,6 +6,7 @@ ProjectGUID="{90297C34-F231-4DF4-848E-A74BCC0E40ED}" RootNamespace="shared" Keyword="Win32Proj" + TargetFrameworkVersion="0" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -899,7 +889,7 @@ /> + + +