Replace (CR) character from all converted scripts and replace it with it's proper (LF) counterpart

- should fix the "linking scripts" failure (not tested)

--HG--
branch : trunk

src/server/scripts/Custom/custom_example.cpp

@@ -59,7 +59,8 @@ EndScriptData */
 #define SAY_SALUTE      "Move out Soldier!"
 
 //This is the GetAI method used by all scripts that involve AI
-//It is called every time a new Creature using this script is created
+//It is called every time a new Creature using this script is created
+class custom_example : public CreatureScript
 {
 public:
     custom_example() : CreatureScript("custom_example") { }

src/server/scripts/Custom/custom_gossip_codebox.cpp

@@ -33,7 +33,8 @@ EndScriptData */
 #define SAY_WRONG               "Wrong!"
 #define SAY_RIGHT               "You're right, you are allowed to see my inner secrets."
 
-//This function is called when the player opens the gossip menubool
+//This function is called when the player opens the gossip menubool
+class custom_gossip_codebox : public GameObjectScript
 {
 public:
     custom_gossip_codebox() : GameObjectScript("custom_gossip_codebox") { }

src/server/scripts/Custom/test.cpp

@@ -152,7 +152,8 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
             }
         }
 };
-
+
+class test : public CreatureScript
 {
 public:
     test() : CreatureScript("test") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp

@@ -29,7 +29,8 @@ enum Spells
 {
     SPELL_FIREBLAST                                        = 15573
 };
-
+
+class boss_ambassador_flamelash : public CreatureScript
 {
 public:
     boss_ambassador_flamelash() : CreatureScript("boss_ambassador_flamelash") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp

@@ -33,7 +33,8 @@ enum Spells
     SPELL_DEMONARMOR                                       = 11735,
     SPELL_ENVELOPINGWEB                                    = 15471
 };
-
+
+class boss_anubshiah : public CreatureScript
 {
 public:
     boss_anubshiah() : CreatureScript("boss_anubshiah") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp

@@ -36,7 +36,8 @@ enum Spells
     SPELL_HANDOFTHAURISSAN                                 = 17492,
     SPELL_AVATAROFFLAME                                    = 15636
 };
-
+
+class boss_emperor_dagran_thaurissan : public CreatureScript
 {
 public:
     boss_emperor_dagran_thaurissan() : CreatureScript("boss_emperor_dagran_thaurissan") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp

@@ -31,7 +31,8 @@ enum Spells
     SPELL_HAMSTRING                                        = 9080,
     SPELL_CLEAVE                                           = 20691
 };
-
+
+class boss_general_angerforge : public CreatureScript
 {
 public:
     boss_general_angerforge() : CreatureScript("boss_general_angerforge") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp

@@ -30,7 +30,8 @@ enum Spells
     SPELL_WHIRLWIND                                        = 15589,
     SPELL_MORTALSTRIKE                                     = 24573
 };
-
+
+class boss_gorosh_the_dervish : public CreatureScript
 {
 public:
     boss_gorosh_the_dervish() : CreatureScript("boss_gorosh_the_dervish") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp

@@ -35,7 +35,8 @@ enum Spells
     SPELL_GROUNDTREMOR                                     = 6524,
     SPELL_FRENZY                                           = 28371
 };
-
+
+class boss_grizzle : public CreatureScript
 {
 public:
     boss_grizzle() : CreatureScript("boss_grizzle") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp

@@ -32,7 +32,8 @@ enum Spells
     SPELL_PSYCHICSCREAM                                    = 8122,
     SPELL_SHADOWSHIELD                                     = 22417
 };
-
+
+class boss_high_interrogator_gerstahn : public CreatureScript
 {
 public:
     boss_high_interrogator_gerstahn() : CreatureScript("boss_high_interrogator_gerstahn") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp

@@ -35,7 +35,8 @@ enum eEnums
 {
     DATA_THRONE_DOOR                              = 24 // not id or guid of doors but number of enum in blackrock_depths.h
 };
-
+
+class boss_magmus : public CreatureScript
 {
 public:
     boss_magmus() : CreatureScript("boss_magmus") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp

@@ -34,7 +34,8 @@ enum Spells
     SPELL_SHADOWWORDPAIN                                   = 10894,
     SPELL_SMITE                                            = 10934
 };
-
+
+class boss_moira_bronzebeard : public CreatureScript
 {
 public:
     boss_moira_bronzebeard() : CreatureScript("boss_moira_bronzebeard") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp

@@ -46,7 +46,8 @@ enum Misc
 #define GOSSIP_ITEM_TEACH_2 "Continue..."
 #define GOSSIP_ITEM_TEACH_3 "[PH] Continue..."
 #define GOSSIP_ITEM_TRIBUTE "I want to pay tribute"
-
+
+class boss_gloomrel : public CreatureScript
 {
 public:
     boss_gloomrel() : CreatureScript("boss_gloomrel") { }
@@ -105,7 +106,8 @@ enum DoomrelSpells
 
 #define GOSSIP_ITEM_CHALLENGE   "Your bondage is at an end, Doom'rel. I challenge you!"
 #define GOSSIP_SELECT_DOOMREL   "[PH] Continue..."
-#define GOSSIP_SELECT_DOOMREL   "[PH] Continue..."
+
+class boss_doomrel : public CreatureScript
 {
 public:
     boss_doomrel() : CreatureScript("boss_doomrel") { }

src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp

@@ -74,7 +74,8 @@ enum eEnums
     GO_SPECTRAL_CHALICE     = 164869,
     GO_CHEST_SEVEN          = 169243
 };
-
+
+class instance_blackrock_depths : public InstanceMapScript
 {
 public:
     instance_blackrock_depths() : InstanceMapScript("instance_blackrock_depths") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp

@@ -29,7 +29,8 @@ EndScriptData */
 #define SPELL_CLEAVE                    20691
 #define SPELL_CONFLIGURATION            16805
 #define SPELL_THUNDERCLAP               15548               //Not sure if right ID. 23931 would be a harder possibility.
-
+
+class boss_drakkisath : public CreatureScript
 {
 public:
     boss_drakkisath() : CreatureScript("boss_drakkisath") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_CORROSIVEACID      20667
 #define SPELL_FREEZE             18763
 #define SPELL_FLAMEBREATH        20712
-
+
+class boss_gyth : public CreatureScript
 {
 public:
     boss_gyth() : CreatureScript("boss_gyth") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp

@@ -32,7 +32,8 @@ EndScriptData */
 #define ADD_1Y                  -324.961395
 #define ADD_1Z                  64.401443
 #define ADD_1O                  3.124724
-
+
+class boss_halycon : public CreatureScript
 {
 public:
     boss_halycon() : CreatureScript("boss_halycon") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp

@@ -32,7 +32,8 @@ EndScriptData */
 #define SPELL_SUNDERARMOR       24317
 #define SPELL_KNOCKAWAY         20686
 #define SPELL_SLOW              22356
-
+
+class boss_highlord_omokk : public CreatureScript
 {
 public:
     boss_highlord_omokk() : CreatureScript("boss_highlord_omokk") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_CRYSTALIZE                16104
 #define SPELL_MOTHERSMILK               16468
 #define SPELL_SUMMON_SPIRE_SPIDERLING   16103
-
+
+class boss_mother_smolderweb : public CreatureScript
 {
 public:
     boss_mother_smolderweb() : CreatureScript("boss_mother_smolderweb") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp

@@ -39,7 +39,8 @@ EndScriptData */
 #define ADD_2Y -511.896942
 #define ADD_2Z 88.195160
 #define ADD_2O 4.613114
-
+
+class boss_overlord_wyrmthalak : public CreatureScript
 {
 public:
     boss_overlord_wyrmthalak() : CreatureScript("boss_overlord_wyrmthalak") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_FIRENOVA          23462
 #define SPELL_FLAMEBUFFET       23341
 #define SPELL_PYROBLAST         17274
-
+
+class boss_pyroguard_emberseer : public CreatureScript
 {
 public:
     boss_pyroguard_emberseer() : CreatureScript("boss_pyroguard_emberseer") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp

@@ -29,7 +29,8 @@ EndScriptData */
 #define SPELL_STUNBOMB          16497
 #define SPELL_HEALING_POTION    15504
 #define SPELL_HOOKEDNET         15609
-
+
+class quartermaster_zigris : public CreatureScript
 {
 public:
     quartermaster_zigris() : CreatureScript("quartermaster_zigris") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_WHIRLWIND                 26038
 #define SPELL_CLEAVE                    20691
 #define SPELL_THUNDERCLAP               23931               //Not sure if he cast this spell
-
+
+class boss_rend_blackhand : public CreatureScript
 {
 public:
     boss_rend_blackhand() : CreatureScript("boss_rend_blackhand") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_CURSEOFBLOOD      24673
 #define SPELL_HEX               16708
 #define SPELL_CLEAVE            20691
-
+
+class boss_shadow_hunter_voshgajin : public CreatureScript
 {
 public:
     boss_shadow_hunter_voshgajin() : CreatureScript("boss_shadow_hunter_voshgajin") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_FLAMEBREAK            16785
 #define SPELL_IMMOLATE              20294
 #define SPELL_TERRIFYINGROAR        14100
-
+
+class boss_the_beast : public CreatureScript
 {
 public:
     boss_the_beast() : CreatureScript("boss_the_beast") { }

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp

@@ -31,7 +31,8 @@ EndScriptData */
 #define SPELL_MORTALSTRIKE      16856
 #define SPELL_PUMMEL            15615
 #define SPELL_THROWAXE          16075
-
+
+class boss_warmaster_voone : public CreatureScript
 {
 public:
     boss_warmaster_voone() : CreatureScript("boss_warmaster_voone") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp

@@ -32,7 +32,8 @@ EndScriptData */
 #define SPELL_BLASTWAVE         23331
 #define SPELL_MORTALSTRIKE      24573
 #define SPELL_KNOCKBACK         25778
-
+
+class boss_broodlord : public CreatureScript
 {
 public:
     boss_broodlord() : CreatureScript("boss_broodlord") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp

@@ -58,7 +58,8 @@ enum Spells
     SPELL_FRENZY                                           = 28371,   //The frenzy spell may be wrong
     SPELL_ENRAGE                                           = 28747
 };
-
+
+class boss_chromaggus : public CreatureScript
 {
 public:
     boss_chromaggus() : CreatureScript("boss_chromaggus") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp

@@ -29,7 +29,8 @@ EndScriptData */
 #define SPELL_WINGBUFFET            18500
 #define SPELL_SHADOWOFEBONROC       23340
 #define SPELL_HEAL                  41386                   //Thea Heal spell of his Shadow
-
+
+class boss_ebonroc : public CreatureScript
 {
 public:
     boss_ebonroc() : CreatureScript("boss_ebonroc") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_SHADOWFLAME       22539
 #define SPELL_WINGBUFFET        23339
 #define SPELL_FLAMEBUFFET       23341
-
+
+class boss_firemaw : public CreatureScript
 {
 public:
     boss_firemaw() : CreatureScript("boss_firemaw") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp

@@ -30,7 +30,8 @@ EndScriptData */
 #define SPELL_SHADOWFLAME        22539
 #define SPELL_WINGBUFFET         23339
 #define SPELL_FRENZY             23342                      //This spell periodically triggers fire nova
-
+
+class boss_flamegor : public CreatureScript
 {
 public:
     boss_flamegor() : CreatureScript("boss_flamegor") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp

@@ -59,7 +59,8 @@ EndScriptData */
 #define SPELL_WARLOCK               23427                   //infernals
 #define SPELL_HUNTER                23436                   //bow broke
 #define SPELL_ROGUE                 23414                   //Paralise
-
+
+class boss_nefarian : public CreatureScript
 {
 public:
     boss_nefarian() : CreatureScript("boss_nefarian") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp

@@ -36,7 +36,8 @@ EndScriptData */
 #define SPELL_WARSTOMP          24375
 #define SPELL_FIREBALLVOLLEY    22425
 #define SPELL_CONFLAGRATION     23023
-
+
+class boss_razorgore : public CreatureScript
 {
 public:
     boss_razorgore() : CreatureScript("boss_razorgore") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp

@@ -39,7 +39,8 @@ EndScriptData */
 #define SPELL_TAILSWIPE             15847
 #define SPELL_BURNINGADRENALINE     23620
 #define SPELL_CLEAVE                20684                   //Chain cleave is most likely named something different and contains a dummy effect
-
+
+class boss_vaelastrasz : public CreatureScript
 {
 public:
     boss_vaelastrasz() : CreatureScript("boss_vaelastrasz") { }

src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp

@@ -68,7 +68,8 @@ EndScriptData */
 //and allow players to start the event over
 //If nefarian dies then he will kill himself then he will kill himself in his hiding place
 //To prevent players from doing the event twice
-
+
+class boss_victor_nefarius : public CreatureScript
 {
 public:
     boss_victor_nefarius() : CreatureScript("boss_victor_nefarius") { }

src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp

@@ -36,7 +36,8 @@ enum eSpels
 
     SAY_AGGRO               = -1036001
 };
-
+
+class boss_mr_smite : public CreatureScript
 {
 public:
     boss_mr_smite() : CreatureScript("boss_mr_smite") { }

src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp

@@ -30,7 +30,8 @@ EndScriptData */
 /*#####
 # item_Defias_Gunpowder
 #####*/
-
+
+class item_defias_gunpowder : public ItemScript
 {
 public:
     item_defias_gunpowder() : ItemScript("item_defias_gunpowder") { }

src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp

@@ -84,7 +84,8 @@ const Position SpawnPosition[] =
     {-495.240,-90.808,-149.493,3.238},
     {-494.195,-89.553,-149.131,3.254}
 };
-
+
+class npc_blastmaster_emi_shortfuse : public CreatureScript
 {
 public:
     npc_blastmaster_emi_shortfuse() : CreatureScript("npc_blastmaster_emi_shortfuse") { }
@@ -543,7 +544,8 @@ public:
 
 
 
-
+
+class boss_grubbis : public CreatureScript
 {
 public:
     boss_grubbis() : CreatureScript("boss_grubbis") { }

src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp

@@ -19,7 +19,8 @@
 #include "gnomeregan.h"
 
 #define    MAX_ENCOUNTER  1
-
+
+class instance_gnomeregan : public InstanceMapScript
 {
 public:
     instance_gnomeregan() : InstanceMapScript("instance_gnomeregan") { }

src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp

@@ -42,7 +42,8 @@ EndScriptData */
 #define SPELL_EVOCATION                 30254
 #define SPELL_ENRAGE                    30403               //Arcane Infusion: Transforms Curator and adds damage.
 #define SPELL_BERSERK                   26662
-
+
+class boss_curator : public CreatureScript
 {
 public:
     boss_curator() : CreatureScript("boss_curator") { }

src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp

@@ -38,7 +38,8 @@ EndScriptData */
 #define SPELL_HOLYWRATH         32445
 #define SPELL_HOLYGROUND        29512
 #define SPELL_BERSERK           26662
-
+
+class boss_maiden_of_virtue : public CreatureScript
 {
 public:
     boss_maiden_of_virtue() : CreatureScript("boss_maiden_of_virtue") { }

src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp

@@ -45,7 +45,8 @@ EndScriptData */
 
 //Attumen (TODO: Use the summoning spell instead of Creature id. It works , but is not convenient for us)
 #define SUMMON_ATTUMEN 15550
-
+
+class boss_attumen : public CreatureScript
 {
 public:
     boss_attumen() : CreatureScript("boss_attumen") { }
@@ -105,7 +106,8 @@ public:
     };
 
 };
-};
+
+class boss_midnight : public CreatureScript
 {
 public:
     boss_midnight() : CreatureScript("boss_midnight") { }
@@ -221,7 +223,8 @@ public:
         void SetMidnight(Creature *pAttumen, uint64 value)
         {
             CAST_AI(boss_attumen::boss_attumenAI, pAttumen->AI())->Midnight = value;
-        {
+        }
+    };
 
 };
 

src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp

@@ -59,7 +59,8 @@ const uint32 Adds[6]=
     19875,
     19876,
 };
-
+
+class boss_moroes : public CreatureScript
 {
 public:
     boss_moroes() : CreatureScript("boss_moroes") { }
@@ -402,7 +403,8 @@ struct boss_moroes_guestAI : public ScriptedAI
 #define SPELL_HEROICSTRIKE      29567
 #define SPELL_SHIELDBASH        11972
 #define SPELL_SHIELDWALL        29390
-#define SPELL_SHIELDWALL        29390
+
+class boss_baroness_dorothea_millstipe : public CreatureScript
 {
 public:
     boss_baroness_dorothea_millstipe() : CreatureScript("boss_baroness_dorothea_millstipe") { }
@@ -465,7 +467,8 @@ public:
     };
 
 };
-
+
+class boss_baron_rafe_dreuger : public CreatureScript
 {
 public:
     boss_baron_rafe_dreuger() : CreatureScript("boss_baron_rafe_dreuger") { }
@@ -522,7 +525,8 @@ public:
     };
 
 };
-    };
+
+class boss_lady_catriona_von_indi : public CreatureScript
 {
 public:
     boss_lady_catriona_von_indi() : CreatureScript("boss_lady_catriona_von_indi") { }
@@ -592,7 +596,8 @@ public:
     };
 
 };
-        }
+
+class boss_lady_keira_berrybuck : public CreatureScript
 {
 public:
     boss_lady_keira_berrybuck() : CreatureScript("boss_lady_keira_berrybuck") { }
@@ -666,7 +671,8 @@ public:
     };
 
 };
-            } else Cleanse_Timer -= diff;
+
+class boss_lord_robin_daris : public CreatureScript
 {
 public:
     boss_lord_robin_daris() : CreatureScript("boss_lord_robin_daris") { }
@@ -722,7 +728,8 @@ public:
     };
 
 };
-                WhirlWind_Timer = 21000;
+
+class boss_lord_crispin_ference : public CreatureScript
 {
 public:
     boss_lord_crispin_ference() : CreatureScript("boss_lord_crispin_ference") { }

src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp

@@ -57,7 +57,8 @@ const uint32 PortalBeam[3] = {30465,30464,30463};
 const uint32 PlayerBuff[3] = {30421,30422,30423};
 const uint32 NetherBuff[3] = {30466,30467,30468};
 const uint32 PlayerDebuff[3] = {38637,38638,38639};
-
+
+class boss_netherspite : public CreatureScript
 {
 public:
     boss_netherspite() : CreatureScript("boss_netherspite") { }

src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp

@@ -57,7 +57,8 @@ float IntroWay[8][3] =
     {-11140   , -1915  ,122},
     {-11163   , -1903  ,91.473}
 };
-
+
+class boss_nightbane : public CreatureScript
 {
 public:
     boss_nightbane() : CreatureScript("boss_nightbane") { }

src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp

@@ -55,7 +55,8 @@ EndScriptData */
 #define CREATURE_FIENDISHIMP    17267
 #define CREATURE_PORTAL         17265
 #define CREATURE_KILREK         17229
-
+
+class mob_kilrek : public CreatureScript
 {
 public:
     mob_kilrek() : CreatureScript("mob_kilrek") { }
@@ -126,7 +127,8 @@ public:
     };
 
 };
-};
+
+class mob_demon_chain : public CreatureScript
 {
 public:
     mob_demon_chain() : CreatureScript("mob_demon_chain") { }
@@ -163,7 +165,8 @@ public:
     };
 
 };
-
+
+class mob_fiendish_portal : public CreatureScript
 {
 public:
     mob_fiendish_portal() : CreatureScript("mob_fiendish_portal") { }
@@ -199,7 +202,8 @@ public:
 };
 
 #define SPELL_FIREBOLT  30050   // Blasts a target for 181-209 Fire damage.
-};
+
+class mob_fiendish_imp : public CreatureScript
 {
 public:
     mob_fiendish_imp() : CreatureScript("mob_fiendish_imp") { }
@@ -241,7 +245,8 @@ public:
     };
 
 };
-        }
+
+class boss_terestian_illhoof : public CreatureScript
 {
 public:
     boss_terestian_illhoof() : CreatureScript("boss_terestian_illhoof") { }

src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp

@@ -101,7 +101,8 @@ void SummonCroneIfReady(InstanceScript* pInstance, Creature* pCreature)
         }
     }
 };
-
+
+class boss_dorothee : public CreatureScript
 {
 public:
     boss_dorothee() : CreatureScript("boss_dorothee") { }
@@ -215,7 +216,8 @@ public:
     };
 
 };
-};
+
+class mob_tito : public CreatureScript
 {
 public:
     mob_tito() : CreatureScript("mob_tito") { }
@@ -281,7 +283,8 @@ void boss_dorothee::boss_dorotheeAI::SummonTito()
         TitoDied = false;
     }
 }
-    }
+
+class boss_strawman : public CreatureScript
 {
 public:
     boss_strawman() : CreatureScript("boss_strawman") { }
@@ -395,7 +398,8 @@ public:
     };
 
 };
-    };
+
+class boss_tinhead : public CreatureScript
 {
 public:
     boss_tinhead() : CreatureScript("boss_tinhead") { }
@@ -504,7 +508,8 @@ public:
     };
 
 };
-        }
+
+class boss_roar : public CreatureScript
 {
 public:
     boss_roar() : CreatureScript("boss_roar") { }
@@ -612,7 +617,8 @@ public:
     };
 
 };
-            DoMeleeAttackIfReady();
+
+class boss_crone : public CreatureScript
 {
 public:
     boss_crone() : CreatureScript("boss_crone") { }
@@ -693,7 +699,8 @@ public:
     };
 
 };
-
+
+class mob_cyclone : public CreatureScript
 {
 public:
     mob_cyclone() : CreatureScript("mob_cyclone") { }
@@ -763,7 +770,8 @@ public:
 
 /**** The Wolf's Entry ****/
 #define CREATURE_BIG_BAD_WOLF           17521
-#define SPELL_TERRIFYING_HOWL           30752
+
+class npc_grandmother : public CreatureScript
 {
 public:
     npc_grandmother() : CreatureScript("npc_grandmother") { }
@@ -791,7 +799,8 @@ public:
 
 };
 
-        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+
+class boss_bigbadwolf : public CreatureScript
 {
 public:
     boss_bigbadwolf() : CreatureScript("boss_bigbadwolf") { }
@@ -990,7 +999,8 @@ void Resurrect(Creature *pTarget)
         else
             pTarget->GetMotionMaster()->Initialize();
 };
-    pTarget->CastSpell(pTarget, SPELL_RES_VISUAL, true);
+
+class boss_julianne : public CreatureScript
 {
 public:
     boss_julianne() : CreatureScript("boss_julianne") { }
@@ -1112,7 +1122,8 @@ public:
     };
 
 };
-
+
+class boss_romulo : public CreatureScript
 {
 public:
     boss_romulo() : CreatureScript("boss_romulo") { }

src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp

@@ -42,7 +42,8 @@ EndScriptData */
 10 - Prince Malchezzar
 11 - Nightbane
 */
-
+
+class instance_karazhan : public InstanceMapScript
 {
 public:
     instance_karazhan() : InstanceMapScript("instance_karazhan") { }

src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp

@@ -101,7 +101,8 @@ float Spawns[6][2]=
 #define SPAWN_Z             90.5
 #define SPAWN_Y             -1758
 #define SPAWN_O             4.738
-
+
+class npc_barnes : public CreatureScript
 {
 public:
     npc_barnes() : CreatureScript("npc_barnes") { }
@@ -408,7 +409,8 @@ enum eBerthold
 };
 
 #define GOSSIP_ITEM_TELEPORT    "Teleport me to the Guardian's Library"
-#define GOSSIP_ITEM_TELEPORT    "Teleport me to the Guardian's Library"
+
+class npc_berthold : public CreatureScript
 {
 public:
     npc_berthold() : CreatureScript("npc_berthold") { }
@@ -460,7 +462,8 @@ public:
 
 static float MedivPos[4] = {-11161.49,-1902.24,91.48,1.94};
 static float ArcanagosPos[4] = {-11169.75,-1881.48,95.39,4.83};
-static float MedivPos[4] = {-11161.49,-1902.24,91.48,1.94};
+
+class npc_image_of_medivh : public CreatureScript
 {
 public:
     npc_image_of_medivh() : CreatureScript("npc_image_of_medivh") { }

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -76,7 +76,8 @@ float KaelLocations[3][2]=
 };
 
 #define LOCATION_Z                  -16.727455
-
+
+class boss_felblood_kaelthas : public CreatureScript
 {
 public:
     boss_felblood_kaelthas() : CreatureScript("boss_felblood_kaelthas") { }
@@ -427,7 +428,8 @@ public:
     };
 
 };
-};
+
+class mob_felkael_flamestrike : public CreatureScript
 {
 public:
     mob_felkael_flamestrike() : CreatureScript("mob_felkael_flamestrike") { }
@@ -468,7 +470,8 @@ public:
     };
 
 };
-
+
+class mob_felkael_phoenix : public CreatureScript
 {
 public:
     mob_felkael_phoenix() : CreatureScript("mob_felkael_phoenix") { }
@@ -587,7 +590,8 @@ public:
     };
 
 };
-    };
+
+class mob_felkael_phoenix_egg : public CreatureScript
 {
 public:
     mob_felkael_phoenix_egg() : CreatureScript("mob_felkael_phoenix_egg") { }
@@ -623,7 +627,8 @@ public:
     };
 
 };
-        }
+
+class mob_arcane_sphere : public CreatureScript
 {
 public:
     mob_arcane_sphere() : CreatureScript("mob_arcane_sphere") { }

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp

@@ -86,7 +86,8 @@ const uint32 m_auiAddEntries[] =
     24553,                                                  //Apoko
     24556,                                                  //Zelfan
 };
