Code style (game + scripts only):
"( " --> "("
" )" --> ")"
--HG--
branch : trunk
This commit is contained in:
@@ -108,7 +108,7 @@ struct boss_nefarianAI : public ScriptedAI
|
||||
|
||||
void UpdateAI(const uint32 diff)
|
||||
{
|
||||
if ( DespawnTimer <= diff)
|
||||
if (DespawnTimer <= diff)
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
m_creature->ForcedDespawn();
|
||||
|
||||
@@ -869,31 +869,31 @@ struct npc_scarlet_minerAI : public npc_escortAI
|
||||
{
|
||||
AddWaypoint(1, 2389.03, -5902.74, 109.014, 5000);
|
||||
AddWaypoint(2, 2341.812012, -5900.484863, 102.619743);
|
||||
AddWaypoint(3, 2306.561279, -5901.738281, 91.792419 );
|
||||
AddWaypoint(4, 2300.098389, -5912.618652, 86.014885 );
|
||||
AddWaypoint(5, 2294.142090, -5927.274414, 75.316849 );
|
||||
AddWaypoint(6, 2286.984375, -5944.955566, 63.714966 );
|
||||
AddWaypoint(7, 2280.001709, -5961.186035, 54.228283 );
|
||||
AddWaypoint(8, 2259.389648, -5974.197754, 42.359348 );
|
||||
AddWaypoint(9, 2242.882812, -5984.642578, 32.827850 );
|
||||
AddWaypoint(10, 2217.265625, -6028.959473, 7.675705 );
|
||||
AddWaypoint(11, 2202.595947, -6061.325684, 5.882018 );
|
||||
AddWaypoint(12, 2188.974609, -6080.866699, 3.370027 );
|
||||
AddWaypoint(3, 2306.561279, -5901.738281, 91.792419);
|
||||
AddWaypoint(4, 2300.098389, -5912.618652, 86.014885);
|
||||
AddWaypoint(5, 2294.142090, -5927.274414, 75.316849);
|
||||
AddWaypoint(6, 2286.984375, -5944.955566, 63.714966);
|
||||
AddWaypoint(7, 2280.001709, -5961.186035, 54.228283);
|
||||
AddWaypoint(8, 2259.389648, -5974.197754, 42.359348);
|
||||
AddWaypoint(9, 2242.882812, -5984.642578, 32.827850);
|
||||
AddWaypoint(10, 2217.265625, -6028.959473, 7.675705);
|
||||
AddWaypoint(11, 2202.595947, -6061.325684, 5.882018);
|
||||
AddWaypoint(12, 2188.974609, -6080.866699, 3.370027);
|
||||
|
||||
if (urand(0,1))
|
||||
{
|
||||
AddWaypoint(13, 2176.483887, -6110.407227, 1.855181 );
|
||||
AddWaypoint(14, 2172.516602, -6146.752441, 1.074235 );
|
||||
AddWaypoint(15, 2138.918457, -6158.920898, 1.342926 );
|
||||
AddWaypoint(16, 2129.866699, -6174.107910, 4.380779 );
|
||||
AddWaypoint(13, 2176.483887, -6110.407227, 1.855181);
|
||||
AddWaypoint(14, 2172.516602, -6146.752441, 1.074235);
|
||||
AddWaypoint(15, 2138.918457, -6158.920898, 1.342926);
|
||||
AddWaypoint(16, 2129.866699, -6174.107910, 4.380779);
|
||||
AddWaypoint(17, 2117.709473, -6193.830078, 13.3542, 10000);
|
||||
}
|
||||
else
|
||||
{
|
||||
AddWaypoint(13, 2184.190186, -6166.447266, 0.968877 );
|
||||
AddWaypoint(14, 2234.265625, -6163.741211, 0.916021 );
|
||||
AddWaypoint(15, 2268.071777, -6158.750977, 1.822252 );
|
||||
AddWaypoint(16, 2270.028320, -6176.505859, 6.340538 );
|
||||
AddWaypoint(13, 2184.190186, -6166.447266, 0.968877);
|
||||
AddWaypoint(14, 2234.265625, -6163.741211, 0.916021);
|
||||
AddWaypoint(15, 2268.071777, -6158.750977, 1.822252);
|
||||
AddWaypoint(16, 2270.028320, -6176.505859, 6.340538);
|
||||
AddWaypoint(17, 2271.739014, -6195.401855, 13.3542, 10000);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1609,10 +1609,10 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
|
||||
bool GossipHello_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreature)
|
||||
{
|
||||
if (pCreature->isQuestGiver())
|
||||
pPlayer->PrepareQuestMenu( pCreature->GetGUID() );
|
||||
pPlayer->PrepareQuestMenu(pCreature->GetGUID());
|
||||
|
||||
if (pPlayer->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE)
|
||||
pPlayer->ADD_GOSSIP_ITEM( 0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
||||
pPlayer->ADD_GOSSIP_ITEM(0, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
||||
|
||||
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
|
||||
|
||||
|
||||
@@ -491,7 +491,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
|
||||
&&(*itr)->HasAura(SPELL_TREE_DISGUISE) )
|
||||
&&(*itr)->HasAura(SPELL_TREE_DISGUISE))
|
||||
{
|
||||
(*itr)->KilledMonsterCredit(MOB_SPARK,0);
|
||||
}
|
||||
|
||||
+1
-1
@@ -1155,7 +1155,7 @@ bool GossipHello_npc_arthas(Player* pPlayer, Creature* pCreature)
|
||||
}
|
||||
|
||||
|
||||
bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 sender, uint32 action )
|
||||
bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 sender, uint32 action)
|
||||
{
|
||||
npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI());
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ enum eSquireDavid
|
||||
bool GossipHello_npc_squire_david(Player* pPlayer, Creature* pCreature)
|
||||
{
|
||||
if (pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_H) == QUEST_STATUS_INCOMPLETE ||
|
||||
pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_A) == QUEST_STATUS_INCOMPLETE )//We need more info about it.
|
||||
pPlayer->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_A) == QUEST_STATUS_INCOMPLETE)//We need more info about it.
|
||||
{
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SQUIRE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SQUIRE_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
|
||||
|
||||
@@ -54,7 +54,7 @@ bool GossipHello_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool GossipSelect_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction )
|
||||
bool GossipSelect_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
|
||||
{
|
||||
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
|
||||
{
|
||||
@@ -273,7 +273,7 @@ bool GossipHello_npc_victorious_challenger(Player* pPlayer, Creature* pCreature)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool GossipSelect_npc_victorious_challenger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction )
|
||||
bool GossipSelect_npc_victorious_challenger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
|
||||
{
|
||||
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
|
||||
{
|
||||
|
||||
@@ -410,7 +410,7 @@ struct mob_rune_of_summoningAI : public ScriptedAI
|
||||
|
||||
void SummonLightningElemental()
|
||||
{
|
||||
m_creature->SummonCreature(CREATURE_RUNE_OF_SUMMONING, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN );
|
||||
m_creature->SummonCreature(CREATURE_RUNE_OF_SUMMONING, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN);
|
||||
m_creature->DealDamage(m_creature, m_creature->GetHealth());
|
||||
}
|
||||
};
|
||||
|
||||
@@ -21,7 +21,7 @@ The teleporter appears to be active and stable.
|
||||
#define WALKWAY 205
|
||||
#define CONSERVATORY 206
|
||||
|
||||
bool GoHello_ulduar_teleporter( Player *pPlayer, GameObject *pGO )
|
||||
bool GoHello_ulduar_teleporter(Player *pPlayer, GameObject *pGO)
|
||||
{
|
||||
ScriptedInstance *pInstance = pGO->GetInstanceData();
|
||||
if (!pInstance) return true;
|
||||
@@ -48,7 +48,7 @@ bool GoHello_ulduar_teleporter( Player *pPlayer, GameObject *pGO )
|
||||
return true;
|
||||
}
|
||||
|
||||
bool GOSelect_ulduar_teleporter( Player *pPlayer, GameObject *pGO, uint32 sender, uint32 action )
|
||||
bool GOSelect_ulduar_teleporter(Player *pPlayer, GameObject *pGO, uint32 sender, uint32 action)
|
||||
{
|
||||
if (sender != GOSSIP_SENDER_MAIN) return true;
|
||||
if (!pPlayer->getAttackers().empty()) return true;
|
||||
|
||||
@@ -429,7 +429,7 @@ enum eFelCrystalforge
|
||||
|
||||
bool GOHello_go_fel_crystalforge(Player *pPlayer, GameObject *pGO)
|
||||
{
|
||||
if ( pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER ) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
|
||||
if (pGO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
|
||||
pPlayer->PrepareQuestMenu(pGO->GetGUID()); /* return true*/
|
||||
|
||||
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
|
||||
|
||||
@@ -1254,7 +1254,7 @@ bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32
|
||||
{
|
||||
if (pPlayer->GetMoney() < 10000000)
|
||||
{
|
||||
pPlayer->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
|
||||
pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
|
||||
pPlayer->PlayerTalkClass->CloseGossip();
|
||||
break;
|
||||
}
|
||||
@@ -1822,7 +1822,7 @@ struct npc_ebon_gargoyleAI : CasterAI
|
||||
// Fly away when dismissed
|
||||
void SpellHit(Unit *source, const SpellEntry *spell)
|
||||
{
|
||||
if (spell->Id != 50515 || !me->isAlive() )
|
||||
if (spell->Id != 50515 || !me->isAlive())
|
||||
return;
|
||||
|
||||
Unit *owner = me->GetOwner();
|
||||
|
||||
Reference in New Issue
Block a user