Skip to content

Commit

Permalink
Tab cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@billy1arm
billy1arm committed Mar 11, 2017
1 parent 8bb369f commit 9d7a0c0
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 73 deletions.
64 changes: 32 additions & 32 deletions scripts/kalimdor/dire_maul/dire_maul.h
View file
Expand Up @@ -101,10 +101,10 @@ enum
SAY_FREE_IMMOLTHAR = -1429000,
SAY_KILL_IMMOLTHAR = -1429001,
SAY_IRONBARK_REDEEM = -1429002,
SAY_CHORUSH_KING_DEAD = -1429003,
SAY_CHORUSH_KING_DEAD = -1429003,

FACTION_HOSTILE = 14,
FACTION_FRIENDLY = 35,
FACTION_FRIENDLY = 35,
SPELL_KING_OF_GORDOK = 22799,
};

Expand All @@ -113,50 +113,50 @@ static const float afMizzleSpawnLoc[4] = { 683.296f, 484.384f, 29.544f, 0.0174f
class instance_dire_maul : public ScriptedInstance
{
public:
instance_dire_maul(Map* pMap);
~instance_dire_maul() {}
instance_dire_maul(Map* pMap);
~instance_dire_maul() {}

void Initialize() override;
void Initialize() override;

void OnPlayerEnter(Player* pPlayer) override;
void OnPlayerEnter(Player* pPlayer) override;

void OnCreatureCreate(Creature* pCreature) override;
void OnObjectCreate(GameObject* pGo) override;
void OnCreatureCreate(Creature* pCreature) override;
void OnObjectCreate(GameObject* pGo) override;

void SetData(uint32 uiType, uint32 uiData) override;
uint32 GetData(uint32 uiType) const override;
void SetData(uint32 uiType, uint32 uiData) override;
uint32 GetData(uint32 uiType) const override;

void OnCreatureEnterCombat(Creature* pCreature) override;
void OnCreatureDeath(Creature* pCreature) override;
void OnCreatureEnterCombat(Creature* pCreature) override;
void OnCreatureDeath(Creature* pCreature) override;

const char* Save() const override { return m_strInstData.c_str(); }
void Load(const char* chrIn) override;
const char* Save() const override { return m_strInstData.c_str(); }
void Load(const char* chrIn) override;

bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override;
bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override;

void Update(uint32 uiDiff) override;
void Update(uint32 uiDiff) override;

protected:
bool CheckAllGeneratorsDestroyed();
void ProcessForceFieldOpening();
void SortPylonGuards();
void PylonGuardJustDied(Creature* pCreature);
bool CheckAllGeneratorsDestroyed();
void ProcessForceFieldOpening();
void SortPylonGuards();
void PylonGuardJustDied(Creature* pCreature);

uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string m_strInstData;
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string m_strInstData;

// East
bool m_bWallDestroyed;
GuidList m_lFelvineShardGUIDs;
// East
bool m_bWallDestroyed;
GuidList m_lFelvineShardGUIDs;

// West
ObjectGuid m_aCrystalGeneratorGuid[MAX_GENERATORS];
// West
ObjectGuid m_aCrystalGeneratorGuid[MAX_GENERATORS];

GuidList m_luiHighborneSummonerGUIDs;
GuidList m_lGeneratorGuardGUIDs;
std::set<uint32> m_sSortedGeneratorGuards[MAX_GENERATORS];
GuidList m_luiHighborneSummonerGUIDs;
GuidList m_lGeneratorGuardGUIDs;
std::set<uint32> m_sSortedGeneratorGuards[MAX_GENERATORS];

// North
bool m_bDoNorthBeforeWest;
// North
bool m_bDoNorthBeforeWest;
};
#endif
82 changes: 41 additions & 41 deletions scripts/kalimdor/dire_maul/instance_dire_maul.cpp
View file
Expand Up @@ -298,36 +298,36 @@ struct is_dire_maul : public InstanceScript
m_auiEncounter[uiType] = uiData;
if (uiData == DONE)
{
// change faction to certian ogres
if (Creature* pOgre = GetSingleCreatureFromStorage(NPC_CAPTAIN_KROMCRUSH))
{
if (pOgre->IsAlive())
{
pOgre->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);

// only evade if required
if (pOgre->getVictim())
pOgre->AI()->EnterEvadeMode();
}
}

if (Creature* pOgre = GetSingleCreatureFromStorage(NPC_CHORUSH))
{
// Chorush evades and yells on king death (if alive)
if (pOgre->IsAlive())
{
DoScriptText(SAY_CHORUSH_KING_DEAD, pOgre);
pOgre->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
pOgre->AI()->EnterEvadeMode();
}

// start WP movement for Mizzle; event handled by movement and gossip dbscripts
if (Creature* pMizzle = pOgre->SummonCreature(NPC_MIZZLE_THE_CRAFTY, afMizzleSpawnLoc[0], afMizzleSpawnLoc[1], afMizzleSpawnLoc[2], afMizzleSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true))
{
pMizzle->SetWalk(false);
pMizzle->GetMotionMaster()->MoveWaypoint();
}
}
// change faction to certian ogres
if (Creature* pOgre = GetSingleCreatureFromStorage(NPC_CAPTAIN_KROMCRUSH))
{
if (pOgre->IsAlive())
{
pOgre->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);

// only evade if required
if (pOgre->getVictim())
pOgre->AI()->EnterEvadeMode();
}
}