-
+
+class boss_priestess_delrissa : public CreatureScript
 {
 public:
     boss_priestess_delrissa() : CreatureScript("boss_priestess_delrissa") { }
@@ -483,7 +484,8 @@ enum eRogueSpells
     SPELL_BACKSTAB          = 15657,
     SPELL_EVISCERATE        = 27611
 };
-};
+
+class boss_kagani_nightstrike : public CreatureScript
 {
 public:
     boss_kagani_nightstrike() : CreatureScript("boss_kagani_nightstrike") { }
@@ -588,7 +590,8 @@ enum eWarlockSpells
     SPELL_IMP_FIREBALL          = 44164,
     SPELL_SUMMON_IMP            = 44163
 };
-    SPELL_SUMMON_IMP            = 44163
+
+class boss_ellris_duskhallow : public CreatureScript
 {
 public:
     boss_ellris_duskhallow() : CreatureScript("boss_ellris_duskhallow") { }
@@ -679,7 +682,8 @@ enum eKickDown
     SPELL_KNOCKDOWN     = 11428,
     SPELL_SNAP_KICK     = 46182
 };
-    SPELL_KNOCKDOWN     = 11428,
+
+class boss_eramas_brightblaze : public CreatureScript
 {
 public:
     boss_eramas_brightblaze() : CreatureScript("boss_eramas_brightblaze") { }
@@ -740,7 +744,8 @@ enum eMageSpells
     SPELL_FROSTBOLT         = 15043,
     SPELL_BLINK             = 14514
 };
