josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix Unrelenting Assault

Browse Source 
--HG--
branch : trunk
This commit is contained in:
thenecromancer
2009-06-30 10:26:27 +02:00
parent 966a5374cc
commit 44815a83c4
3 changed files with 238 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/4321_world.sql
+35 -35
View File
@@ -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');
src/game/SpellEffects.cpp
+29
View File
@@ -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
win/VC90/shared.vcproj
+174 -173
View File
@@ -6,6 +6,7 @@
ProjectGUID="{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
RootNamespace="shared"
Keyword="Win32Proj"
TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -99,6 +100,166 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
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"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug_NoPCH|Win32"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
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"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
@@ -182,86 +343,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
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"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
@@ -344,86 +425,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug_NoPCH|Win32"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
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"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch"
AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\"
ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug_NoPCH|x64"
OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)"
@@ -876,17 +877,6 @@
Outputs="revision.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
Description="Getting Version..."
CommandLine="cd $(InputDir)&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.hg/branch.cache"
Outputs="revision.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
@@ -899,7 +889,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
Name="Debug_NoPCH|Win32"
>
<Tool
Name="VCCustomBuildTool"
@@ -910,7 +900,18 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_NoPCH|Win32"
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
Description="Getting Version..."
CommandLine="cd $(InputDir)&#x0D;&#x0A;&quot;$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe&quot; &quot;..\..&quot;&#x0D;&#x0A;"
AdditionalDependencies="$(SolutionDir)../.hg/branch.cache"
Outputs="revision.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"