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

*Cleanup..

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-27 17:07:40 -07:00
parent 9bcb6695af
commit 86c7bbc8bb
66 changed files with 884 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bindings/scripts/ScriptMgr.cpp
View File

@@ -77,7 +77,7 @@ void ScriptsFree()
}
TRINITY_DLL_EXPORT
void ScriptsInit(char const* cfg_file = "trinitycore.conf")
void ScriptsInit(char const* cfg_file = _TRINITY_SCRIPT_CONFIG)
{
//Trinity Script startup
outstring_log(" _____ _ _ _ ____ _ _");

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

@@ -450,7 +450,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\def_blackrock_depths.h"
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\blackrock_depths.h"
>
</File>
<File
@@ -562,7 +562,11 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\deadmines\def_deadmines.h"
RelativePath="..\scripts\eastern_kingdoms\deadmines\deadmines.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\deadmines\instance_deadmines.cpp"
>
</File>
</Filter>
@@ -610,7 +614,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\karazhan\def_karazhan.h"
RelativePath="..\scripts\eastern_kingdoms\karazhan\karazhan.h"
>
</File>
<File
@@ -642,7 +646,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\def_magisters_terrace.h"
RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.h"
>
</File>
<File
@@ -698,7 +702,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\molten_core\def_molten_core.h"
RelativePath="..\scripts\eastern_kingdoms\molten_core\molten_core.h"
>
</File>
<File
@@ -711,7 +715,7 @@
</File>
</Filter>
<Filter
Name="scarlet_enclave"
Name="Scarlet Enclave"
>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\the_scarlet_enclave.cpp"
@@ -774,7 +778,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\def_scarlet_monastery.h"
RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h"
>
</File>
<File
@@ -834,7 +838,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scholomance\def_scholomance.h"
RelativePath="..\scripts\eastern_kingdoms\scholomance\scholomance.h"
>
</File>
<File
@@ -846,7 +850,7 @@
Name="Shadowfang Keep"
>
<File
RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\def_shadowfang_keep.h"
RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h"
>
</File>
<File
@@ -906,7 +910,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\stratholme\def_stratholme.h"
RelativePath="..\scripts\eastern_kingdoms\stratholme\stratholme.h"
>
</File>
<File
@@ -922,7 +926,7 @@
Name="Sunken Temple"
>
<File
RelativePath="..\scripts\eastern_kingdoms\sunken_temple\def_sunken_temple.h"
RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.h"
>
</File>
<File
@@ -962,7 +966,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\def_sunwell_plateau.h"
RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.h"
>
</File>
<File
@@ -1022,7 +1026,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\zulaman\def_zulaman.h"
RelativePath="..\scripts\eastern_kingdoms\zulaman\zulaman.h"
>
</File>
<File
@@ -1090,7 +1094,7 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\zulgurub\def_zulgurub.h"
RelativePath="..\scripts\eastern_kingdoms\zulgurub\zulgurub.h"
>
</File>
<File
@@ -1230,7 +1234,7 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\blackfathom_depths\def_blackfathom_deeps.h"
RelativePath="..\scripts\kalimdor\blackfathom_depths\blackfathom_deeps.h"
>
</File>
</Filter>
@@ -1256,12 +1260,12 @@
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_salramm.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_infinite.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\def_culling_of_stratholme.h"
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_infinite.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\culling_of_stratholme.h"
>
</File>
<File
@@ -1289,7 +1293,7 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\def_dark_portal.h"
RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.h"
>
</File>
<File
@@ -1321,7 +1325,7 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\def_hyjal.h"
RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.h"
>
</File>
<File
@@ -1365,7 +1369,7 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\def_old_hillsbrad.h"
RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.h"
>
</File>
<File
@@ -1430,7 +1434,7 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\razorfen_kraul\def_razorfen_kraul.h"
RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.h"
>
</File>
</Filter>
@@ -1465,6 +1469,10 @@
RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.h"
>
</File>
</Filter>
<Filter
Name="Temple of Ahn&apos;Qiraj"
@@ -1506,7 +1514,7 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\def_temple_of_ahnqiraj.h"
RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\temple_of_ahnqiraj.h"
>
</File>
<File
@@ -1522,7 +1530,7 @@
Name="Wailing Caverns"
>
<File
RelativePath="..\scripts\kalimdor\wailing_caverns\def_wailing_caverns.h"
RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.h"
>
</File>
<File
@@ -1660,7 +1668,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\def_ahnkahet.h"
RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\ahnkahet.h"
>
</File>
<File
@@ -1684,7 +1692,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\azjol_nerub.h"
>
</File>
<File
@@ -1713,7 +1721,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\draktharon_keep\def_drak_tharon_keep.h"
RelativePath="..\scripts\northrend\draktharon_keep\drak_tharon_keep.h"
>
</File>
<File
@@ -1745,7 +1753,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\gundrak\def_gundrak.h"
RelativePath="..\scripts\northrend\gundrak\gundrak.h"
>
</File>
<File
@@ -1817,7 +1825,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\naxxramas\def_naxxramas.h"
RelativePath="..\scripts\northrend\naxxramas\naxxramas.h"
>
</File>
<File
@@ -1856,7 +1864,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\nexus\def_nexus.h"
RelativePath="..\scripts\northrend\nexus\nexus\nexus.h"
>
</File>
<File
@@ -1884,7 +1892,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\oculus\def_oculus.h"
RelativePath="..\scripts\northrend\nexus\oculus\oculus.h"
>
</File>
<File
@@ -1900,7 +1908,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\eye_of_eternity\def_eye_of_eternity.h"
RelativePath="..\scripts\northrend\nexus\eye_of_eternity\eye_of_eternity.h"
>
</File>
<File
@@ -1917,7 +1925,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\obsidian_sanctum\def_obsidian_sanctum.h"
RelativePath="..\scripts\northrend\obsidian_sanctum\obsidian_sanctum.h"
>
</File>
<File
@@ -1944,7 +1952,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\halls_of_stone\def_halls_of_stone.h"
RelativePath="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.h"
>
</File>
<File
@@ -1972,7 +1980,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\def_halls_of_lightning.h"
RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\halls_of_lightning.h"
>
</File>
<File
@@ -2040,7 +2048,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\ulduar\def_ulduar.h"
RelativePath="..\scripts\northrend\ulduar\ulduar\ulduar.h"
>
</File>
<File
@@ -2068,7 +2076,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.h"
>
</File>
<File
@@ -2100,7 +2108,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\def_pinnacle.h"
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\utgarde_pinnacle.h"
>
</File>
<File
@@ -2121,7 +2129,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\vault_of_archavon\def_vault_of_archavon.h"
RelativePath="..\scripts\northrend\vault_of_archavon\vault_of_archavon.h"
>
</File>
<File
@@ -2161,7 +2169,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\violet_hold\def_violet_hold.h"
RelativePath="..\scripts\northrend\violet_hold\violet_hold.h"
>
</File>
<File
@@ -2248,7 +2256,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\auchindoun\sethekk_halls\def_sethekk_halls.h"
RelativePath="..\scripts\outland\auchindoun\sethekk_halls\sethekk_halls.h"
>
</File>
<File
@@ -2276,7 +2284,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\shadow_labyrinth.h"
>
</File>
<File
@@ -2325,7 +2333,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\black_temple\def_black_temple.h"
RelativePath="..\scripts\outland\black_temple\black_temple.h"
>
</File>
<File
@@ -2368,7 +2376,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\serpent_shrine.h"
>
</File>
<File
@@ -2392,7 +2400,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\def_steam_vault.h"
RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\steam_vault.h"
>
</File>
<File
@@ -2425,7 +2433,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\gruuls_lair\def_gruuls_lair.h"
RelativePath="..\scripts\outland\gruuls_lair\gruuls_lair.h"
>
</File>
<File
@@ -2452,7 +2460,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\def_blood_furnace.h"
RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\blood_furnace.h"
>
</File>
<File
@@ -2468,7 +2476,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\magtheridons_lair.h"
>
</File>
<File
@@ -2492,7 +2500,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\hellfire_ramparts.h"
>
</File>
<File
@@ -2516,7 +2524,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\def_shattered_halls.h"
RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\shattered_halls.h"
>
</File>
<File
@@ -2540,7 +2548,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\arcatraz\def_arcatraz.h"
RelativePath="..\scripts\outland\tempest_keep\arcatraz\arcatraz.h"
>
</File>
<File
@@ -2584,7 +2592,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\the_eye\def_the_eye.h"
RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.h"
>
</File>
<File
@@ -2616,7 +2624,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\def_mechanar.h"
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\mechanar.h"
>
</File>
<File

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

@@ -506,6 +506,10 @@
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\blackrock_depths.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\blackrock_depths.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_ambassador_flamelash.cpp"
>
@@ -546,10 +550,6 @@
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_tomb_of_seven.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\def_blackrock_depths.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\instance_blackrock_depths.cpp"
>
@@ -659,7 +659,11 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\deadmines\def_deadmines.h"
RelativePath="..\scripts\eastern_kingdoms\deadmines\deadmines.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\deadmines\instance_deadmines.cpp"
>
</File>
</Filter>
@@ -706,10 +710,6 @@
RelativePath="..\scripts\eastern_kingdoms\karazhan\bosses_opera.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\karazhan\def_karazhan.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\karazhan\instance_karazhan.cpp"
>
@@ -718,6 +718,10 @@
RelativePath="..\scripts\eastern_kingdoms\karazhan\karazhan.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\karazhan\karazhan.h"
>
</File>
</Filter>
<Filter
Name="Magister&apos;s Terrace"
@@ -738,10 +742,6 @@
RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\boss_vexallus.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\def_magisters_terrace.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\instance_magisters_terrace.cpp"
>
@@ -750,6 +750,10 @@
RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.h"
>
</File>
</Filter>
<Filter
Name="Molten Core"
@@ -794,10 +798,6 @@
RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_sulfuron_harbinger.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\molten_core\def_molten_core.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\molten_core\instance_molten_core.cpp"
>
@@ -806,9 +806,13 @@
RelativePath="..\scripts\eastern_kingdoms\molten_core\molten_core.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\molten_core\molten_core.h"
>
</File>
</Filter>
<Filter
Name="scarlet_enclave"
Name="Scarlet Enclave"
>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\chapter1.cpp"
@@ -871,11 +875,11 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\def_scarlet_monastery.h"
RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp"
RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h"
>
</File>
</Filter>
@@ -931,21 +935,17 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scholomance\def_scholomance.h"
RelativePath="..\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp"
RelativePath="..\scripts\eastern_kingdoms\scholomance\scholomance.h"
>
</File>
</Filter>
<Filter
Name="Shadowfang Keep"
>
<File
RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\def_shadowfang_keep.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp"
>
@@ -954,6 +954,10 @@
RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h"
>
</File>
</Filter>
<Filter
Name="Stratholme"
@@ -1002,10 +1006,6 @@
RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_timmy_the_cruel.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\stratholme\def_stratholme.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp"
>
@@ -1014,14 +1014,14 @@
RelativePath="..\scripts\eastern_kingdoms\stratholme\stratholme.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\stratholme\stratholme.h"
>
</File>
</Filter>
<Filter
Name="Sunken Temple"
>
<File
RelativePath="..\scripts\eastern_kingdoms\sunken_temple\def_sunken_temple.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp"
>
@@ -1030,6 +1030,10 @@
RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.h"
>
</File>
</Filter>
<Filter
Name="Sunwell Plateau"
@@ -1058,10 +1062,6 @@
RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\boss_muru.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\def_sunwell_plateau.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\instance_sunwell_plateau.cpp"
>
@@ -1070,6 +1070,10 @@
RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.h"
>
</File>
</Filter>
<Filter
Name="Uldaman"
@@ -1118,10 +1122,6 @@
RelativePath="..\scripts\eastern_kingdoms\zulaman\boss_zuljin.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\zulaman\def_zulaman.h"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\zulaman\instance_zulaman.cpp"
>
@@ -1130,6 +1130,10 @@
RelativePath="..\scripts\eastern_kingdoms\zulaman\zulaman.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\zulaman\zulaman.h"
>
</File>
</Filter>
<Filter
Name="Zul&apos;Gurub"
@@ -1187,11 +1191,11 @@
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\zulgurub\def_zulgurub.h"
RelativePath="..\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp"
>
</File>
<File
RelativePath="..\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp"
RelativePath="..\scripts\eastern_kingdoms\zulgurub\zulgurub.h"
>
</File>
</Filter>
@@ -1311,7 +1315,7 @@
Name="Blackfathom Depths"
>
<File
RelativePath="..\scripts\kalimdor\blackfathom_depths\def_blackfathom_deeps.h"
RelativePath="..\scripts\kalimdor\blackfathom_depths\blackfathom_deeps.h"
>
</File>
<File
@@ -1329,6 +1333,10 @@
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_epoch.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_infinite.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_mal_ganis.cpp"
>
@@ -1341,12 +1349,8 @@
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_salramm.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_infinite.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\def_culling_of_stratholme.h"
RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\culling_of_stratholme.h"
>
</File>
<File
@@ -1374,7 +1378,7 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\def_dark_portal.h"
RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.h"
>
</File>
<File
@@ -1406,11 +1410,11 @@
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\def_hyjal.h"
RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.cpp"
RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.h"
>
</File>
<File
@@ -1449,10 +1453,6 @@
RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\boss_leutenant_drake.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\def_old_hillsbrad.h"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp"
>
@@ -1461,6 +1461,10 @@
RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.h"
>
</File>
</Filter>
</Filter>
<Filter
@@ -1506,10 +1510,6 @@
<Filter
Name="Razorfen Kraul"
>
<File
RelativePath="..\scripts\kalimdor\razorfen_kraul\def_razorfen_kraul.h"
>
</File>
<File
RelativePath="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp"
>
@@ -1518,6 +1518,10 @@
RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.h"
>
</File>
</Filter>
<Filter
Name="Ruins of Ahn&apos;Qiraj"
@@ -1550,6 +1554,10 @@
RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.h"
>
</File>
</Filter>
<Filter
Name="Temple of Ahn&apos;Qiraj"
@@ -1590,10 +1598,6 @@
RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_viscidus.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\def_temple_of_ahnqiraj.h"
>
</File>
<File
RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp"
>
@@ -1602,14 +1606,14 @@
RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\temple_of_ahnqiraj.h"
>
</File>
</Filter>
<Filter
Name="Wailing Caverns"
>
<File
RelativePath="..\scripts\kalimdor\wailing_caverns\def_wailing_caverns.h"
>
</File>
<File
RelativePath="..\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp"
>
@@ -1618,6 +1622,10 @@
RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp"
>
</File>
<File
RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.h"
>
</File>
</Filter>
<Filter
Name="Zul&apos;Farrak"
@@ -1673,6 +1681,10 @@
<Filter
Name="Ahn&apos;kahet"
>
<File
RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\ahnkahet.h"
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_amanitar.cpp"
>
@@ -1693,10 +1705,6 @@
RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_prince_taldaram.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\def_ahnkahet.h"
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\instance_ahnkahet.cpp"
>
@@ -1705,6 +1713,10 @@
<Filter
Name="Azjol-Nerub"
>
<File
RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\azjol_nerub.h"
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
>
@@ -1717,10 +1729,6 @@
RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
>
</File>
<File
RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\instance_azjol_nerub.cpp"
>
@@ -1747,7 +1755,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\draktharon_keep\def_drak_tharon_keep.h"
RelativePath="..\scripts\northrend\draktharon_keep\drak_tharon_keep.h"
>
</File>
<File
@@ -1779,7 +1787,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\gundrak\def_gundrak.h"
RelativePath="..\scripts\northrend\gundrak\gundrak.h"
>
</File>
<File
@@ -1851,11 +1859,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\naxxramas\def_naxxramas.h"
RelativePath="..\scripts\northrend\naxxramas\instance_naxxramas.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\naxxramas\instance_naxxramas.cpp"
RelativePath="..\scripts\northrend\naxxramas\naxxramas.h"
>
</File>
</Filter>
@@ -1890,11 +1898,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\nexus\def_nexus.h"
RelativePath="..\scripts\northrend\nexus\nexus\instance_nexus.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\nexus\instance_nexus.cpp"
RelativePath="..\scripts\northrend\nexus\nexus\nexus.h"
>
</File>
</Filter>
@@ -1918,11 +1926,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\oculus\def_oculus.h"
RelativePath="..\scripts\northrend\nexus\oculus\instance_oculus.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\oculus\instance_oculus.cpp"
RelativePath="..\scripts\northrend\nexus\oculus\oculus.h"
>
</File>
</Filter>
@@ -1934,7 +1942,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\nexus\eye_of_eternity\def_eye_of_eternity.h"
RelativePath="..\scripts\northrend\nexus\eye_of_eternity\eye_of_eternity.h"
>
</File>
<File
@@ -1951,11 +1959,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\obsidian_sanctum\def_obsidian_sanctum.h"
RelativePath="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp"
RelativePath="..\scripts\northrend\obsidian_sanctum\obsidian_sanctum.h"
>
</File>
</Filter>
@@ -1978,11 +1986,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\halls_of_stone\def_halls_of_stone.h"
RelativePath="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.cpp"
RelativePath="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.h"
>
</File>
<File
@@ -2010,7 +2018,7 @@
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\def_halls_of_lightning.h"
RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\halls_of_lightning.h"
>
</File>
<File
@@ -2078,11 +2086,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\ulduar\def_ulduar.h"
RelativePath="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp"
RelativePath="..\scripts\northrend\ulduar\ulduar\ulduar.h"
>
</File>
<File
@@ -2109,10 +2117,6 @@
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
>
</File>
<File
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
>
@@ -2121,6 +2125,10 @@
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.h"
>
</File>
</Filter>
<Filter
Name="Utgarde Pinnacle"
@@ -2142,11 +2150,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\def_pinnacle.h"
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\utgarde_pinnacle.h"
>
</File>
</Filter>
@@ -2163,11 +2171,11 @@
>
</File>
<File
RelativePath="..\scripts\northrend\vault_of_archavon\def_vault_of_archavon.h"
RelativePath="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp"
RelativePath="..\scripts\northrend\vault_of_archavon\vault_of_archavon.h"
>
</File>
</Filter>
@@ -2202,10 +2210,6 @@
RelativePath="..\scripts\northrend\violet_hold\boss_zuramat.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\violet_hold\def_violet_hold.h"
>
</File>
<File
RelativePath="..\scripts\northrend\violet_hold\instance_violet_hold.cpp"
>
@@ -2214,6 +2218,10 @@
RelativePath="..\scripts\northrend\violet_hold\violet_hold.cpp"
>
</File>
<File
RelativePath="..\scripts\northrend\violet_hold\violet_hold.h"
>
</File>
</Filter>
</Filter>
<Filter
@@ -2298,11 +2306,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\auchindoun\sethekk_halls\def_sethekk_halls.h"
RelativePath="..\scripts\outland\auchindoun\sethekk_halls\instance_sethekk_halls.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\auchindoun\sethekk_halls\instance_sethekk_halls.cpp"
RelativePath="..\scripts\outland\auchindoun\sethekk_halls\sethekk_halls.h"
>
</File>
</Filter>
@@ -2326,11 +2334,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\shadow_labyrinth.h"
>
</File>
</Filter>
@@ -2342,6 +2350,10 @@
RelativePath="..\scripts\outland\black_temple\black_temple.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\black_temple\black_temple.h"
>
</File>
<File
RelativePath="..\scripts\outland\black_temple\boss_bloodboil.cpp"
>
@@ -2374,10 +2386,6 @@
RelativePath="..\scripts\outland\black_temple\boss_warlord_najentus.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\black_temple\def_black_temple.h"
>
</File>
<File
RelativePath="..\scripts\outland\black_temple\illidari_council.cpp"
>
@@ -2418,11 +2426,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\serpent_shrine.h"
>
</File>
</Filter>
@@ -2442,11 +2450,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\def_steam_vault.h"
RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\steam_vault.h"
>
</File>
</Filter>
@@ -2475,7 +2483,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\gruuls_lair\def_gruuls_lair.h"
RelativePath="..\scripts\outland\gruuls_lair\gruuls_lair.h"
>
</File>
<File
@@ -2489,6 +2497,10 @@
<Filter
Name="Blood Furnace"
>
<File
RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\blood_furnace.h"
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_broggok.cpp"
>
@@ -2501,10 +2513,6 @@
RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\def_blood_furnace.h"
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp"
>
@@ -2518,11 +2526,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\magtheridons_lair.h"
>
</File>
</Filter>
@@ -2542,7 +2550,7 @@
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\hellfire_ramparts.h"
>
</File>
<File
@@ -2566,11 +2574,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\def_shattered_halls.h"
RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\shattered_halls.h"
>
</File>
</Filter>
@@ -2586,11 +2594,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
RelativePath="..\scripts\outland\tempest_keep\arcatraz\arcatraz.h"
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\arcatraz\def_arcatraz.h"
RelativePath="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
>
</File>
<File
@@ -2633,10 +2641,6 @@
RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_void_reaver.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\the_eye\def_the_eye.h"
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp"
>
@@ -2645,6 +2649,10 @@
RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.h"
>
</File>
</Filter>
<Filter
Name="The Mechanar"
@@ -2666,11 +2674,11 @@
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\def_mechanar.h"
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp"
>
</File>
<File
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp"
RelativePath="..\scripts\outland\tempest_keep\the_mechanar\mechanar.h"
>
</File>
</Filter>

2
src/bindings/scripts/base/escort_ai.cpp
View File

@@ -274,7 +274,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
//Check if player or any member of his group is within range
if (HasEscortState(STATE_ESCORT_ESCORTING) && m_uiPlayerGUID && !m_creature->getVictim() && !HasEscortState(STATE_ESCORT_RETURNING))
{
if (m_uiPlayerCheckTimer < uiDiff)
if (m_uiPlayerCheckTimer <= uiDiff)
{
if (DespawnAtFar && !IsPlayerOrGroupInRange())
{

2
src/bindings/scripts/base/follower_ai.cpp
View File

@@ -186,7 +186,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
{
if (HasFollowState(STATE_FOLLOW_INPROGRESS) && !m_creature->getVictim())
{
if (m_uiUpdateFollowTimer < uiDiff)
if (m_uiUpdateFollowTimer <= uiDiff)
{
if (HasFollowState(STATE_FOLLOW_COMPLETE) && !HasFollowState(STATE_FOLLOW_POSTEVENT))
{

30
src/bindings/scripts/base/guard_ai.cpp
View File

@@ -68,24 +68,24 @@ void guardAI::UpdateAI(const uint32 diff)
//Buff timer (only buff when we are alive and not in combat
if (m_creature->isAlive() && !m_creature->isInCombat())
if (BuffTimer < diff)
{
//Find a spell that targets friendly and applies an aura (these are generally buffs)
SpellEntry const *info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
if (info && !GlobalCooldown)
if (BuffTimer <= diff)
{
//Cast the buff spell
DoCastSpell(m_creature, info);
//Find a spell that targets friendly and applies an aura (these are generally buffs)
SpellEntry const *info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
//Set our global cooldown
GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
if (info && !GlobalCooldown)
{
//Cast the buff spell
DoCastSpell(m_creature, info);
//Set our timer to 10 minutes before rebuff
BuffTimer = 600000;
} //Try agian in 30 seconds
else BuffTimer = 30000;
}else BuffTimer -= diff;
//Set our global cooldown
GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
//Set our timer to 10 minutes before rebuff
BuffTimer = 600000;
} //Try again in 30 seconds
else BuffTimer = 30000;
} else BuffTimer -= diff;
//Return since we have no target
if (!UpdateVictim())

2
src/bindings/scripts/base/simple_ai.cpp
View File

@@ -211,7 +211,7 @@ void SimpleAI::UpdateAI(const uint32 diff)
if (!Spell[i].Enabled || !Spell[i].Spell_Id)
continue;
if (Spell_Timer[i] < diff)
if (Spell_Timer[i] <= diff)
{
//Check if this is a percentage based
if (Spell[i].First_Cast < 0 && Spell[i].First_Cast > -100 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > -Spell[i].First_Cast)

2
src/bindings/scripts/include/sc_creature.cpp
View File

@@ -543,7 +543,7 @@ enum eNPCs
// It is assumed the information is found elswehere and can be handled by mangos. So far no luck finding such information/way to extract it.
bool ScriptedAI::EnterEvadeIfOutOfCombatArea(const uint32 uiDiff)
{
if (m_uiEvadeCheckCooldown < uiDiff)
if (m_uiEvadeCheckCooldown <= uiDiff)
m_uiEvadeCheckCooldown = 2500;
else
{

10
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
View File

@@ -374,24 +374,24 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI
return;
//ThunderClap_Timer
if (ThunderClap_Timer < diff)
if (ThunderClap_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP);
ThunderClap_Timer = 10000;
}else ThunderClap_Timer -= diff;
} else ThunderClap_Timer -= diff;
//FireballVolley_Timer
if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
{
if (FireballVolley_Timer < diff)
if (FireballVolley_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FIREBALLVOLLEY);
FireballVolley_Timer = 15000;
}else FireballVolley_Timer -= diff;
} else FireballVolley_Timer -= diff;
}
//MightyBlow_Timer
if (MightyBlow_Timer < diff)
if (MightyBlow_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW);
MightyBlow_Timer = 10000;

8
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
View File

@@ -74,14 +74,14 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI
return;
//FireBlast_Timer
if (FireBlast_Timer < diff)
if (FireBlast_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FIREBLAST);
FireBlast_Timer = 7000;
}else FireBlast_Timer -= diff;
} else FireBlast_Timer -= diff;
//Spirit_Timer
if (Spirit_Timer < diff)
if (Spirit_Timer <= diff)
{
SummonSpirits(m_creature->getVictim());
SummonSpirits(m_creature->getVictim());
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI
SummonSpirits(m_creature->getVictim());
Spirit_Timer = 30000;
}else Spirit_Timer -= diff;
} else Spirit_Timer -= diff;
DoMeleeAttackIfReady();
}

30
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
View File

@@ -62,43 +62,41 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI
return;
//ShadowBolt_Timer
if (ShadowBolt_Timer < diff)
if (ShadowBolt_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT);
ShadowBolt_Timer = 7000;
}else ShadowBolt_Timer -= diff;
} else ShadowBolt_Timer -= diff;
//CurseOfTongues_Timer
if (CurseOfTongues_Timer < diff)
if (CurseOfTongues_Timer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target) DoCast(target,SPELL_CURSEOFTONGUES);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_CURSEOFTONGUES);
CurseOfTongues_Timer = 18000;
}else CurseOfTongues_Timer -= diff;
} else CurseOfTongues_Timer -= diff;
//CurseOfWeakness_Timer
if (CurseOfWeakness_Timer < diff)
if (CurseOfWeakness_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CURSEOFWEAKNESS);
CurseOfWeakness_Timer = 45000;
}else CurseOfWeakness_Timer -= diff;
} else CurseOfWeakness_Timer -= diff;
//DemonArmor_Timer
if (DemonArmor_Timer < diff)
if (DemonArmor_Timer <= diff)
{
DoCast(m_creature,SPELL_DEMONARMOR);
DemonArmor_Timer = 300000;
}else DemonArmor_Timer -= diff;
} else DemonArmor_Timer -= diff;
//EnvelopingWeb_Timer
if (EnvelopingWeb_Timer < diff)
if (EnvelopingWeb_Timer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target) DoCast(target,SPELL_ENVELOPINGWEB);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_ENVELOPINGWEB);
EnvelopingWeb_Timer = 12000;
}else EnvelopingWeb_Timer -= diff;
} else EnvelopingWeb_Timer -= diff;
DoMeleeAttackIfReady();
}

