Scripts/ICC: 1eb2aef followup

(cherry picked from commit 3e9b55361842337156a38d17200200b30ebb62ae)

1 files changed, 74 insertions, 52 deletions

diff --git a/src/server/scripts/Northrend/northrend_script_loader.cpp b/src/server/scripts/Northrend/northrend_script_loader.cpp
index 57bd641591c..9b7f93fb455 100644
--- a/src/server/scripts/Northrend/northrend_script_loader.cpp
+++ b/src/server/scripts/Northrend/northrend_script_loader.cpp
@@ -15,20 +15,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// This is where scripts' loading functions should be declared:
+ // This is where scripts' loading functions should be declared:
+ // Gundrak
 void AddSC_boss_slad_ran();
 void AddSC_boss_moorabi();
 void AddSC_boss_drakkari_colossus();
 void AddSC_boss_gal_darah();
 void AddSC_boss_eck();
 void AddSC_instance_gundrak();
-
 // Azjol-Nerub - Azjol-Nerub
 void AddSC_boss_krik_thir();
 void AddSC_boss_hadronox();
 void AddSC_boss_anub_arak();
 void AddSC_instance_azjol_nerub();
-
 // Azjol-Nerub - Ahn'kahet
 void AddSC_boss_elder_nadox();
 void AddSC_boss_taldaram();
@@ -36,27 +35,28 @@ void AddSC_boss_amanitar();
 void AddSC_boss_jedoga_shadowseeker();
 void AddSC_boss_volazj();
 void AddSC_instance_ahnkahet();
-
 // Drak'Tharon Keep
 void AddSC_boss_trollgore();
 void AddSC_boss_novos();
 void AddSC_boss_king_dred();
 void AddSC_boss_tharon_ja();
 void AddSC_instance_drak_tharon_keep();
-
-void AddSC_boss_argent_challenge();      //Trial of the Champion
+// Trial of the Champion
+void AddSC_boss_argent_challenge();
 void AddSC_boss_black_knight();
 void AddSC_boss_grand_champions();
 void AddSC_instance_trial_of_the_champion();
 void AddSC_trial_of_the_champion();
-void AddSC_boss_anubarak_trial();        //Trial of the Crusader
+// Trial of the Crusader
+void AddSC_boss_anubarak_trial();
 void AddSC_boss_faction_champions();
 void AddSC_boss_jaraxxus();
 void AddSC_boss_northrend_beasts();
 void AddSC_boss_twin_valkyr();
 void AddSC_trial_of_the_crusader();
 void AddSC_instance_trial_of_the_crusader();
-void AddSC_boss_anubrekhan();            //Naxxramas
+// Naxxramas
+void AddSC_boss_anubrekhan();
 void AddSC_boss_maexxna();
 void AddSC_boss_patchwerk();
 void AddSC_boss_grobbulus();
@@ -72,34 +72,41 @@ void AddSC_boss_heigan();
 void AddSC_boss_gothik();
 void AddSC_boss_thaddius();
 void AddSC_instance_naxxramas();
-void AddSC_boss_nexus_commanders();     // The Nexus Nexus
+// The Nexus Nexus
+void AddSC_boss_nexus_commanders();
 void AddSC_boss_magus_telestra();
 void AddSC_boss_anomalus();
 void AddSC_boss_ormorok();
 void AddSC_boss_keristrasza();
 void AddSC_instance_nexus();
-void AddSC_boss_drakos();                //The Nexus The Oculus
+// The Nexus The Oculus
+void AddSC_boss_drakos();
 void AddSC_boss_urom();
 void AddSC_boss_varos();
 void AddSC_boss_eregos();
 void AddSC_instance_oculus();
 void AddSC_oculus();
-void AddSC_boss_malygos();              // The Nexus: Eye of Eternity
+// The Nexus: Eye of Eternity
+void AddSC_boss_malygos();
 void AddSC_instance_eye_of_eternity();
-void AddSC_boss_sartharion();            //Obsidian Sanctum
+// Obsidian Sanctum
+void AddSC_boss_sartharion();
 void AddSC_obsidian_sanctum();
 void AddSC_instance_obsidian_sanctum();
