Skip to content

Commit

Permalink
Fix a few typos in the Shattered Halls scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
evil-at-wow committed Sep 30, 2023
1 parent 1d68aad commit 87c8bd4
Showing 1 changed file with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ enum

SPELL_DOUBLE_ATTACK = 19818,

NPC_SHATTERED_HAND_GLADIATIOR = 17464,
NPC_SHATTERED_HAND_GLADIATOR = 17464,
NPC_SHATTERED_HAND_CENTURION = 17465,

MAX_GLADIATORS = 3,
};

enum GladiatiorActions
enum GladiatorActions
{
GLADIATOR_STOP_EVENT,
GLADIATIOR_EVENT_RP,
GLADIATOR_EVENT_RP,
GLADIATOR_ACTION_MAX,
};

Expand All @@ -59,7 +59,7 @@ struct npc_shattered_hand_gladiator : public CombatAI
npc_shattered_hand_gladiator(Creature* creature) : CombatAI(creature, GLADIATOR_ACTION_MAX)
{
AddTimerlessCombatAction(GLADIATOR_STOP_EVENT, true);
AddCustomAction(GLADIATIOR_EVENT_RP, true, [&]() { DoDelayedReset(); });
AddCustomAction(GLADIATOR_EVENT_RP, true, [&]() { DoDelayedReset(); });
}

ObjectGuid m_sparringPartner;
Expand All @@ -77,7 +77,7 @@ struct npc_shattered_hand_gladiator : public CombatAI
void DoDelayedReset()
{
EnterEvadeMode();
DisableTimer(GLADIATIOR_EVENT_RP);
DisableTimer(GLADIATOR_EVENT_RP);
}

void HandleEventStart(Creature* partner)
Expand Down Expand Up @@ -106,7 +106,7 @@ struct npc_shattered_hand_gladiator : public CombatAI
m_creature->AttackStop();
m_creature->ClearTemporaryFaction();
m_creature->HandleEmote(EMOTE_ONESHOT_BOW);
ResetTimer(GLADIATIOR_EVENT_RP, 1000);
ResetTimer(GLADIATOR_EVENT_RP, 1000);
m_eventStarted = false;
}
else if (eventType == AI_EVENT_CUSTOM_C) // Start Duel
Expand Down Expand Up @@ -203,7 +203,7 @@ struct npc_shattered_hand_centurion : public CombatAI
// Get all 4 Gladiators in Range
std::list<Creature*> m_gladiator;
GuidVector m_gladiatorGuid;
GetCreatureListWithEntryInGrid(m_gladiator, m_creature, NPC_SHATTERED_HAND_GLADIATIOR, 10.0f);
GetCreatureListWithEntryInGrid(m_gladiator, m_creature, NPC_SHATTERED_HAND_GLADIATOR, 10.0f);
for (Creature* gladiator : m_gladiator)
m_gladiatorGuid.push_back(gladiator->GetObjectGuid());

Expand Down Expand Up @@ -257,7 +257,7 @@ struct npc_shattered_hand_centurion : public CombatAI
DoBroadcastText(SAY_FINISH, m_creature);

CreatureList gladiatorList;
GetCreatureListWithEntryInGrid(gladiatorList, m_creature, NPC_SHATTERED_HAND_GLADIATIOR, 20.0f);
GetCreatureListWithEntryInGrid(gladiatorList, m_creature, NPC_SHATTERED_HAND_GLADIATOR, 20.0f);
for (Creature* gladiator : gladiatorList)
{
if (gladiator->IsAlive())
Expand All @@ -283,4 +283,4 @@ void AddSC_shattered_halls()
pNewScript->Name = "npc_shattered_hand_gladiator";
pNewScript->GetAI = &GetNewAIInstance<npc_shattered_hand_gladiator>;
pNewScript->RegisterSelf();
}
}

0 comments on commit 87c8bd4

Please sign in to comment.