6
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
View File

@@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI
if (!UpdateVictim())
return;
if (HandOfThaurissan_Timer < diff)
if (HandOfThaurissan_Timer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
DoCast(target,SPELL_HANDOFTHAURISSAN);
@@ -86,11 +86,11 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI
}else HandOfThaurissan_Timer -= diff;
//AvatarOfFlame_Timer
if (AvatarOfFlame_Timer < diff)
if (AvatarOfFlame_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_AVATAROFFLAME);
AvatarOfFlame_Timer = 18000;
}else AvatarOfFlame_Timer -= diff;
} else AvatarOfFlame_Timer -= diff;
DoMeleeAttackIfReady();
}

14
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
View File

@@ -110,30 +110,30 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
return;
//MightyBlow_Timer
if (MightyBlow_Timer < diff)
if (MightyBlow_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW);
MightyBlow_Timer = 18000;
}else MightyBlow_Timer -= diff;
} else MightyBlow_Timer -= diff;
//HamString_Timer
if (HamString_Timer < diff)
if (HamString_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_HAMSTRING);
HamString_Timer = 15000;
}else HamString_Timer -= diff;
} else HamString_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 9000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//Adds_Timer
if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 21)
{
if (Adds_Timer < diff)
if (Adds_Timer <= diff)
{
// summon 3 Adds every 25s
SummonAdds(m_creature->getVictim());

4
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
View File

@@ -53,14 +53,14 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI
return;
//WhirlWind_Timer
if (WhirlWind_Timer < diff)
if (WhirlWind_Timer <= diff)
{
DoCast(m_creature,SPELL_WHIRLWIND);
WhirlWind_Timer = 15000;
}else WhirlWind_Timer -= diff;
//MortalStrike_Timer
if (MortalStrike_Timer < diff)
if (MortalStrike_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE);
MortalStrike_Timer = 15000;

8
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
View File

@@ -58,22 +58,22 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI
return;
//GroundTremor_Timer
if (GroundTremor_Timer < diff)
if (GroundTremor_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_GROUNDTREMOR);
GroundTremor_Timer = 8000;
}else GroundTremor_Timer -= diff;
} else GroundTremor_Timer -= diff;
//Frenzy_Timer
if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
{
if (Frenzy_Timer < diff)
if (Frenzy_Timer <= diff)
{
DoCast(m_creature,SPELL_FRENZY);
DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature);
Frenzy_Timer = 15000;
}else Frenzy_Timer -= diff;
} else Frenzy_Timer -= diff;
}
DoMeleeAttackIfReady();

26
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
View File

