Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Some quest fixes for some dk quests. Not enabled for now. By Azrael and ckegg. sql will be added later so you may get some console error during start up.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-16 16:20:31 -05:00
parent 73b2226827
commit 0bf3aa109f
6 changed files with 25 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,6 +89,8 @@ SET(trinityscript_LIB_SRCS
scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
scripts/eastern_kingdoms/molten_core/molten_core.cpp
scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp

8
src/bindings/scripts/VC80/80ScriptDev2.vcproj
View File

@@ -717,6 +717,14 @@
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\the_scarlet_enclave.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\chapter1.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\chapter2.cpp"
>
</File>
</Filter>
<Filter
Name="Scarlet Monastery"

8
src/bindings/scripts/VC90/90ScriptDev2.vcproj
View File

@@ -714,6 +714,14 @@
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\the_scarlet_enclave.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\chapter1.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\chapter2.cpp"
>
</File>
</Filter>
<Filter
Name="Scarlet Monastery"

1135
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/bindings/scripts/system/ScriptLoader.cpp
View File

@@ -91,6 +91,8 @@ extern void AddSC_boss_ragnaros();
extern void AddSC_instance_molten_core();
extern void AddSC_molten_core();
extern void AddSC_the_scarlet_enclave(); //Scarlet Enclave
extern void AddSC_the_scarlet_enclave_c1();
extern void AddSC_the_scarlet_enclave_c2();
extern void AddSC_boss_arcanist_doan(); //Scarlet Monastery
extern void AddSC_boss_azshir_the_sleepless();
extern void AddSC_boss_bloodmage_thalnos();
@@ -477,6 +479,8 @@ void AddScripts()
AddSC_instance_molten_core();
AddSC_molten_core();
AddSC_the_scarlet_enclave(); //Scarlet Enclave
AddSC_the_scarlet_enclave_c1();
AddSC_the_scarlet_enclave_c2();
AddSC_boss_arcanist_doan(); //Scarlet Monastery
AddSC_boss_azshir_the_sleepless();
AddSC_boss_bloodmage_thalnos();

3
src/game/SpellEffects.cpp
View File

@@ -2014,10 +2014,11 @@ void Spell::EffectForceCast(uint32 i)
{
switch(m_spellInfo->Id)
{
// 52463 also use custom damage and the summon veh spell use that damamge and cast mount aura?
case 52588: unitTarget->RemoveAura(damage); break;
}
}
else
else // this was for 52463, need further study
{
unitTarget->CastCustomSpell(unitTarget, spellInfo->Id, &damage, NULL, NULL, true, NULL, NULL, m_originalCasterGUID);
return;