-    SPELL_CONE_OF_COLD      = 38384,
+
+class boss_yazzai : public CreatureScript
 {
 public:
     boss_yazzai() : CreatureScript("boss_yazzai") { }
@@ -870,7 +875,8 @@ enum eWarriorSpells
     SPELL_BATTLE_SHOUT          = 27578,
     SPELL_MORTAL_STRIKE         = 44268
 };
-    SPELL_FRIGHTENING_SHOUT     = 19134,
+
+class boss_warlord_salaris : public CreatureScript
 {
 public:
     boss_warlord_salaris() : CreatureScript("boss_warlord_salaris") { }
@@ -990,7 +996,8 @@ enum eHunterSpells
 
     NPC_SLIVER                  = 24552
 };
-    SPELL_MULTI_SHOT            = 31942,
+
+class boss_garaxxas : public CreatureScript
 {
 public:
     boss_garaxxas() : CreatureScript("boss_garaxxas") { }
@@ -1109,7 +1116,8 @@ enum Spells
     SPELL_FIRE_NOVA_TOTEM       = 44257,
     SPELL_EARTHBIND_TOTEM       = 15786
 };
-    SPELL_WAR_STOMP             = 46026,
+
+class boss_apoko : public CreatureScript
 {
 public:
     boss_apoko() : CreatureScript("boss_apoko") { }
@@ -1207,7 +1215,8 @@ enum eEngineerSpells
     SPELL_FEL_IRON_BOMB         = 46024,
     SPELL_SHEEP_EXPLOSION       = 44279
 };
