diff options
Diffstat (limited to 'src')
30 files changed, 100 insertions, 35 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 13ac778fb80..7aeb730893d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -1080,6 +1080,7 @@ enum GiftOfTheHarvester SPELL_GHOST_TRANSFORM = 52505 }; +// 52479 - Gift of the Harvester class spell_gift_of_the_harvester : public SpellScript { PrepareSpellScript(spell_gift_of_the_harvester); @@ -1087,10 +1088,10 @@ class spell_gift_of_the_harvester : public SpellScript bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( - { - SPELL_GHOUL_TRANFORM, - SPELL_GHOST_TRANSFORM - }); + { + SPELL_GHOUL_TRANFORM, + SPELL_GHOST_TRANSFORM + }); } void HandleScriptEffect(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index e7b185376c5..7fce427c775 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -1002,6 +1002,7 @@ class boss_koragg : public CreatureScript } }; +// 43522 - Unstable Affliction class spell_hexlord_unstable_affliction : public SpellScriptLoader { public: diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index b67e30e454f..f319766306e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -305,21 +305,21 @@ class npc_spawn_of_marli : public CreatureScript } }; +// 24083 - Hatch Eggs class spell_hatch_spiders : public SpellScript { - PrepareSpellScript(spell_hatch_spiders); - - void HandleObjectAreaTargetSelect(std::list<WorldObject*>& targets) - { - targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); - targets.resize(GetSpellInfo()->MaxAffectedTargets); - } - - void Register() override - { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hatch_spiders::HandleObjectAreaTargetSelect, EFFECT_0, TARGET_GAMEOBJECT_DEST_AREA); - } - + PrepareSpellScript(spell_hatch_spiders); + + void HandleObjectAreaTargetSelect(std::list<WorldObject*>& targets) + { + targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + targets.resize(GetSpellInfo()->MaxAffectedTargets); + } + + void Register() override + { + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hatch_spiders::HandleObjectAreaTargetSelect, EFFECT_0, TARGET_GAMEOBJECT_DEST_AREA); + } }; void AddSC_boss_marli() diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index a13eddf6480..0af9d3be92c 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -617,7 +617,7 @@ public: } }; -// 29528 - Inoculate Nestlewood Owlkin +// 29528 - Inoculate Nestlewood Owlkin class spell_inoculate_nestlewood : public AuraScript { PrepareAuraScript(spell_inoculate_nestlewood); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index f4f472c85ac..0125ece962f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -988,6 +988,7 @@ class spell_hadronox_periodic_summon_template_AuraScript : public AuraScript uint32 _bottomSpellId; }; +// 53035 - Summon Anub'ar Champion Periodic class spell_hadronox_periodic_summon_champion : public SpellScriptLoader { public: @@ -1005,6 +1006,7 @@ class spell_hadronox_periodic_summon_champion : public SpellScriptLoader } }; +// 53037 - Summon Anub'ar Crypt Fiend Periodic class spell_hadronox_periodic_summon_crypt_fiend : public SpellScriptLoader { public: @@ -1022,6 +1024,7 @@ class spell_hadronox_periodic_summon_crypt_fiend : public SpellScriptLoader } }; +// 53036 - Summon Anub'ar Necromancer Periodic class spell_hadronox_periodic_summon_necromancer : public SpellScriptLoader { public: @@ -1039,6 +1042,7 @@ class spell_hadronox_periodic_summon_necromancer : public SpellScriptLoader } }; +// 53030, 59417 - Leech Poison class spell_hadronox_leeching_poison : public SpellScriptLoader { public: @@ -1077,6 +1081,8 @@ class spell_hadronox_leeching_poison : public SpellScriptLoader } }; +// 53177 - Web Front Doors +// 53185 - Web Side Door class spell_hadronox_web_doors : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 5954a293db4..a1672eded15 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1399,6 +1399,7 @@ class go_twilight_portal : public GameObjectScript } }; +// 74641 - Meteor Strike class spell_halion_meteor_strike_marker : public SpellScriptLoader { public: @@ -1486,6 +1487,8 @@ class spell_halion_combustion_consumption : public SpellScriptLoader uint32 _spellID; }; +// 74629 - Combustion Periodic +// 74803 - Consumption Periodic class spell_halion_combustion_consumption_periodic : public SpellScriptLoader { public: @@ -1590,6 +1593,8 @@ class spell_halion_marks : public SpellScriptLoader uint32 _removeSpell; }; +// 74610 - Fiery Combustion +// 74800 - Soul Consumption class spell_halion_damage_aoe_summon : public SpellScriptLoader { public: @@ -1690,6 +1695,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader bool _isApplyHandler; }; +// 75396 - Clear Debuffs class spell_halion_clear_debuffs : public SpellScriptLoader { public: @@ -1737,6 +1743,7 @@ class TwilightCutterSelector Unit* _channelTarget; }; +// 74769, 77844, 77845, 77846 - Twilight Cutter class spell_halion_twilight_cutter : public SpellScriptLoader { public: @@ -1774,6 +1781,7 @@ class spell_halion_twilight_cutter : public SpellScriptLoader } }; +// 74808 - Twilight Phasing class spell_halion_twilight_phasing : public SpellScriptLoader { public: @@ -1842,6 +1850,7 @@ class spell_halion_summon_exit_portals : public SpellScriptLoader } }; +// 75880 - Spawn Living Embers class spell_halion_spawn_living_embers : public SpellScriptLoader { public: @@ -1875,6 +1884,7 @@ class spell_halion_spawn_living_embers : public SpellScriptLoader } }; +// 75886, 75887 - Blazing Aura class spell_halion_blazing_aura : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index b42915f93d4..190a8ca275e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -881,6 +881,7 @@ class spell_pursuing_spikes : public AuraScript } }; +// 65919 - Impale class spell_impale : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index b81c52e4c80..ebc883d7f04 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -1137,7 +1137,7 @@ class spell_gormok_snobolled : public AuraScript } }; -// 66823 - Paralytic Toxin +// 66823, 67618, 67619, 67620 - Paralytic Toxin class spell_jormungars_paralytic_toxin : public AuraScript { PrepareAuraScript(spell_jormungars_paralytic_toxin); @@ -1191,7 +1191,7 @@ class spell_jormungars_paralytic_toxin : public AuraScript } }; -// 66870 - Burning Bile +// 66870, 67621, 67622, 67623 - Burning Bile class spell_jormungars_burning_bile : public SpellScript { PrepareSpellScript(spell_jormungars_burning_bile); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 30c3307a67a..71c508df17c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -513,6 +513,7 @@ private: ObjectGuid _tyrannusGUID; }; +// 69012 - Explosive Barrage class spell_krick_explosive_barrage : public AuraScript { PrepareAuraScript(spell_krick_explosive_barrage); @@ -539,6 +540,7 @@ class spell_krick_explosive_barrage : public AuraScript } }; +// 69263 - Explosive Barrage class spell_ick_explosive_barrage : public AuraScript { PrepareAuraScript(spell_ick_explosive_barrage); @@ -595,6 +597,7 @@ class spell_exploding_orb_hasty_grow : public AuraScript } }; +// 68987 - Pursuit class spell_krick_pursuit : public SpellScript { PrepareSpellScript(spell_krick_pursuit); @@ -637,6 +640,7 @@ class spell_krick_pursuit_AuraScript : public AuraScript } }; +// 69029, 70850 - Pursuit Confusion class spell_krick_pursuit_confusion : public AuraScript { PrepareAuraScript(spell_krick_pursuit_confusion); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index f836f17eef8..683f4a1f0ef 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1715,6 +1715,7 @@ struct npc_gunship_cannon : public PassiveAI } }; +// 68721 - Rocket Pack class spell_igb_rocket_pack : public AuraScript { PrepareAuraScript(spell_igb_rocket_pack); @@ -1746,6 +1747,7 @@ class spell_igb_rocket_pack : public AuraScript } }; +// 70348 - Rocket Pack Useable class spell_igb_rocket_pack_useable : public AuraScript { PrepareAuraScript(spell_igb_rocket_pack_useable); @@ -1784,6 +1786,8 @@ class spell_igb_rocket_pack_useable : public AuraScript } }; +// 70120 - On Skybreaker Deck +// 70121 - On Orgrim's Hammer Deck class spell_igb_on_gunship_deck : public AuraScript { PrepareAuraScript(spell_igb_on_gunship_deck); @@ -1825,6 +1829,8 @@ private: uint32 _teamInInstance; }; +// 69470 - Heat Drain +// 69487 - Overheat class spell_igb_periodic_trigger_with_power_cost : public AuraScript { PrepareAuraScript(spell_igb_periodic_trigger_with_power_cost); @@ -1841,6 +1847,7 @@ class spell_igb_periodic_trigger_with_power_cost : public AuraScript } }; +// 69399, 70172 - Cannon Blast class spell_igb_cannon_blast : public SpellScript { PrepareSpellScript(spell_igb_cannon_blast); @@ -1867,6 +1874,7 @@ class spell_igb_cannon_blast : public SpellScript } }; +// 69402, 70175 - Incinerating Blast class spell_igb_incinerating_blast : public SpellScript { PrepareSpellScript(spell_igb_incinerating_blast); @@ -1903,6 +1911,7 @@ private: uint32 _energyLeft; }; +// 69487 - Overheat class spell_igb_overheat : public AuraScript { PrepareAuraScript(spell_igb_overheat); @@ -1948,6 +1957,7 @@ class spell_igb_overheat : public AuraScript } }; +// 69705 - Below Zero class spell_igb_below_zero : public SpellScript { PrepareSpellScript(spell_igb_below_zero); @@ -1966,6 +1976,7 @@ class spell_igb_below_zero : public SpellScript } }; +// 70104 - Teleport to Enemy Ship class spell_igb_teleport_to_enemy_ship : public SpellScript { PrepareSpellScript(spell_igb_teleport_to_enemy_ship); @@ -1989,6 +2000,7 @@ class spell_igb_teleport_to_enemy_ship : public SpellScript } }; +// 70397, 70403 - Burning Pitch class spell_igb_burning_pitch_selector : public SpellScript { PrepareSpellScript(spell_igb_burning_pitch_selector); @@ -2027,6 +2039,7 @@ class spell_igb_burning_pitch_selector : public SpellScript } }; +// 71335, 71339 - Burning Pitch class spell_igb_burning_pitch : public SpellScript { PrepareSpellScript(spell_igb_burning_pitch); @@ -2046,6 +2059,7 @@ class spell_igb_burning_pitch : public SpellScript } }; +// 69678, 70609 - Rocket Artillery class spell_igb_rocket_artillery : public SpellScript { PrepareSpellScript(spell_igb_rocket_artillery); @@ -2073,6 +2087,7 @@ class spell_igb_rocket_artillery : public SpellScript } }; +// 69679 - Rocket Artillery class spell_igb_rocket_artillery_explosion : public SpellScript { PrepareSpellScript(spell_igb_rocket_artillery_explosion); @@ -2093,6 +2108,7 @@ class spell_igb_rocket_artillery_explosion : public SpellScript } }; +// 67335 - Gunship Fall Teleport class spell_igb_gunship_fall_teleport : public SpellScript { PrepareSpellScript(spell_igb_gunship_fall_teleport); @@ -2123,6 +2139,7 @@ class spell_igb_gunship_fall_teleport : public SpellScript } }; +// 70331 - Check for Players class spell_igb_check_for_players : public SpellScript { PrepareSpellScript(spell_igb_check_for_players); @@ -2166,6 +2183,7 @@ private: uint32 _playerCount; }; +// 72340 - Teleport Players on Victory class spell_igb_teleport_players_on_victory : public SpellScript { PrepareSpellScript(spell_igb_teleport_players_on_victory); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 3065fe9b2bd..dd70bc05592 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1303,6 +1303,7 @@ class spell_generic_remove_empowered_blood : public SpellScript } }; +// 70733 - Stoneform class spell_icc_stoneform : public AuraScript { PrepareAuraScript(spell_icc_stoneform); @@ -1336,6 +1337,7 @@ class spell_icc_stoneform : public AuraScript } }; +// 70536, 70545, 70546, 70547 - Spirit Alarm class spell_icc_sprit_alarm : public SpellScript { PrepareSpellScript(spell_icc_sprit_alarm); @@ -1452,6 +1454,7 @@ private: std::list<WorldObject*> _sharedList; }; +// 72155, 72162 - Harvest Blight Specimen class spell_icc_harvest_blight_specimen : public SpellScript { PrepareSpellScript(spell_icc_harvest_blight_specimen); diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp index 290828badb6..a7f88e441b9 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp @@ -139,6 +139,8 @@ class npc_ioc_gunship_captain : public CreatureScript } }; +// 66630 - Alliance Gunship Portal +// 66637 - Horde Gunship Portal class spell_ioc_gunship_portal : public SpellScriptLoader { public: @@ -179,6 +181,7 @@ class spell_ioc_gunship_portal : public SpellScriptLoader } }; +// 66656 - Parachute class spell_ioc_parachute_ic : public SpellScriptLoader { public: @@ -235,6 +238,7 @@ class StartLaunchEvent : public BasicEvent ObjectGuid::LowType _lowGuid; }; +// 66218 - Launch class spell_ioc_launch : public SpellScriptLoader { public: @@ -272,6 +276,8 @@ enum SeaforiumBombSpells SPELL_A_BOMB_INATION_CREDIT = 68367 }; +// 66672 - Huge Seaforium Blast +// 66676 - Seaforium Blast class spell_ioc_seaforium_blast_credit : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 6cf8eb5f987..1f1d20df53f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -287,7 +287,7 @@ private: uint8 state; }; -// spell 28374 (10man) / 54426 (25man) - Decimate +// 28374, 54426 - Decimate class spell_gluth_decimate : public SpellScript { PrepareSpellScript(spell_gluth_decimate); @@ -330,8 +330,7 @@ class spell_gluth_decimate : public SpellScript } }; -// used by both 28239 & 28404 (single target and aoe zombie-kill spell) to heal Gluth on each target hit. - +// 28239, 28404 - Zombie Chow Search (single target and aoe zombie-kill spell) to heal Gluth on each target hit class spell_gluth_zombiechow_search : public SpellScript { PrepareSpellScript(spell_gluth_zombiechow_search); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index e3d179fb53e..02d56d27b81 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -865,6 +865,7 @@ struct npc_gothik_trigger : public ScriptedAI } }; +// 27831, 55638 - Shadow Bolt Volley class spell_gothik_shadow_bolt_volley : public SpellScript { PrepareSpellScript(spell_gothik_shadow_bolt_volley); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 80167874547..ba107d08a46 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -210,7 +210,7 @@ class spell_grobbulus_mutating_injection : public AuraScript } }; -// 28158, 54362 - Poison (Grobbulus) +// 28158, 54362 - Poison class spell_grobbulus_poison_cloud : public AuraScript { PrepareAuraScript(spell_grobbulus_poison_cloud); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 57a282e115b..ffac51d90a1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -211,6 +211,7 @@ struct boss_heigan : public BossAI bool _safetyDance; // is achievement still possible? (= no player deaths yet) }; +// 29371 - Eruption class spell_heigan_eruption : public SpellScript { PrepareSpellScript(spell_heigan_eruption); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index aeb13a21ea1..7e0c26ef4dc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -825,6 +825,7 @@ struct npc_kelthuzad_guardian : public ScriptedAI uint32 _bloodTapTimer; }; +// 28410 - Chains of Kel'Thuzad class spell_kelthuzad_chains : public AuraScript { PrepareAuraScript(spell_kelthuzad_chains); @@ -846,6 +847,7 @@ class spell_kelthuzad_chains : public AuraScript } }; +// 27819 - Detonate Mana class spell_kelthuzad_detonate_mana : public AuraScript { PrepareAuraScript(spell_kelthuzad_detonate_mana); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 0a641d2c852..0995313f448 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -151,6 +151,7 @@ class achievement_spore_loser : public AchievementCriteriaScript } }; +// 29865, 55053 - Deathbloom class spell_loatheb_deathbloom : public AuraScript { PrepareAuraScript(spell_loatheb_deathbloom); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 64e123df301..4cf7e3fdb57 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -233,6 +233,7 @@ struct containment_sphere : public GameObjectAI } }; +// 48095 - Intense Cold class spell_intense_cold : public AuraScript { PrepareAuraScript(spell_intense_cold); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 8f2cb177003..f2d1d4c7a60 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -199,6 +199,7 @@ struct boss_loken : public BossAI bool _isIntroDone; }; +// 52942, 59837 - Pulsing Shockwave class spell_loken_pulsing_shockwave : public SpellScript { PrepareSpellScript(spell_loken_pulsing_shockwave); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index d948491732e..d84083e7921 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -131,6 +131,7 @@ struct boss_krystallus : public BossAI } }; +// 50810, 61546 - Shatter class spell_krystallus_shatter : public SpellScript { PrepareSpellScript(spell_krystallus_shatter); @@ -150,6 +151,7 @@ class spell_krystallus_shatter : public SpellScript } }; +// 50811, 61547 - Shatter class spell_krystallus_shatter_effect : public SpellScript { PrepareSpellScript(spell_krystallus_shatter_effect); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 84b041273a1..06822d9c2ff 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1543,6 +1543,7 @@ class spell_tar_blaze : public AuraScript } }; +// 64414 - Load into Catapult class spell_load_into_catapult : public SpellScriptLoader { enum Spells diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 76c9cd50351..4562031363c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -446,6 +446,7 @@ class npc_scorch_ground : public CreatureScript } }; +// 62717, 63477 - Slag Pot class spell_ignis_slag_pot : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 06c997b935a..799f2f6438c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -608,6 +608,7 @@ class spell_ulduar_stone_grip : public SpellScriptLoader } }; +// 63720, 64004 - Stone Shout class spell_kologarn_stone_shout : public SpellScriptLoader { public: @@ -643,6 +644,7 @@ class spell_kologarn_stone_shout : public SpellScriptLoader } }; +// 63342 - Focused Eyebeam Summon Trigger class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index c8c6b9c6adf..daba4bfc3db 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -99,7 +99,7 @@ struct boss_koralon : public BossAI } }; -// 66725, 68161 - SPELL_METEOR_FISTS +// 66725, 68161 - Meteor Fists class spell_koralon_meteor_fists : public AuraScript { PrepareAuraScript(spell_koralon_meteor_fists); @@ -121,8 +121,8 @@ class spell_koralon_meteor_fists : public AuraScript } }; -// 66765, 67333 - SPELL_METEOR_FISTS_DAMAGE -// 66809, 67331 - SPELL_FW_METEOR_FISTS_DAMAGE +// 66765, 67333 - Meteor Fists +// 66809, 67331 - Meteor Fists class spell_koralon_meteor_fists_damage : public SpellScript { PrepareSpellScript(spell_koralon_meteor_fists_damage); diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 2091c630761..fb3e5729603 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -835,6 +835,7 @@ enum InfectedWorgenBite SPELL_WORGENS_CALL = 53095 }; +// 53094 - Infected Worgen Bite class spell_infected_worgen_bite : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 3a9b9ff2306..ef0637bdab1 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -964,6 +964,7 @@ enum JokkumScriptcast EVENT_KROLMIR_9 = 24, }; +// 61319 - Jokkum Scriptcast class spell_jokkum_scriptcast : public SpellScriptLoader { public: spell_jokkum_scriptcast() : SpellScriptLoader("spell_jokkum_scriptcast") { } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index 31a6d8dbc51..0a0b6b82b8b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -183,6 +183,7 @@ class boss_shattered_executioner : public CreatureScript } }; +// 39288, 39289, 39290 - Kargath's Executioner class spell_kargath_executioner : public SpellScriptLoader { public: diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 9c369e92aa6..495046810cc 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -31,17 +31,17 @@ #include "Vehicle.h" #include "World.h" -// 45102 Romantic Picnic enum SpellsPicnic { SPELL_BASKET_CHECK = 45119, // Holiday - Valentine - Romantic Picnic Near Basket Check SPELL_MEAL_PERIODIC = 45103, // Holiday - Valentine - Romantic Picnic Meal Periodic - effect dummy SPELL_MEAL_EAT_VISUAL = 45120, // Holiday - Valentine - Romantic Picnic Meal Eat Visual - //SPELL_MEAL_PARTICLE = 45114, // Holiday - Valentine - Romantic Picnic Meal Particle - unused + // SPELL_MEAL_PARTICLE = 45114, // Holiday - Valentine - Romantic Picnic Meal Particle - unused SPELL_DRINK_VISUAL = 45121, // Holiday - Valentine - Romantic Picnic Drink Visual SPELL_ROMANTIC_PICNIC_ACHIEV = 45123, // Romantic Picnic periodic = 5000 }; +// 45102 - Romantic Picnic class spell_love_is_in_the_air_romantic_picnic : public AuraScript { PrepareAuraScript(spell_love_is_in_the_air_romantic_picnic); @@ -210,7 +210,6 @@ class spell_hallow_end_candy_pirate : public SpellScriptLoader } }; -// 24750 Trick enum TrickSpells { SPELL_PIRATE_COSTUME_MALE = 24708, @@ -225,6 +224,7 @@ enum TrickSpells SPELL_TRICK_BUFF = 24753, }; +// 24750 - Trick class spell_hallow_end_trick : public SpellScriptLoader { public: @@ -295,7 +295,6 @@ class spell_hallow_end_trick : public SpellScriptLoader } }; -// 24751 Trick or Treat enum TrickOrTreatSpells { SPELL_TRICK = 24714, @@ -306,6 +305,7 @@ enum TrickOrTreatSpells SPELL_UPSET_TUMMY = 42966 }; +// 24751 - Trick or Treat class spell_hallow_end_trick_or_treat : public SpellScriptLoader { public: @@ -342,6 +342,7 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader } }; +// 44436 - Tricky Treat class spell_hallow_end_tricky_treat : public SpellScriptLoader { public: @@ -380,10 +381,8 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader } }; -// Hallowed wands enum HallowendData { - //wand spells SPELL_HALLOWED_WAND_PIRATE = 24717, SPELL_HALLOWED_WAND_NINJA = 24718, SPELL_HALLOWED_WAND_LEPER_GNOME = 24719, @@ -394,6 +393,7 @@ enum HallowendData SPELL_HALLOWED_WAND_BAT = 24741 }; +// 24717, 24718, 24719, 24720, 24724, 24733, 24737, 24741 class spell_hallow_end_wand : public SpellScriptLoader { public: diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index a504362c1df..3d139f44eb1 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -879,7 +879,7 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScript } }; -// -53234 - Piercing Shots +// -53234 - Piercing Shots class spell_hun_piercing_shots : public AuraScript { PrepareAuraScript(spell_hun_piercing_shots); @@ -1260,7 +1260,7 @@ class spell_hun_thrill_of_the_hunt : public AuraScript } }; -// 67151 - T9 4P Bonus +// 67151 - Item - Hunter T9 4P Bonus (Steady Shot) class spell_hun_t9_4p_bonus : public AuraScript { PrepareAuraScript(spell_hun_t9_4p_bonus); |