Scripts/SFK: moved poison clouds for the Horde version to spawn groups and handle them properly again

This commit is contained in:
Ovahlord committed 2020-01-07 16:34:24 +01:00
1 parent 8265d7d472
commit 8f47cdd667
3 files changed
+536 -10

No files matched your search

@@ -19,11 +19,9 @@
#include "shadowfang_keep.h"
#include "AreaBoundary.h"
#include "GameObject.h"
#include "Player.h"
#include "InstanceScript.h"
#include "shadowfang_keep.h"
#include "TemporarySummon.h"
#include "ScriptedCreature.h"
#include "Player.h"
ObjectData const creatureData[] =
{
@@ -59,9 +57,13 @@ BossBoundaryData const boundaries =
enum SpawnGroups
{
SPAWN_GROUP_ENTRANCE_ALLIANCE = 412,
SPAWN_GROUP_ENTRANCE_HORDE = 413,
SPAWN_GROUP_DISEASE_CLOUDS_ENTRANCE = 414
SPAWN_GROUP_ENTRANCE_ALLIANCE = 412,
SPAWN_GROUP_ENTRANCE_HORDE = 413,
SPAWN_GROUP_DISEASE_CLOUDS_ENTRANCE = 414,
SPAWN_GROUP_DISEASE_CLOUDS_BARON_ASHBURY = 415,
SPAWN_GROUP_DISEASE_CLOUDS_BARON_SILVERLAINE = 416,
SPAWN_GROUP_DISEASE_CLOUDS_COMMANDER_SPRINGVALE = 417,
SPAWN_GROUP_DISEASE_CLOUDS_LORD_WALDEN = 418
};
class instance_shadowfang_keep : public InstanceMapScript
@@ -136,15 +138,29 @@ public:
void UpdateSpawnGroups()
{
// Disease Cloud Spawns
if (*_teamInInstance == HORDE)
{
instance->SpawnGroupSpawn(SPAWN_GROUP_DISEASE_CLOUDS_ENTRANCE);
if (GetBossState(DATA_BARON_ASHBURY) == DONE)
instance->SpawnGroupSpawn(SPAWN_GROUP_DISEASE_CLOUDS_BARON_ASHBURY);
if (GetBossState(DATA_BARON_SILVERLAINE) == DONE)
instance->SpawnGroupSpawn(SPAWN_GROUP_DISEASE_CLOUDS_BARON_SILVERLAINE);
if (GetBossState(DATA_COMMANDER_SPRINGVALE) == DONE)
instance->SpawnGroupSpawn(SPAWN_GROUP_DISEASE_CLOUDS_COMMANDER_SPRINGVALE);
if (GetBossState(DATA_LORD_WALDEN) == DONE)
instance->SpawnGroupSpawn(SPAWN_GROUP_DISEASE_CLOUDS_LORD_WALDEN);
}
// Entrance Handling
if (GetBossState(DATA_BARON_ASHBURY) != DONE)
instance->SpawnGroupSpawn(*_teamInInstance == ALLIANCE ? SPAWN_GROUP_ENTRANCE_ALLIANCE : SPAWN_GROUP_ENTRANCE_HORDE);
else if (GetBossState(DATA_BARON_ASHBURY) == DONE)
instance->SpawnGroupDespawn(*_teamInInstance == ALLIANCE ? SPAWN_GROUP_ENTRANCE_ALLIANCE : SPAWN_GROUP_ENTRANCE_HORDE);
// To-do: handle boss related event spawns here
}
uint32 GetData(uint32 type) const override
@@ -106,7 +106,7 @@ class at_sfk_pre_walden : public AreaTriggerScript
public:
at_sfk_pre_walden() : AreaTriggerScript("at_sfk_pre_walden") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*areaTrigger*/)
{
return true;
}
@@ -117,7 +117,7 @@ class at_sfk_godfrey_intro : public AreaTriggerScript
public:
at_sfk_godfrey_intro() : AreaTriggerScript("at_sfk_godfrey_intro") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*areaTrigger*/)
{
return true;
}