-{
+
+class boss_zelfan : public CreatureScript
 {
 public:
     boss_zelfan() : CreatureScript("boss_zelfan") { }
@@ -1291,7 +1300,9 @@ public:
     };
 
 };
-                DoCast(me, SPELL_HIGH_EXPLOSIVE_SHEEP);
+
+/*
+class mob_high_explosive_sheep : public CreatureScript
 {
 public:
     mob_high_explosive_sheep() : CreatureScript("mob_high_explosive_sheep") { }

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp

@@ -50,7 +50,8 @@ EndScriptData */
 #define DATA_CRYSTALS                   6
 
 #define CREATURE_FEL_CRYSTAL            24722
-
+
+class boss_selin_fireheart : public CreatureScript
 {
 public:
     boss_selin_fireheart() : CreatureScript("boss_selin_fireheart") { }
@@ -318,7 +319,8 @@ public:
 
 };
 
-
+
+class mob_fel_crystal : public CreatureScript
 {
 public:
     mob_fel_crystal() : CreatureScript("mob_fel_crystal") { }

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp

@@ -58,7 +58,8 @@ enum eEnums
     INTERVAL_MODIFIER               = 15,
     INTERVAL_SWITCH                 = 6
 };
-
+
+class boss_vexallus : public CreatureScript
 {
 public:
     boss_vexallus() : CreatureScript("boss_vexallus") { }
@@ -193,7 +194,8 @@ public:
 
 };
 