@@ -59,36 +59,34 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI
return;
//ShadowWordPain_Timer
if (ShadowWordPain_Timer < diff)
if (ShadowWordPain_Timer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target)DoCast(target,SPELL_SHADOWWORDPAIN);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_SHADOWWORDPAIN);
ShadowWordPain_Timer = 7000;
}else ShadowWordPain_Timer -= diff;
} else ShadowWordPain_Timer -= diff;
//ManaBurn_Timer
if (ManaBurn_Timer < diff)
if (ManaBurn_Timer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target)DoCast(target,SPELL_MANABURN);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_MANABURN);
ManaBurn_Timer = 10000;
}else ManaBurn_Timer -= diff;
} else ManaBurn_Timer -= diff;
//PsychicScream_Timer
if (PsychicScream_Timer < diff)
if (PsychicScream_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_PSYCHICSCREAM);
PsychicScream_Timer = 30000;
}else PsychicScream_Timer -= diff;
} else PsychicScream_Timer -= diff;
//ShadowShield_Timer
if (ShadowShield_Timer < diff)
if (ShadowShield_Timer <= diff)
{
DoCast(m_creature,SPELL_SHADOWSHIELD);
ShadowShield_Timer = 25000;
}else ShadowShield_Timer -= diff;
} else ShadowShield_Timer -= diff;
DoMeleeAttackIfReady();
}

4
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
View File

@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
return;
//FieryBurst_Timer
if (FieryBurst_Timer < diff)
if (FieryBurst_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FIERYBURST);
FieryBurst_Timer = 6000;
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
//WarStomp_Timer
if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
{
if (WarStomp_Timer < diff)
if (WarStomp_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_WARSTOMP);
WarStomp_Timer = 8000;

6
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
View File

@@ -65,21 +65,21 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI
return;
//MindBlast_Timer
if (MindBlast_Timer < diff)
if (MindBlast_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MINDBLAST);
MindBlast_Timer = 14000;
}else MindBlast_Timer -= diff;
//ShadowWordPain_Timer
if (ShadowWordPain_Timer < diff)
if (ShadowWordPain_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWWORDPAIN);
ShadowWordPain_Timer = 18000;
}else ShadowWordPain_Timer -= diff;
//Smite_Timer
if (Smite_Timer < diff)
if (Smite_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SMITE);
Smite_Timer = 10000;

18
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
View File

@@ -161,34 +161,34 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
return;
//ShadowVolley_Timer
if (ShadowVolley_Timer < diff)
if (ShadowVolley_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWBOLTVOLLEY);
ShadowVolley_Timer = 12000;
}else ShadowVolley_Timer -= diff;
} else ShadowVolley_Timer -= diff;
//Immolate_Timer
if (Immolate_Timer < diff)
if (Immolate_Timer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_IMMOLATE);
Immolate_Timer = 25000;
}else Immolate_Timer -= diff;
} else Immolate_Timer -= diff;
//CurseOfWeakness_Timer
if (CurseOfWeakness_Timer < diff)
if (CurseOfWeakness_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CURSEOFWEAKNESS);
CurseOfWeakness_Timer = 45000;
}else CurseOfWeakness_Timer -= diff;
} else CurseOfWeakness_Timer -= diff;
//DemonArmor_Timer
if (DemonArmor_Timer < diff)
if (DemonArmor_Timer <= diff)
{
DoCast(m_creature,SPELL_DEMONARMOR);
DemonArmor_Timer = 300000;
}else DemonArmor_Timer -= diff;
} else DemonArmor_Timer -= diff;
//Summon Voidwalkers
if (!Voidwalkers && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)

16
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
View File

@@ -56,32 +56,32 @@ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI
return;
//FireNova_Timer
if (FireNova_Timer < diff)
if (FireNova_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FIRENOVA);
FireNova_Timer = 10000;
}else FireNova_Timer -= diff;
} else FireNova_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 8000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//Confliguration_Timer
if (Confliguration_Timer < diff)
if (Confliguration_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CONFLIGURATION);
Confliguration_Timer = 18000;
}else Confliguration_Timer -= diff;
} else Confliguration_Timer -= diff;
//Thunderclap_Timer
if (Thunderclap_Timer < diff)
if (Thunderclap_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP);
Thunderclap_Timer = 20000;
}else Thunderclap_Timer -= diff;
} else Thunderclap_Timer -= diff;
DoMeleeAttackIfReady();
}

12
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
View File

@@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
if (!bAggro && Line1Count == 0 && Line2Count == 0)
{
if (Aggro_Timer < diff)
if (Aggro_Timer <= diff)
{
bAggro = true;
// Visible now!
@@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
// Summon Dragon pack. 2 Dragons and 3 Whelps
if (!bAggro && !SummonedRend && Line1Count > 0)
{
if (Dragons_Timer < diff)
if (Dragons_Timer <= diff)
{
SummonCreatureWithRandomTarget(10372);
SummonCreatureWithRandomTarget(10372);
@@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
//Summon Orc pack. 1 Orc Handler 1 Elite Dragonkin and 3 Whelps
if (!bAggro && !SummonedRend && Line1Count == 0 && Line2Count > 0)
{
if (Orc_Timer < diff)
if (Orc_Timer <= diff)
{
SummonCreatureWithRandomTarget(10447);
SummonCreatureWithRandomTarget(10317);
@@ -152,21 +152,21 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
if (bAggro)
{
// CorrosiveAcid_Timer
if (CorrosiveAcid_Timer < diff)
if (CorrosiveAcid_Timer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_CORROSIVEACID);
CorrosiveAcid_Timer = 7000;
} else CorrosiveAcid_Timer -= diff;
// Freeze_Timer
if (Freeze_Timer < diff)
if (Freeze_Timer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_FREEZE);
Freeze_Timer = 16000;
} else Freeze_Timer -= diff;
// Flamebreath_Timer
if (Flamebreath_Timer < diff)
if (Flamebreath_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FLAMEBREATH);
Flamebreath_Timer = 10500;

8
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
View File

@@ -57,18 +57,18 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI
return;
//CrowdPummel_Timer
if (CrowdPummel_Timer < diff)
if (CrowdPummel_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CROWDPUMMEL);
CrowdPummel_Timer = 14000;
}else CrowdPummel_Timer -= diff;
} else CrowdPummel_Timer -= diff;
//MightyBlow_Timer
if (MightyBlow_Timer < diff)
if (MightyBlow_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW);
MightyBlow_Timer = 10000;
}else MightyBlow_Timer -= diff;
} else MightyBlow_Timer -= diff;
//Summon Gizrul
if (!Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25)

28
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
View File

@@ -65,53 +65,53 @@ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI
return;
//WarStomp_Timer
if (WarStomp_Timer < diff)
if (WarStomp_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_WARSTOMP);
WarStomp_Timer = 14000;
}else WarStomp_Timer -= diff;
} else WarStomp_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 8000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//Strike_Timer
if (Strike_Timer < diff)
if (Strike_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_STRIKE);
Strike_Timer = 10000;
}else Strike_Timer -= diff;
} else Strike_Timer -= diff;
//Rend_Timer
if (Rend_Timer < diff)
if (Rend_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_REND);
Rend_Timer = 18000;
}else Rend_Timer -= diff;
} else Rend_Timer -= diff;
//SunderArmor_Timer
if (SunderArmor_Timer < diff)
if (SunderArmor_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SUNDERARMOR);
SunderArmor_Timer = 25000;
}else SunderArmor_Timer -= diff;
} else SunderArmor_Timer -= diff;
//KnockAway_Timer
if (KnockAway_Timer < diff)
if (KnockAway_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY);
KnockAway_Timer = 12000;
}else KnockAway_Timer -= diff;
} else KnockAway_Timer -= diff;
//Slow_Timer
if (Slow_Timer < diff)
if (Slow_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SLOW);
Slow_Timer = 18000;
}else Slow_Timer -= diff;
} else Slow_Timer -= diff;
DoMeleeAttackIfReady();
}

10
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
View File

@@ -55,18 +55,18 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI
return;
//Crystalize_Timer
if (Crystalize_Timer < diff)
if (Crystalize_Timer <= diff)
{
DoCast(m_creature,SPELL_CRYSTALIZE);
Crystalize_Timer = 15000;
}else Crystalize_Timer -= diff;
} else Crystalize_Timer -= diff;
//MothersMilk_Timer
if (MothersMilk_Timer < diff)
if (MothersMilk_Timer <= diff)
{
DoCast(m_creature,SPELL_MOTHERSMILK);
MothersMilk_Timer = 5000+rand()%7500;
}else MothersMilk_Timer -= diff;
MothersMilk_Timer = urand(5000,12500);
} else MothersMilk_Timer -= diff;
DoMeleeAttackIfReady();
}

16
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
View File

@@ -69,32 +69,32 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
return;
//BlastWave_Timer
if (BlastWave_Timer < diff)
if (BlastWave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_BLASTWAVE);
BlastWave_Timer = 20000;
}else BlastWave_Timer -= diff;
} else BlastWave_Timer -= diff;
//Shout_Timer
if (Shout_Timer < diff)
if (Shout_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHOUT);
Shout_Timer = 10000;
}else Shout_Timer -= diff;
} else Shout_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 7000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//Knockaway_Timer
if (Knockaway_Timer < diff)
if (Knockaway_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY);
Knockaway_Timer = 14000;
}else Knockaway_Timer -= diff;
} else Knockaway_Timer -= diff;
//Summon two Beserks
if (!Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)

17
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
View File

@@ -53,27 +53,26 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI
return;
//FireNova_Timer
if (FireNova_Timer < diff)
if (FireNova_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FIRENOVA);
FireNova_Timer = 6000;
}else FireNova_Timer -= diff;
} else FireNova_Timer -= diff;
//FlameBuffet_Timer
if (FlameBuffet_Timer < diff)
if (FlameBuffet_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FLAMEBUFFET);
FlameBuffet_Timer = 14000;
}else FlameBuffet_Timer -= diff;
} else FlameBuffet_Timer -= diff;
//PyroBlast_Timer
if (PyroBlast_Timer < diff)
if (PyroBlast_Timer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target) DoCast(target,SPELL_PYROBLAST);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_PYROBLAST);
PyroBlast_Timer = 15000;
}else PyroBlast_Timer -= diff;
} else PyroBlast_Timer -= diff;
DoMeleeAttackIfReady();
}

8
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
View File

@@ -54,18 +54,18 @@ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI
return;
//Shoot_Timer
if (Shoot_Timer < diff)
if (Shoot_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHOOT);
Shoot_Timer = 500;
}else Shoot_Timer -= diff;
} else Shoot_Timer -= diff;
//StunBomb_Timer
if (StunBomb_Timer < diff)
if (StunBomb_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_STUNBOMB);
StunBomb_Timer = 14000;
}else StunBomb_Timer -= diff;
} else StunBomb_Timer -= diff;
DoMeleeAttackIfReady();
}

12
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
View File

@@ -53,25 +53,25 @@ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI
return;
//WhirlWind_Timer
if (WhirlWind_Timer < diff)
if (WhirlWind_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_WHIRLWIND);
WhirlWind_Timer = 18000;
}else WhirlWind_Timer -= diff;
} else WhirlWind_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 10000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//Thunderclap_Timer
if (Thunderclap_Timer < diff)
if (Thunderclap_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP);
Thunderclap_Timer = 16000;
}else Thunderclap_Timer -= diff;
} else Thunderclap_Timer -= diff;
DoMeleeAttackIfReady();
}

15
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
View File

@@ -55,27 +55,26 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI
return;
//CurseOfBlood_Timer
if (CurseOfBlood_Timer < diff)
if (CurseOfBlood_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CURSEOFBLOOD);
CurseOfBlood_Timer = 45000;
}else CurseOfBlood_Timer -= diff;
//Hex_Timer
if (Hex_Timer < diff)
if (Hex_Timer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target) DoCast(target,SPELL_HEX);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_HEX);
Hex_Timer = 15000;
}else Hex_Timer -= diff;
} else Hex_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 7000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
DoMeleeAttackIfReady();
}

17
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
View File

@@ -53,27 +53,26 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI
return;
//Flamebreak_Timer
if (Flamebreak_Timer < diff)
if (Flamebreak_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FLAMEBREAK);
Flamebreak_Timer = 10000;
}else Flamebreak_Timer -= diff;
} else Flamebreak_Timer -= diff;
//Immolate_Timer
if (Immolate_Timer < diff)
if (Immolate_Timer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target) DoCast(target,SPELL_IMMOLATE);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_IMMOLATE);
Immolate_Timer = 8000;
}else Immolate_Timer -= diff;
} else Immolate_Timer -= diff;
//TerrifyingRoar_Timer
if (TerrifyingRoar_Timer < diff)
if (TerrifyingRoar_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_TERRIFYINGROAR);
TerrifyingRoar_Timer = 20000;
}else TerrifyingRoar_Timer -= diff;
} else TerrifyingRoar_Timer -= diff;
DoMeleeAttackIfReady();
}

24
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
View File

@@ -62,46 +62,46 @@ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI
return;
//Snapkick_Timer
if (Snapkick_Timer < diff)
if (Snapkick_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SNAPKICK);
Snapkick_Timer = 6000;
}else Snapkick_Timer -= diff;
} else Snapkick_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 12000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//Uppercut_Timer
if (Uppercut_Timer < diff)
if (Uppercut_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_UPPERCUT);
Uppercut_Timer = 14000;
}else Uppercut_Timer -= diff;
} else Uppercut_Timer -= diff;
//MortalStrike_Timer
if (MortalStrike_Timer < diff)
if (MortalStrike_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE);
MortalStrike_Timer = 10000;
}else MortalStrike_Timer -= diff;
} else MortalStrike_Timer -= diff;
//Pummel_Timer
if (Pummel_Timer < diff)
if (Pummel_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_PUMMEL);
Pummel_Timer = 16000;
}else Pummel_Timer -= diff;
} else Pummel_Timer -= diff;
//ThrowAxe_Timer
if (ThrowAxe_Timer < diff)
if (ThrowAxe_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_THROWAXE);
ThrowAxe_Timer = 8000;
}else ThrowAxe_Timer -= diff;
} else ThrowAxe_Timer -= diff;
DoMeleeAttackIfReady();
}

22
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
View File

@@ -60,35 +60,35 @@ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI
return;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 7000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
// BlastWave
if (BlastWave_Timer < diff)
if (BlastWave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_BLASTWAVE);
BlastWave_Timer = 8000 + rand()%8000;
}else BlastWave_Timer -= diff;
BlastWave_Timer = urand(8000,16000);
} else BlastWave_Timer -= diff;
//MortalStrike_Timer
if (MortalStrike_Timer < diff)
if (MortalStrike_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE);
MortalStrike_Timer = 25000 + rand()%10000;
}else MortalStrike_Timer -= diff;
MortalStrike_Timer = urand(25000,35000);
} else MortalStrike_Timer -= diff;
if (KnockBack_Timer < diff)
if (KnockBack_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_KNOCKBACK);
//Drop 50% aggro
if (DoGetThreat(m_creature->getVictim()))
DoModifyThreatPercent(m_creature->getVictim(),-50);
KnockBack_Timer = 15000 + rand()%15000;
}else KnockBack_Timer -= diff;
KnockBack_Timer = urand(15000,30000);
} else KnockBack_Timer -= diff;
if (EnterEvadeIfOutOfCombatArea(diff))
DoScriptText(SAY_LEASH, m_creature);

66
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
View File

