sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #141 from Krath/master

Browse Source 
Trial of the Champions : Checking if the player is mounted.
This commit is contained in:
Yehonal
2016-09-24 17:49:26 +02:00
committed by GitHub
parent 7de07357e9 e1884fd3c4
commit 9076dde4e0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+14 -4
View File
@@ -31,10 +31,20 @@ public:
switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) ) switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) )
{ {
case INSTANCE_PROGRESS_INITIAL: case INSTANCE_PROGRESS_INITIAL:
gossipTextId = 14688; if(!pPlayer->GetVehicle() )
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); if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE)
break; 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: case INSTANCE_PROGRESS_CHAMPIONS_DEAD:
gossipTextId = 14737; gossipTextId = 14737;
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339);