-void AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
+// Ulduar: Halls of Lightning
+void AddSC_boss_bjarngrim();
 void AddSC_boss_loken();
 void AddSC_boss_ionar();
 void AddSC_boss_volkhan();
 void AddSC_instance_halls_of_lightning();
-void AddSC_boss_maiden_of_grief();       //Ulduar Halls of Stone
+// Ulduar: Halls of Stone
+void AddSC_boss_maiden_of_grief();
 void AddSC_boss_krystallus();
 void AddSC_boss_sjonnir();
 void AddSC_instance_halls_of_stone();
 void AddSC_halls_of_stone();
-void AddSC_boss_auriaya();               //Ulduar Ulduar
+// Ulduar
+void AddSC_boss_auriaya();
 void AddSC_boss_flame_leviathan();
 void AddSC_boss_ignis();
 void AddSC_boss_razorscale();
@@ -114,29 +121,26 @@ void AddSC_boss_thorim();
 void AddSC_boss_yogg_saron();
 void AddSC_boss_algalon_the_observer();
 void AddSC_instance_ulduar();
-
 // Utgarde Keep - Utgarde Keep
 void AddSC_boss_keleseth();
 void AddSC_boss_skarvald_dalronn();
 void AddSC_boss_ingvar_the_plunderer();
 void AddSC_instance_utgarde_keep();
 void AddSC_utgarde_keep();
-
 // Utgarde Keep - Utgarde Pinnacle
 void AddSC_boss_svala();
 void AddSC_boss_palehoof();
 void AddSC_boss_skadi();
 void AddSC_boss_ymiron();
 void AddSC_instance_utgarde_pinnacle();
-
 // Vault of Archavon
 void AddSC_boss_archavon();
 void AddSC_boss_emalon();
 void AddSC_boss_koralon();
 void AddSC_boss_toravon();
 void AddSC_instance_vault_of_archavon();
-
-void AddSC_boss_cyanigosa();             //Violet Hold
+// Violet Hold
+void AddSC_boss_cyanigosa();
 void AddSC_boss_erekem();
 void AddSC_boss_ichoron();
 void AddSC_boss_lavanthor();
@@ -145,20 +149,24 @@ void AddSC_boss_xevozz();
 void AddSC_boss_zuramat();
 void AddSC_instance_violet_hold();
 void AddSC_violet_hold();
-void AddSC_instance_forge_of_souls();   //Forge of Souls
+// Forge of Souls
+void AddSC_instance_forge_of_souls();
 void AddSC_forge_of_souls();
 void AddSC_boss_bronjahm();
 void AddSC_boss_devourer_of_souls();
-void AddSC_instance_pit_of_saron();     //Pit of Saron
+// Pit of Saron
+void AddSC_instance_pit_of_saron();
 void AddSC_pit_of_saron();
 void AddSC_boss_garfrost();
 void AddSC_boss_ick();
 void AddSC_boss_tyrannus();
-void AddSC_instance_halls_of_reflection();   // Halls of Reflection
+// Halls of Reflection
+void AddSC_instance_halls_of_reflection();
 void AddSC_halls_of_reflection();
 void AddSC_boss_falric();
 void AddSC_boss_marwyn();
-void AddSC_boss_lord_marrowgar();       // Icecrown Citadel
+// Icecrown Citadel
+void AddSC_boss_lord_marrowgar();
 void AddSC_boss_lady_deathwhisper();
 void AddSC_boss_icecrown_gunship_battle();
 void AddSC_boss_deathbringer_saurfang();
@@ -167,19 +175,22 @@ void AddSC_boss_rotface();
 void AddSC_boss_professor_putricide();
 void AddSC_boss_blood_prince_council();
 void AddSC_boss_blood_queen_lana_thel();
+void AddSC_boss_sister_svalna();
 void AddSC_boss_valithria_dreamwalker();
 void AddSC_boss_sindragosa();
 void AddSC_boss_the_lich_king();
 void AddSC_icecrown_citadel_teleport();
 void AddSC_instance_icecrown_citadel();
 void AddSC_icecrown_citadel();
-void AddSC_instance_ruby_sanctum();      // Ruby Sanctum
+// Ruby Sanctum
+void AddSC_instance_ruby_sanctum();
 void AddSC_ruby_sanctum();
 void AddSC_boss_baltharus_the_warborn();
 void AddSC_boss_saviana_ragefire();
 void AddSC_boss_general_zarithrian();
 void AddSC_boss_halion();