@@ -29,11 +29,11 @@ EndScriptData */
//These spells are actually called elemental shield
//What they do is decrease all damage by 75% then they increase
//One school of damage by 1100%
#define SPELL_FIRE_VURNALBILTY 22277
#define SPELL_FROST_VURNALBILTY 22278
#define SPELL_SHADOW_VURNALBILTY 22279
#define SPELL_NATURE_VURNALBILTY 22280
#define SPELL_ARCANE_VURNALBILTY 22281
#define SPELL_FIRE_VULNERABILITY 22277
#define SPELL_FROST_VULNERABILITY 22278
#define SPELL_SHADOW_VULNERABILITY 22279
#define SPELL_NATURE_VULNERABILITY 22280
#define SPELL_ARCANE_VULNERABILITY 22281
#define SPELL_INCINERATE 23308 //Incinerate 23308,23309
#define SPELL_TIMELAPSE 23310 //Time lapse 23310, 23311(old threat mod that was removed in 2.01)
@@ -172,7 +172,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
void Reset()
{
CurrentVurln_Spell = 0; //We use this to store our last vurlnability spell so we can remove it later
CurrentVurln_Spell = 0; //We use this to store our last vulnerabilty spell so we can remove it later
Shimmer_Timer = 0; //Time till we change vurlnerabilites
Breath1_Timer = 30000; //First breath is 30 seconds
@@ -193,67 +193,49 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
return;
//Shimmer_Timer Timer
if (Shimmer_Timer < diff)
if (Shimmer_Timer <= diff)
{
//Remove old vurlnability spell
//Remove old vulnerabilty spell
if (CurrentVurln_Spell)
m_creature->RemoveAurasDueToSpell(CurrentVurln_Spell);
//Cast new random vurlnabilty on self
uint32 spell;
switch (rand()%5)
{
case 0: spell = SPELL_FIRE_VURNALBILTY; break;
case 1: spell = SPELL_FROST_VURNALBILTY; break;
case 2: spell = SPELL_SHADOW_VURNALBILTY; break;
case 3: spell = SPELL_NATURE_VURNALBILTY; break;
case 4: spell = SPELL_ARCANE_VURNALBILTY; break;
}
//Cast new random vulnerabilty on self
uint32 spell = RAND(SPELL_FIRE_VULNERABILITY, SPELL_FROST_VULNERABILITY,
SPELL_SHADOW_VULNERABILITY, SPELL_NATURE_VULNERABILITY, SPELL_ARCANE_VULNERABILITY);
DoCast(m_creature,spell);
CurrentVurln_Spell = spell;
DoScriptText(EMOTE_SHIMMER, m_creature);
Shimmer_Timer = 45000;
}else Shimmer_Timer -= diff;
} else Shimmer_Timer -= diff;
//Breath1_Timer
if (Breath1_Timer < diff)
if (Breath1_Timer <= diff)
{
DoCast(m_creature->getVictim(),Breath1_Spell);
Breath1_Timer = 60000;
}else Breath1_Timer -= diff;
} else Breath1_Timer -= diff;
//Breath2_Timer
if (Breath2_Timer < diff)
if (Breath2_Timer <= diff)
{
DoCast(m_creature->getVictim(),Breath2_Spell);
Breath2_Timer = 60000;
}else Breath2_Timer -= diff;
} else Breath2_Timer -= diff;
//Affliction_Timer
if (Affliction_Timer < diff)
if (Affliction_Timer <= diff)
{
uint32 SpellAfflict = 0;
switch (rand()%5)
{
case 0: SpellAfflict = SPELL_BROODAF_BLUE; break;
case 1: SpellAfflict = SPELL_BROODAF_BLACK; break;
case 2: SpellAfflict = SPELL_BROODAF_RED; break;
case 3: SpellAfflict = SPELL_BROODAF_BRONZE; break;
case 4: SpellAfflict = SPELL_BROODAF_GREEN; break;
}
uint32 SpellAfflict = RAND(SPELL_BROODAF_BLUE, SPELL_BROODAF_BLACK,
SPELL_BROODAF_RED, SPELL_BROODAF_BRONZE, SPELL_BROODAF_GREEN);
std::list<HostilReference*>::iterator i;
for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); )
{
Unit* pUnit = NULL;
pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
++i;
if (pUnit)
if (Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()))
{
//Cast affliction
DoCast(pUnit, SpellAfflict, true);
@@ -280,15 +262,15 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
}
Affliction_Timer = 10000;
}else Affliction_Timer -= diff;
} else Affliction_Timer -= diff;
//Frenzy_Timer
if (Frenzy_Timer < diff)
if (Frenzy_Timer <= diff)
{
DoCast(m_creature,SPELL_FRENZY);
DoScriptText(EMOTE_FRENZY, m_creature);
Frenzy_Timer = 10000 + (rand() % 5000);
}else Frenzy_Timer -= diff;
Frenzy_Timer = urand(10000,15000);
} else Frenzy_Timer -= diff;
//Enrage if not already enraged and below 20%
if (!Enraged && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20)

22
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
View File

@@ -56,33 +56,33 @@ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI
return;
//Shadowflame Timer
if (ShadowFlame_Timer < diff)
if (ShadowFlame_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME);
ShadowFlame_Timer = 12000 + rand()%3000;
}else ShadowFlame_Timer -= diff;
ShadowFlame_Timer = urand(12000,15000);
} else ShadowFlame_Timer -= diff;
//Wing Buffet Timer
if (WingBuffet_Timer < diff)
if (WingBuffet_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_WINGBUFFET);
WingBuffet_Timer = 25000;
}else WingBuffet_Timer -= diff;
} else WingBuffet_Timer -= diff;
//Shadow of Ebonroc Timer
if (ShadowOfEbonroc_Timer < diff)
if (ShadowOfEbonroc_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWOFEBONROC);
ShadowOfEbonroc_Timer = 25000 + rand()%10000;
}else ShadowOfEbonroc_Timer -= diff;
ShadowOfEbonroc_Timer = urand(25000,350000);
} else ShadowOfEbonroc_Timer -= diff;
if (m_creature->getVictim()->HasAura(SPELL_SHADOWOFEBONROC))
{
if (Heal_Timer < diff)
if (Heal_Timer <= diff)
{
DoCast(m_creature, SPELL_HEAL);
Heal_Timer = 1000 + rand()%2000;
}else Heal_Timer -= diff;
Heal_Timer = urand(1000,3000);
} else Heal_Timer -= diff;
}
DoMeleeAttackIfReady();

14
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
View File

@@ -53,28 +53,28 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI
return;
//ShadowFlame_Timer
if (ShadowFlame_Timer < diff)
if (ShadowFlame_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME);
ShadowFlame_Timer = 15000 + rand()%3000;
}else ShadowFlame_Timer -= diff;
ShadowFlame_Timer = urand(15000,18000);
} else ShadowFlame_Timer -= diff;
//WingBuffet_Timer
if (WingBuffet_Timer < diff)
if (WingBuffet_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_WINGBUFFET);
if (DoGetThreat(m_creature->getVictim()))
DoModifyThreatPercent(m_creature->getVictim(),-75);
WingBuffet_Timer = 25000;
}else WingBuffet_Timer -= diff;
} else WingBuffet_Timer -= diff;
//FlameBuffet_Timer
if (FlameBuffet_Timer < diff)
if (FlameBuffet_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FLAMEBUFFET);
FlameBuffet_Timer = 5000;
}else FlameBuffet_Timer -= diff;
} else FlameBuffet_Timer -= diff;
DoMeleeAttackIfReady();
}

12
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
View File

@@ -55,29 +55,29 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI
return;
//ShadowFlame_Timer
if (ShadowFlame_Timer < diff)
if (ShadowFlame_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME);
ShadowFlame_Timer = 15000 + rand()%7000;
}else ShadowFlame_Timer -= diff;
} else ShadowFlame_Timer -= diff;
//WingBuffet_Timer
if (WingBuffet_Timer < diff)
if (WingBuffet_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_WINGBUFFET);
if (DoGetThreat(m_creature->getVictim()))
DoModifyThreatPercent(m_creature->getVictim(),-75);
WingBuffet_Timer = 25000;
}else WingBuffet_Timer -= diff;
} else WingBuffet_Timer -= diff;
//Frenzy_Timer
if (Frenzy_Timer < diff)
if (Frenzy_Timer <= diff)
{
DoScriptText(EMOTE_FRENZY, m_creature);
DoCast(m_creature,SPELL_FRENZY);
Frenzy_Timer = 8000 + (rand()%2000);
}else Frenzy_Timer -= diff;
} else Frenzy_Timer -= diff;
DoMeleeAttackIfReady();
}

28
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
View File

@@ -108,61 +108,61 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
if(DespawnTimer < diff)
if( DespawnTimer <= diff)
{
if(!UpdateVictim())
m_creature->ForcedDespawn();
DespawnTimer = 5000;
}else DespawnTimer -= diff;
} else DespawnTimer -= diff;
if (!UpdateVictim())
return;
//ShadowFlame_Timer
if (ShadowFlame_Timer < diff)
if (ShadowFlame_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME);
ShadowFlame_Timer = 12000;
}else ShadowFlame_Timer -= diff;
} else ShadowFlame_Timer -= diff;
//BellowingRoar_Timer
if (BellowingRoar_Timer < diff)
if (BellowingRoar_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_BELLOWINGROAR);
BellowingRoar_Timer = 30000;
}else BellowingRoar_Timer -= diff;
} else BellowingRoar_Timer -= diff;
//VeilOfShadow_Timer
if (VeilOfShadow_Timer < diff)
if (VeilOfShadow_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_VEILOFSHADOW);
VeilOfShadow_Timer = 15000;
}else VeilOfShadow_Timer -= diff;
} else VeilOfShadow_Timer -= diff;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 7000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//TailLash_Timer
if (TailLash_Timer < diff)
if (TailLash_Timer <= diff)
{
//Cast NYI since we need a better check for behind target
//DoCast(m_creature->getVictim(),SPELL_TAILLASH);
TailLash_Timer = 10000;
}else TailLash_Timer -= diff;
} else TailLash_Timer -= diff;
//ClassCall_Timer
if (ClassCall_Timer < diff)
if (ClassCall_Timer <= diff)
{
//Cast a random class call
//On official it is based on what classes are currently on the hostil list
//but we can't do that yet so just randomly call one
switch (rand()%9)
switch (urand(0,8))
{
case 0:
DoScriptText(SAY_MAGE, m_creature);

28
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
View File

@@ -68,28 +68,28 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
return;
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 7000 + rand()%3000;
}else Cleave_Timer -= diff;
Cleave_Timer = urand(7000,10000);
} else Cleave_Timer -= diff;
//WarStomp_Timer
if (WarStomp_Timer < diff)
if (WarStomp_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_WARSTOMP);
WarStomp_Timer = 15000 + rand()%10000;
}else WarStomp_Timer -= diff;
WarStomp_Timer = urand(15000,25000);
} else WarStomp_Timer -= diff;
//FireballVolley_Timer
if (FireballVolley_Timer < diff)
if (FireballVolley_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FIREBALLVOLLEY);
FireballVolley_Timer = 12000 + rand()%3000;
}else FireballVolley_Timer -= diff;
FireballVolley_Timer = urand(12000,15000);
} else FireballVolley_Timer -= diff;
//Conflagration_Timer
if (Conflagration_Timer < diff)
if (Conflagration_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CONFLAGRATION);
//We will remove this threat reduction and add an aura check.
@@ -98,16 +98,12 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
//DoModifyThreatPercent(m_creature->getVictim(),-50);
Conflagration_Timer = 12000;
}else Conflagration_Timer -= diff;
} else Conflagration_Timer -= diff;
// Aura Check. If the gamer is affected by confliguration we attack a random gamer.
if (m_creature->getVictim() && m_creature->getVictim()->HasAura(SPELL_CONFLAGRATION))
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,1);
if (target)
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
m_creature->TauntApply(target);
}
DoMeleeAttackIfReady();
}

77
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
View File

@@ -48,8 +48,8 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
}
uint64 PlayerGUID;
uint32 SpeachTimer;
uint32 SpeachNum;
uint32 SpeechTimer;
uint32 SpeechNum;
uint32 Cleave_Timer;
uint32 FlameBreath_Timer;
uint32 FireNova_Timer;
@@ -57,13 +57,13 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
uint32 BurningAdrenalineTank_Timer;
uint32 TailSwipe_Timer;
bool HasYelled;
bool DoingSpeach;
bool DoingSpeech;
void Reset()
{
PlayerGUID = 0;
SpeachTimer = 0;
SpeachNum = 0;
SpeechTimer = 0;
SpeechNum = 0;
Cleave_Timer = 8000; //These times are probably wrong
FlameBreath_Timer = 11000;
BurningAdrenalineCaster_Timer = 15000;
@@ -71,10 +71,10 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
FireNova_Timer = 5000;
TailSwipe_Timer = 20000;
HasYelled = false;
DoingSpeach = false;
DoingSpeech = false;
}
void BeginSpeach(Unit* target)
void BeginSpeech(Unit* target)
{
//Stand up and begin speach
PlayerGUID = target->GetGUID();
@@ -82,9 +82,9 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
//10 seconds
DoScriptText(SAY_LINE1, m_creature);
SpeachTimer = 10000;
SpeachNum = 0;
DoingSpeach = true;
SpeechTimer = 10000;
SpeechNum = 0;
DoingSpeech = true;
m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
}
@@ -106,24 +106,24 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
//Speach
if (DoingSpeach)
//Speech
if (DoingSpeech)
{
if (SpeachTimer < diff)
if (SpeechTimer <= diff)
{
switch (SpeachNum)
switch (SpeechNum)
{
case 0:
//16 seconds till next line
DoScriptText(SAY_LINE2, m_creature);
SpeachTimer = 16000;
SpeachNum++;
SpeechTimer = 16000;
++SpeechNum;
break;
case 1:
//This one is actually 16 seconds but we only go to 10 seconds because he starts attacking after he says "I must fight this!"
DoScriptText(SAY_LINE3, m_creature);
SpeachTimer = 10000;
SpeachNum++;
SpeechTimer = 10000;
++SpeechNum;
break;
case 2:
m_creature->setFaction(103);
@@ -132,11 +132,11 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
AttackStart(Unit::GetUnit((*m_creature),PlayerGUID));
DoCast(m_creature,SPELL_ESSENCEOFTHERED);
}
SpeachTimer = 0;
DoingSpeach = false;
SpeechTimer = 0;
DoingSpeech = false;
break;
}
}else SpeachTimer -= diff;
} else SpeechTimer -= diff;
}
//Return since we have no target
@@ -151,58 +151,57 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
}
//Cleave_Timer
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_CLEAVE);
Cleave_Timer = 15000;
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
//FlameBreath_Timer
if (FlameBreath_Timer < diff)
if (FlameBreath_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FLAMEBREATH);
FlameBreath_Timer = 4000 + rand()%4000;
}else FlameBreath_Timer -= diff;
FlameBreath_Timer = urand(4000,8000);
} else FlameBreath_Timer -= diff;
//BurningAdrenalineCaster_Timer
if (BurningAdrenalineCaster_Timer < diff)
if (BurningAdrenalineCaster_Timer <= diff)
{
Unit* target = NULL;
int i = 0 ;
uint8 i = 0;
while (i < 3) // max 3 tries to get a random target with power_mana
{
++i;
target = SelectUnit(SELECT_TARGET_RANDOM,1);//not aggro leader
if (target)
if (target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) //not aggro leader
if (target->getPowerType() == POWER_MANA)
i=3;
i = 3;
}
if (target) // cast on self (see below)
target->CastSpell(target,SPELL_BURNINGADRENALINE,1);
BurningAdrenalineCaster_Timer = 15000;
}else BurningAdrenalineCaster_Timer -= diff;
} else BurningAdrenalineCaster_Timer -= diff;
//BurningAdrenalineTank_Timer
if (BurningAdrenalineTank_Timer < diff)
if (BurningAdrenalineTank_Timer <= diff)
{
// have the victim cast the spell on himself otherwise the third effect aura will be applied
// to Vael instead of the player
m_creature->getVictim()->CastSpell(m_creature->getVictim(),SPELL_BURNINGADRENALINE,1);
BurningAdrenalineTank_Timer = 45000;
}else BurningAdrenalineTank_Timer -= diff;
} else BurningAdrenalineTank_Timer -= diff;
//FireNova_Timer
if (FireNova_Timer < diff)
if (FireNova_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_FIRENOVA);
FireNova_Timer = 5000;
}else FireNova_Timer -= diff;
} else FireNova_Timer -= diff;
//TailSwipe_Timer
if (TailSwipe_Timer < diff)
if (TailSwipe_Timer <= diff)
{
//Only cast if we are behind
/*if (!m_creature->HasInArc(M_PI, m_creature->getVictim()))
@@ -211,7 +210,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
}*/
TailSwipe_Timer = 20000;
}else TailSwipe_Timer -= diff;
} else TailSwipe_Timer -= diff;
DoMeleeAttackIfReady();
}
@@ -222,7 +221,7 @@ void SendDefaultMenu_boss_vael(Player* pPlayer, Creature* pCreature, uint32 uiAc
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(boss_vaelAI, pCreature->AI())->BeginSpeach(pPlayer);
CAST_AI(boss_vaelAI, pCreature->AI())->BeginSpeech(pPlayer);
}
}

