diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2016-09-24 17:49:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-24 17:49:26 +0200 |
| commit | 9076dde4e02082e4d2c801cfc22c33041138be5a (patch) | |
| tree | f5089abd686263da80d20ddf1b704026299a02a7 /src | |
| parent | 7de07357e992310654ed3b9c179ae0984b307a74 (diff) | |
| parent | e1884fd3c4c40944d118f885257282772ec50e2b (diff) | |
Merge pull request #141 from Krath/master
Trial of the Champions : Checking if the player is mounted.
Diffstat (limited to 'src')
| -rw-r--r-- | src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index ec96dc603a..90e861ca2f 100644 --- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -31,10 +31,20 @@ public: switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) ) { case INSTANCE_PROGRESS_INITIAL: - 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; + 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); |