nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 18:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

pushed all pending sqls.

Browse Source
This commit is contained in:
lee1991
2017-02-03 12:44:48 +00:00
parent a0aff6d241
commit d7bc82bc13
57 changed files with 1014 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
View File

@@ -1017,7 +1017,7 @@ public:
{
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) )
announcer->GetMotionMaster()->MovePoint(0, 735.81f, 661.92f, 412.39f);
if( Creature* boss = instance->SummonCreature(Counter ? NPC_EADRIC : NPC_PALETRESS, SpawnPosition) )
if (Creature* boss = instance->SummonCreature(Counter ? NPC_EADRIC : NPC_PALETRESS, SpawnPosition))
boss->GetMotionMaster()->MovePoint(0, 746.881f, 660.263f, 411.7f);
events.ScheduleEvent(EVENT_CLOSE_GATE, 5000);
events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_SAY_1, 4000);
@@ -1059,8 +1059,8 @@ public:
break;
case EVENT_ARGENT_CHALLENGE_MOVE_FORWARD:
{
if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) )
boss->GetMotionMaster()->MovePoint(0, 746.881f, 635.263f, 411.7f);
if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID))
boss->GetMotionMaster()->MovePoint(0, 746.881f, 635.263f, 411.7f);
events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_ATTACK, 3000);
events.PopEvent();
}

56
src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
View File

@@ -20,41 +20,41 @@ public:
bool OnGossipHello(Player* pPlayer, Creature* pCreature)
{
if (!pCreature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
if( !pCreature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) )
return true;
InstanceScript* pInstance = pCreature->GetInstanceScript();
if (!pInstance)
if( !pInstance )
return true;
uint32 gossipTextId = 0;
switch (pInstance->GetData(DATA_INSTANCE_PROGRESS))
switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) )
{
case INSTANCE_PROGRESS_INITIAL:
if (!pPlayer->GetVehicle())
{
if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE)
gossipTextId = 15043; //Horde text
else
gossipTextId = 14757; //Alliance text
}
else
{
gossipTextId = 14688;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1338);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1341);
}
break;
case INSTANCE_PROGRESS_CHAMPIONS_DEAD:
gossipTextId = 14737;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1339);
break;
case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED:
gossipTextId = 14738;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1340);
break;
default:
return true;
case INSTANCE_PROGRESS_INITIAL:
if(!pPlayer->GetVehicle() )
{
if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE)
gossipTextId = 15043; //Horde text
else
gossipTextId = 14757; //Alliance text
}
else
{
gossipTextId = 14688;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338);
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341);
}
break;
case INSTANCE_PROGRESS_CHAMPIONS_DEAD:
gossipTextId = 14737;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339);
break;
case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED:
gossipTextId = 14738;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1340);
break;
default:
return true;
}
pPlayer->SEND_GOSSIP_MENU(gossipTextId, pCreature->GetGUID());