52
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
View File

@@ -227,29 +227,25 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
if (SpawnedAdds < 42)
{
//ShadowBoltTimer
if (ShadowBoltTimer < diff)
if (ShadowBoltTimer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target)
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_SHADOWBOLT);
ShadowBoltTimer = 3000 + (rand()%7000);
}else ShadowBoltTimer -= diff;
ShadowBoltTimer = urand(3000,10000);
} else ShadowBoltTimer -= diff;
//FearTimer
if (FearTimer < diff)
if (FearTimer <= diff)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target)
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_FEAR);
FearTimer = 10000 + (rand()%10000);
}else FearTimer -= diff;
} else FearTimer -= diff;
//Add spawning mechanism
if (AddSpawnTimer < diff)
if (AddSpawnTimer <= diff)
{
//Spawn 2 random types of creatures at the 2 locations
uint32 CreatureID;
@@ -257,15 +253,16 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
Unit* target = NULL;
//1 in 3 chance it will be a chromatic
if (rand()%3 == 0)
if (urand(0,2) == 0)
CreatureID = CREATURE_CHROMATIC_DRAKANOID;
else CreatureID = DrakType1;
else
CreatureID = DrakType1;
SpawnedAdds++;
++SpawnedAdds;
//Spawn Creature and force it to start attacking a random target
Spawned = m_creature->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
if (target && Spawned)
{
Spawned->AI()->AttackStart(target);
@@ -273,16 +270,15 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
}
//1 in 3 chance it will be a chromatic
if (rand()%3 == 0)
if (urand(0,2) == 0)
CreatureID = CREATURE_CHROMATIC_DRAKANOID;
else CreatureID = DrakType2;
else
CreatureID = DrakType2;
SpawnedAdds++;
++SpawnedAdds;
target = NULL;
Spawned = NULL;
Spawned = m_creature->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
if (target && Spawned)
{
Spawned->AI()->AttackStart(target);
@@ -309,10 +305,8 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
m_creature->addUnitState(UNIT_STAT_FLEEING);
//Spawn nef and have him attack a random target
Creature* Nefarian = NULL;
Nefarian = m_creature->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000);
target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Creature* Nefarian = m_creature->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000);
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
if (target && Nefarian)
{
Nefarian->AI()->AttackStart(target);
@@ -323,11 +317,11 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
}
AddSpawnTimer = 4000;
}else AddSpawnTimer -= diff;
} else AddSpawnTimer -= diff;
}
else if (NefarianGUID)
{
if (NefCheckTime < diff)
if (NefCheckTime <= diff)
{
Unit* Nefarian = Unit::GetCreature((*m_creature),NefarianGUID);
@@ -340,7 +334,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
}
NefCheckTime = 2000;
}else NefCheckTime -= diff;
} else NefCheckTime -= diff;
}
}
};

16
src/bindings/scripts/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
View File

@@ -43,7 +43,7 @@ enum Misc
struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
{
instance_deadmines(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
instance_deadmines(Map* pMap) : ScriptedInstance(pMap) { Initialize(); };
GameObject* IronCladDoor;
GameObject* DefiasCannon;
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
if (!IronCladDoor || !DefiasCannon || !DoorLever)
return;
switch(State)
switch (State)
{
case CANNON_GUNPOWDER_USED:
CannonBlast_Timer = DATA_CANNON_BLAST_TIMER;
@@ -76,11 +76,11 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
IronCladDoor->SetName("Mr. Smite");
IronCladDoor->MonsterYell(SAY_MR_SMITE_ALARM1, LANG_UNIVERSAL, 0);
DoPlaySound(IronCladDoor, SOUND_MR_SMITE_ALARM1);
State=CANNON_BLAST_INITIATED;
State = CANNON_BLAST_INITIATED;
break;
case CANNON_BLAST_INITIATED:
PiratesDelay_Timer = DATA_PIRATES_DELAY_TIMER;
if (CannonBlast_Timer<diff)
if (CannonBlast_Timer <= diff)
{
SummonCreatures();
ShootCannon();
@@ -89,16 +89,14 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
IronCladDoor->MonsterYell(SAY_MR_SMITE_ALARM2, LANG_UNIVERSAL, 0);
DoPlaySound(IronCladDoor, SOUND_MR_SMITE_ALARM2);
State = PIRATES_ATTACK;
}else
CannonBlast_Timer-=diff;
} else CannonBlast_Timer -= diff;
break;
case PIRATES_ATTACK:
if (PiratesDelay_Timer<diff)
if (PiratesDelay_Timer <= diff)
{
MoveCreaturesInside();
State = EVENT_DONE;
}else
PiratesDelay_Timer-=diff;
} else PiratesDelay_Timer -= diff;
break;
}
}

8
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
View File

@@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI
return;
//always decrease BerserkTimer
if (BerserkTimer < diff)
if (BerserkTimer <= diff)
{
//if evocate, then break evocate
if (Evocating)
@@ -116,7 +116,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI
if (!Enraged)
{
if (AddTimer < diff)
if (AddTimer <= diff)
{
//Summon Astral Flare
Creature* AstralFlare = DoSpawnCreature(17096, rand()%37, rand()%37, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
@@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI
}
}
if (HatefulBoltTimer < diff)
if (HatefulBoltTimer <= diff)
{
if (Enraged)
HatefulBoltTimer = 7000;
@@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI
if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 1))
DoCast(target, SPELL_HATEFUL_BOLT);
}else HatefulBoltTimer -= diff;
} else HatefulBoltTimer -= diff;
DoMeleeAttackIfReady();
}

23
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
View File

@@ -85,37 +85,36 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI
{
DoCast(m_creature, SPELL_BERSERK,true);
Enraged = true;
} else Enrage_Timer -=diff;
} else Enrage_Timer -= diff;
if (Holyground_Timer < diff)
if (Holyground_Timer <= diff)
{
DoCast(m_creature, SPELL_HOLYGROUND, true); //Triggered so it doesn't interrupt her at all
DoCast(m_creature, SPELL_HOLYGROUND, true); //Triggered so it doesn't interrupt her at all
Holyground_Timer = 3000;
} else Holyground_Timer -= diff;
if (Repentance_Timer < diff)
if (Repentance_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_REPENTANCE);
DoScriptText(RAND(SAY_REPENTANCE1,SAY_REPENTANCE2), m_creature);
Repentance_Timer = 25000 + rand()%10000; //A little randomness on that spell
Repentance_Timer = urand(25000,35000); //A little randomness on that spell
} else Repentance_Timer -= diff;
if (Holyfire_Timer < diff)
if (Holyfire_Timer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_HOLYFIRE);
Holyfire_Timer = 8000 + rand()%15000; //Anywhere from 8 to 23 seconds, good luck having several of those in a row!
Holyfire_Timer = urand(8000,23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row!
} else Holyfire_Timer -= diff;
if (Holywrath_Timer < diff)
if (Holywrath_Timer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_HOLYWRATH);
Holywrath_Timer = 20000+(rand()%5000); //20-30 secs sounds nice
Holywrath_Timer = urand(20000,25000); //20-30 secs sounds nice
} else Holywrath_Timer -= diff;
DoMeleeAttackIfReady();

8
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
View File

@@ -221,19 +221,19 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))
return;
if (CleaveTimer < diff)
if (CleaveTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_SHADOWCLEAVE);
CleaveTimer = urand(10000,15000);
} else CleaveTimer -= diff;
if (CurseTimer < diff)
if (CurseTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_INTANGIBLE_PRESENCE);
CurseTimer = 30000;
} else CurseTimer -= diff;
if (RandomYellTimer < diff)
if (RandomYellTimer <= diff)
{
DoScriptText(RAND(SAY_RANDOM1,SAY_RANDOM2), m_creature);
RandomYellTimer = urand(30000,60000);
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
if (m_creature->GetUInt32Value(UNIT_FIELD_DISPLAYID) == MOUNTED_DISPLAYID)
{
if (ChargeTimer < diff)
if (ChargeTimer <= diff)
{
Unit *target;
std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();

137
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
View File

@@ -236,7 +236,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
Enrage = true;
}
if (CheckAdds_Timer < diff)
if (CheckAdds_Timer <= diff)
{
for (uint8 i = 0; i < 4; ++i)
{
@@ -255,7 +255,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
if (!Enrage)
{
//Cast Vanish, then Garrote random victim
if (Vanish_Timer < diff)
if (Vanish_Timer <= diff)
{
DoCast(m_creature, SPELL_VANISH);
InVanish = true;
@@ -263,34 +263,32 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
Wait_Timer = 5000;
} else Vanish_Timer -= diff;
if (Gouge_Timer < diff)
if (Gouge_Timer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_GOUGE);
Gouge_Timer = 40000;
} else Gouge_Timer -= diff;
if (Blind_Timer < diff)
if (Blind_Timer <= diff)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (target && target->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinMeleeRange(target))
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, m_creature->GetMeleeReach()*5, true);
if (target && m_creature->IsWithinMeleeRange(target))
{
DoCast(target, SPELL_BLIND);
Blind_Timer = 40000;
}
else
Blind_Timer = 1000;
else Blind_Timer = 1000;
} else Blind_Timer -= diff;
}
if (InVanish)
{
if (Wait_Timer < diff)
if (Wait_Timer <= diff)
{
DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2), m_creature);
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
target->CastSpell(target, SPELL_GARROTE,true);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
target->CastSpell(target, SPELL_GARROTE,true);
InVanish = false;
} else Wait_Timer -= diff;
@@ -339,7 +337,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
}
}
Unit* SelectTarget()
Unit* SelectGuestTarget()
{
uint64 TempGUID = GuestGUID[rand()%5];
if (TempGUID)
@@ -393,29 +391,28 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_
boss_moroes_guestAI::UpdateAI(diff);
if (MindFlay_Timer < diff)
if (MindFlay_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_MINDFLY);
MindFlay_Timer = 12000; //3sec channeled
}else MindFlay_Timer -= diff;
MindFlay_Timer = 12000; // 3 sec channeled
} else MindFlay_Timer -= diff;
if (ManaBurn_Timer < diff)
if (ManaBurn_Timer <= diff)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (target && (target->getPowerType() == POWER_MANA))
DoCast(target,SPELL_MANABURN);
ManaBurn_Timer = 5000; //3 sec cast
}else ManaBurn_Timer -= diff;
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
if (target->getPowerType() == POWER_MANA)
DoCast(target,SPELL_MANABURN);
ManaBurn_Timer = 5000; // 3 sec cast
} else ManaBurn_Timer -= diff;
if (ShadowWordPain_Timer < diff)
if (ShadowWordPain_Timer <= diff)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (target)
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
{
DoCast(target,SPELL_SWPAIN);
ShadowWordPain_Timer = 7000;
}
}else ShadowWordPain_Timer -= diff;
} else ShadowWordPain_Timer -= diff;
}
};
@@ -448,24 +445,24 @@ struct TRINITY_DLL_DECL boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
boss_moroes_guestAI::UpdateAI(diff);
if (SealOfCommand_Timer < diff)
if (SealOfCommand_Timer <= diff)
{
DoCast(m_creature,SPELL_SEALOFCOMMAND);
SealOfCommand_Timer = 32000;
JudgementOfCommand_Timer = 29000;
}else SealOfCommand_Timer -= diff;
} else SealOfCommand_Timer -= diff;
if (JudgementOfCommand_Timer < diff)
if (JudgementOfCommand_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_JUDGEMENTOFCOMMAND);
JudgementOfCommand_Timer = SealOfCommand_Timer + 29000;
}else JudgementOfCommand_Timer -= diff;
} else JudgementOfCommand_Timer -= diff;
if (HammerOfJustice_Timer < diff)
if (HammerOfJustice_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_HAMMEROFJUSTICE);
HammerOfJustice_Timer = 12000;
}else HammerOfJustice_Timer -= diff;
} else HammerOfJustice_Timer -= diff;
}
};
@@ -503,39 +500,33 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest
boss_moroes_guestAI::UpdateAI(diff);
if (PowerWordShield_Timer < diff)
if (PowerWordShield_Timer <= diff)
{
DoCast(m_creature,SPELL_PWSHIELD);
PowerWordShield_Timer = 15000;
}else PowerWordShield_Timer -= diff;
} else PowerWordShield_Timer -= diff;
if (GreaterHeal_Timer < diff)
if (GreaterHeal_Timer <= diff)
{
Unit* target = SelectTarget();
Unit* target = SelectGuestTarget();
DoCast(target, SPELL_GREATERHEAL);
GreaterHeal_Timer = 17000;
}else GreaterHeal_Timer -= diff;
} else GreaterHeal_Timer -= diff;
if (HolyFire_Timer < diff)
if (HolyFire_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_HOLYFIRE);
HolyFire_Timer = 22000;
}else HolyFire_Timer -= diff;
} else HolyFire_Timer -= diff;
if (DispelMagic_Timer < diff)
if (DispelMagic_Timer <= diff)
{
if (rand()%2)
{
Unit* target = SelectTarget();
if (Unit* target = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)))
DoCast(target, SPELL_DISPELMAGIC);
}
else
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DISPELMAGIC);
DispelMagic_Timer = 25000;
}else DispelMagic_Timer -= diff;
} else DispelMagic_Timer -= diff;
}
};
@@ -573,37 +564,37 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
boss_moroes_guestAI::UpdateAI(diff);
if (DivineShield_Timer < diff)
if (DivineShield_Timer <= diff)
{
DoCast(m_creature,SPELL_DIVINESHIELD);
DivineShield_Timer = 31000;
}else DivineShield_Timer -= diff;
} else DivineShield_Timer -= diff;
if (HolyLight_Timer < diff)
if (HolyLight_Timer <= diff)
{
Unit* target = SelectTarget();
Unit* target = SelectGuestTarget();
DoCast(target, SPELL_HOLYLIGHT);
HolyLight_Timer = 10000;
}else HolyLight_Timer -= diff;
} else HolyLight_Timer -= diff;
if (GreaterBless_Timer < diff)
if (GreaterBless_Timer <= diff)
{
Unit* target = SelectTarget();
Unit* target = SelectGuestTarget();
DoCast(target, SPELL_GREATERBLESSOFMIGHT);
GreaterBless_Timer = 50000;
}else GreaterBless_Timer -= diff;
} else GreaterBless_Timer -= diff;
if (Cleanse_Timer < diff)
if (Cleanse_Timer <= diff)
{
Unit* target = SelectTarget();
Unit* target = SelectGuestTarget();
DoCast(target, SPELL_CLEANSE);
Cleanse_Timer = 10000;
}else Cleanse_Timer -= diff;
} else Cleanse_Timer -= diff;
}
};
@@ -636,23 +627,23 @@ struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI
boss_moroes_guestAI::UpdateAI(diff);
if (Hamstring_Timer < diff)
if (Hamstring_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_HAMSTRING);
Hamstring_Timer = 12000;
}else Hamstring_Timer -= diff;
} else Hamstring_Timer -= diff;
if (MortalStrike_Timer < diff)
if (MortalStrike_Timer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_MORTALSTRIKE);
MortalStrike_Timer = 18000;
}else MortalStrike_Timer -= diff;
} else MortalStrike_Timer -= diff;
if (WhirlWind_Timer < diff)
if (WhirlWind_Timer <= diff)
{
DoCast(m_creature,SPELL_WHIRLWIND);
WhirlWind_Timer = 21000;
}else WhirlWind_Timer -= diff;
} else WhirlWind_Timer -= diff;
}
};
@@ -688,29 +679,29 @@ struct TRINITY_DLL_DECL boss_lord_crispin_ferenceAI : public boss_moroes_guestAI
boss_moroes_guestAI::UpdateAI(diff);
if (Disarm_Timer < diff)
if (Disarm_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_DISARM);
Disarm_Timer = 12000;
}else Disarm_Timer -= diff;
} else Disarm_Timer -= diff;
if (HeroicStrike_Timer < diff)
if (HeroicStrike_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_HEROICSTRIKE);
HeroicStrike_Timer = 10000;
}else HeroicStrike_Timer -= diff;
} else HeroicStrike_Timer -= diff;
if (ShieldBash_Timer < diff)
if (ShieldBash_Timer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SHIELDBASH);
ShieldBash_Timer = 13000;
}else ShieldBash_Timer -= diff;
} else ShieldBash_Timer -= diff;
if (ShieldWall_Timer < diff)
if (ShieldWall_Timer <= diff)
{
DoCast(m_creature,SPELL_SHIELDWALL);
ShieldWall_Timer = 21000;
}else ShieldWall_Timer -= diff;
} else ShieldWall_Timer -= diff;
}
};

