Remove def_ from headers filename. Part 2

--HG-- branch : trunk
2009-10-22 12:29:57 +02:00
parent 43e933ada2
commit acc00f0b01
119 changed files with 121 additions and 118 deletions
@@ -206,15 +206,15 @@ SET(trinityscript_LIB_SRCS
   scripts/examples/example_gossip_codebox.cpp
   scripts/examples/example_misc.cpp
   scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
-   scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h
+   scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h
   scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
   scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
   scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
   scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
   scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
   scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
-   scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
-   scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h
+   scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
+   scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
   scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
   scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
   scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
@@ -225,7 +225,7 @@ SET(trinityscript_LIB_SRCS
   scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
   scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
   scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
-   scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h
+   scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
   scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
   scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
   scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
@@ -235,7 +235,7 @@ SET(trinityscript_LIB_SRCS
   scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
   scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
   scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
-   scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
+   scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
   scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
   scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
   scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
@@ -245,7 +245,7 @@ SET(trinityscript_LIB_SRCS
   scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
   scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
   scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
-   scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
+   scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
   scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
   scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
   scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
@@ -254,7 +254,7 @@ SET(trinityscript_LIB_SRCS
   scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
   scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
   scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
-   scripts/kalimdor/ruins_of_ahnqiraj/def_ruins_of_ahnqiraj.h
+   scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
   scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
   scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
   scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
@@ -265,10 +265,10 @@ SET(trinityscript_LIB_SRCS
   scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
   scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
   scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
-   scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
+   scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
   scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
   scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
-   scripts/kalimdor/wailing_caverns/def_wailing_caverns.h
+   scripts/kalimdor/wailing_caverns/wailing_caverns.h
   scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
   scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
   scripts/kalimdor/zulfarrak/zulfarrak.cpp
@@ -426,13 +426,13 @@ SET(trinityscript_LIB_SRCS
   scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp
   scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
   scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
-   scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h
+   scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
   scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
   scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
   scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
   scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
   scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
-   scripts/outland/auchindoun/shadow_labyrinth/def_shadow_labyrinth.h
+   scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
   scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
   scripts/outland/black_temple/black_temple.cpp
   scripts/outland/black_temple/boss_bloodboil.cpp
@@ -443,7 +443,7 @@ SET(trinityscript_LIB_SRCS
   scripts/outland/black_temple/boss_supremus.cpp
   scripts/outland/black_temple/boss_teron_gorefiend.cpp
   scripts/outland/black_temple/boss_warlord_najentus.cpp
-   scripts/outland/black_temple/def_black_temple.h
+   scripts/outland/black_temple/black_temple.h
   scripts/outland/black_temple/illidari_council.cpp
   scripts/outland/black_temple/instance_black_temple.cpp
   scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -452,40 +452,40 @@ SET(trinityscript_LIB_SRCS
   scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
   scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
   scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
-   scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
+   scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
   scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
   scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
   scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
   scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
-   scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h
+   scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h
   scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
   scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
   scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
   scripts/outland/gruuls_lair/boss_gruul.cpp
   scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
-   scripts/outland/gruuls_lair/def_gruuls_lair.h
+   scripts/outland/gruuls_lair/gruuls_lair.h
   scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
   scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
   scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
   scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
   scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
-   scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h
+   scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
   scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
   scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
   scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
-   scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
+   scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
   scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
   scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
-   scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
+   scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
   scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
   scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
   scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
-   scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h
+   scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
   scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
   scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
   scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
   scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
-   scripts/outland/tempest_keep/arcatraz/def_arcatraz.h
+   scripts/outland/tempest_keep/arcatraz/arcatraz.h
   scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
   scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
   scripts/outland/tempest_keep/botanica/boss_laj.cpp
@@ -494,14 +494,14 @@ SET(trinityscript_LIB_SRCS
   scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
   scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
   scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
-   scripts/outland/tempest_keep/the_eye/def_the_eye.h
+   scripts/outland/tempest_keep/the_eye/the_eye.h
   scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
   scripts/outland/tempest_keep/the_eye/the_eye.cpp
   scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
   scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
   scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
   scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
-   scripts/outland/tempest_keep/the_mechanar/def_mechanar.h
+   scripts/outland/tempest_keep/the_mechanar/mechanar.h
   scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
   scripts/outland/blades_edge_mountains.cpp
   scripts/outland/boss_doomlord_kazzak.cpp
@@ -22,7 +22,7 @@ SDCategory: Blackfathom Deeps
 EndScriptData */

 #include "precompiled.h"
-#include "def_blackfathom_deeps.h"
+#include "blackfathom_deeps.h"

 #define MAX_ENCOUNTER 2

@@ -10,7 +10,7 @@ Script Data End */
 update creature_template set scriptname = '' where entry = '';
 *** SQL END ***/
 #include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"

 enum Spells
 {
@@ -1,5 +1,5 @@
 #include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"

 enum Spells
 {
@@ -10,7 +10,7 @@ Script Data End */
 update creature_template set scriptname = 'boss_mal_ganis' where entry = '';
 *** SQL END ***/
 #include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"

 enum Spells
 {
@@ -10,7 +10,7 @@ Script Data End */
 update creature_template set scriptname = 'boss_meathook' where entry = '';
 *** SQL END ***/
 #include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"

 enum Spells
 {
@@ -10,7 +10,7 @@ Script Data End */
 update creature_template set scriptname = 'boss_salramm' where entry = '';
 *** SQL END ***/
 #include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"

 enum Spells
 {
@@ -1,6 +1,8 @@
 #include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"
+
 #define MAX_ENCOUNTER 5
+
 /* Culling of Stratholme encounters:
 0 - Meathook
 1 - Salramm the Fleshcrafter
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */

 #include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"

 enum eEnums
 {
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */

 #include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"

 enum eEnums
 {
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */

 #include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"

 enum eEnums
 {
@@ -28,7 +28,7 @@ npc_saat
 EndContentData */

 #include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"

 #define SAY_ENTER               -1269020                    //where does this belong?
 #define SAY_INTRO               -1269021
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */

 #include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"

 #define MAX_ENCOUNTER              2

@@ -1,6 +1,6 @@

 #include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "hyjal_trash.h"

 #define SPELL_CARRION_SWARM 31306
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Mount Hyjal
 EndScriptData */

 #include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "SpellAuras.h"
 #include "hyjal_trash.h"

@@ -1,6 +1,6 @@

 #include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "hyjal_trash.h"

 #define SPELL_RAIN_OF_FIRE 31340
@@ -1,6 +1,6 @@

 #include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "hyjal_trash.h"

 #define SPELL_CLEAVE 31436
@@ -1,6 +1,6 @@

 #include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "hyjal_trash.h"

 #define SPELL_FROST_ARMOR 31256
@@ -5,7 +5,7 @@
 #ifndef SC_HYJALAI_H
 #define SC_HYJALAI_H

-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "escort_ai.h"

 // Trash Mobs summoned in waves
@@ -1,6 +1,6 @@

 #include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "hyjal_trash.h"
 #include "hyjalAI.h"

@@ -2,7 +2,7 @@
 #ifndef SC_HYJAL_TRASH_AI_H
 #define SC_HYJAL_TRASH_AI_H

-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "escort_ai.h"

 #define MINRAIDDAMAGE  700000//minimal damage before trash can drop loot and reputation, resets if faction leader dies
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Mount Hyjal
 EndScriptData */

 #include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
 #include "hyjal_trash.h"

 enum eEnums
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */

 #include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"

 #define SAY_ENTER                   -1560000
 #define SAY_TAUNT1                  -1560001
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */

 #include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"

 #define SAY_ENTER1                  -1560013
 #define SAY_ENTER2                  -1560014
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */

 #include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"
 #include "escort_ai.h"

 /*######
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */

 #include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"

 #define MAX_ENCOUNTER      6

@@ -29,7 +29,7 @@ EndContentData */

 #include "precompiled.h"
 #include "escort_ai.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"

 #define QUEST_ENTRY_HILLSBRAD   10282
 #define QUEST_ENTRY_DIVERSION   10283
@@ -22,7 +22,7 @@ SDCategory: Razorfen Kraul
 EndScriptData */

 #include "precompiled.h"
-#include "def_razorfen_kraul.h"
+#include "razorfen_kraul.h"

 #define WARD_KEEPERS_NR 2

@@ -27,7 +27,7 @@ EndContentData */

 #include "precompiled.h"
 #include "escort_ai.h"
-#include "def_razorfen_kraul.h"
+#include "razorfen_kraul.h"

 #define SAY_READY -1047000
 #define SAY_POINT -10470001
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"

 /*
 To do:
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"

 enum Yells
 {
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"

 enum Spells
 {
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"

 enum Emotes
 {
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"

 enum Yells
 {
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"

 enum Yells
 {
@@ -22,7 +22,8 @@ SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
+
 #define MAX_ENCOUNTER 6

 /* Ruins of Ahn'Qiraj encounters:
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"

 #define SPELL_CLEAVE        26350
 #define SPELL_TOXIC_VOLLEY  25812
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"

 //Text emote
 #define EMOTE_WEAKENED              -1531011
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"

 #define SPELL_SWEEP             26103
 #define SPELL_SANDBLAST         26102
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
 #include "Group.h"

 #define SAY_AGGRO1                  -1531000
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
 #include "WorldPacket.h"

 #include "Item.h"
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
 EndScriptData */

 #include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"

 struct TRINITY_DLL_DECL instance_temple_of_ahnqiraj : public ScriptedInstance
 {
@@ -22,7 +22,7 @@ SDCategory: Wailing Caverns
 EndScriptData */

 #include "precompiled.h"
-#include "def_wailing_caverns.h"
+#include "wailing_caverns.h"

 #define MAX_ENCOUNTER   9

@@ -26,7 +26,7 @@ EndContentData */

 #include "precompiled.h"
 #include "escort_ai.h"
-#include "def_wailing_caverns.h"
+#include "wailing_caverns.h"

 /*######
 ## npc_disciple_of_naralex
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Sethekk Halls
 EndScriptData */

 #include "precompiled.h"
-#include "def_sethekk_halls.h"
+#include "sethekk_halls.h"

 #define SAY_INTRO                   -1556007

@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Sethekk Halls
 EndScriptData */

 #include "precompiled.h"
-#include "def_sethekk_halls.h"
+#include "sethekk_halls.h"

 enum eEnums
 {
@@ -23,7 +23,7 @@ EndScriptData */

 #include "precompiled.h"
 #include "escort_ai.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"

 enum eEnums
 {
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */

 #include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"

 #define SPELL_INCITE_CHAOS    33676
 #define SPELL_INCITE_CHAOS_B  33684                         //debuff applied to each member of party
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */

 #include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"

 #define SAY_INTRO                       -1555028
 #define SAY_AGGRO1                      -1555029
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */

 #include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"

 #define EMOTE_SONIC_BOOM            -1555036

@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */

 #include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"

 #define MAX_ENCOUNTER 5

@@ -26,7 +26,7 @@ npc_spirit_of_olum
 EndContentData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 /*###
 # npc_spirit_of_olum
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 //Speech'n'Sound
 #define SAY_AGGRO               -1564029
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 #define GETGO(obj, guid)      GameObject* obj = pInstance->instance->GetGameObject(guid)
 #define GETUNIT(unit, guid)   Unit* unit = Unit::GetUnit(*m_creature, guid)
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 //Speech'n'Sounds
 #define SAY_TAUNT1              -1564018
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
 #include "Spell.h"

 //Sound'n'speech
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 #define SAY_DEATH                   -1564013
 #define SAY_LOW_HEALTH              -1564014
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 #define EMOTE_NEW_TARGET            -1564010
 #define EMOTE_PUNCH_GROUND          -1564011                //DoScriptText(EMOTE_PUNCH_GROUND, m_creature);
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 //Speech'n'sound
 #define SAY_INTRO                       -1564037
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 enum eEnums
 {
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 //Speech'n'Sounds
 #define SAY_GATH_SLAY           -1564085
@@ -22,7 +22,7 @@ SDCategory: Black Temple
 EndScriptData */

 #include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"

 #define MAX_ENCOUNTER      9

@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */

 #include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
 #include "escort_ai.h"

 #define SAY_AGGRO                   -1548021
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */

 #include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"

 #define SAY_AGGRO                   -1548000
 #define SAY_SWITCH_TO_CLEAN         -1548001
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */

 #include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
 #include "simple_ai.h"
 #include "Spell.h"

@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */

 #include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"

 // --- Spells used by Leotheras The Blind
 #define SPELL_WHIRLWIND         37640
@@ -22,7 +22,7 @@ SDCategory: The Lurker Below
 EndScriptData */

 #include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
 #include "simple_ai.h"
 #include "Spell.h"

@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */

 #include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"

 #define SAY_AGGRO                   -1548030
 #define SAY_SUMMON1                 -1548031
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */

 #include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"

 #define MAX_ENCOUNTER 6
 #define SPELL_SCALDINGWATER 37284
@@ -27,7 +27,7 @@ mob_coilfang_waterelemental
 EndContentData */

 #include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"

 #define SAY_SUMMON                  -1545000
 #define SAY_AGGRO_1                 -1545001
@@ -27,7 +27,7 @@ mob_steamrigger_mechanic
 EndContentData */

 #include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"

 #define SAY_MECHANICS               -1545007
 #define SAY_AGGRO_1                 -1545008
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, The Steamvault
 EndScriptData */

 #include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"

 #define SAY_INTRO                   -1545016
 #define SAY_REGEN                   -1545017
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, The Steamvault
 EndScriptData */

 #include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"

 #define MAX_ENCOUNTER 4

@@ -22,7 +22,7 @@ SDCategory: Gruul's Lair
 EndScriptData */

 #include "precompiled.h"
-#include "def_gruuls_lair.h"
+#include "gruuls_lair.h"

 enum eEnums
 {
@@ -22,7 +22,7 @@ SDCategory: Gruul's Lair
 EndScriptData */

 #include "precompiled.h"
-#include "def_gruuls_lair.h"
+#include "gruuls_lair.h"

 #define SAY_AGGRO               -1565000
 #define SAY_ENRAGE              -1565001
@@ -22,7 +22,7 @@ SDCategory: Gruul's Lair
 EndScriptData */

 #include "precompiled.h"
-#include "def_gruuls_lair.h"
+#include "gruuls_lair.h"

 #define MAX_ENCOUNTER 2

@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Blood Furnace
 EndScriptData */

 #include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"

 enum eEnums
 {
@@ -27,7 +27,7 @@ mob_shadowmoon_channeler
 EndContentData */

 #include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"

 enum eKelidan
 {
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Blood Furnace
 EndScriptData */

 #include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"

 enum eEnums
 {
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Blood Furnace
 EndScriptData */

 #include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"

 #define ENTRY_SEWER1                 181823
 #define ENTRY_SEWER2                 181766
@@ -22,7 +22,7 @@ SDCategory: Hellfire Ramparts
 EndScriptData */

 #include "precompiled.h"
-#include "def_hellfire_ramparts.h"
+#include "hellfire_ramparts.h"

 struct TRINITY_DLL_DECL instance_ramparts : public ScriptedInstance
 {
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Magtheridon's lair
 EndScriptData */

 #include "precompiled.h"
-#include "def_magtheridons_lair.h"
+#include "magtheridons_lair.h"

 struct Yell
 {
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Magtheridon's lair
 EndScriptData */

 #include "precompiled.h"
-#include "def_magtheridons_lair.h"
+#include "magtheridons_lair.h"

 #define SPELL_SOUL_TRANSFER         30531 // core bug, does not support target 7
 #define SPELL_BLAZE_TARGET          30541 // core bug, does not support target 7
--- a/Show More
+++ b/Show More