*Merge

--HG--
branch : trunk

1 files changed, 2 insertions, 1281 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 50a502e98ed..84215e01a0c 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -8,6 +8,7 @@
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
+#include "../system/ScriptLoader.h"
 
 #define _FULLVERSION "TrinityScript"
 
@@ -42,647 +43,6 @@ void FillSpellSummary();
 void LoadOverridenSQLData();
 void LoadOverridenDBCData();
 
-// -- Scripts to be added --
-
-// -- Areatrigger --
-extern void AddSC_areatrigger_scripts();
-
-// -- Boss --
-extern void AddSC_boss_emeriss();
-extern void AddSC_boss_taerar();
-extern void AddSC_boss_ysondre();
-
-// -- Creature --
-extern void AddSC_generic_creature();
-
-// -- Custom --
-
-// -- Examples --
-extern void AddSC_example_creature();
-extern void AddSC_example_escort();
-extern void AddSC_example_gossip_codebox();
-extern void AddSC_example_misc();
-
-// -- GO --
-extern void AddSC_go_scripts();
-
-// -- Guard --
-extern void AddSC_guards();
-
-// -- Honor --
-
-// -- Item --
-extern void AddSC_item_scripts();
-
-// -- NPC --
-extern void AddSC_npc_professions();
-extern void AddSC_npcs_special();
-extern void AddSC_npc_taxi();
-
-// -- Servers --
-
-//--------------------
-//------ ZONE --------
-
-//Alterac Mountains
-//extern void AddSC_alterac_mountains();
-
-//Arathi Highlands
-extern void AddSC_arathi_highlands();
-
-//Ashenvale Forest
-extern void AddSC_ashenvale();
-
-//Aunchindoun
-//--Auchenai Crypts
-extern void AddSC_boss_exarch_maladaar();
-extern void AddSC_boss_shirrak_the_dead_watcher();
-
-//--Mana Tombs
-extern void AddSC_boss_nexusprince_shaffar();
-extern void AddSC_boss_pandemonius();
-
-//--Sekketh Halls
-extern void AddSC_boss_darkweaver_syth();
-extern void AddSC_boss_talon_king_ikiss();
-extern void AddSC_instance_sethekk_halls();
-
-//--Shadow Labyrinth
-extern void AddSC_boss_ambassador_hellmaw();
-extern void AddSC_boss_blackheart_the_inciter();
-extern void AddSC_boss_grandmaster_vorpil();
-extern void AddSC_boss_murmur();
-extern void AddSC_instance_shadow_labyrinth();
-
-//Azjol-Nerub
-//--Ahn'kahet
-extern void AddSC_instance_ahnkahet();
-extern void AddSC_boss_elder_nadox();
-
-//Azshara
-extern void AddSC_boss_azuregos();
-extern void AddSC_azshara();
-
-//Azuremyst Isle
-extern void AddSC_azuremyst_isle();
-
-//Badlands
-//Barrens
-extern void AddSC_the_barrens();
-
-//Black Temple
-extern void AddSC_black_temple();
-extern void AddSC_boss_illidan();
-extern void AddSC_boss_shade_of_akama();
-extern void AddSC_boss_supremus();
-extern void AddSC_boss_gurtogg_bloodboil();
-extern void AddSC_boss_mother_shahraz();
-extern void AddSC_boss_reliquary_of_souls();
-extern void AddSC_boss_teron_gorefiend();
-extern void AddSC_boss_najentus();
-extern void AddSC_boss_illidari_council();
-extern void AddSC_instance_black_temple();
-
-//Blackfathom Depths
-extern void AddSC_instance_blackfathom_deeps();
-
-//Blackrock Depths
-extern void AddSC_blackrock_depths();
-extern void AddSC_boss_ambassador_flamelash();
-extern void AddSC_boss_anubshiah();
-extern void AddSC_boss_draganthaurissan();
-extern void AddSC_boss_general_angerforge();
-extern void AddSC_boss_gorosh_the_dervish();
-extern void AddSC_boss_grizzle();
-extern void AddSC_boss_high_interrogator_gerstahn();
-extern void AddSC_boss_magmus();
-extern void AddSC_boss_moira_bronzebeard();
-extern void AddSC_boss_tomb_of_seven();
-extern void AddSC_instance_blackrock_depths();
-
-//Blackrock Spire
-extern void AddSC_boss_drakkisath();
-extern void AddSC_boss_halycon();
-extern void AddSC_boss_highlordomokk();
-extern void AddSC_boss_mothersmolderweb();
-extern void AddSC_boss_overlordwyrmthalak();
-extern void AddSC_boss_shadowvosh();
-extern void AddSC_boss_thebeast();
-extern void AddSC_boss_warmastervoone();
-extern void AddSC_boss_quatermasterzigris();
-extern void AddSC_boss_pyroguard_emberseer();
-extern void AddSC_boss_gyth();
-extern void AddSC_boss_rend_blackhand();
-
-//Blackwing lair
-extern void AddSC_boss_razorgore();
-extern void AddSC_boss_vael();
-extern void AddSC_boss_broodlord();
-extern void AddSC_boss_firemaw();
-extern void AddSC_boss_ebonroc();
-extern void AddSC_boss_flamegor();
-extern void AddSC_boss_chromaggus();
-extern void AddSC_boss_nefarian();
-extern void AddSC_boss_victor_nefarius();
-
-//Blade's Edge Mountains
-extern void AddSC_blades_edge_mountains();
-
-//Blasted lands
-extern void AddSC_boss_kruul();
-extern void AddSC_blasted_lands();
-
-//Bloodmyst Isle
-extern void AddSC_bloodmyst_isle();
-
-//Borean Tundra
-extern void AddSC_borean_tundra();
-
-//Burning steppes
-extern void AddSC_burning_steppes();
-
-//Caverns of Time
-//--Battle for Mt. Hyjal
-extern void AddSC_hyjal();
-extern void AddSC_boss_archimonde();
-extern void AddSC_instance_mount_hyjal();
-extern void AddSC_hyjal_trash();
-extern void AddSC_boss_rage_winterchill();
-extern void AddSC_boss_anetheron();
-extern void AddSC_boss_kazrogal();
-extern void AddSC_boss_azgalor();
-
-//--Old Hillsbrad
-extern void AddSC_boss_captain_skarloc();
-extern void AddSC_boss_epoch_hunter();
-extern void AddSC_boss_lieutenant_drake();
-extern void AddSC_instance_old_hillsbrad();
-extern void AddSC_old_hillsbrad();
-
-//--The Dark Portal
-extern void AddSC_boss_aeonus();
-extern void AddSC_boss_chrono_lord_deja();
-extern void AddSC_boss_temporus();
-extern void AddSC_dark_portal();
-extern void AddSC_instance_dark_portal();
-
-//Coilfang Resevoir
-//--Serpent Shrine Cavern
-extern void AddSC_boss_fathomlord_karathress();
-extern void AddSC_boss_hydross_the_unstable();
-extern void AddSC_boss_lady_vashj();
-extern void AddSC_boss_leotheras_the_blind();
-extern void AddSC_boss_morogrim_tidewalker();
-extern void AddSC_instance_serpentshrine_cavern();
-extern void AddSC_boss_the_lurker_below();
-
-//--Slave Pens
-
-//--Steam Vault
-extern void AddSC_boss_hydromancer_thespia();
-extern void AddSC_boss_mekgineer_steamrigger();
-extern void AddSC_boss_warlord_kalithresh();
-extern void AddSC_instance_steam_vault();
-
-//--Underbog
-extern void AddSC_boss_hungarfen();
-extern void AddSC_boss_the_black_stalker();
-
-//Darkshore
-extern void AddSC_darkshore();
-
-//Darnassus
-//Deadmines
-extern void AddSC_instance_deadmines();
-
-//Deadwind pass
-//Desolace
-extern void AddSC_desolace();
-
-//Dire Maul
-
-extern void AddSC_dragonblight();
-
-//Dun Morogh
-extern void AddSC_dun_morogh();
-
-//Durotar
-//Duskwood
-//Dustwallow marsh
-extern void AddSC_dustwallow_marsh();
-
-//Eversong Woods
-extern void AddSC_eversong_woods();
-
-//Exodar
-//Eastern Plaguelands
-extern void AddSC_eastern_plaguelands();
-extern void AddSC_the_scarlet_enclave();
-
-//Elwynn Forest
-extern void AddSC_elwynn_forest();
-
-//Felwood
-extern void AddSC_felwood();
-
-//Feralas
-extern void AddSC_feralas();
-
-//Ghostlands
-extern void AddSC_ghostlands();
-
-//Gnomeregan
-
-//Grizzly Hills
-extern void AddSC_grizzly_hills();
-
-//Gruul's Lair
-extern void AddSC_boss_gruul();
-extern void AddSC_boss_high_king_maulgar();
-extern void AddSC_instance_gruuls_lair();
-
-//Hellfire Citadel
-//--Blood Furnace
-extern void AddSC_boss_broggok();
-extern void AddSC_boss_kelidan_the_breaker();
-extern void AddSC_boss_the_maker();
-extern void AddSC_instance_blood_furnace();
-
-//--Magtheridon's Lair
-extern void AddSC_boss_magtheridon();
-extern void AddSC_instance_magtheridons_lair();
-
-//--Shattered Halls
-extern void AddSC_boss_grand_warlock_nethekurse();
-extern void AddSC_boss_warbringer_omrogg();
-extern void AddSC_boss_warchief_kargath_bladefist();
-extern void AddSC_instance_shattered_halls();
-
-//--Ramparts
-extern void AddSC_boss_watchkeeper_gargolmar();
-extern void AddSC_boss_omor_the_unscarred();
-extern void AddSC_boss_vazruden_the_herald();
-extern void AddSC_instance_ramparts();
-
-//Hellfire Peninsula
-extern void AddSC_boss_doomlordkazzak();
-extern void AddSC_hellfire_peninsula();
-
-//Hillsbrad Foothills
-//Hinterlands
-extern void AddSC_hinterlands();
-
-//Icecrown
-extern void AddSC_icecrown();
-
-//Ironforge
-extern void AddSC_ironforge();
-
-//Isle of Quel'Danas
-extern void AddSC_isle_of_queldanas();
-
-//Karazhan
-extern void AddSC_boss_attumen();
-extern void AddSC_boss_curator();
-extern void AddSC_boss_maiden_of_virtue();
-extern void AddSC_boss_shade_of_aran();
-extern void AddSC_boss_malchezaar();
-extern void AddSC_boss_terestian_illhoof();
-extern void AddSC_boss_moroes();
-extern void AddSC_bosses_opera();
-extern void AddSC_boss_netherspite();
-extern void AddSC_instance_karazhan();
-extern void AddSC_karazhan();
-extern void AddSC_boss_nightbane();
-
-//Loch Modan
-extern void AddSC_loch_modan();
-
-//Lower Blackrock Spire
-
-// Magister's Terrace
-extern void AddSC_boss_felblood_kaelthas();
-extern void AddSC_boss_selin_fireheart();
-extern void AddSC_boss_vexallus();
-extern void AddSC_boss_priestess_delrissa();
-extern void AddSC_instance_magisters_terrace();
-extern void AddSC_magisters_terrace();
-
-//Maraudon
-extern void AddSC_boss_celebras_the_cursed();
-extern void AddSC_boss_landslide();
-extern void AddSC_boss_noxxion();
-extern void AddSC_boss_ptheradras();
-
-//Molten core
-extern void AddSC_boss_lucifron();
-extern void AddSC_boss_magmadar();
-extern void AddSC_boss_gehennas();
-extern void AddSC_boss_garr();
-extern void AddSC_boss_baron_geddon();
-extern void AddSC_boss_shazzrah();
-extern void AddSC_boss_golemagg();
-extern void AddSC_boss_sulfuron();
-extern void AddSC_boss_majordomo();
-extern void AddSC_boss_ragnaros();
-extern void AddSC_instance_molten_core();
-extern void AddSC_molten_core();
-
-//Moonglade
-extern void AddSC_moonglade();
-
-//Mulgore
-extern void AddSC_mulgore();
-
-//Nagrand
-extern void AddSC_nagrand();
-
-//Naxxramas
-extern void AddSC_boss_anubrekhan();
-extern void AddSC_boss_maexxna();
-extern void AddSC_boss_patchwerk();
-extern void AddSC_boss_grobbulus();
-extern void AddSC_boss_razuvious();
-extern void AddSC_boss_kelthuzad();
-extern void AddSC_boss_loatheb();
-extern void AddSC_boss_noth();
-extern void AddSC_boss_gluth();
-extern void AddSC_boss_sapphiron();
-extern void AddSC_boss_four_horsemen();
-extern void AddSC_boss_faerlina();
-extern void AddSC_boss_heigan();
-extern void AddSC_boss_gothik();
-extern void AddSC_boss_thaddius();
-extern void AddSC_instance_naxxramas();
-
-//Netherstorm
-extern void AddSC_netherstorm();
-
-//The Nexus
-extern void AddSC_boss_magus_telestra();
-extern void AddSC_boss_anomalus();
-extern void AddSC_boss_ormorok();
-extern void AddSC_boss_keristrasza();
-extern void AddSC_instance_nexus();
-
-//Obsidian Sanctum
-extern void AddSC_instance_obsidian_sanctum();
-
-//Onyxia's Lair
-extern void AddSC_boss_onyxia();
-
-//Orgrimmar
-extern void AddSC_orgrimmar();
-
-//Ragefire Chasm
-//Razorfen Downs
-extern void AddSC_boss_amnennar_the_coldbringer();
-extern void AddSC_razorfen_downs();
-
-//Razorfen Kraul
-extern void AddSC_razorfen_kraul();
-
-//Redridge Mountains
-//Ruins of Ahn'Qiraj
-//Scarlet Monastery
-extern void AddSC_boss_arcanist_doan();
-extern void AddSC_boss_azshir_the_sleepless();
-extern void AddSC_boss_bloodmage_thalnos();
-extern void AddSC_boss_headless_horseman();
-extern void AddSC_boss_herod();
-extern void AddSC_boss_high_inquisitor_fairbanks();
-extern void AddSC_boss_houndmaster_loksey();
-extern void AddSC_boss_interrogator_vishas();
-extern void AddSC_boss_scorn();
-extern void AddSC_instance_scarlet_monastery();
-extern void AddSC_boss_mograine_and_whitemane();
-
-//Scholomance
-extern void AddSC_boss_darkmaster_gandling();
-extern void AddSC_boss_death_knight_darkreaver();
-extern void AddSC_boss_theolenkrastinov();
-extern void AddSC_boss_illuciabarov();
-extern void AddSC_boss_instructormalicia();
-extern void AddSC_boss_jandicebarov();
-extern void AddSC_boss_kormok();
-extern void AddSC_boss_lordalexeibarov();
-extern void AddSC_boss_lorekeeperpolkelt();
-extern void AddSC_boss_rasfrost();
-extern void AddSC_boss_theravenian();
-extern void AddSC_boss_vectus();
-extern void AddSC_instance_scholomance();
-
-//Searing gorge
-extern void AddSC_searing_gorge();
-
-//Shadowfang keep
-extern void AddSC_shadowfang_keep();
-extern void AddSC_instance_shadowfang_keep();
-
-//Shadowmoon Valley
-extern void AddSC_boss_doomwalker();
-extern void AddSC_shadowmoon_valley();
-
-//Shattrath
-extern void AddSC_shattrath_city();
-
-//Sholazar Basin
-extern void AddSC_sholazar_basin();
-
-//Silithus
-extern void AddSC_silithus();
-
-//Silvermoon
-extern void AddSC_silvermoon_city();
-
-//Silverpine forest
-extern void AddSC_silverpine_forest();
-
-//Stockade
-//Stonetalon mountains
-extern void AddSC_stonetalon_mountains();
-
-//Stormwind City
-extern void AddSC_stormwind_city();
-
-//Stranglethorn Vale
-extern void AddSC_stranglethorn_vale();
-
-//Stratholme
-extern void AddSC_boss_magistrate_barthilas();
-extern void AddSC_boss_maleki_the_pallid();
-extern void AddSC_boss_nerubenkan();
-extern void AddSC_boss_cannon_master_willey();
-extern void AddSC_boss_baroness_anastari();
-extern void AddSC_boss_ramstein_the_gorger();
-extern void AddSC_boss_timmy_the_cruel();
-extern void AddSC_boss_postmaster_malown();
-extern void AddSC_boss_baron_rivendare();
-extern void AddSC_boss_dathrohan_balnazzar();
-extern void AddSC_boss_order_of_silver_hand();
-extern void AddSC_instance_stratholme();
-extern void AddSC_stratholme();
-
-//Sunken Temple
-//Sunwell Plateau
-extern void AddSC_instance_sunwell_plateau();
-extern void AddSC_boss_kalecgos();
-extern void AddSC_boss_brutallus();
-extern void AddSC_boss_felmyst();
-extern void AddSC_boss_eredar_twins();
-extern void AddSC_boss_muru();
-extern void AddSC_boss_kiljaeden();
-extern void AddSC_sunwell_plateau();
-
-//Tanaris
-extern void AddSC_tanaris();
-
-//Teldrassil
- extern void AddSC_teldrassil();
- 
-//Tempest Keep
-//--Arcatraz
-extern void AddSC_arcatraz();
-extern void AddSC_boss_harbinger_skyriss();
-extern void AddSC_instance_arcatraz();
-
-//--Botanica
-extern void AddSC_boss_high_botanist_freywinn();
-extern void AddSC_boss_laj();
-extern void AddSC_boss_warp_splinter();
-
-//--The Eye
-extern void AddSC_boss_alar();
-extern void AddSC_boss_kaelthas();
-extern void AddSC_boss_void_reaver();
-extern void AddSC_boss_high_astromancer_solarian();
-extern void AddSC_instance_the_eye();
-extern void AddSC_the_eye();
-
-//--The Mechanar
-extern void AddSC_boss_gatewatcher_iron_hand();
-extern void AddSC_boss_nethermancer_sepethrea();
-extern void AddSC_boss_pathaleon_the_calculator();
-extern void AddSC_instance_mechanar();
-
-//Temple of ahn'qiraj
-extern void AddSC_boss_cthun();
-extern void AddSC_boss_fankriss();
-extern void AddSC_boss_huhuran();
-extern void AddSC_bug_trio();
-extern void AddSC_boss_sartura();
-extern void AddSC_boss_skeram();
-extern void AddSC_boss_twinemperors();
-extern void AddSC_mob_anubisath_sentinel();
-extern void AddSC_instance_temple_of_ahnqiraj();
-
-//Terokkar Forest
-extern void AddSC_terokkar_forest();
-
-//Thousand Needles
-extern void AddSC_thousand_needles();
-
-//Thunder Bluff
-extern void AddSC_thunder_bluff();
-
-//Tirisfal Glades
-extern void AddSC_tirisfal_glades();
-
-//Uldaman
-extern void AddSC_boss_archaedas();
-extern void AddSC_boss_ironaya();
-extern void AddSC_uldaman();
-extern void AddSC_instance_uldaman();
-
-//Undercity
-extern void AddSC_undercity();
-
-//Un'Goro Crater
-extern void AddSC_ungoro_crater();
-
-//Upper blackrock spire
-
-//Utgarde Keep
-extern void AddSC_boss_keleseth();
-extern void AddSC_boss_skarvald_dalronn();
-extern void AddSC_boss_ingvar_the_plunderer();
-extern void AddSC_instance_utgarde_keep();
-extern void AddSC_utgarde_keep();
-
-//Wailing caverns
-extern void AddSC_wailing_caverns();
-extern void AddSC_instance_wailing_caverns();
-
-//Western plaguelands
-extern void AddSC_western_plaguelands();
-
-//Westfall
-extern void AddSC_westfall();
-
-//Wetlands
-//Winterspring
-extern void AddSC_winterspring();
-
-//Zangarmarsh
-extern void AddSC_zangarmarsh();
-
-//Zul'Farrak
-extern void AddSC_zulfarrak();
-
-//Zul'Gurub
-extern void AddSC_boss_jeklik();
-extern void AddSC_boss_venoxis();
-extern void AddSC_boss_marli();
-extern void AddSC_boss_mandokir();
-extern void AddSC_boss_gahzranka();
-extern void AddSC_boss_thekal();
-extern void AddSC_boss_arlokk();
-extern void AddSC_boss_jindo();
-extern void AddSC_boss_hakkar();
-extern void AddSC_boss_grilek();
-extern void AddSC_boss_hazzarah();
-extern void AddSC_boss_renataki();
-extern void AddSC_boss_wushoolay();
-extern void AddSC_instance_zulgurub();
-
-//Zul'Aman
-extern void AddSC_boss_akilzon();
-extern void AddSC_boss_halazzi();
-extern void AddSC_boss_hex_lord_malacrass();
-extern void AddSC_boss_janalai();
-extern void AddSC_boss_nalorakk();
-extern void AddSC_boss_zuljin();
-extern void AddSC_instance_zulaman();
-extern void AddSC_zulaman();
-
-//Zul'Drak
-extern void AddSC_zuldrak();
-
-//Northrend
-//Dungeon
-
-//Vault of Archavon
-extern void AddSC_boss_archavon();
-extern void AddSC_boss_emalon();
-extern void AddSC_instance_archavon();
-
-//Ulduar
-extern void AddSC_boss_auriaya();
-extern void AddSC_boss_flame_leviathan();
-extern void AddSC_boss_ignis();
-extern void AddSC_boss_razorscale();
-extern void AddSC_boss_xt002();
-//extern void AddSC_instance_ulduar();
-
-//Halls of Lightning
-extern void AddSC_boss_bjarngrim();
-extern void AddSC_boss_loken();
-extern void AddSC_instance_halls_of_lightning();
-
-//Region
-extern void AddSC_wintergrasp();
-
-// -------------------
 void LoadDatabase()
 {
     //Get db string from file
@@ -979,646 +339,7 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
 
     FillSpellSummary();
 
-    // -- Scripts to be added --
-
-    // -- Areatrigger --
-    AddSC_areatrigger_scripts();
-
-    // -- Boss --
-    AddSC_boss_emeriss();
-    AddSC_boss_taerar();
-    AddSC_boss_ysondre();
-
-    // -- Creature --
-    AddSC_generic_creature();
-
-    // -- Custom --
-
-    // -- Examples --
-    AddSC_example_creature();
-    AddSC_example_escort();
-    AddSC_example_gossip_codebox();
-    AddSC_example_misc();
-
-    // -- GO --
-    AddSC_go_scripts();
-
-    // -- Guard --
-    AddSC_guards();
-
-    // -- Honor --
-
-    // -- Item --
-    AddSC_item_scripts();
-
-    // -- NPC --
-    AddSC_npc_professions();
-    AddSC_npcs_special();
-    AddSC_npc_taxi();
-
-    // -- Servers --
-
-    //--------------------
-    //------ ZONE --------
-
-    //Alterac Mountains
-    //AddSC_alterac_mountains();
-
-    //Arathi Highlands
-    AddSC_arathi_highlands();
-
-    //Ashenvale Forest
-    AddSC_ashenvale();
-
-    //Aunchindoun
-    //--Auchenai Crypts
-    AddSC_boss_exarch_maladaar();
-    AddSC_boss_shirrak_the_dead_watcher();
-
-    //--Mana Tombs
-    AddSC_boss_nexusprince_shaffar();
-    AddSC_boss_pandemonius();
-
-    //--Sekketh Halls
-    AddSC_boss_darkweaver_syth();
-    AddSC_boss_talon_king_ikiss();
-    AddSC_instance_sethekk_halls();
-
-    //--Shadow Labyrinth
-    AddSC_boss_ambassador_hellmaw();
-    AddSC_boss_blackheart_the_inciter();
-    AddSC_boss_grandmaster_vorpil();
-    AddSC_boss_murmur();
-    AddSC_instance_shadow_labyrinth();
-
-    //Azjol-Nerub
-    //--Ahn'kahet
-    AddSC_instance_ahnkahet();
-    AddSC_boss_elder_nadox();
-
-    //Azshara
-    AddSC_boss_azuregos();
-    AddSC_azshara();
-
-    //Azuremyst Isle
-    AddSC_azuremyst_isle();
-
-    //Badlands
-    //Barrens
-    AddSC_the_barrens();
-
-    //Black Temple
-    AddSC_black_temple();
-    AddSC_boss_illidan();
-    AddSC_boss_shade_of_akama();
-    AddSC_boss_supremus();
-    AddSC_boss_gurtogg_bloodboil();
-    AddSC_boss_mother_shahraz();
-    AddSC_boss_reliquary_of_souls();
-    AddSC_boss_teron_gorefiend();
-    AddSC_boss_najentus();
-    AddSC_boss_illidari_council();
-    AddSC_instance_black_temple();
-
-    //Blackfathom Depths
-    AddSC_instance_blackfathom_deeps();
-
-    //Blackrock Depths
-    AddSC_blackrock_depths();
-    AddSC_boss_ambassador_flamelash();
-    AddSC_boss_anubshiah();
-    AddSC_boss_draganthaurissan();
-    AddSC_boss_general_angerforge();
-    AddSC_boss_gorosh_the_dervish();
-    AddSC_boss_grizzle();
-    AddSC_boss_high_interrogator_gerstahn();
-    AddSC_boss_magmus();
-    AddSC_boss_moira_bronzebeard();
-    AddSC_boss_tomb_of_seven();
-    AddSC_instance_blackrock_depths();
-
-    //Blackrock Spire
-    AddSC_boss_drakkisath();
-    AddSC_boss_halycon();
-    AddSC_boss_highlordomokk();
-    AddSC_boss_mothersmolderweb();
-    AddSC_boss_overlordwyrmthalak();
-    AddSC_boss_shadowvosh();
-    AddSC_boss_thebeast();
-    AddSC_boss_warmastervoone();
-    AddSC_boss_quatermasterzigris();
-    AddSC_boss_pyroguard_emberseer();
-    AddSC_boss_gyth();
-    AddSC_boss_rend_blackhand();
-
-    //Blackwing lair
-    AddSC_boss_razorgore();
-    AddSC_boss_vael();
-    AddSC_boss_broodlord();
-    AddSC_boss_firemaw();
-    AddSC_boss_ebonroc();
-    AddSC_boss_flamegor();
-    AddSC_boss_chromaggus();
-    AddSC_boss_nefarian();
-    AddSC_boss_victor_nefarius();
-
-    //Blade's Edge Mountains
-    AddSC_blades_edge_mountains();
-
-    //Blasted lands
-    AddSC_boss_kruul();
-    AddSC_blasted_lands();
-
-    //Bloodmyst Isle
-    AddSC_bloodmyst_isle();
-
-    //Borean Tundra
-    AddSC_borean_tundra();
-
-    //Burning steppes
-    AddSC_burning_steppes();
-
-    //Caverns of Time
-    //--Battle for Mt. Hyjal
-    AddSC_hyjal();
-    AddSC_boss_archimonde();
-    AddSC_instance_mount_hyjal();
-    AddSC_hyjal_trash();
-    AddSC_boss_rage_winterchill();
-    AddSC_boss_anetheron();
-    AddSC_boss_kazrogal();
-    AddSC_boss_azgalor();
-
-    //--Old Hillsbrad
-    AddSC_boss_captain_skarloc();
-    AddSC_boss_epoch_hunter();
-    AddSC_boss_lieutenant_drake();
-    AddSC_instance_old_hillsbrad();
-    AddSC_old_hillsbrad();
-
-    //--The Dark Portal
-    AddSC_boss_aeonus();
-    AddSC_boss_chrono_lord_deja();
-    AddSC_boss_temporus();
-    AddSC_dark_portal();
-    AddSC_instance_dark_portal();
-
-    //Coilfang Resevoir
-    //--Serpent Shrine Cavern
-    AddSC_boss_fathomlord_karathress();
-    AddSC_boss_hydross_the_unstable();
-    AddSC_boss_lady_vashj();
-    AddSC_boss_leotheras_the_blind();
-    AddSC_boss_morogrim_tidewalker();
-    AddSC_instance_serpentshrine_cavern();
-    AddSC_boss_the_lurker_below();
-
-    //--Slave Pens
-    //--Steam Vault
-    AddSC_boss_hydromancer_thespia();
-    AddSC_boss_mekgineer_steamrigger();
-    AddSC_boss_warlord_kalithresh();
-    AddSC_instance_steam_vault();
-
-    //--Underbog
-    AddSC_boss_hungarfen();
-    AddSC_boss_the_black_stalker();
-
-    //Darkshore
-    AddSC_darkshore();
-
-    //Darnassus
-    //Deadmines
-    AddSC_instance_deadmines();
-
-    //Deadwind pass
-    //Desolace
-    AddSC_desolace();
-
-    //Dire Maul
-
-    AddSC_dragonblight();
-
-    //Dun Morogh
-    AddSC_dun_morogh();
-
-    //Durotar
-    //Duskwood
-    //Dustwallow marsh
-    AddSC_dustwallow_marsh();
-
-    //Eversong Woods
-    AddSC_eversong_woods();
-
-    //Exodar
-    //Eastern Plaguelands
-    AddSC_eastern_plaguelands();
-    AddSC_the_scarlet_enclave();
-
-    //Elwynn Forest
-    AddSC_elwynn_forest();
-
-    //Felwood
-    AddSC_felwood();
-
-    //Feralas
-    AddSC_feralas();
-
-    //Ghostlands
-    AddSC_ghostlands();
-
-    //Gnomeregan
-
-    //Grizzly Hills
-    AddSC_grizzly_hills();
-
-    //Gruul's Lair
-    AddSC_boss_gruul();
-    AddSC_boss_high_king_maulgar();
-    AddSC_instance_gruuls_lair();
-
-    //Hellfire Citadel
-    //--Blood Furnace
-    AddSC_boss_broggok();
-    AddSC_boss_kelidan_the_breaker();
-    AddSC_boss_the_maker();
-    AddSC_instance_blood_furnace();
-
-    //--Magtheridon's Lair
-    AddSC_boss_magtheridon();
-    AddSC_instance_magtheridons_lair();
-
-    //--Shattered Halls
-    AddSC_boss_grand_warlock_nethekurse();
-    AddSC_boss_warbringer_omrogg();
-    AddSC_boss_warchief_kargath_bladefist();
-    AddSC_instance_shattered_halls();
-
-    //--Ramparts
-    AddSC_boss_watchkeeper_gargolmar();
-    AddSC_boss_omor_the_unscarred();
-    AddSC_boss_vazruden_the_herald();
-    AddSC_instance_ramparts();
-
-    //Hellfire Peninsula
-    AddSC_boss_doomlordkazzak();
-    AddSC_hellfire_peninsula();
-
-    //Hillsbrad Foothills
-    //Hinterlands
-    AddSC_hinterlands();
-
-    //Icecrown
-    AddSC_icecrown();
-
-    //Ironforge
-    AddSC_ironforge();
-
-    //Isle of Quel'Danas
-    AddSC_isle_of_queldanas();
-
-    //Karazhan
-    AddSC_boss_attumen();
-    AddSC_boss_curator();
-    AddSC_boss_maiden_of_virtue();
-    AddSC_boss_shade_of_aran();
-    AddSC_boss_malchezaar();
-    AddSC_boss_terestian_illhoof();
-    AddSC_boss_moroes();
-    AddSC_bosses_opera();
-    AddSC_boss_netherspite();
-    AddSC_instance_karazhan();
-    AddSC_karazhan();
-    AddSC_boss_nightbane();
-
-    //Loch Modan
-    AddSC_loch_modan();
-
-    //Lower Blackrock Spire
-
-    // Magister's Terrace
-    AddSC_boss_felblood_kaelthas();
-    AddSC_boss_selin_fireheart();
-    AddSC_boss_vexallus();
-    AddSC_boss_priestess_delrissa();
-    AddSC_instance_magisters_terrace();
-    AddSC_magisters_terrace();
-
-    //Maraudon
-    AddSC_boss_celebras_the_cursed();
-    AddSC_boss_landslide();
-    AddSC_boss_noxxion();
-    AddSC_boss_ptheradras();
-
-    //Molten core
-    AddSC_boss_lucifron();
-    AddSC_boss_magmadar();
-    AddSC_boss_gehennas();
-    AddSC_boss_garr();
-    AddSC_boss_baron_geddon();
-    AddSC_boss_shazzrah();
-    AddSC_boss_golemagg();
-    AddSC_boss_sulfuron();
-    AddSC_boss_majordomo();
-    AddSC_boss_ragnaros();
-    AddSC_instance_molten_core();
-    AddSC_molten_core();
-
-    //Moonglade
-    AddSC_moonglade();
-
-    //Mulgore
-    AddSC_mulgore();
-
-    //Nagrand
-    AddSC_nagrand();
-
-    //Naxxramas
-    AddSC_boss_anubrekhan();
-    AddSC_boss_faerlina();
-    AddSC_boss_maexxna();
-    AddSC_boss_patchwerk();
-    AddSC_boss_grobbulus();
-    AddSC_boss_razuvious();
-    AddSC_boss_kelthuzad();
-    AddSC_boss_loatheb();
-    AddSC_boss_noth();
-    AddSC_boss_gluth();
-    AddSC_boss_sapphiron();
-    AddSC_boss_four_horsemen();
-    AddSC_boss_heigan();
-    AddSC_boss_gothik();
-    AddSC_boss_thaddius();
-    AddSC_instance_naxxramas();
-
-    //Netherstorm
-    AddSC_netherstorm();
-
-    //The Nexus
-    AddSC_boss_magus_telestra();
-    AddSC_boss_anomalus();
-    AddSC_boss_ormorok();
-    AddSC_boss_keristrasza();
-    AddSC_instance_nexus();
-
-    //Obsidian Sanctum
-    AddSC_instance_obsidian_sanctum();
-
-    //Onyxia's Lair
-    AddSC_boss_onyxia();
-
-    //Orgrimmar
-    AddSC_orgrimmar();
-
-    //Ragefire Chasm
-    //Razorfen Downs
-    AddSC_boss_amnennar_the_coldbringer();
-    AddSC_razorfen_downs();
-
-    //Razorfen Kraul
-    AddSC_razorfen_kraul();
-
-    //Redridge Mountains
-    //Ruins of Ahn'Qiraj
-    //Scarlet Monastery
-    AddSC_boss_arcanist_doan();
-    AddSC_boss_azshir_the_sleepless();
-    AddSC_boss_bloodmage_thalnos();
-    AddSC_boss_headless_horseman();
-    AddSC_boss_herod();
-    AddSC_boss_high_inquisitor_fairbanks();
-    AddSC_boss_houndmaster_loksey();
-    AddSC_boss_interrogator_vishas();
-    AddSC_boss_scorn();
-    AddSC_instance_scarlet_monastery();
-    AddSC_boss_mograine_and_whitemane();
-
-    //Scholomance
-    AddSC_boss_darkmaster_gandling();
-    AddSC_boss_death_knight_darkreaver();
-    AddSC_boss_theolenkrastinov();
-    AddSC_boss_illuciabarov();
-    AddSC_boss_instructormalicia();
-    AddSC_boss_jandicebarov();
-    AddSC_boss_kormok();
-    AddSC_boss_lordalexeibarov();
-    AddSC_boss_lorekeeperpolkelt();
-    AddSC_boss_rasfrost();
-    AddSC_boss_theravenian();
-    AddSC_boss_vectus();
-    AddSC_instance_scholomance();
-
-    //Searing gorge
-    AddSC_searing_gorge();
-
-    //Shadowfang keep
-    AddSC_shadowfang_keep();
-    AddSC_instance_shadowfang_keep();
-
-    //Shadowmoon Valley
-    AddSC_boss_doomwalker();
-    AddSC_shadowmoon_valley();
-
-    //Shattrath
-    AddSC_shattrath_city();
-
-    //Sholazar Basin
-    AddSC_sholazar_basin();
-
-    //Silithus
-    AddSC_silithus();
-
-    //Silvermoon
-    AddSC_silvermoon_city();
-
-    //Silverpine forest
-    AddSC_silverpine_forest();
-
-    //Stockade
-    //Stonetalon mountains
-    AddSC_stonetalon_mountains();
-
-    //Stormwind City
-    AddSC_stormwind_city();
-
-    //Stranglethorn Vale
-    AddSC_stranglethorn_vale();
-
-    //Stratholme
-    AddSC_boss_magistrate_barthilas();
-    AddSC_boss_maleki_the_pallid();
-    AddSC_boss_nerubenkan();
-    AddSC_boss_cannon_master_willey();
-    AddSC_boss_baroness_anastari();
-    AddSC_boss_ramstein_the_gorger();
-    AddSC_boss_timmy_the_cruel();
-    AddSC_boss_postmaster_malown();
-    AddSC_boss_baron_rivendare();
-    AddSC_boss_dathrohan_balnazzar();
-    AddSC_boss_order_of_silver_hand();
-    AddSC_instance_stratholme();
-    AddSC_stratholme();
-
-    //Sunken Temple
-    //Sunwell Plateau
-    AddSC_instance_sunwell_plateau();
-    AddSC_boss_kalecgos();
-    AddSC_boss_brutallus();
-    AddSC_boss_felmyst();
-    AddSC_boss_eredar_twins();
-    AddSC_boss_muru();
-    AddSC_boss_kiljaeden();
-    AddSC_sunwell_plateau();
-
-    //Tanaris
-    AddSC_tanaris();
-
-    //Teldrassil
-    AddSC_teldrassil();
-
-    //Tempest Keep
-    //--Arcatraz
-    AddSC_arcatraz();
-    AddSC_boss_harbinger_skyriss();
-    AddSC_instance_arcatraz();
-
-    //--Botanica
-    AddSC_boss_high_botanist_freywinn();
-    AddSC_boss_laj();
-    AddSC_boss_warp_splinter();
-
-    //--The Eye
-    AddSC_boss_alar();
-    AddSC_boss_kaelthas();
-    AddSC_boss_void_reaver();
-    AddSC_boss_high_astromancer_solarian();
-    AddSC_instance_the_eye();
-    AddSC_the_eye();
-
-    //--The Mechanar
-    AddSC_boss_gatewatcher_iron_hand();
-    AddSC_boss_nethermancer_sepethrea();
-    AddSC_boss_pathaleon_the_calculator();
-    AddSC_instance_mechanar();
-
-    //Temple of ahn'qiraj
-    AddSC_boss_cthun();
-    AddSC_boss_fankriss();
-    AddSC_boss_huhuran();
-    AddSC_bug_trio();
-    AddSC_boss_sartura();
-    AddSC_boss_skeram();
-    AddSC_boss_twinemperors();
-    AddSC_mob_anubisath_sentinel();
-    AddSC_instance_temple_of_ahnqiraj();
-
-    //Terokkar Forest
-    AddSC_terokkar_forest();
-
-    //Thousand Needles
-    AddSC_thousand_needles();
-
-    //Thunder Bluff
-    AddSC_thunder_bluff();
-
-    //Tirisfal Glades
-    AddSC_tirisfal_glades();
-
-    //Uldaman
-    AddSC_boss_archaedas();
-    AddSC_boss_ironaya();
-    AddSC_uldaman();
-    AddSC_instance_uldaman();
-
-    //Undercity
-    AddSC_undercity();
-
-    //Un'Goro Crater
-    AddSC_ungoro_crater();
-
-    //Upper blackrock spire
-
-    //Utgarde Keep
-    AddSC_boss_keleseth();
-    AddSC_boss_skarvald_dalronn();
-    AddSC_boss_ingvar_the_plunderer();
-    AddSC_instance_utgarde_keep();
-    AddSC_utgarde_keep();
-
-    //Wailing caverns
-    AddSC_wailing_caverns();
-    AddSC_instance_wailing_caverns();
-
-    //Western plaguelands
-    AddSC_western_plaguelands();
-
-    //Westfall
-    AddSC_westfall();
-
-    //Wetlands
-    //Winterspring
-    AddSC_winterspring();
-
-    //Zangarmarsh
-    AddSC_zangarmarsh();
-
-    //Zul'Farrak
-    AddSC_zulfarrak();
-
-    //Zul'Gurub
-    AddSC_boss_jeklik();
-    AddSC_boss_venoxis();
-    AddSC_boss_marli();
-    AddSC_boss_mandokir();
-    AddSC_boss_gahzranka();
-    AddSC_boss_thekal();
-    AddSC_boss_arlokk();
-    AddSC_boss_jindo();
-    AddSC_boss_hakkar();
-    AddSC_boss_grilek();
-    AddSC_boss_hazzarah();
-    AddSC_boss_renataki();
-    AddSC_boss_wushoolay();
-    AddSC_instance_zulgurub();
-
-    //Zul'Aman
-    AddSC_boss_akilzon();
-    AddSC_boss_halazzi();
-    AddSC_boss_hex_lord_malacrass();
-    AddSC_boss_janalai();
-    AddSC_boss_nalorakk();
-    AddSC_boss_zuljin();
-    AddSC_instance_zulaman();
-    AddSC_zulaman();
-
-    //Zul'Drak
-    AddSC_zuldrak();
-
-    //Northrend
-    //Dungeon
-
-    //Vault of Archavon
-    AddSC_boss_archavon();
-    AddSC_boss_emalon();
-    AddSC_instance_archavon();
-
-    //Ulduar
-    AddSC_boss_auriaya();
-    AddSC_boss_flame_leviathan();
-    AddSC_boss_ignis();
-    AddSC_boss_razorscale();
-    AddSC_boss_xt002();
-    //AddSC_instance_ulduar();
-
-    //Halls of Lightning
-    AddSC_boss_bjarngrim();
-    AddSC_boss_loken();
-    AddSC_instance_halls_of_lightning();
-
-    //Region
-    AddSC_wintergrasp();
-
-    // -------------------
+    AddScripts();
 
     outstring_log(">> Loaded %i C++ Scripts.", num_sc_scripts);