34
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
View File

@@ -263,11 +263,11 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
return;
// Void Zone
if(VoidZoneTimer < diff)
if (VoidZoneTimer <= diff)
{
DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,45,true),SPELL_VOIDZONE,true);
VoidZoneTimer = 15000;
}else VoidZoneTimer -= diff;
} else VoidZoneTimer -= diff;
// NetherInfusion Berserk
if(!Berserk && NetherInfusionTimer < diff)
@@ -280,56 +280,56 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
if(PortalPhase) // PORTAL PHASE
{
// Distribute beams and buffs
if(PortalTimer < diff)
if (PortalTimer <= diff)
{
UpdatePortals();
PortalTimer = 1000;
}else PortalTimer -= diff;
} else PortalTimer -= diff;
// Empowerment & Nether Burn
if(EmpowermentTimer < diff)
if (EmpowermentTimer <= diff)
{
DoCast(m_creature, SPELL_EMPOWERMENT);
m_creature->AddAura(SPELL_NETHERBURN_AURA, m_creature);
EmpowermentTimer = 90000;
}else EmpowermentTimer -= diff;
} else EmpowermentTimer -= diff;
if(PhaseTimer < diff)
if (PhaseTimer <= diff)
{
if(!m_creature->IsNonMeleeSpellCasted(false))
if (!m_creature->IsNonMeleeSpellCasted(false))
{
SwitchToBanishPhase();
return;
}
}else PhaseTimer -= diff;
} else PhaseTimer -= diff;
}
else // BANISH PHASE
{
// Netherbreath
if(NetherbreathTimer < diff)
if (NetherbreathTimer <= diff)
{
if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,40,true))
DoCast(target,SPELL_NETHERBREATH);
NetherbreathTimer = 5000+rand()%2000;
}else NetherbreathTimer -= diff;
NetherbreathTimer = urand(5000,7000);
} else NetherbreathTimer -= diff;
if(PhaseTimer < diff)
if (PhaseTimer <= diff)
{
if(!m_creature->IsNonMeleeSpellCasted(false))
if (!m_creature->IsNonMeleeSpellCasted(false))
{
SwitchToPortalPhase();
return;
}
}else PhaseTimer -= diff;
} else PhaseTimer -= diff;
}
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI_boss_netherspite(Creature *_Creature)
CreatureAI* GetAI_boss_netherspite(Creature *pCreature)
{
return new boss_netherspiteAI(_Creature);
return new boss_netherspiteAI(pCreature);
}
void AddSC_boss_netherspite()

79
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
View File

@@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
Flying = true;
FlyTimer = 45000+rand()%15000; //timer wrong between 45 and 60 seconds
FlyTimer = urand(45000,60000); //timer wrong between 45 and 60 seconds
++FlyCount;
RainofBonesTimer = 5000; //timer wrong (maybe)
@@ -244,8 +244,8 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
if (WaitTimer)
if (WaitTimer < diff)
/* The timer for this was never setup apparently, not sure if the code works properly:
if (WaitTimer <= diff)
{
if (Intro)
{
@@ -261,7 +261,6 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
++MovePhase;
}
}
if (Flying)
{
if (MovePhase >= 7)
@@ -278,7 +277,8 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
}
WaitTimer = 0;
}else WaitTimer -= diff;
} else WaitTimer -= diff;
*/
if (!UpdateVictim())
return;
@@ -295,39 +295,39 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
Movement = false;
}
if (BellowingRoarTimer < diff)
if (BellowingRoarTimer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_BELLOWING_ROAR);
BellowingRoarTimer = 30000+rand()%10000 ; //Timer
}else BellowingRoarTimer -= diff;
BellowingRoarTimer = urand(30000,40000);
} else BellowingRoarTimer -= diff;
if (SmolderingBreathTimer < diff)
if (SmolderingBreathTimer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SMOLDERING_BREATH);
SmolderingBreathTimer = 20000;//timer
}else SmolderingBreathTimer -= diff;
SmolderingBreathTimer = 20000;
} else SmolderingBreathTimer -= diff;
if (CharredEarthTimer < diff)
if (CharredEarthTimer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_CHARRED_EARTH);
CharredEarthTimer = 20000; //timer
}else CharredEarthTimer -= diff;
CharredEarthTimer = 20000;
} else CharredEarthTimer -= diff;
if (TailSweepTimer < diff)
if (TailSweepTimer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
if (!m_creature->HasInArc(M_PI, target))
DoCast(target,SPELL_TAIL_SWEEP);
TailSweepTimer = 15000;//timer
}else TailSweepTimer -= diff;
TailSweepTimer = 15000;
} else TailSweepTimer -= diff;
if (SearingCindersTimer < diff)
if (SearingCindersTimer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_SEARING_CINDERS);
SearingCindersTimer = 10000; //timer
}else SearingCindersTimer -= diff;
SearingCindersTimer = 10000;
} else SearingCindersTimer -= diff;
uint32 Prozent;
Prozent = (m_creature->GetHealth()*100) / m_creature->GetMaxHealth();
@@ -363,44 +363,41 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
DoCast(m_creature->getVictim(),SPELL_RAIN_OF_BONES);
RainBones = true;
SmokingBlastTimer = 20000;
}else RainofBonesTimer -= diff;
} else RainofBonesTimer -= diff;
if (DistractingAshTimer < diff)
if (DistractingAshTimer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target,SPELL_DISTRACTING_ASH);
DistractingAshTimer = 2000;//timer wrong
}else DistractingAshTimer -= diff;
DistractingAshTimer = 2000; //timer wrong
} else DistractingAshTimer -= diff;
}
if (RainBones)
{
if (SmokingBlastTimer < diff)
if (SmokingBlastTimer <= diff)
{
DoCast(m_creature->getVictim(),SPELL_SMOKING_BLAST);
SmokingBlastTimer = 1500 ; //timer wrong
}else SmokingBlastTimer -= diff;
SmokingBlastTimer = 1500; //timer wrong
} else SmokingBlastTimer -= diff;
}
if (FireballBarrageTimer < diff)
if (FireballBarrageTimer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_FARTHEST, 0))
DoCast(target,SPELL_FIREBALL_BARRAGE);
FireballBarrageTimer = 20000; //Timer
}else FireballBarrageTimer -= diff;
FireballBarrageTimer = 20000;
} else FireballBarrageTimer -= diff;
if (FlyTimer < diff) //landing
if (FlyTimer <= diff) //landing
{
if (rand()%2 == 0)
m_creature->MonsterYell(YELL_LAND_PHASE_1, LANG_UNIVERSAL, NULL);
else
m_creature->MonsterYell(YELL_LAND_PHASE_2, LANG_UNIVERSAL, NULL);
m_creature->MonsterYell(RAND(*YELL_LAND_PHASE_1,*YELL_LAND_PHASE_2), LANG_UNIVERSAL, NULL);
(*m_creature).GetMotionMaster()->Clear(false);
m_creature->GetMotionMaster()->Clear(false);
m_creature->GetMotionMaster()->MovePoint(3,IntroWay[3][0],IntroWay[3][1],IntroWay[3][2]);
Flying = true;
}else FlyTimer -= diff;
} else FlyTimer -= diff;
}
}
};

63
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
View File

@@ -408,7 +408,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
m_creature->SetBaseWeaponDamage(OFF_ATTACK, MINDAMAGE, cinfo->mindmg);
m_creature->SetBaseWeaponDamage(OFF_ATTACK, MAXDAMAGE, cinfo->maxdmg);
//Sigh, updating only works on main attack , do it manually ....
//Sigh, updating only works on main attack, do it manually ....
m_creature->SetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, cinfo->mindmg);
m_creature->SetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, cinfo->maxdmg);
@@ -430,8 +430,8 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
DoScriptText(SAY_AXE_TOSS2, m_creature);
Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
for (uint32 i=0; i<2; ++i)
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
for (uint8 i = 0; i < 2; ++i)
{
Creature *axe = m_creature->SummonCreature(MALCHEZARS_AXE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
if (axe)
@@ -455,33 +455,31 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
return;
}
if (SunderArmorTimer < diff)
if (SunderArmorTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_SUNDER_ARMOR);
SunderArmorTimer = 10000 + rand()%8000;
SunderArmorTimer = urand(10000,18000);
}else SunderArmorTimer -= diff;
} else SunderArmorTimer -= diff;
if (Cleave_Timer < diff)
if (Cleave_Timer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_CLEAVE);
Cleave_Timer = 6000 + rand()%6000;
Cleave_Timer = urand(6000,12000);
}else Cleave_Timer -= diff;
} else Cleave_Timer -= diff;
}
else
{
if (AxesTargetSwitchTimer < diff)
if (AxesTargetSwitchTimer <= diff)
{
AxesTargetSwitchTimer = 7500 + rand()%12500 ;
AxesTargetSwitchTimer = urand(7500,20000);
Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (target)
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
{
for (uint8 i = 0; i < 2; ++i)
{
Unit *axe = Unit::GetUnit(*m_creature, axes[i]);
if (axe)
if (Unit *axe = Unit::GetUnit(*m_creature, axes[i]))
{
float threat = 1000000.0f;
if (axe->getVictim())
@@ -495,35 +493,36 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
}
} else AxesTargetSwitchTimer -= diff;
if (AmplifyDamageTimer < diff)
if (AmplifyDamageTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_AMPLIFY_DAMAGE);
AmplifyDamageTimer = 20000 + rand()%10000;
}else AmplifyDamageTimer -= diff;
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target, SPELL_AMPLIFY_DAMAGE);
AmplifyDamageTimer = urand(20000,30000);
} else AmplifyDamageTimer -= diff;
}
//Time for global and double timers
if (InfernalTimer < diff)
if (InfernalTimer <= diff)
{
SummonInfernal(diff);
InfernalTimer = phase == 3 ? 14500 : 44500; //15 secs in phase 3, 45 otherwise
}else InfernalTimer -= diff;
InfernalTimer = phase == 3 ? 14500 : 44500; //15 secs in phase 3, 45 otherwise
} else InfernalTimer -= diff;
if (ShadowNovaTimer < diff)
if (ShadowNovaTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_SHADOWNOVA);
ShadowNovaTimer = phase == 3 ? 31000 : -1;
}else ShadowNovaTimer -= diff;
ShadowNovaTimer = phase == 3 ? 31000 : _UI32_MAX;
} else ShadowNovaTimer -= diff;
if (phase != 2)
{
if (SWPainTimer < diff)
if (SWPainTimer <= diff)
{
Unit* target = NULL;
if (phase == 1)
target = m_creature->getVictim(); // the tank
else //anyone but the tank
target = SelectUnit(SELECT_TARGET_RANDOM, 1);
target = m_creature->getVictim(); // the tank
else // anyone but the tank
target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true);
if (target)
DoCast(target, SPELL_SW_PAIN);
@@ -534,16 +533,16 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
if (phase != 3)
{
if (EnfeebleTimer < diff)
if (EnfeebleTimer <= diff)
{
EnfeebleHealthEffect();
EnfeebleTimer = 30000;
ShadowNovaTimer = 5000;
EnfeebleResetTimer = 9000;
}else EnfeebleTimer -= diff;
} else EnfeebleTimer -= diff;
}
if (phase==2)
if (phase == 2)
DoMeleeAttacksIfReady();
else
DoMeleeAttackIfReady();

39
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
View File

