Code Style (game + scripts only):
"==" --> " == " (when needed) --HG-- branch : trunk
This commit is contained in:
@@ -56,7 +56,7 @@ struct mobs_spitelashesAI : public ScriptedAI
|
||||
if (!spellhit &&
|
||||
Hitter->GetTypeId() == TYPEID_PLAYER &&
|
||||
CAST_PLR(Hitter)->GetQuestStatus(9364) == QUEST_STATUS_INCOMPLETE &&
|
||||
(Spellkind->Id==118 || Spellkind->Id== 12824 || Spellkind->Id== 12825 || Spellkind->Id== 12826))
|
||||
(Spellkind->Id == 118 || Spellkind->Id == 12824 || Spellkind->Id == 12825 || Spellkind->Id == 12826))
|
||||
{
|
||||
spellhit=true;
|
||||
DoCast(m_creature, 29124); //become a sheep
|
||||
|
||||
@@ -490,7 +490,7 @@ struct npc_geezleAI : public ScriptedAI
|
||||
|
||||
for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr)
|
||||
{
|
||||
if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY)==QUEST_STATUS_INCOMPLETE
|
||||
if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE
|
||||
&&(*itr)->HasAura(SPELL_TREE_DISGUISE))
|
||||
{
|
||||
(*itr)->KilledMonsterCredit(MOB_SPARK,0);
|
||||
|
||||
@@ -171,7 +171,7 @@ struct instance_mount_hyjal : public ScriptedInstance
|
||||
case DATA_AZGALOREVENT:
|
||||
{
|
||||
m_auiEncounter[3] = data;
|
||||
if (data==DONE)
|
||||
if (data == DONE)
|
||||
{
|
||||
if (ArchiYell)break;
|
||||
ArchiYell = true;
|
||||
|
||||
@@ -40,19 +40,19 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCrea
|
||||
if (pCreature->isQuestGiver())
|
||||
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
|
||||
|
||||
if (eCreature==9528)
|
||||
if (eCreature == 9528)
|
||||
{
|
||||
if (pPlayer->GetQuestRewardStatus(4101))
|
||||
{
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
||||
pPlayer->SEND_GOSSIP_MENU(2848, pCreature->GetGUID());
|
||||
} else if (pPlayer->GetTeam()==HORDE)
|
||||
} else if (pPlayer->GetTeam() == HORDE)
|
||||
pPlayer->SEND_GOSSIP_MENU(2845, pCreature->GetGUID());
|
||||
else
|
||||
pPlayer->SEND_GOSSIP_MENU(2844, pCreature->GetGUID());
|
||||
}
|
||||
|
||||
if (eCreature==9529)
|
||||
if (eCreature == 9529)
|
||||
{
|
||||
if (pPlayer->GetQuestRewardStatus(4102))
|
||||
{
|
||||
@@ -69,7 +69,7 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCrea
|
||||
|
||||
bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
|
||||
{
|
||||
if (uiAction ==GOSSIP_ACTION_INFO_DEF+1)
|
||||
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
|
||||
{
|
||||
pPlayer->CLOSE_GOSSIP_MENU();
|
||||
pCreature->CastSpell(pPlayer, 15120, false);
|
||||
|
||||
@@ -130,9 +130,9 @@ bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature, ui
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
pPlayer->SEND_GOSSIP_MENU(4735, pCreature->GetGUID());
|
||||
if (pPlayer->GetQuestStatus(5929)==QUEST_STATUS_INCOMPLETE)
|
||||
if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->AreaExploredOrEventHappens(5929);
|
||||
if (pPlayer->GetQuestStatus(5930)==QUEST_STATUS_INCOMPLETE)
|
||||
if (pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->AreaExploredOrEventHappens(5930);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -80,20 +80,20 @@ struct boss_ayamissAI : public ScriptedAI
|
||||
return;
|
||||
|
||||
//If he is 70% start phase 2
|
||||
if (phase==1 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 70 && !m_creature->IsNonMeleeSpellCasted(false))
|
||||
if (phase == 1 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 70 && !m_creature->IsNonMeleeSpellCasted(false))
|
||||
{
|
||||
phase=2;
|
||||
}
|
||||
|
||||
//STINGERSPRAY_Timer (only in phase2)
|
||||
if (phase==2 && STINGERSPRAY_Timer <= diff)
|
||||
if (phase == 2 && STINGERSPRAY_Timer <= diff)
|
||||
{
|
||||
DoCast(m_creature->getVictim(), SPELL_STINGERSPRAY);
|
||||
STINGERSPRAY_Timer = 30000;
|
||||
} else STINGERSPRAY_Timer -= diff;
|
||||
|
||||
//POISONSTINGER_Timer (only in phase1)
|
||||
if (phase==1 && POISONSTINGER_Timer <= diff)
|
||||
if (phase == 1 && POISONSTINGER_Timer <= diff)
|
||||
{
|
||||
DoCast(m_creature->getVictim(), SPELL_POISONSTINGER);
|
||||
POISONSTINGER_Timer = 30000;
|
||||
|
||||
@@ -931,7 +931,7 @@ struct npc_anachronos_quest_triggerAI : public ScriptedAI
|
||||
if (Spawn)
|
||||
{
|
||||
Spawn->LoadCreaturesAddon();
|
||||
if (Spawn->GetGUID()== 15423)
|
||||
if (Spawn->GetGUID() == 15423)
|
||||
Spawn->SetUInt32Value(UNIT_FIELD_DISPLAYID,15427+rand()%4);
|
||||
if (i >= 30) WaveCount = 1;
|
||||
if (i >= 33) WaveCount = 2;
|
||||
|
||||
@@ -253,7 +253,7 @@ struct aqsentinelAI : public ScriptedAI
|
||||
for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); ++i)
|
||||
{
|
||||
Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
|
||||
if (pUnit->getPowerType()==POWER_MANA)
|
||||
if (pUnit->getPowerType() == POWER_MANA)
|
||||
return pUnit;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
@@ -134,7 +134,7 @@ bool GossipHello_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature)
|
||||
|
||||
bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
|
||||
{
|
||||
if (uiAction ==GOSSIP_ACTION_INFO_DEF+1)
|
||||
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
|
||||
{
|
||||
pPlayer->CLOSE_GOSSIP_MENU();
|
||||
pCreature->CastSpell(pPlayer, 16351, false);
|
||||
|
||||
Reference in New Issue
Block a user