-
+
+class mob_pure_energy : public CreatureScript
 {
 public:
     mob_pure_energy() : CreatureScript("mob_pure_energy") { }

src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp

@@ -34,7 +34,8 @@ EndScriptData */
 2  - Priestess Delrissa
 3  - Kael'thas Sunstrider
 */
-
+
+class instance_magisters_terrace : public InstanceMapScript
 {
 public:
     instance_magisters_terrace() : InstanceMapScript("instance_magisters_terrace") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp

@@ -31,7 +31,8 @@ EndScriptData */
 #define SPELL_IGNITEMANA            19659
 #define SPELL_LIVINGBOMB            20475
 #define SPELL_ARMAGEDDOM            20479
-
+
+class boss_baron_geddon : public CreatureScript
 {
 public:
     boss_baron_geddon() : CreatureScript("boss_baron_geddon") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp

@@ -33,7 +33,8 @@ EndScriptData */
 //Add spells
 #define SPELL_ERUPTION              19497
 #define SPELL_IMMOLATE              20294
-
+
+class boss_garr : public CreatureScript
 {
 public:
     boss_garr() : CreatureScript("boss_garr") { }
@@ -88,7 +89,8 @@ public:
     };
 
 };
-};
+
+class mob_firesworn : public CreatureScript
 {
 public:
     mob_firesworn() : CreatureScript("mob_firesworn") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_SHADOWBOLT            19728
 #define SPELL_RAINOFFIRE            19717
 #define SPELL_GEHENNASCURSE         19716
-
+
+class boss_gehennas : public CreatureScript
 {
 public:
     boss_gehennas() : CreatureScript("boss_gehennas") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp

@@ -38,7 +38,8 @@ enum eEnums
     EMOTE_LOWHP             = -1409002,
     SPELL_MANGLE            = 19820
 };
-
+
+class boss_golemagg : public CreatureScript
 {
 public:
     boss_golemagg() : CreatureScript("boss_golemagg") { }
@@ -129,7 +130,8 @@ public:
     };
 
 };
-};
+
+class mob_core_rager : public CreatureScript
 {
 public:
     mob_core_rager() : CreatureScript("mob_core_rager") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_IMPENDINGDOOM 19702
 #define SPELL_LUCIFRONCURSE 19703
 #define SPELL_SHADOWSHOCK   20603
-
+
+class boss_lucifron : public CreatureScript
 {
 public:
     boss_lucifron() : CreatureScript("boss_lucifron") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp

@@ -32,7 +32,8 @@ EndScriptData */
 #define SPELL_PANIC                 19408
 #define SPELL_LAVABOMB              19411                   //This calls a dummy server side effect that isn't implemented yet
 #define SPELL_LAVABOMB_ALT          19428                   //This is the spell that the lava bomb casts
-
+
+class boss_magmadar : public CreatureScript
 {
 public:
     boss_magmadar() : CreatureScript("boss_magmadar") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp

@@ -52,7 +52,8 @@ EndScriptData */
 
 #define ENTRY_FLAMEWALKER_HEALER    11663
 #define ENTRY_FLAMEWALKER_ELITE     11664
-
+
+class boss_majordomo : public CreatureScript
 {
 public:
     boss_majordomo() : CreatureScript("boss_majordomo") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp

@@ -84,7 +84,8 @@ EndScriptData */
 #define ADD_8Y -810.869385
 #define ADD_8Z -229.683182
 #define ADD_8O 4.693108
-
+
+class boss_ragnaros : public CreatureScript
 {
 public:
     boss_ragnaros() : CreatureScript("boss_ragnaros") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp

@@ -29,7 +29,8 @@ EndScriptData */
 #define SPELL_SHAZZRAHCURSE             19713
 #define SPELL_DEADENMAGIC               19714
 #define SPELL_COUNTERSPELL              19715
-
+
+class boss_shazzrah : public CreatureScript
 {
 public:
     boss_shazzrah() : CreatureScript("boss_shazzrah") { }

src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp

@@ -36,7 +36,8 @@ EndScriptData */
 #define SPELL_HEAL                  19775
 #define SPELL_SHADOWWORDPAIN        19776
 #define SPELL_IMMOLATE              20294
-
+
+class boss_sulfuron : public CreatureScript
 {
 public:
     boss_sulfuron() : CreatureScript("boss_sulfuron") { }
@@ -130,7 +131,8 @@ public:
     };
 
 };
-};
+
+class mob_flamewaker_priest : public CreatureScript
 {
 public:
     mob_flamewaker_priest() : CreatureScript("mob_flamewaker_priest") { }

src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp

@@ -39,7 +39,8 @@ EndScriptData */
 #define ID_DOMO         12018
 #define ID_RAGNAROS     11502
 #define ID_FLAMEWAKERPRIEST     11662
-
+
+class instance_molten_core : public InstanceMapScript
 {
 public:
     instance_molten_core() : InstanceMapScript("instance_molten_core") { }

src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp

@@ -40,7 +40,8 @@ EndContentData */
 #define SPELL_WITHERING_HEAT        19367
 #define SPELL_ANCIENT_DESPAIR       19369
 #define SPELL_ANCIENT_HYSTERIA      19372
-
+
+class mob_ancient_core_hound : public CreatureScript
 {
 public:
     mob_ancient_core_hound() : CreatureScript("mob_ancient_core_hound") { }

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp

@@ -89,7 +89,8 @@ enum UnworthyInitiatePhase
     PHASE_TO_ATTACK,
     PHASE_ATTACKING,
 };
-
+
+class npc_unworthy_initiate : public CreatureScript
 {
 public:
     npc_unworthy_initiate() : CreatureScript("npc_unworthy_initiate") { }
@@ -278,7 +279,8 @@ public:
 
 };
 
-
+
+class npc_unworthy_initiate_anchor : public CreatureScript
 {
 public:
     npc_unworthy_initiate_anchor() : CreatureScript("npc_unworthy_initiate_anchor") { }
@@ -307,7 +309,8 @@ public:
 
 
 
-
+
+class go_acherus_soul_prison : public GameObjectScript
 {
 public:
     go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { }
@@ -355,7 +358,8 @@ int32 m_auiRandomSay[] =
 {
     SAY_DUEL_A, SAY_DUEL_B, SAY_DUEL_C, SAY_DUEL_D, SAY_DUEL_E, SAY_DUEL_F, SAY_DUEL_G, SAY_DUEL_H, SAY_DUEL_I
 };
-{
+
+class npc_death_knight_initiate : public CreatureScript
 {
 public:
     npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { }
@@ -519,7 +523,8 @@ public:
 
 #define DESPAWN_HORSE 52267
 #define SAY_DARK_RIDER      "The realm of shadows awaits..."
-######*/
+
+class npc_dark_rider_of_acherus : public CreatureScript
 {
 public:
     npc_dark_rider_of_acherus() : CreatureScript("npc_dark_rider_of_acherus") { }
@@ -611,7 +616,8 @@ enum eSalanar
     CALL_DARK_RIDER             = 52266,
     SPELL_EFFECT_OVERTAKE       = 52349
 };
-    EFFECT_STOLEN_HORSE         = 52263,
+
+class npc_salanar_the_horseman : public CreatureScript
 {
 public:
     npc_salanar_the_horseman() : CreatureScript("npc_salanar_the_horseman") { }
@@ -677,7 +683,8 @@ public:
 /*######
 ## npc_ros_dark_rider
 ######*/
-};
+
+class npc_ros_dark_rider : public CreatureScript
 {
 public:
     npc_ros_dark_rider() : CreatureScript("npc_ros_dark_rider") { }
@@ -728,7 +735,8 @@ enum SG
 {
     GHOULS = 28845,
     GHOSTS = 28846,
-
+};
+class npc_dkc1_gothik : public CreatureScript
 {
 public:
     npc_dkc1_gothik() : CreatureScript("npc_dkc1_gothik") { }
@@ -772,7 +780,8 @@ public:
 
 };
 
-                    }
+
+class npc_scarlet_ghoul : public CreatureScript
 {
 public:
     npc_scarlet_ghoul() : CreatureScript("npc_scarlet_ghoul") { }
@@ -862,7 +871,8 @@ public:
 
 #define SPELL_CART_CHECK     54173
 #define SPELL_CART_DRAG      52465
-};
+
+class npc_scarlet_miner_cart : public CreatureScript
 {
 public:
     npc_scarlet_miner_cart() : CreatureScript("npc_scarlet_miner_cart") { }
@@ -916,7 +926,8 @@ public:
 
 #define SAY_SCARLET_MINER1  "Where'd this come from? I better get this down to the ships before the foreman sees it!"
 #define SAY_SCARLET_MINER2  "Now I can have a rest!"
-
+
+class npc_scarlet_miner : public CreatureScript
 {
 public:
     npc_scarlet_miner() : CreatureScript("npc_scarlet_miner") { }
@@ -1051,7 +1062,8 @@ public:
 ######*/
 
 #define SPELL_CART_SUMM   52463
-        }
+
+class go_inconspicuous_mine_car : public GameObjectScript
 {
 public:
     go_inconspicuous_mine_car() : GameObjectScript("go_inconspicuous_mine_car") { }

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp

@@ -43,7 +43,8 @@ enum win_friends
     SAY_PERSUADED6                    = -1609519,
     SPELL_PERSUASIVE_STRIKE           = 52781
 };
-
+
+class npc_crusade_persuaded : public CreatureScript
 {
 public:
     npc_crusade_persuaded() : CreatureScript("npc_crusade_persuaded") { }
@@ -171,7 +172,8 @@ enum eKoltira
     //NPC_DEATH_KNIGHT_MOUNT          = 29201,
     MODEL_DEATH_KNIGHT_MOUNT        = 25278
 };
-};
+
+class npc_koltira_deathweaver : public CreatureScript
 {
 public:
     npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { }
@@ -351,7 +353,8 @@ enum ScarletCourierEnum
     GO_INCONSPICUOUS_TREE              = 191144,
     NPC_SCARLET_COURIER                = 29076
 };
-    NPC_SCARLET_COURIER                = 29076
+
+class mob_scarlet_courier : public CreatureScript
 {
 public:
     mob_scarlet_courier() : CreatureScript("mob_scarlet_courier") { }
@@ -445,7 +448,8 @@ enum valroth
     SPELL_VALROTH_SMITE               = 52926,
     SPELL_SUMMON_VALROTH_REMAINS      = 52929
 };
-    SPELL_VALROTH_SMITE               = 52926,
+
+class mob_high_inquisitor_valroth : public CreatureScript
 {
 public:
     mob_high_inquisitor_valroth() : CreatureScript("mob_high_inquisitor_valroth") { }
@@ -581,7 +585,8 @@ enum SpecialSurprise
 
     NPC_PLAGUEFIST              = 29053
 };
-    EMOTE_DIES                  = -1609078,
+
+class npc_a_special_surprise : public CreatureScript
 {
 public:
     npc_a_special_surprise() : CreatureScript("npc_a_special_surprise") { }

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp

@@ -282,7 +282,8 @@ static Locations LightofDawnLoc[]=
     {2272.709, -5255.552, 78.226, 0},     // 28 Lich king kicked
     {2273.972, -5257.676, 78.862, 0}      // 29 Lich king moves forward
 };
-
+
+class npc_highlord_darion_mograine : public CreatureScript
 {
 public:
     npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { }
@@ -1658,7 +1659,8 @@ public:
 
 /*######
 ## npc the lich king in dawn of light
-## npc the lich king in dawn of light
+######*/
+class npc_the_lich_king_tirion_dawn : public CreatureScript
 {
 public:
     npc_the_lich_king_tirion_dawn() : CreatureScript("npc_the_lich_king_tirion_dawn") { }

src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp

@@ -22,7 +22,8 @@
 ####*/
 #define SPELL_REVIVE 51918
 #define VALK_WHISPER "It is not yet your time, champion. Rise! Rise and fight once more!"
-
+
+class npc_valkyr_battle_maiden : public CreatureScript
 {
 public:
     npc_valkyr_battle_maiden() : CreatureScript("npc_valkyr_battle_maiden") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp

@@ -36,7 +36,8 @@ enum eEnums
     SPELL_FIREAOE               = 9435,
     SPELL_ARCANEBUBBLE          = 9438,
 };
-
+
+class boss_arcanist_doan : public CreatureScript
 {
 public:
     boss_arcanist_doan() : CreatureScript("boss_arcanist_doan") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 #define SPELL_CALLOFTHEGRAVE            17831
 #define SPELL_TERRIFY                   7399
 #define SPELL_SOULSIPHON                7290
-
+
+class boss_azshir_the_sleepless : public CreatureScript
 {
 public:
     boss_azshir_the_sleepless() : CreatureScript("boss_azshir_the_sleepless") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp

@@ -36,7 +36,8 @@ enum eEnums
     SPELL_FLAMESPIKE        = 8814,
     SPELL_FIRENOVA          = 16079,
 };
-
+
+class boss_bloodmage_thalnos : public CreatureScript
 {
 public:
     boss_bloodmage_thalnos() : CreatureScript("boss_bloodmage_thalnos") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp

@@ -127,7 +127,8 @@ static const char* Text[]=
 };
 
 #define EMOTE_LAUGHS    "Headless Horseman laughs"
-
+
+class mob_wisp_invis : public CreatureScript
 {
 public:
     mob_wisp_invis() : CreatureScript("mob_wisp_invis") { }
@@ -213,7 +214,8 @@ public:
     };
 
 };
-};
+
+class mob_head : public CreatureScript
 {
 public:
     mob_head() : CreatureScript("mob_head") { }
@@ -309,7 +311,8 @@ public:
                 me->GetMotionMaster()->MoveFleeing(caster->getVictim());
             }
         }
-            }
+
+        void Disappear();
         void UpdateAI(const uint32 diff)
         {
             if (!withbody)
@@ -350,7 +353,8 @@ public:
     };
 
 };
-    };
+
+class boss_headless_horseman : public CreatureScript
 {
 public:
     boss_headless_horseman() : CreatureScript("boss_headless_horseman") { }
@@ -758,7 +762,8 @@ public:
 };
 
 
-
+
+class mob_pulsing_pumpkin : public CreatureScript
 {
 public:
     mob_pulsing_pumpkin() : CreatureScript("mob_pulsing_pumpkin") { }
@@ -839,7 +844,8 @@ public:
     };
 
 };
-                DoMeleeAttackIfReady();
+
+class go_loosely_turned_soil : public GameObjectScript
 {
 public:
     go_loosely_turned_soil() : GameObjectScript("go_loosely_turned_soil") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp

@@ -39,7 +39,8 @@ EndScriptData */
 
 #define ENTRY_SCARLET_TRAINEE       6575
 #define ENTRY_SCARLET_MYRMIDON      4295
-
+
+class boss_herod : public CreatureScript
 {
 public:
     boss_herod() : CreatureScript("boss_herod") { }
@@ -117,7 +118,8 @@ public:
 
 };
 
-
+
+class mob_scarlet_trainee : public CreatureScript
 {
 public:
     mob_scarlet_trainee() : CreatureScript("mob_scarlet_trainee") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp

@@ -34,7 +34,8 @@ enum eSpells
     SPELL_POWERWORDSHIELD           = 11647,
     SPELL_SLEEP                     = 8399
 };
-
+
+class boss_high_inquisitor_fairbanks : public CreatureScript
 {
 public:
     boss_high_inquisitor_fairbanks() : CreatureScript("boss_high_inquisitor_fairbanks") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp

@@ -31,7 +31,8 @@ enum eEnums
     SPELL_SUMMONSCARLETHOUND        = 17164,
     SPELL_BLOODLUST                 = 6742
 };
-
+
+class boss_houndmaster_loksey : public CreatureScript
 {
 public:
     boss_houndmaster_loksey() : CreatureScript("boss_houndmaster_loksey") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp

@@ -36,7 +36,8 @@ enum eEnums
 
     SPELL_SHADOWWORDPAIN    = 2767,
 };
-
+
+class boss_interrogator_vishas : public CreatureScript
 {
 public:
     boss_interrogator_vishas() : CreatureScript("boss_interrogator_vishas") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp

@@ -52,7 +52,8 @@ enum eEnums
     SPELL_HEAL                   = 12039,
     SPELL_POWERWORDSHIELD        = 22187
 };
-
+
+class boss_scarlet_commander_mograine : public CreatureScript
 {
 public:
     boss_scarlet_commander_mograine() : CreatureScript("boss_scarlet_commander_mograine") { }
@@ -216,7 +217,8 @@ public:
     };
 
 };
-};
+
+class boss_high_inquisitor_whitemane : public CreatureScript
 {
 public:
     boss_high_inquisitor_whitemane() : CreatureScript("boss_high_inquisitor_whitemane") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp

@@ -29,7 +29,8 @@ EndScriptData */
 #define SPELL_FROSTBOLTVOLLEY           8398
 #define SPELL_MINDFLAY                  17313
 #define SPELL_FROSTNOVA                 15531
-
+
+class boss_scorn : public CreatureScript
 {
 public:
     boss_scorn() : CreatureScript("boss_scorn") { }

src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp

@@ -32,7 +32,8 @@ EndScriptData */
 #define ENTRY_PUMPKIN           23694
 
 #define MAX_ENCOUNTER 2
-
+
+class instance_scarlet_monastery : public InstanceMapScript
 {
 public:
     instance_scarlet_monastery() : InstanceMapScript("instance_scarlet_monastery") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp

@@ -49,7 +49,8 @@ EndScriptData */
 #define ADD_4Y 99.373
 #define ADD_4Z 104.732
 #define ADD_4O 3.16
-
+
+class boss_darkmaster_gandling : public CreatureScript
 {
 public:
     boss_darkmaster_gandling() : CreatureScript("boss_darkmaster_gandling") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp

@@ -24,7 +24,8 @@ SDCategory: Scholomance
 EndScriptData */
 
 #include "ScriptPCH.h"
-
+
+class boss_death_knight_darkreaver : public CreatureScript
 {
 public:
     boss_death_knight_darkreaver() : CreatureScript("boss_death_knight_darkreaver") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp

@@ -34,7 +34,8 @@ enum eEnums
     SPELL_BACKHAND              = 18103,
     SPELL_FRENZY                = 8269
 };
-
+
+class boss_doctor_theolen_krastinov : public CreatureScript
 {
 public:
     boss_doctor_theolen_krastinov() : CreatureScript("boss_doctor_theolen_krastinov") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp

@@ -30,7 +30,8 @@ EndScriptData */
 #define SPELL_SHADOWSHOCK       20603
 #define SPELL_SILENCE           15487
 #define SPELL_FEAR              6215
-
+
+class boss_illucia_barov : public CreatureScript
 {
 public:
     boss_illucia_barov() : CreatureScript("boss_illucia_barov") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp

@@ -31,7 +31,8 @@ EndScriptData */
 #define SPELL_FLASHHEAL            10917
 #define SPELL_RENEW                10929
 #define SPELL_HEALINGTOUCH         9889
-
+
+class boss_instructor_malicia : public CreatureScript
 {
 public:
     boss_instructor_malicia() : CreatureScript("boss_instructor_malicia") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp

@@ -30,7 +30,8 @@ EndScriptData */
 
 //Spells of Illusion of Jandice Barov
 #define SPELL_CLEAVE                15584
-
+
+class boss_jandice_barov : public CreatureScript
 {
 public:
     boss_jandice_barov() : CreatureScript("boss_jandice_barov") { }
@@ -151,7 +152,8 @@ public:
 };
 
 // Illusion of Jandice Barov Script
-// Illusion of Jandice Barov Script
+
+class mob_illusionofjandicebarov : public CreatureScript
 {
 public:
     mob_illusionofjandicebarov() : CreatureScript("mob_illusionofjandicebarov") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp

@@ -27,7 +27,8 @@ EndScriptData */
 
 #define SPELL_SHADOWBOLTVOLLEY      20741
 #define SPELL_BONESHIELD            27688
-
+
+class boss_kormok : public CreatureScript
 {
 public:
     boss_kormok() : CreatureScript("boss_kormok") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp

@@ -28,7 +28,8 @@ EndScriptData */
 
 #define SPELL_IMMOLATE             20294                    // Old ID  was 15570
 #define SPELL_VEILOFSHADOW         17820
-
+
+class boss_lord_alexei_barov : public CreatureScript
 {
 public:
     boss_lord_alexei_barov() : CreatureScript("boss_lord_alexei_barov") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp

@@ -30,7 +30,8 @@ EndScriptData */
 #define SPELL_DARKPLAGUE             18270
 #define SPELL_CORROSIVEACID          23313
 #define SPELL_NOXIOUSCATALYST        18151
-
+
+class boss_lorekeeper_polkelt : public CreatureScript
 {
 public:
     boss_lorekeeper_polkelt() : CreatureScript("boss_lorekeeper_polkelt") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp

@@ -31,7 +31,8 @@ EndScriptData */
 #define SPELL_FEAR              26070
 #define SPELL_CHILLNOVA         18099
 #define SPELL_FROSTVOLLEY       8398
-
+
+class boss_boss_ras_frostwhisper : public CreatureScript
 {
 public:
     boss_boss_ras_frostwhisper() : CreatureScript("boss_boss_ras_frostwhisper") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp

@@ -30,7 +30,8 @@ EndScriptData */
 #define SPELL_CLEAVE            20691
 #define SPELL_SUNDERINCLEAVE    25174
 #define SPELL_KNOCKAWAY         10101
-
+
+class boss_the_ravenian : public CreatureScript
 {
 public:
     boss_the_ravenian() : CreatureScript("boss_the_ravenian") { }

src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp

@@ -34,7 +34,8 @@ enum eEnums
     SPELL_FIRESHIELD             = 19626,
     SPELL_FRENZY                 = 8269 //28371,
 };
-
+
+class boss_vectus : public CreatureScript
 {
 public:
     boss_vectus() : CreatureScript("boss_vectus") { }

src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp

@@ -36,7 +36,8 @@ EndScriptData */
 #define GO_GATE_ILLUCIA     177371
 
 #define MAX_ENCOUNTER          2
-
+
+class instance_scholomance : public InstanceMapScript
 {
 public:
     instance_scholomance() : InstanceMapScript("instance_scholomance") { }

src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp

@@ -53,7 +53,8 @@ const Position SpawnLocation[] =
     {-145.905,2180.520,128.448,4.183},
     {-140.794,2178.037,128.448,4.090},
     {-138.640,2170.159,136.577,2.737}
-};
+};
+class instance_shadowfang_keep : public InstanceMapScript
 {
 public:
     instance_shadowfang_keep() : InstanceMapScript("instance_shadowfang_keep") { }

src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp

@@ -52,7 +52,8 @@ enum eEnums
 };
 
 #define GOSSIP_ITEM_DOOR        "Thanks, I'll follow you to the door."
-
+
+class npc_shadowfang_prisoner : public CreatureScript
 {
 public:
     npc_shadowfang_prisoner() : CreatureScript("npc_shadowfang_prisoner") { }
@@ -141,7 +142,8 @@ public:
 
 
 
-
+
+class npc_arugal_voidwalker : public CreatureScript
 {
 public:
     npc_arugal_voidwalker() : CreatureScript("npc_arugal_voidwalker") { }

src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp

@@ -76,7 +76,8 @@ EndScriptData */
 #define SPELL_RAISE_DEAD4   17478
 #define SPELL_RAISE_DEAD5   17479
 #define SPELL_RAISE_DEAD6   17480
-
+
+class boss_baron_rivendare : public CreatureScript
 {
 public:
     boss_baron_rivendare() : CreatureScript("boss_baron_rivendare") { }

src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp

@@ -30,7 +30,8 @@ EndScriptData */
 #define SPELL_BANSHEECURSE    16867
 #define SPELL_SILENCE    18327
 //#define SPELL_POSSESS   17244
-
+
+class boss_baroness_anastari : public CreatureScript
 {
 public:
     boss_baroness_anastari() : CreatureScript("boss_baroness_anastari") { }

src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp

@@ -75,7 +75,8 @@ EndScriptData */
 #define SPELL_PUMMEL    15615
 #define SPELL_SHOOT    16496
 //#define SPELL_SUMMONCRIMSONRIFLEMAN    17279
-
+
+class boss_cannon_master_willey : public CreatureScript
 {
 public:
     boss_cannon_master_willey() : CreatureScript("boss_cannon_master_willey") { }

src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp

@@ -64,7 +64,8 @@ SummonDef m_aSummonPoint[]=
     {3460.975, -3078.901, 135.002, 3.784},                  //G2 back left
     {3457.338, -3073.979, 135.002, 3.784}                   //G2 back, right
 };
-
+
+class boss_dathrohan_balnazzar : public CreatureScript
 {
 public:
     boss_dathrohan_balnazzar() : CreatureScript("boss_dathrohan_balnazzar") { }