@@ -291,12 +291,12 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
return;
//Normal casts
if (NormalCastTimer < diff)
if (NormalCastTimer <= diff)
{
if (!m_creature->IsNonMeleeSpellCasted(false))
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM, 0);
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
if (!target)
return;
@@ -307,17 +307,17 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
if (!ArcaneCooldown)
{
Spells[AvailableSpells] = SPELL_ARCMISSLE;
AvailableSpells++;
++AvailableSpells;
}
if (!FireCooldown)
{
Spells[AvailableSpells] = SPELL_FIREBALL;
AvailableSpells++;
++AvailableSpells;
}
if (!FrostCooldown)
{
Spells[AvailableSpells] = SPELL_FROSTBOLT;
AvailableSpells++;
++AvailableSpells;
}
//If no available spells wait 1 second and try again
@@ -328,25 +328,24 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
}
}
NormalCastTimer = 1000;
}else NormalCastTimer -= diff;
} else NormalCastTimer -= diff;
if (SecondarySpellTimer < diff)
if (SecondarySpellTimer <= diff)
{
switch (rand()%2)
switch (urand(0,1))
{
case 0:
DoCast(m_creature, SPELL_AOE_CS);
break;
case 1:
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_CHAINSOFICE);
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_CHAINSOFICE);
break;
}
SecondarySpellTimer = 5000 + (rand()%15000);
}else SecondarySpellTimer -= diff;
SecondarySpellTimer = urand(5000,20000);
} else SecondarySpellTimer -= diff;
if (SuperCastTimer < diff)
if (SuperCastTimer <= diff)
{
uint8 Available[2];
@@ -433,7 +432,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
DoScriptText(SAY_ELEMENTALS, m_creature);
}
if (BerserkTimer < diff)
if (BerserkTimer <= diff)
{
for (uint32 i = 0; i < 5; ++i)
{
@@ -456,9 +455,9 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
FlameWreathTimer -= diff;
else FlameWreathTimer = 0;
if (FlameWreathCheckTime < diff)
if (FlameWreathCheckTime <= diff)
{
for (uint32 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
if (!FlameWreathTarget[i])
continue;
@@ -526,11 +525,11 @@ struct TRINITY_DLL_DECL water_elementalAI : public ScriptedAI
if (!UpdateVictim())
return;
if (CastTimer < diff)
if (CastTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_WATERBOLT);
CastTimer = 2000 + (rand()%3000);
}else CastTimer -= diff;
CastTimer = urand(2000,5000);
} else CastTimer -= diff;
}
};

33
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
View File

@@ -102,12 +102,12 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI
if (!UpdateVictim())
return;
if (AmplifyTimer < diff)
if (AmplifyTimer <= diff)
{
m_creature->InterruptNonMeleeSpells(false);
DoCast(m_creature->getVictim(),SPELL_AMPLIFY_FLAMES);
AmplifyTimer = 10000 + rand()%10000;
AmplifyTimer = urand(10000,20000);
}else AmplifyTimer -= diff;
DoMeleeAttackIfReady();
@@ -275,16 +275,15 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
if (!UpdateVictim())
return;
if (SacrificeTimer < diff)
if (SacrificeTimer <= diff)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true);
if (target && target->isAlive())
{
DoCast(target, SPELL_SACRIFICE, true);
DoCast(target, SPELL_SUMMON_DEMONCHAINS, true);
Creature* Chains = m_creature->FindNearestCreature(CREATURE_DEMONCHAINS, 5000);
if (Chains)
if (Creature* Chains = m_creature->FindNearestCreature(CREATURE_DEMONCHAINS, 5000))
{
CAST_AI(mob_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID();
Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true);
@@ -292,15 +291,15 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
SacrificeTimer = 30000;
}
}
}else SacrificeTimer -= diff;
} else SacrificeTimer -= diff;
if (ShadowboltTimer < diff)
if (ShadowboltTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT);
ShadowboltTimer = 10000;
}else ShadowboltTimer -= diff;
} else ShadowboltTimer -= diff;
if (SummonTimer < diff)
if (SummonTimer <= diff)
{
if(!PortalGUID[0])
DoCast(m_creature->getVictim(), SPELL_FIENDISH_PORTAL, false);
@@ -310,19 +309,19 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
if(PortalGUID[0] && PortalGUID[1])
{
if (Creature* pPortal = Unit::GetCreature(*m_creature, PortalGUID[rand()%2]))
if (Creature* pPortal = Unit::GetCreature(*m_creature, PortalGUID[urand(0,1)]))
pPortal->CastSpell(m_creature->getVictim(), SPELL_SUMMON_FIENDISIMP, false);
SummonTimer = 5000;
}
}else SummonTimer -= diff;
} else SummonTimer -= diff;
if (!Berserk)
{
if (BerserkTimer < diff)
if (BerserkTimer <= diff)
{
DoCast(m_creature, SPELL_BERSERK);
Berserk = true;
}else BerserkTimer -= diff;
} else BerserkTimer -= diff;
}
DoMeleeAttackIfReady();
@@ -352,11 +351,11 @@ struct TRINITY_DLL_DECL mob_fiendish_impAI : public ScriptedAI
if (!UpdateVictim())
return;
if (FireboltTimer < diff)
if (FireboltTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_FIREBOLT);
FireboltTimer = 2200;
}else FireboltTimer -= diff;
} else FireboltTimer -= diff;
DoMeleeAttackIfReady();
}

172
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
View File

@@ -174,27 +174,27 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI
{
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0;
}else AggroTimer -= diff;
} else AggroTimer -= diff;
}
if (!UpdateVictim())
return;
if (WaterBoltTimer < diff)
if (WaterBoltTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT);
WaterBoltTimer = TitoDied ? 1500 : 5000;
}else WaterBoltTimer -= diff;
} else WaterBoltTimer -= diff;
if (FearTimer < diff)
if (FearTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_SCREAM);
FearTimer = 30000;
}else FearTimer -= diff;
} else FearTimer -= diff;
if (!SummonedTito)
{
if (SummonTitoTimer < diff)
if (SummonTitoTimer <= diff)
SummonTito();
else SummonTitoTimer -= diff;
}
@@ -236,11 +236,11 @@ struct TRINITY_DLL_DECL mob_titoAI : public ScriptedAI
if (!UpdateVictim())
return;
if (YipTimer < diff)
if (YipTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_YIPPING);
YipTimer = 10000;
}else YipTimer -= diff;
} else YipTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -338,23 +338,24 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI
{
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0;
}else AggroTimer -= diff;
} else AggroTimer -= diff;
}
if (!UpdateVictim())
return;
if (BrainBashTimer < diff)
if (BrainBashTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_BRAIN_BASH);
BrainBashTimer = 15000;
}else BrainBashTimer -= diff;
} else BrainBashTimer -= diff;
if (BrainWipeTimer < diff)
if (BrainWipeTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_BRAIN_WIPE);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target, SPELL_BRAIN_WIPE);
BrainWipeTimer = 20000;
}else BrainWipeTimer -= diff;
} else BrainWipeTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -427,31 +428,31 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI
{
if (AggroTimer)
{
if (AggroTimer < diff)
if (AggroTimer <= diff)
{
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0;
}else AggroTimer -= diff;
} else AggroTimer -= diff;
}
if (!UpdateVictim())
return;
if (CleaveTimer < diff)
if (CleaveTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_CLEAVE);
CleaveTimer = 5000;
}else CleaveTimer -= diff;
} else CleaveTimer -= diff;
if (RustCount < 8)
{
if (RustTimer < diff)
if (RustTimer <= diff)
{
RustCount++;
DoScriptText(EMOTE_RUST, m_creature);
++RustCount;
DoScriptText(EMOTE_RUST, m_creature);
DoCast(m_creature, SPELL_RUST);
RustTimer = 6000;
}else RustTimer -= diff;
} else RustTimer -= diff;
}
DoMeleeAttackIfReady();
@@ -533,23 +534,23 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI
if (!UpdateVictim())
return;
if (MangleTimer < diff)
if (MangleTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_MANGLE);
MangleTimer = 5000 + rand()%3000;
}else MangleTimer -= diff;
MangleTimer = urand(5000,8000);
} else MangleTimer -= diff;
if (ShredTimer < diff)
if (ShredTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_SHRED);
ShredTimer = 10000 + rand()%5000;
}else ShredTimer -= diff;
ShredTimer = urand(10000,15000);
} else ShredTimer -= diff;
if (ScreamTimer < diff)
if (ScreamTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_FRIGHTENED_SCREAM);
ScreamTimer = 20000 + rand()%10000;
}else ScreamTimer -= diff;
ScreamTimer = urand(20000,30000);
} else ScreamTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -608,19 +609,18 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI
if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
if (CycloneTimer < diff)
if (CycloneTimer <= diff)
{
Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, rand()%10, rand()%10, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
if (Cyclone)
if (Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, urand(0,9), urand(0,9), 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true);
CycloneTimer = 30000;
}else CycloneTimer -= diff;
} else CycloneTimer -= diff;
if (ChainLightningTimer < diff)
if (ChainLightningTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING);
ChainLightningTimer = 15000;
}else ChainLightningTimer -= diff;
} else ChainLightningTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -648,13 +648,13 @@ struct TRINITY_DLL_DECL mob_cycloneAI : public ScriptedAI
if (!m_creature->HasAura(SPELL_KNOCKBACK))
DoCast(m_creature, SPELL_KNOCKBACK, true);
if (MoveTimer < diff)
if (MoveTimer <= diff)
{
Position pos;
m_creature->GetRandomNearPosition(pos, 10);
m_creature->GetMotionMaster()->MovePoint(0, pos);
MoveTimer = 5000 + rand()%3000;
}else MoveTimer -= diff;
MoveTimer = urand(5000,8000);
} else MoveTimer -= diff;
}
};
@@ -796,15 +796,13 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI
DoMeleeAttackIfReady();
if (ChaseTimer < diff)
if (ChaseTimer <= diff)
{
if (!IsChasing)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (target && target->GetTypeId() == TYPEID_PLAYER)
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
{
DoScriptText(SAY_WOLF_HOOD, m_creature);
DoCast(target, SPELL_LITTLE_RED_RIDING_HOOD, true);
TempThreat = DoGetThreat(target);
if (TempThreat)
@@ -830,22 +828,22 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI
ChaseTimer = 40000;
}
}else ChaseTimer -= diff;
} else ChaseTimer -= diff;
if (IsChasing)
return;
if (FearTimer < diff)
if (FearTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_TERRIFYING_HOWL);
FearTimer = 25000 + rand()%10000;
}else FearTimer -= diff;
FearTimer = urand(25000,35000);
} else FearTimer -= diff;
if (SwipeTimer < diff)
if (SwipeTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_WIDE_SWIPE);
SwipeTimer = 25000 + rand()%5000;
}else SwipeTimer -= diff;
SwipeTimer = urand(25000,30000);
} else SwipeTimer -= diff;
}
};
@@ -1283,7 +1281,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
if (Phase == PHASE_ROMULO && !SummonedRomulo)
{
if (SummonRomuloTimer < diff)
if (SummonRomuloTimer <= diff)
{
if (Creature* pRomulo = m_creature->SummonCreature(CREATURE_ROMULO, ROMULO_X, ROMULO_Y, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
{
@@ -1295,7 +1293,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
pRomulo->setFaction(16);
}
SummonedRomulo = true;
}else SummonRomuloTimer -= diff;
} else SummonRomuloTimer -= diff;
}
if (ResurrectSelfTimer)
@@ -1319,7 +1317,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
if (RomuloDead)
{
if (ResurrectTimer < diff)
if (ResurrectTimer <= diff)
{
Creature* Romulo = (Unit::GetCreature((*m_creature), RomuloGUID));
if (Romulo && CAST_AI(boss_romuloAI, Romulo->AI())->IsFakingDeath)
@@ -1330,38 +1328,39 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
RomuloDead = false;
ResurrectTimer = 10000;
}
}else ResurrectTimer -= diff;
} else ResurrectTimer -= diff;
}
if (BlindingPassionTimer < diff)
if (BlindingPassionTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_BLINDING_PASSION);
BlindingPassionTimer = 30000 + rand()%15000;
}else BlindingPassionTimer -= diff;
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target, SPELL_BLINDING_PASSION);
BlindingPassionTimer = urand(30000,45000);
} else BlindingPassionTimer -= diff;
if (DevotionTimer < diff)
if (DevotionTimer <= diff)
{
DoCast(m_creature, SPELL_DEVOTION);
DevotionTimer = 15000 + rand()%30000;
}else DevotionTimer -= diff;
DevotionTimer = urand(15000,45000);
} else DevotionTimer -= diff;
if (PowerfulAttractionTimer < diff)
if (PowerfulAttractionTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION);
PowerfulAttractionTimer = 5000 + rand()%25000;
}else PowerfulAttractionTimer -= diff;
PowerfulAttractionTimer = urand(5000,30000);
} else PowerfulAttractionTimer -= diff;
if (EternalAffectionTimer < diff)
if (EternalAffectionTimer <= diff)
{
if (rand()%2 == 1 && SummonedRomulo)
if (urand(0,1) && SummonedRomulo)
{
Creature* Romulo = (Unit::GetCreature((*m_creature), RomuloGUID));
if (Romulo && Romulo->isAlive() && !RomuloDead)
DoCast(Romulo, SPELL_ETERNAL_AFFECTION);
}else DoCast(m_creature, SPELL_ETERNAL_AFFECTION);
} else DoCast(m_creature, SPELL_ETERNAL_AFFECTION);
EternalAffectionTimer = 45000 + rand()%15000;
}else EternalAffectionTimer -= diff;
EternalAffectionTimer = urand(45000,60000);
} else EternalAffectionTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -1373,7 +1372,7 @@ void boss_romuloAI::UpdateAI(const uint32 diff)
if (JulianneDead)
{
if (ResurrectTimer < diff)
if (ResurrectTimer <= diff)
{
Creature* Julianne = (Unit::GetCreature((*m_creature), JulianneGUID));
if (Julianne && CAST_AI(boss_julianneAI, Julianne->AI())->IsFakingDeath)
@@ -1384,36 +1383,37 @@ void boss_romuloAI::UpdateAI(const uint32 diff)
JulianneDead = false;
ResurrectTimer = 10000;
}
}else ResurrectTimer -= diff;
} else ResurrectTimer -= diff;
}
if (BackwardLungeTimer < diff)
if (BackwardLungeTimer <= diff)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true);
if (target && !m_creature->HasInArc(M_PI, target))
{
DoCast(target, SPELL_BACKWARD_LUNGE);
BackwardLungeTimer = 15000 + rand()%15000;
BackwardLungeTimer = urand(15000,30000);
}
}else BackwardLungeTimer -= diff;
} else BackwardLungeTimer -= diff;
if (DaringTimer < diff)
if (DaringTimer <= diff)
{
DoCast(m_creature, SPELL_DARING);
DaringTimer = 20000 + rand()%20000;
}else DaringTimer -= diff;
DaringTimer = urand(20000,40000);
} else DaringTimer -= diff;
if (DeadlySwatheTimer < diff)
if (DeadlySwatheTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DEADLY_SWATHE);
DeadlySwatheTimer = 15000 + rand()%10000;
}else DeadlySwatheTimer -= diff;
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(target, SPELL_DEADLY_SWATHE);
DeadlySwatheTimer = urand(15000,25000);
} else DeadlySwatheTimer -= diff;
if (PoisonThrustTimer < diff)
if (PoisonThrustTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_POISON_THRUST);
PoisonThrustTimer = 10000 + rand()%10000;
}else PoisonThrustTimer -= diff;
PoisonThrustTimer = urand(10000,20000);
} else PoisonThrustTimer -= diff;
DoMeleeAttackIfReady();
}

28
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp
View File

