Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-11 14:53:16 -05:00
parent 3120221deb 37548b02fd
commit ccd9f4eeb2
3 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/updates/2591_world.sql Normal file
View File

@@ -0,0 +1,6 @@
INSERT IGNORE INTO `spell_linked_spell` VALUES (16857, 60089, 0, 'Faerie Fire (Feral) Rank 1');
INSERT IGNORE INTO `spell_linked_spell` VALUES (17390, 60089, 0, 'Faerie Fire (Feral) Rank 2');
INSERT IGNORE INTO `spell_linked_spell` VALUES (17391, 60089, 0, 'Faerie Fire (Feral) Rank 3');
INSERT IGNORE INTO `spell_linked_spell` VALUES (17392, 60089, 0, 'Faerie Fire (Feral) Rank 4');
INSERT IGNORE INTO `spell_linked_spell` VALUES (27011, 60089, 0, 'Faerie Fire (Feral) Rank 5');
INSERT IGNORE INTO `spell_linked_spell` VALUES (48475, 60089, 0, 'Faerie Fire (Feral) Rank 6');

33
src/bindings/scripts/CMakeLists.txt
View File

@@ -353,10 +353,6 @@ SET(trinityscript_LIB_SRCS
scripts/zone/uldaman/uldaman.cpp
scripts/zone/undercity/undercity.cpp
scripts/zone/ungoro_crater/ungoro_crater.cpp
scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
scripts/zone/western_plaguelands/western_plaguelands.cpp
scripts/zone/westfall/westfall.cpp
@@ -387,8 +383,11 @@ SET(trinityscript_LIB_SRCS
scripts/zone/zulgurub/boss_wushoolay.cpp
scripts/zone/zulgurub/def_zulgurub.h
scripts/zone/zulgurub/instance_zulgurub.cpp
scripts/zone/utgarde_keep/utgarde_keep/instance_keep.cpp
scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
scripts/zone/utgarde_keep/utgarde_keep/instance_keep.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_dalronn.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar.cpp
@@ -413,18 +412,18 @@ SET(trinityscript_LIB_SRCS
scripts/zone/nexus/oculus/boss_varos.cpp
scripts/zone/nexus/oculus/boss_eregos.cpp
scripts/zone/nexus/oculus/def_oculus.h
scripts/zone/azjol-nerub/azjol-nerub/instance_azjol_nerub.cpp
scripts/zone/azjol-nerub/azjol-nerub/boss_krik_thir.cpp
scripts/zone/azjol-nerub/azjol-nerub/boss_hadronox.cpp
scripts/zone/azjol-nerub/azjol-nerub/boss_anub_arak.cpp
scripts/zone/azjol-nerub/azjol-nerub/def_azjol_nerub.h
scripts/zone/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
scripts/zone/azjol-nerub/ahnkahet/boss_taldaram.cpp
scripts/zone/azjol-nerub/ahnkahet/boss_nadox.cpp
scripts/zone/azjol-nerub/ahnkahet/boss_jedoga.cpp
scripts/zone/azjol-nerub/ahnkahet/boss_volazj.cpp
scripts/zone/azjol-nerub/ahnkahet/boss_aminitar.cpp
scripts/zone/azjol-nerub/ahnkahet/def_ahnkahet.h
scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol_nerub.cpp
scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krik_thir.cpp
scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_hadronox.cpp
scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anub_arak.cpp
scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol_nerub.h
scripts/zone/Azjol-Nerub/ahnkahet/instance_ahnkahet.cpp
scripts/zone/Azjol-Nerub/ahnkahet/boss_taldaram.cpp
scripts/zone/Azjol-Nerub/ahnkahet/boss_nadox.cpp
scripts/zone/Azjol-Nerub/ahnkahet/boss_jedoga.cpp
scripts/zone/Azjol-Nerub/ahnkahet/boss_volazj.cpp
scripts/zone/Azjol-Nerub/ahnkahet/boss_aminitar.cpp
scripts/zone/Azjol-Nerub/ahnkahet/def_ahnkahet.h
scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
scripts/zone/draktharon_keep/boss_trollgore.cpp
scripts/zone/draktharon_keep/boss_novos.cpp

12
src/game/SpellEffects.cpp
View File

@@ -430,6 +430,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 12 / 100);
break;
}
// Concussion Blow
else if(m_spellInfo->SpellFamilyFlags[0] & 0x4000000)
{
int32 pct = m_caster->CalculateSpellDamage(m_spellInfo, 2, m_spellInfo->EffectBasePoints[2], unitTarget);
damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * pct / 100);
break;
}
break;
}
case SPELLFAMILY_WARLOCK:
@@ -493,6 +500,11 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
{
damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.08f);
}
// Faerie Fire (Feral)
else if(m_spellInfo->Id == 60089)
{
damage += int32((m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 5 / 100) + 1);
}
//Mangle Bonus for the initial damage of Lacerate and Rake
if((m_spellInfo->SpellFamilyFlags.IsEqual(0x1000,0,0) && m_spellInfo->SpellIconID==494) ||
(m_spellInfo->SpellFamilyFlags.IsEqual(0,0x100,0) && m_spellInfo->SpellIconID==2246))