@@ -68,7 +68,6 @@ public:
|
||||
{
|
||||
instance = creature->GetInstanceScript();
|
||||
go = false;
|
||||
pos = 0;
|
||||
}
|
||||
|
||||
uint32 SwarmTimer;
|
||||
@@ -76,7 +75,6 @@ public:
|
||||
uint32 AuraTimer;
|
||||
uint32 InfernoTimer;
|
||||
bool go;
|
||||
uint32 pos;
|
||||
|
||||
void Reset()
|
||||
{
|
||||
@@ -119,7 +117,6 @@ public:
|
||||
|
||||
void WaypointReached(uint32 i)
|
||||
{
|
||||
pos = i;
|
||||
if (i == 7 && instance)
|
||||
{
|
||||
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_JAINAPROUDMOORE));
|
||||
|
||||
@@ -110,7 +110,8 @@ public:
|
||||
bool IsEncounterInProgress() const
|
||||
{
|
||||
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
|
||||
if (m_auiEncounter[i] == IN_PROGRESS) return true;
|
||||
if (m_auiEncounter[i] == IN_PROGRESS)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -607,7 +607,8 @@ public:
|
||||
if (WisperTimer <= diff)
|
||||
{
|
||||
Map* map = me->GetMap();
|
||||
if (!map->IsDungeon()) return;
|
||||
if (!map->IsDungeon())
|
||||
return;
|
||||
|
||||
//Play random sound to the zone
|
||||
Map::PlayerList const &PlayerList = map->GetPlayers();
|
||||
|
||||
@@ -117,7 +117,7 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64 GetData64 (uint32 identifier)
|
||||
uint64 GetData64(uint32 identifier)
|
||||
{
|
||||
switch (identifier)
|
||||
{
|
||||
|
||||
@@ -199,18 +199,6 @@ public:
|
||||
+## go_troll_cage
|
||||
+######*/
|
||||
|
||||
void initBlyCrewMember(InstanceScript* instance, uint32 entry, float x, float y, float z)
|
||||
{
|
||||
if (Creature* crew = instance->instance->GetCreature(instance->GetData64(entry)))
|
||||
{
|
||||
crew->SetReactState(REACT_AGGRESSIVE);
|
||||
crew->SetWalk(true);
|
||||
crew->SetHomePosition(x, y, z, 0);
|
||||
crew->GetMotionMaster()->MovePoint(1, x, y, z);
|
||||
crew->setFaction(FACTION_FREED);
|
||||
}
|
||||
}
|
||||
|
||||
class go_troll_cage : public GameObjectScript
|
||||
{
|
||||
public:
|
||||
@@ -231,6 +219,18 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
private:
|
||||
void initBlyCrewMember(InstanceScript* instance, uint32 entry, float x, float y, float z)
|
||||
{
|
||||
if (Creature* crew = instance->instance->GetCreature(instance->GetData64(entry)))
|
||||
{
|
||||
crew->SetReactState(REACT_AGGRESSIVE);
|
||||
crew->SetWalk(true);
|
||||
crew->SetHomePosition(x, y, z, 0);
|
||||
crew->GetMotionMaster()->MovePoint(1, x, y, z);
|
||||
crew->setFaction(FACTION_FREED);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/*######
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
uint32 m_uiRebuffTimer;
|
||||
bool work;
|
||||
|
||||
void Reset ()
|
||||
void Reset()
|
||||
{
|
||||
uiPlayerGUID = 0;
|
||||
m_uiRebuffTimer = 0;
|
||||
|
||||
@@ -385,7 +385,8 @@ public:
|
||||
|
||||
void MoveInLineOfSight(Unit* who)
|
||||
{
|
||||
if (!who || (!who->isAlive())) return;
|
||||
if (!who || (!who->isAlive()))
|
||||
return;
|
||||
|
||||
if (me->IsWithinDistInMap(who, 10.0f) && (who->GetTypeId() == TYPEID_PLAYER) && CAST_PLR(who)->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE && !EventInProgress)
|
||||
{
|
||||
@@ -433,8 +434,10 @@ public:
|
||||
if (BigWill)
|
||||
{
|
||||
Creature* creature = Unit::GetCreature((*me), BigWill);
|
||||
if (creature) {
|
||||
if (creature->isAlive()) {
|
||||
if (creature)
|
||||
{
|
||||
if (creature->isAlive())
|
||||
{
|
||||
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
|
||||
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
creature->setDeathState(JUST_DIED);
|
||||
|
||||
Reference in New Issue
Block a user