if (Creature* pOgre = GetSingleCreatureFromStorage(NPC_CHORUSH))
{
// Chorush evades and yells on king death (if alive)
if (pOgre->IsAlive())
{
DoScriptText(SAY_CHORUSH_KING_DEAD, pOgre);
pOgre->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
pOgre->AI()->EnterEvadeMode();
}

// start WP movement for Mizzle; event handled by movement and gossip dbscripts
if (Creature* pMizzle = pOgre->SummonCreature(NPC_MIZZLE_THE_CRAFTY, afMizzleSpawnLoc[0], afMizzleSpawnLoc[1], afMizzleSpawnLoc[2], afMizzleSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true))
{
pMizzle->SetWalk(false);
pMizzle->GetMotionMaster()->MoveWaypoint();
}
}
}
break;
case TYPE_MOLDAR:
Expand Down Expand Up @@ -471,17 +471,17 @@ struct is_dire_maul : public InstanceScript
{
switch (uiInstanceConditionId)
{
case INSTANCE_CONDITION_ID_NORMAL_MODE: // No guards alive
case INSTANCE_CONDITION_ID_HARD_MODE: // One guard alive
case INSTANCE_CONDITION_ID_HARD_MODE_2: // Two guards alive
case INSTANCE_CONDITION_ID_HARD_MODE_3: // Three guards alive
case INSTANCE_CONDITION_ID_HARD_MODE_4: // All guards alive
{
uint8 uiTributeRunAliveBosses = (GetData(TYPE_MOLDAR) != DONE ? 1 : 0) + (GetData(TYPE_FENGUS) != DONE ? 1 : 0) + (GetData(TYPE_SLIPKIK) != DONE ? 1 : 0)
+ (GetData(TYPE_KROMCRUSH) != DONE ? 1 : 0);

return uiInstanceConditionId == uiTributeRunAliveBosses;
}
case INSTANCE_CONDITION_ID_NORMAL_MODE: // No guards alive
case INSTANCE_CONDITION_ID_HARD_MODE: // One guard alive
case INSTANCE_CONDITION_ID_HARD_MODE_2: // Two guards alive
case INSTANCE_CONDITION_ID_HARD_MODE_3: // Three guards alive
case INSTANCE_CONDITION_ID_HARD_MODE_4: // All guards alive
{
uint8 uiTributeRunAliveBosses = (GetData(TYPE_MOLDAR) != DONE ? 1 : 0) + (GetData(TYPE_FENGUS) != DONE ? 1 : 0) + (GetData(TYPE_SLIPKIK) != DONE ? 1 : 0)
+ (GetData(TYPE_KROMCRUSH) != DONE ? 1 : 0);

return uiInstanceConditionId == uiTributeRunAliveBosses;
}
}

script_error_log("instance_dire_maul::CheckConditionCriteriaMeet called with unsupported Id %u. Called with param plr %s, src %s, condition source type %u",
Expand Down

0 comments on commit 9d7a0c0

Please sign in to comment.