@@ -262,7 +262,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
if (HasEscortState(STATE_ESCORT_PAUSED))
{
if (TalkTimer < diff)
if (TalkTimer <= diff)
{
if (TalkCount > 3)
{
@@ -275,19 +275,18 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
Talk(TalkCount);
++TalkCount;
}
else
TalkTimer -= diff;
} else TalkTimer -= diff;
}
if (PerformanceReady)
{
if (!RaidWiped)
{
if (WipeTimer < diff)
if (WipeTimer <= diff)
{
Map* pMap = m_creature->GetMap();
if (!pMap->IsDungeon()) return;
if (!pMap->IsDungeon())
return;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
if (PlayerList.isEmpty())
@@ -311,7 +310,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
}
WipeTimer = 15000;
}else WipeTimer -= diff;
} else WipeTimer -= diff;
}
}
@@ -590,32 +589,29 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
if (YellTimer < diff)
if (YellTimer <= diff)
{
if (EventStarted)
{
YellTimer = NextStep(Step++);
}
}else YellTimer -= diff;
} else YellTimer -= diff;
if (Step >= 7 && Step <= 12)
{
Unit* arca = Unit::GetUnit((*m_creature),ArcanagosGUID);
if (FireArcanagosTimer < diff)
if (FireArcanagosTimer <= diff)
{
if (arca)
arca->CastSpell(m_creature, SPELL_FIRE_BALL, false);
FireArcanagosTimer = 6000;
}else FireArcanagosTimer -= diff;
} else FireArcanagosTimer -= diff;
if (FireMedivhTimer < diff)
if (FireMedivhTimer <= diff)
{
if (arca)
DoCast(arca, SPELL_FIRE_BALL);
FireMedivhTimer = 5000;
}else FireMedivhTimer -= diff;
} else FireMedivhTimer -= diff;
}
}
};

6
src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
View File

@@ -280,14 +280,14 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
DoCast(m_creature, SPELL_SHOCK_BARRIER, true);
DoCast(m_creature->getVictim(), SPELL_PYROBLAST);
PyroblastTimer = 60000;
}else PyroblastTimer -= diff;
} else PyroblastTimer -= diff;
}
if (FireballTimer < diff)
{
DoCast(m_creature->getVictim(), Heroic ? SPELL_FIREBALL_HEROIC : SPELL_FIREBALL_NORMAL);
FireballTimer = 2000 + rand()%4000;
}else FireballTimer -= diff;
FireballTimer = urand(2000,6000);
} else FireballTimer -= diff;
if (PhoenixTimer < diff)
{

2
src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
View File

@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL npc_kalecgosAI : public ScriptedAI
{
if (m_uiTransformTimer)
{
if (m_uiTransformTimer < uiDiff)
if (m_uiTransformTimer <= uiDiff)
{
m_creature->CastSpell(m_creature,SPELL_ORB_KILL_CREDIT,false);
DoWorkaroundForQuestCredit();

8
src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp
View File

@@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
return;
//Pyroblast
if (m_uiPyroblastTimer < uiDiff)
if (m_uiPyroblastTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_PYROBLAST);
@@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
// Earthquake
if (m_bEnraged)
{
if (m_uiEarthquakeTimer < uiDiff)
if (m_uiEarthquakeTimer <= uiDiff)
{
DoCast(m_creature->getVictim(), SPELL_EARTHQUAKE);
m_uiEarthquakeTimer = 3*IN_MILISECONDS;
@@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
/*
// Golemagg's Trust
if (m_uiBuffTimer < uiDiff)
if (m_uiBuffTimer <= uidiff)
{
DoCast(m_creature, SPELL_GOLEMAGG_TRUST);
m_uiBuffTimer = 2.5*IN_MILISECONDS;
@@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL mob_core_ragerAI : public ScriptedAI
return;
// Mangle
if (m_uiMangleTimer < uiDiff)
if (m_uiMangleTimer <= uiDiff)
{
DoCast(m_creature->getVictim(), SPELL_MANGLE);
m_uiMangleTimer = 10*IN_MILISECONDS;

6
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
View File

@@ -400,7 +400,7 @@ struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public CombatAI
{
if (m_bIsDuelInProgress)
{
if (m_uiDuelTimer < uiDiff)
if (m_uiDuelTimer <= uiDiff)
{
m_creature->setFaction(FACTION_HOSTILE);
@@ -513,7 +513,7 @@ struct TRINITY_DLL_DECL npc_dark_rider_of_acherusAI : public ScriptedAI
if (!Intro)
return;
if (PhaseTimer < diff)
if (PhaseTimer <= diff)
{
switch(Phase)
{
@@ -941,7 +941,7 @@ struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI
{
if (IntroPhase)
{
if (IntroTimer < diff)
if (IntroTimer <= diff)
{
if (IntroPhase == 1)
{

20
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
View File

@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL npc_crusade_persuadedAI : public ScriptedAI
{
if (uiSpeech_counter)
{
if (uiSpeech_timer < diff)
if (uiSpeech_timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(uiPlayerGUID);
if(!pPlayer)
@@ -251,7 +251,7 @@ struct TRINITY_DLL_DECL npc_koltira_deathweaverAI : public npc_escortAI
if (HasEscortState(STATE_ESCORT_PAUSED))
{
if (m_uiWave_Timer < uiDiff)
if (m_uiWave_Timer <= uiDiff)
{
switch(m_uiWave)
{
@@ -372,7 +372,7 @@ struct TRINITY_DLL_DECL mob_scarlet_courierAI : public ScriptedAI
{
if(uiStage && !me->isInCombat())
{
if (uiStage_timer < diff)
if (uiStage_timer <= diff)
{
switch(uiStage)
{
@@ -448,26 +448,26 @@ struct TRINITY_DLL_DECL mob_high_inquisitor_valrothAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
if (uiRenew_timer < diff)
if (uiRenew_timer <= diff)
{
Shout();
DoCast(me, SPELL_RENEW);
uiRenew_timer = 1000 + rand()%5000;
}else uiRenew_timer -= diff;
} else uiRenew_timer -= diff;
if (uiInquisitor_Penance_timer < diff)
if (uiInquisitor_Penance_timer <= diff)
{
Shout();
DoCast(me->getVictim(), SPELL_INQUISITOR_PENANCE);
uiInquisitor_Penance_timer = 2000 + rand()%5000;
}else uiInquisitor_Penance_timer -= diff;
} else uiInquisitor_Penance_timer -= diff;
if (uiValroth_Smite_timer < diff)
if (uiValroth_Smite_timer <= diff)
{
Shout();
DoCast(me->getVictim(), SPELL_VALROTH_SMITE);
uiValroth_Smite_timer = 1000 + rand()%5000;
}else uiValroth_Smite_timer -= diff;
} else uiValroth_Smite_timer -= diff;
DoMeleeAttackIfReady();
}
@@ -633,7 +633,7 @@ struct TRINITY_DLL_DECL npc_a_special_surpriseAI : public ScriptedAI
{
if (PlayerGUID && !me->getVictim() && me->isAlive())
{
if (ExecuteSpeech_Timer < diff)
if (ExecuteSpeech_Timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(PlayerGUID);

20
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
View File

@@ -187,18 +187,18 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI
return;
//m_uiCrusaderStrike_Timer
if (m_uiCrusaderStrike_Timer < uiDiff)
if (m_uiCrusaderStrike_Timer <= uiDiff)
{
DoCast(m_creature->getVictim(),SPELL_CRUSADERSTRIKE);
m_uiCrusaderStrike_Timer = 10000;
}else m_uiCrusaderStrike_Timer -= uiDiff;
} else m_uiCrusaderStrike_Timer -= uiDiff;
//m_uiHammerOfJustice_Timer
if (m_uiHammerOfJustice_Timer < uiDiff)
if (m_uiHammerOfJustice_Timer <= uiDiff)
{
DoCast(m_creature->getVictim(),SPELL_HAMMEROFJUSTICE);
m_uiHammerOfJustice_Timer = 60000;
}else m_uiHammerOfJustice_Timer -= uiDiff;
} else m_uiHammerOfJustice_Timer -= uiDiff;
DoMeleeAttackIfReady();
}
@@ -291,7 +291,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI
return;
//If we are <75% hp cast healing spells at self or Mograine
if (m_uiHeal_Timer < uiDiff)
if (m_uiHeal_Timer <= uiDiff)
{
Creature* pTarget = NULL;
@@ -312,21 +312,21 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI
DoCast(pTarget, SPELL_HEAL);
m_uiHeal_Timer = 13000;
}else m_uiHeal_Timer -= uiDiff;
} else m_uiHeal_Timer -= uiDiff;
//m_uiPowerWordShield_Timer
if (m_uiPowerWordShield_Timer < uiDiff)
if (m_uiPowerWordShield_Timer <= uiDiff)
{
DoCast(m_creature,SPELL_POWERWORDSHIELD);
m_uiPowerWordShield_Timer = 15000;
}else m_uiPowerWordShield_Timer -= uiDiff;
} else m_uiPowerWordShield_Timer -= uiDiff;
//m_uiHolySmite_Timer
if (m_uiHolySmite_Timer < uiDiff)
if (m_uiHolySmite_Timer <= uiDiff)
{
DoCast(m_creature->getVictim(),SPELL_HOLYSMITE);
m_uiHolySmite_Timer = 6000;
}else m_uiHolySmite_Timer -= uiDiff;
} else m_uiHolySmite_Timer -= uiDiff;
DoMeleeAttackIfReady();
}

6
src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
View File

@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI
return;
//Rend_Timer
if (m_uiRend_Timer < uiDiff)
if (m_uiRend_Timer <= uiDiff)
{
DoCast(m_creature->getVictim(), SPELL_REND);
m_uiRend_Timer = 10000;
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI
m_uiRend_Timer -= uiDiff;
//Backhand_Timer
if (m_uiBackhand_Timer < uiDiff)
if (m_uiBackhand_Timer <= uiDiff)
{
DoCast(m_creature->getVictim(), SPELL_BACKHAND);
m_uiBackhand_Timer = 10000;
@@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI
//Frenzy_Timer
if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 26)
{
if (m_uiFrenzy_Timer < uiDiff)
if (m_uiFrenzy_Timer <= uiDiff)
{
DoCast(m_creature,SPELL_FRENZY);
DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature);

2
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
View File

@@ -5,7 +5,7 @@
#ifndef DEF_HYJAL_H
#define DEF_HYJAL_H
#define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy"
#define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy."
enum eTypes
{

2
src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
View File

@@ -13,7 +13,7 @@
#define TYPE_THRALL_PART4 6
#define DATA_THRALL 7
#define DATA_TARETHA 8
#define DATA_EPOCH 9
#define DATA_EPOCH 9
#define WORLD_STATE_OH 2436
#endif

2
src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
View File

@@ -7,7 +7,7 @@
#define MAX_ENCOUNTER 2
enum eEnums
enum eTypes
{
TYPE_VAZRUDEN = 1,
TYPE_NAZAN = 2

2
src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
View File

@@ -7,7 +7,7 @@
#define DATA_MAGTHERIDON_EVENT 1
#define DATA_MAGTHERIDON 3
#define DATA_CHANNELER_EVENT 2
#define DATA_CHANNELER_EVENT 2
#define DATA_COLLAPSE 6
#define DATA_CHANNELER 9
#endif

6
src/game/GameEventMgr.cpp
View File

@@ -1488,13 +1488,13 @@ bool GameEventMgr::hasGameObjectActiveEventExcept(uint32 go_id, uint16 event_id)
return false;
}
void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate)
{
QuestRelList::iterator itr;
for (itr = mGameEventCreatureQuests[event_id].begin(); itr != mGameEventCreatureQuests[event_id].end(); ++itr)
{
QuestRelations &CreatureQuestMap = objmgr.mCreatureQuestRelations;
if (Activate) // Add the pair(id,quest) to the multimap
if (activate) // Add the pair(id,quest) to the multimap
CreatureQuestMap.insert(QuestRelations::value_type(itr->first, itr->second));
else
{
@@ -1519,7 +1519,7 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
for (itr = mGameEventGameObjectQuests[event_id].begin(); itr != mGameEventGameObjectQuests[event_id].end(); ++itr)
{
QuestRelations &GameObjectQuestMap = objmgr.mGOQuestRelations;
if (Activate) // Add the pair(id,quest) to the multimap
if (activate) // Add the pair(id,quest) to the multimap
GameObjectQuestMap.insert(QuestRelations::value_type(itr->first, itr->second));
else
{

8
src/game/GameEventMgr.h
View File

@@ -26,14 +26,14 @@
#include "Platform/Define.h"
#include "Policies/Singleton.h"
#define max_ge_check_delay 86400 // 1 day in seconds
#define max_ge_check_delay DAY // 1 day in seconds
enum GameEventState
{
GAMEEVENT_NORMAL = 0, // standard game events
GAMEEVENT_WORLD_INACTIVE = 1, // not yet started
GAMEEVENT_WORLD_CONDITIONS = 2, // condition matching phase
GAMEEVENT_WORLD_NEXTPHASE = 3, // conditions are met, now 'lenght' timer to start next event
GAMEEVENT_WORLD_NEXTPHASE = 3, // conditions are met, now 'length' timer to start next event
GAMEEVENT_WORLD_FINISHED = 4, // next events are started, unapply this one
GAMEEVENT_INTERNAL = 5, // never handled in update
};
@@ -67,7 +67,7 @@ struct GameEventData
std::set<uint16 /*gameevent id*/> prerequisite_events; // events that must be completed before starting this event
std::string description;
bool isValid() const { return ((length > 0) || (state > GAMEEVENT_NORMAL)); }
bool isValid() const { return length > 0 || state > GAMEEVENT_NORMAL; }
};
struct ModelEquip
@@ -121,7 +121,7 @@ class GameEventMgr
void GameEventSpawn(int16 event_id);
void GameEventUnspawn(int16 event_id);
void ChangeEquipOrModel(int16 event_id, bool activate);
void UpdateEventQuests(uint16 event_id, bool Activate);
void UpdateEventQuests(uint16 event_id, bool activate);
void UpdateEventNPCFlags(uint16 event_id);
void UpdateEventNPCVendor(uint16 event_id, bool activate);
void UpdateBattleGroundSettings();

6
src/game/SharedDefines.h
View File

@@ -534,7 +534,7 @@ enum Language
LANG_ZOMBIE = 36,
LANG_GNOMISH_BINARY = 37,
LANG_GOBLIN_BINARY = 38,
LANG_ADDON = 0xFFFFFFFF // used by addons, in 2.4.0 not exit, replaced by messagetype?
LANG_ADDON = 0xFFFFFFFF // used by addons, in 2.4.0 not exist, replaced by messagetype?
};
#define LANGUAGES_COUNT 19
@@ -1945,8 +1945,8 @@ enum CreatureTypeFlags
CREATURE_TYPEFLAGS_UNK15 = 0x04000, //? Possibly not in use
CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x08000, //can be looted by engineer
CREATURE_TYPEFLAGS_EXOTIC = 0x10000, //can be tamed by hunter as exotic pet
CREATURE_TYPEFLAGS_UNK18 = 0x20000, //? Related to veichles/pvp?
CREATURE_TYPEFLAGS_UNK19 = 0x40000, //? Related to veichle/siege weapons?
CREATURE_TYPEFLAGS_UNK18 = 0x20000, //? Related to vehicles/pvp?
CREATURE_TYPEFLAGS_UNK19 = 0x40000, //? Related to vehicles/siege weapons?
CREATURE_TYPEFLAGS_UNK20 = 0x80000
};