Merge pull request #8 from azerothcore/master

Merge

src/server/game/Entities/Creature/Creature.cpp

@@ -1579,7 +1579,7 @@ void Creature::SelectLevel(bool changelevel)
     SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, stats->AttackPower);
     SetModifierValue(UNIT_MOD_ATTACK_POWER_RANGED, BASE_VALUE, stats->RangedAttackPower);
 
-    sScriptMgr->Creature_SelectLevel(cInfo, this);
+    sScriptMgr->OnCreatureSelectLevel(cInfo, this);
 }
 
 float Creature::_GetHealthMod(int32 Rank)

src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp

@@ -57,11 +57,11 @@ void ScriptMgr::OnBeforeCreatureSelectLevel(const CreatureTemplate* cinfo, Creat
     });
 }
 
-void ScriptMgr::Creature_SelectLevel(const CreatureTemplate* cinfo, Creature* creature)
+void ScriptMgr::OnCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* creature)
 {
     ExecuteScript<AllCreatureScript>([&](AllCreatureScript* script)
     {
-        script->Creature_SelectLevel(cinfo, creature);
+        script->OnCreatureSelectLevel(cinfo, creature);
     });
 }
 

src/server/game/Scripting/ScriptDefines/AllCreatureScript.h

@@ -33,7 +33,7 @@ public:
     virtual void OnBeforeCreatureSelectLevel(const CreatureTemplate* /*cinfo*/, Creature* /*creature*/, uint8& /*level*/) { }
 
     // Called from End of Creature SelectLevel.
-    virtual void Creature_SelectLevel(const CreatureTemplate* /*cinfo*/, Creature* /*creature*/) { }
+    virtual void OnCreatureSelectLevel(const CreatureTemplate* /*cinfo*/, Creature* /*creature*/) { }
 
     /**
      * @brief This hook runs after add creature in world

src/server/game/Scripting/ScriptMgr.h

@@ -593,7 +593,7 @@ public: /* AllCreatureScript */
     //listener function (OnAllCreatureUpdate) is called by OnCreatureUpdate
     //void OnAllCreatureUpdate(Creature* creature, uint32 diff);
     void OnBeforeCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* creature, uint8& level);
-    void Creature_SelectLevel(const CreatureTemplate* cinfo, Creature* creature);
+    void OnCreatureSelectLevel(const CreatureTemplate* cinfo, Creature* creature);
     void OnCreatureSaveToDB(Creature* creature);
 
 public: /* AllGameobjectScript */

src/server/game/World/WorldState.cpp

@@ -1312,6 +1312,8 @@ void WorldState::StartScourgeInvasion(bool sendMail)
         Acore::Containers::RandomShuffle(randomIds);
         for (uint32 id : randomIds)
             OnEnable(m_siData.m_activeInvasions[id]);
+
+        sGameEventMgr->StartEvent(GAME_EVENT_SCOURGE_INVASION_BOSSES);
     }
 }
 

src/server/game/World/WorldState.h

@@ -65,6 +65,7 @@ enum WorldStateGameEvents
 {
     // Scourge Invasion
     GAME_EVENT_SCOURGE_INVASION                         = 17,
+    GAME_EVENT_SCOURGE_INVASION_BOSSES                  = 120,
     GAME_EVENT_SCOURGE_INVASION_WINTERSPRING            = 121,
     GAME_EVENT_SCOURGE_INVASION_TANARIS                 = 122,
     GAME_EVENT_SCOURGE_INVASION_AZSHARA                 = 123,