diff options
| -rw-r--r-- | sql/updates/4321_world.sql | 70 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 29 | ||||
| -rw-r--r-- | win/VC90/shared.vcproj | 51 |
3 files changed, 90 insertions, 60 deletions
diff --git a/sql/updates/4321_world.sql b/sql/updates/4321_world.sql index 16c2fe33041..55f600907e3 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 0f25602fb21..6c261c586c3 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 721b3ffd5c8..aa0d061648f 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" > <Platforms> <Platform @@ -100,7 +101,7 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug|Win32" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -123,21 +124,19 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" @@ -153,7 +152,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -161,7 +160,6 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" @@ -183,7 +181,7 @@ /> </Configuration> <Configuration - Name="Debug|Win32" + Name="Debug_NoPCH|Win32" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -243,7 +241,7 @@ <Tool Name="VCLibrarianTool" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" - AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" SuppressStartupBanner="true" /> <Tool @@ -263,7 +261,7 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|x64" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -291,15 +289,16 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" @@ -315,7 +314,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool @@ -345,7 +344,7 @@ /> </Configuration> <Configuration - Name="Debug_NoPCH|Win32" + Name="Debug|x64" OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" @@ -368,6 +367,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -404,8 +404,9 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" - AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" /> <Tool @@ -877,7 +878,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" @@ -888,7 +889,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Debug_NoPCH|Win32" > <Tool Name="VCCustomBuildTool" @@ -899,7 +900,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|x64" > <Tool Name="VCCustomBuildTool" @@ -910,7 +911,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug_NoPCH|Win32" + Name="Debug|x64" > <Tool Name="VCCustomBuildTool" |