Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
This commit is contained in:
Vincent-Michael committed 2013-08-10 17:58:53 +02:00
commit bb9614d00d
73 files changed
+381 -374

No files matched your search

@@ -178,7 +178,7 @@ class spell_argaloth_meteor_slash : public SpellScriptLoader
void Register() OVERRIDE
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_meteor_slash_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_meteor_slash_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104);
OnHit += SpellHitFn(spell_argaloth_meteor_slash_SpellScript::SplitDamage);
}
@@ -44,7 +44,7 @@ class instance_baradin_hold: public InstanceMapScript
OccutharDoor = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch(creature->GetEntry())
{
@@ -60,7 +60,7 @@ class instance_baradin_hold: public InstanceMapScript
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch(go->GetEntry())
{
@@ -75,7 +75,7 @@ class instance_baradin_hold: public InstanceMapScript
}
}
uint64 GetData64(uint32 data) const
uint64 GetData64(uint32 data) const OVERRIDE
{
switch (data)
{
@@ -92,7 +92,7 @@ class instance_baradin_hold: public InstanceMapScript
return 0;
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) OVERRIDE
{
switch(go->GetEntry())
{
@@ -105,7 +105,7 @@ class instance_baradin_hold: public InstanceMapScript
}
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -116,7 +116,7 @@ class instance_baradin_hold: public InstanceMapScript
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) OVERRIDE
{
if (!in)
{
@@ -115,7 +115,7 @@ public:
uint32 TombTimer;
uint32 TombEventCounter;
void Initialize()
void Initialize() OVERRIDE
{
memset(&encounter, 0, sizeof(encounter));
@@ -156,7 +156,7 @@ public:
TombBossGUIDs[i] = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -178,7 +178,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -342,12 +342,12 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
return str_data;
}
void Load(const char* in)
void Load(const char* in) OVERRIDE
{
if (!in)
{
@@ -429,7 +429,7 @@ public:
TombEventStarterGUID = 0;
SetData(TYPE_TOMB_OF_SEVEN, DONE);
}
void Update(uint32 diff)
void Update(uint32 diff) OVERRIDE
{
if (TombEventStarterGUID && GhostKillCount < 7)
{
@@ -75,7 +75,7 @@ public:
go_portcullis_tobossrooms = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -133,7 +133,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -240,7 +240,7 @@ public:
}
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -270,7 +270,7 @@ public:
return true;
}
void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId)
void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE
{
switch (eventId)
{
@@ -414,7 +414,7 @@ public:
return 0;
}
void Update(uint32 diff)
void Update(uint32 diff) OVERRIDE
{
Events.Update(diff);
@@ -531,7 +531,7 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -542,7 +542,7 @@ public:
return saveStream.str();
}
void Load(const char* strIn)
void Load(const char* strIn) OVERRIDE
{
if (!strIn)
{
@@ -59,7 +59,7 @@ public:
SetBossNumber(EncounterCount);
}
void Initialize()
void Initialize() OVERRIDE
{
// Razorgore
EggCount = 0;
@@ -85,7 +85,7 @@ public:
NefarianGUID = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -126,7 +126,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -159,13 +159,13 @@ public:
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) OVERRIDE
{
if (go->GetEntry() == 177807) // Egg
EggList.remove(go->GetGUID());
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -268,14 +268,14 @@ public:
}
}
void OnUnitDeath(Unit* unit)
void OnUnitDeath(Unit* unit) OVERRIDE
{
//! HACK, needed because of buggy CreatureAI after charm
if (unit->GetEntry() == NPC_RAZORGORE && GetBossState(BOSS_RAZORGORE) != DONE)
SetBossState(BOSS_RAZORGORE, DONE);
}
void Update(uint32 diff)
void Update(uint32 diff) OVERRIDE
{
if (_events.Empty())
return;
@@ -79,7 +79,7 @@ class instance_molten_core : public InstanceMapScript
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -94,7 +94,7 @@ class instance_molten_core : public InstanceMapScript
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -183,7 +183,7 @@ class instance_molten_core : public InstanceMapScript
summon->AI()->DoAction(ACTION_START_RAGNAROS_ALT);
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -72,7 +72,7 @@ class instance_deadmines : public InstanceMapScript
uint32 PiratesDelay_Timer;
uint64 uiSmiteChestGUID;
void Initialize()
void Initialize() OVERRIDE
{
FactoryDoorGUID = 0;
IronCladDoorGUID = 0;
@@ -86,7 +86,7 @@ class instance_deadmines : public InstanceMapScript
uiSmiteChestGUID = 0;
}
virtual void Update(uint32 diff)
virtual void Update(uint32 diff) OVERRIDE
{
if (!IronCladDoorGUID || !DefiasCannonGUID || !DoorLeverGUID)
return;
@@ -188,7 +188,7 @@ class instance_deadmines : public InstanceMapScript
pDoorLever->SetUInt32Value(GAMEOBJECT_FLAGS, 4);
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -45,7 +45,7 @@ public:
uint64 uiBastmasterEmiShortfuseGUID;
void Initialize()
void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -55,7 +55,7 @@ public:
uiBastmasterEmiShortfuseGUID = 0;
}
void Load(const char* in)
void Load(const char* in) OVERRIDE
{
if (!in)
{
@@ -77,7 +77,7 @@ public:
OUT_LOAD_INST_DATA_COMPLETE;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -85,7 +85,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -80,7 +80,7 @@ public:
uint64 ImageGUID;
uint64 DustCoveredChest;
void Initialize()
void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -108,7 +108,7 @@ public:
DustCoveredChest = 0;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -117,7 +117,7 @@ public:
return false;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -190,7 +190,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -236,7 +236,7 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
return strSaveData;
}
@@ -86,7 +86,7 @@ public:
uint32 StatuesState;
uint8 felCristalIndex;
void Initialize()
void Initialize() OVERRIDE
{
memset(&Encounter, 0, sizeof(Encounter));
@@ -108,7 +108,7 @@ public:
felCristalIndex = 0;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (Encounter[i] == IN_PROGRESS)
@@ -188,7 +188,7 @@ public:
SaveToDB();
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -204,7 +204,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -235,7 +235,7 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -246,7 +246,7 @@ public:
return saveStream.str();
}
void Load(const char* str)
void Load(const char* str) OVERRIDE
{
if (!str)
{
@@ -63,7 +63,7 @@ public:
uint32 encounter[MAX_ENCOUNTER];
void Initialize()
void Initialize() OVERRIDE
{
memset(&encounter, 0, sizeof(encounter));
@@ -78,7 +78,7 @@ public:
DoorHighInquisitorGUID = 0;
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -87,7 +87,7 @@ public:
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -48,7 +48,7 @@ class instance_scholomance : public InstanceMapScript
BrazierOfTheHeraldGUID = 0;
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -84,7 +84,7 @@ class instance_scholomance : public InstanceMapScript
}
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -168,7 +168,7 @@ class instance_scholomance : public InstanceMapScript
instance->SummonCreature(NPC_DARKMASTER_GANDLING, GandlingLoc);
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -179,7 +179,7 @@ class instance_scholomance : public InstanceMapScript
return saveStream.str();
}
void Load(const char* str)
void Load(const char* str) OVERRIDE
{
if (!str)
{
@@ -94,7 +94,7 @@ public:
uint8 uiPhase;
uint16 uiTimer;
void Initialize()
void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -110,7 +110,7 @@ public:
uiTimer = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -120,7 +120,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -218,12 +218,12 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
return str_data;
}
void Load(const char* in)
void Load(const char* in) OVERRIDE
{
if (!in)
{
@@ -72,7 +72,7 @@ class instance_stratholme : public InstanceMapScript
std::set<uint64> abomnationGUID;
EventMap events;
void Initialize()
void Initialize() OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
EncounterState[i] = NOT_STARTED;
@@ -126,7 +126,7 @@ class instance_stratholme : public InstanceMapScript
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -146,7 +146,7 @@ class instance_stratholme : public InstanceMapScript
}
}
void OnCreatureRemove(Creature* creature)
void OnCreatureRemove(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -160,7 +160,7 @@ class instance_stratholme : public InstanceMapScript
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -353,7 +353,7 @@ class instance_stratholme : public InstanceMapScript
SaveToDB();
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -365,7 +365,7 @@ class instance_stratholme : public InstanceMapScript
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) OVERRIDE
{
if (!in)
{
@@ -426,7 +426,7 @@ class instance_stratholme : public InstanceMapScript
return 0;
}
void Update(uint32 diff)
void Update(uint32 diff) OVERRIDE
{
events.Update(diff);
@@ -79,7 +79,7 @@ public:
bool s5;
bool s6;
void Initialize()
void Initialize() OVERRIDE
{
GOAtalaiStatue1 = 0;
GOAtalaiStatue2 = 0;
@@ -99,7 +99,7 @@ public:
s6 = false;
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -81,7 +81,7 @@ public:
uint32 SpectralRealmTimer;
std::vector<uint64> SpectralRealmList;
void Initialize()
void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -113,7 +113,7 @@ public:
SpectralRealmTimer = 5000;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -141,7 +141,7 @@ public:
return NULL;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -161,7 +161,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -272,7 +272,7 @@ public:
SaveToDB();
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
std::ostringstream stream;
@@ -283,7 +283,7 @@ public:
return stream.str();
}
void Load(char const* in)
void Load(char const* in) OVERRIDE
{
if (!in)
{
@@ -47,7 +47,7 @@ class instance_uldaman : public InstanceMapScript
{
instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) {}
void Initialize()
void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -67,7 +67,7 @@ class instance_uldaman : public InstanceMapScript
keystoneCheck = false;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -99,7 +99,7 @@ class instance_uldaman : public InstanceMapScript
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -308,7 +308,7 @@ class instance_uldaman : public InstanceMapScript
}
}
}
void Update(uint32 diff)
void Update(uint32 diff) OVERRIDE
{
if (!keystoneCheck)
return;
@@ -403,12 +403,12 @@ class instance_uldaman : public InstanceMapScript
}
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
return str_data;
}
void Load(const char* in)
void Load(const char* in) OVERRIDE
{
if (!in)
{
@@ -430,7 +430,7 @@ class instance_uldaman : public InstanceMapScript
OUT_LOAD_INST_DATA_COMPLETE;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -494,7 +494,7 @@ class instance_uldaman : public InstanceMapScript
return 0;
} // end GetData64
void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId)
void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE
{
switch (eventId)
{
@@ -44,13 +44,13 @@ class instance_zulaman : public InstanceMapScript
ZulAmanBossCount = 0;
}
void FillInitialWorldStates(WorldPacket& packet)
void FillInitialWorldStates(WorldPacket& packet) OVERRIDE
{
packet << uint32(WORLD_STATE_ZULAMAN_TIMER_ENABLED) << uint32(ZulAmanState ? 1 : 0);
packet << uint32(WORLD_STATE_ZULAMAN_TIMER) << uint32(SpeedRunTimer);
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -83,7 +83,7 @@ class instance_zulaman : public InstanceMapScript
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -101,7 +101,7 @@ class instance_zulaman : public InstanceMapScript
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -177,7 +177,7 @@ class instance_zulaman : public InstanceMapScript
return 0;
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -221,7 +221,7 @@ class instance_zulaman : public InstanceMapScript
return true;
}
void ProcessEvent(WorldObject* /*obj*/, uint32 eventId)
void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) OVERRIDE
{
switch (eventId)
{
@@ -266,7 +266,7 @@ class instance_zulaman : public InstanceMapScript
}
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -278,7 +278,7 @@ class instance_zulaman : public InstanceMapScript
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) OVERRIDE
{
if (!str)
{
@@ -53,7 +53,7 @@ class instance_zulgurub : public InstanceMapScript
jindoTiggerGUID = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -92,7 +92,7 @@ class instance_zulgurub : public InstanceMapScript
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -108,7 +108,7 @@ class instance_zulgurub : public InstanceMapScript
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -124,7 +124,7 @@ class instance_zulgurub : public InstanceMapScript
}
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -197,7 +197,7 @@ class instance_zulgurub : public InstanceMapScript
return 0;
}
std::string GetSaveData()
std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -208,7 +208,7 @@ class instance_zulgurub : public InstanceMapScript
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) OVERRIDE
{
if (!str)
{