-void AddSC_isle_of_conquest();           // Isle of Conquest
+// Isle of Conquest
+void AddSC_isle_of_conquest();
 void AddSC_boss_ioc_horde_alliance();
 
 void AddSC_dalaran();
@@ -198,13 +209,13 @@ void AddSC_crystalsong_forest();
 // void Add${NameOfDirectory}Scripts()
 void AddNorthrendScripts()
 {
-    AddSC_boss_slad_ran();               //Gundrak
+    // Gundrak
+    AddSC_boss_slad_ran();
     AddSC_boss_moorabi();
     AddSC_boss_drakkari_colossus();
     AddSC_boss_gal_darah();
     AddSC_boss_eck();
     AddSC_instance_gundrak();
-
     // Azjol-Nerub - Ahn'kahet
     AddSC_boss_elder_nadox();
     AddSC_boss_taldaram();
@@ -212,33 +223,33 @@ void AddNorthrendScripts()
     AddSC_boss_jedoga_shadowseeker();
     AddSC_boss_volazj();
     AddSC_instance_ahnkahet();
-
     // Azjol-Nerub - Azjol-Nerub
     AddSC_boss_krik_thir();
     AddSC_boss_hadronox();
     AddSC_boss_anub_arak();
     AddSC_instance_azjol_nerub();
-
     // Drak'Tharon Keep
     AddSC_boss_trollgore();
     AddSC_boss_novos();
     AddSC_boss_king_dred();
     AddSC_boss_tharon_ja();
     AddSC_instance_drak_tharon_keep();
-
-    AddSC_boss_argent_challenge();      //Trial of the Champion
+    // Trial of the Champion
+    AddSC_boss_argent_challenge();
     AddSC_boss_black_knight();
     AddSC_boss_grand_champions();
     AddSC_instance_trial_of_the_champion();
     AddSC_trial_of_the_champion();
-    AddSC_boss_anubarak_trial();        //Trial of the Crusader
+    // Trial of the Crusader
+    AddSC_boss_anubarak_trial();
     AddSC_boss_faction_champions();
     AddSC_boss_jaraxxus();
     AddSC_trial_of_the_crusader();
     AddSC_boss_twin_valkyr();
     AddSC_boss_northrend_beasts();
     AddSC_instance_trial_of_the_crusader();
-    AddSC_boss_anubrekhan();            //Naxxramas
+    // Naxxramas
+    AddSC_boss_anubrekhan();
     AddSC_boss_maexxna();
     AddSC_boss_patchwerk();
     AddSC_boss_grobbulus();
@@ -254,34 +265,41 @@ void AddNorthrendScripts()
     AddSC_boss_gothik();
     AddSC_boss_thaddius();
     AddSC_instance_naxxramas();
-    AddSC_boss_nexus_commanders();      // The Nexus Nexus
+    // The Nexus: Nexus
+    AddSC_boss_nexus_commanders();
     AddSC_boss_magus_telestra();
     AddSC_boss_anomalus();
     AddSC_boss_ormorok();
     AddSC_boss_keristrasza();
     AddSC_instance_nexus();
-    AddSC_boss_drakos();                //The Nexus The Oculus
+    // The Nexus: The Oculus
+    AddSC_boss_drakos();
     AddSC_boss_urom();
     AddSC_boss_varos();
     AddSC_boss_eregos();
     AddSC_instance_oculus();
     AddSC_oculus();
-    AddSC_boss_malygos();              // The Nexus: Eye of Eternity
+    // The Nexus: Eye of Eternity
+    AddSC_boss_malygos();
     AddSC_instance_eye_of_eternity();
-    AddSC_boss_sartharion();            //Obsidian Sanctum
+    // Obsidian Sanctum
+    AddSC_boss_sartharion();
     AddSC_obsidian_sanctum();
     AddSC_instance_obsidian_sanctum();
-    AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
+    // Halls of Lightning
+    AddSC_boss_bjarngrim();
     AddSC_boss_loken();
     AddSC_boss_ionar();
     AddSC_boss_volkhan();
     AddSC_instance_halls_of_lightning();
-    AddSC_boss_maiden_of_grief();       //Ulduar Halls of Stone
+    // Halls of Stone
+    AddSC_boss_maiden_of_grief();
     AddSC_boss_krystallus();
     AddSC_boss_sjonnir();
     AddSC_instance_halls_of_stone();
     AddSC_halls_of_stone();
-    AddSC_boss_auriaya();               //Ulduar Ulduar
+    // Ulduar
+    AddSC_boss_auriaya();
     AddSC_boss_flame_leviathan();
     AddSC_boss_ignis();
     AddSC_boss_razorscale();
@@ -296,29 +314,26 @@ void AddNorthrendScripts()
     AddSC_boss_yogg_saron();
     AddSC_boss_algalon_the_observer();
     AddSC_instance_ulduar();
-
     // Utgarde Keep - Utgarde Keep
     AddSC_boss_keleseth();
     AddSC_boss_skarvald_dalronn();
     AddSC_boss_ingvar_the_plunderer();
     AddSC_instance_utgarde_keep();
     AddSC_utgarde_keep();
-
     // Utgarde Keep - Utgarde Pinnacle
     AddSC_boss_svala();
     AddSC_boss_palehoof();
     AddSC_boss_skadi();
     AddSC_boss_ymiron();
     AddSC_instance_utgarde_pinnacle();
-
     // Vault of Archavon
     AddSC_boss_archavon();
     AddSC_boss_emalon();
     AddSC_boss_koralon();
     AddSC_boss_toravon();
     AddSC_instance_vault_of_archavon();
-
-    AddSC_boss_cyanigosa();             //Violet Hold
+    // Violet Hold
+    AddSC_boss_cyanigosa();
     AddSC_boss_erekem();
     AddSC_boss_ichoron();
     AddSC_boss_lavanthor();
@@ -327,20 +342,24 @@ void AddNorthrendScripts()
     AddSC_boss_zuramat();
     AddSC_instance_violet_hold();
     AddSC_violet_hold();
-    AddSC_instance_forge_of_souls();   //Forge of Souls
+    // Forge of Souls
+    AddSC_instance_forge_of_souls();
     AddSC_forge_of_souls();
     AddSC_boss_bronjahm();
     AddSC_boss_devourer_of_souls();
-    AddSC_instance_pit_of_saron();      //Pit of Saron
+    // Pit of Saron
+    AddSC_instance_pit_of_saron();
     AddSC_pit_of_saron();
     AddSC_boss_garfrost();
     AddSC_boss_ick();
     AddSC_boss_tyrannus();
-    AddSC_instance_halls_of_reflection();   // Halls of Reflection
+    // Halls of Reflection
+    AddSC_instance_halls_of_reflection();
     AddSC_halls_of_reflection();
     AddSC_boss_falric();
     AddSC_boss_marwyn();
-    AddSC_boss_lord_marrowgar();        // Icecrown Citadel
+    // Icecrown Citadel
+    AddSC_boss_lord_marrowgar();
     AddSC_boss_lady_deathwhisper();
     AddSC_boss_icecrown_gunship_battle();
     AddSC_boss_deathbringer_saurfang();
@@ -349,19 +368,22 @@ void AddNorthrendScripts()
     AddSC_boss_professor_putricide();
     AddSC_boss_blood_prince_council();
     AddSC_boss_blood_queen_lana_thel();
+    AddSC_boss_sister_svalna();
     AddSC_boss_valithria_dreamwalker();
     AddSC_boss_sindragosa();
     AddSC_boss_the_lich_king();
     AddSC_icecrown_citadel_teleport();
     AddSC_instance_icecrown_citadel();
     AddSC_icecrown_citadel();
-    AddSC_instance_ruby_sanctum();      // Ruby Sanctum
+    // Ruby Sanctum
+    AddSC_instance_ruby_sanctum();
     AddSC_ruby_sanctum();
     AddSC_boss_baltharus_the_warborn();
     AddSC_boss_saviana_ragefire();
     AddSC_boss_general_zarithrian();
     AddSC_boss_halion();
-    AddSC_isle_of_conquest();          // Isle of Conquest
+    // Isle of Conquest
+    AddSC_isle_of_conquest();
     AddSC_boss_ioc_horde_alliance();
 
     AddSC_dalaran();