Skip to content

Commit 0eea8d6

Browse files
MitchesDMitchesD
committed
Merge pull request TrinityCore#15497 from ShinDarth/335-misc
[3.3.5] Low priority changes after latest backports
2 parents 20ce8cb + b1d773f commit 0eea8d6

7 files changed

Lines changed: 173 additions & 141 deletions

File tree

‎sql/updates/world/2015_09_14_00_world_335.sql‎

Lines changed: 32 additions & 0 deletions
Large diffs are not rendered by default.

‎src/server/game/Entities/Creature/GossipDef.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,10 @@ void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, ObjectGuid npcGUID) con
381381

382382
void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGUID, bool activateAccept) const
383383
{
384-
std::string questTitle = quest->GetTitle();
385-
std::string questDetails = quest->GetDetails();
386-
std::string questObjectives = quest->GetObjectives();
387-
std::string questEndText = quest->GetEndText();
384+
std::string questTitle = quest->GetTitle();
385+
std::string questDetails = quest->GetDetails();
386+
std::string questObjectives = quest->GetObjectives();
387+
std::string questAreaDescription = quest->GetAreaDescription();
388388

389389
int32 locale = _session->GetSessionDbLocaleIndex();
390390
if (locale >= 0)
@@ -394,7 +394,7 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGU
394394
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
395395
ObjectMgr::GetLocaleString(localeData->Details, locale, questDetails);
396396
ObjectMgr::GetLocaleString(localeData->Objectives, locale, questObjectives);
397-
ObjectMgr::GetLocaleString(localeData->EndText, locale, questEndText);
397+
ObjectMgr::GetLocaleString(localeData->AreaDescription, locale, questAreaDescription);
398398
}
399399
}
400400

@@ -489,11 +489,11 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGU
489489

490490
void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
491491
{
492-
std::string questTitle = quest->GetTitle();
493-
std::string questDetails = quest->GetDetails();
494-
std::string questObjectives = quest->GetObjectives();
495-
std::string questEndText = quest->GetEndText();
496-
std::string questCompletedText = quest->GetCompletedText();
492+
std::string questTitle = quest->GetTitle();
493+
std::string questDetails = quest->GetDetails();
494+
std::string questObjectives = quest->GetObjectives();
495+
std::string questAreaDescription = quest->GetAreaDescription();
496+
std::string questCompletedText = quest->GetCompletedText();
497497

498498
std::string questObjectiveText[QUEST_OBJECTIVES_COUNT];
499499
for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
@@ -507,7 +507,7 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
507507
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
508508
ObjectMgr::GetLocaleString(localeData->Details, locale, questDetails);
509509
ObjectMgr::GetLocaleString(localeData->Objectives, locale, questObjectives);
510-
ObjectMgr::GetLocaleString(localeData->EndText, locale, questEndText);
510+
ObjectMgr::GetLocaleString(localeData->AreaDescription, locale, questAreaDescription);
511511
ObjectMgr::GetLocaleString(localeData->CompletedText, locale, questCompletedText);
512512

513513
for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
@@ -585,9 +585,9 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
585585
for (uint8 i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // unk (0)
586586
data << int32(quest->RewardFactionValueIdOverride[i]);
587587

588-
data << uint32(quest->GetPointMapId());
589-
data << float(quest->GetPointX());
590-
data << float(quest->GetPointY());
588+
data << uint32(quest->GetPOIContinent());
589+
data << float(quest->GetPOIx());
590+
data << float(quest->GetPOIy());
591591
data << uint32(quest->GetPointOpt());
592592

593593
if (sWorld->getBoolConfig(CONFIG_UI_QUESTLEVELS_IN_DIALOGS))
@@ -596,7 +596,7 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
596596
data << questTitle;
597597
data << questObjectives;
598598
data << questDetails;
599-
data << questEndText;
599+
data << questAreaDescription;
600600
data << questCompletedText; // display in quest objectives window once all objectives are completed
601601

602602
for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
@@ -607,7 +607,7 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
607607
data << uint32(quest->RequiredNpcOrGo[i]);
608608

609609
data << uint32(quest->RequiredNpcOrGoCount[i]);
610-
data << uint32(quest->RequiredSourceItemId[i]);
610+
data << uint32(quest->ItemDrop[i]);
611611
data << uint32(0); // req source count?
612612
}
613613

‎src/server/game/Entities/Player/Player.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15060,15 +15060,15 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
1506015060
uint32 qtime = 0;
1506115061
if (quest->HasSpecialFlag(QUEST_SPECIAL_FLAGS_TIMED))
1506215062
{
15063-
uint32 limittime = quest->GetLimitTime();
15063+
uint32 timeAllowed = quest->GetTimeAllowed();
1506415064

1506515065
// shared timed quest
1506615066
if (questGiver && questGiver->GetTypeId() == TYPEID_PLAYER)
15067-
limittime = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].Timer / IN_MILLISECONDS;
15067+
timeAllowed = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].Timer / IN_MILLISECONDS;
1506815068

1506915069
AddTimedQuest(quest_id);
15070-
questStatusData.Timer = limittime * IN_MILLISECONDS;
15071-
qtime = static_cast<uint32>(time(NULL)) + limittime;
15070+
questStatusData.Timer = timeAllowed * IN_MILLISECONDS;
15071+
qtime = static_cast<uint32>(time(NULL)) + timeAllowed;
1507215072
}
1507315073
else
1507415074
questStatusData.Timer = 0;
@@ -15158,10 +15158,10 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver,
1515815158

1515915159
for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
1516015160
{
15161-
if (quest->RequiredSourceItemId[i])
15161+
if (quest->ItemDrop[i])
1516215162
{
15163-
uint32 count = quest->RequiredSourceItemCount[i];
15164-
DestroyItemCount(quest->RequiredSourceItemId[i], count ? count : 9999, true);
15163+
uint32 count = quest->ItemDropQuantity[i];
15164+
DestroyItemCount(quest->ItemDrop[i], count ? count : 9999, true);
1516515165
}
1516615166
}
1516715167

@@ -15368,9 +15368,9 @@ void Player::FailQuest(uint32 questId)
1536815368
// Destroy items received on starting the quest.
1536915369
DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true, true);
1537015370
for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
15371-
if (quest->RequiredSourceItemId[i] > 0 && quest->RequiredSourceItemCount[i] > 0)
15371+
if (quest->ItemDrop[i] > 0 && quest->ItemDropQuantity[i] > 0)
1537215372
// Destroy items received during the quest.
15373-
DestroyItemCount(quest->RequiredSourceItemId[i], quest->RequiredSourceItemCount[i], true, true);
15373+
DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true, true);
1537415374
}
1537515375
}
1537615376

@@ -15552,7 +15552,7 @@ bool Player::SatisfyQuestClass(Quest const* qInfo, bool msg) const
1555215552

1555315553
bool Player::SatisfyQuestRace(Quest const* qInfo, bool msg)
1555415554
{
15555-
uint32 reqraces = qInfo->GetRequiredRaces();
15555+
uint32 reqraces = qInfo->GetAllowableRaces();
1555615556
if (reqraces == 0)
1555715557
return true;
1555815558
if ((reqraces & getRaceMask()) == 0)
@@ -16673,7 +16673,7 @@ bool Player::HasQuestForItem(uint32 itemid) const
1667316673
for (uint8 j = 0; j < QUEST_SOURCE_ITEM_IDS_COUNT; ++j)
1667416674
{
1667516675
// examined item is a source item
16676-
if (qinfo->RequiredSourceItemId[j] == itemid)
16676+
if (qinfo->ItemDrop[j] == itemid)
1667716677
{
1667816678
ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(itemid);
1667916679

@@ -16682,9 +16682,9 @@ bool Player::HasQuestForItem(uint32 itemid) const
1668216682
return true;
1668316683

1668416684
// allows custom amount drop when not 0
16685-
if (qinfo->RequiredSourceItemCount[j])
16685+
if (qinfo->ItemDropQuantity[j])
1668616686
{
16687-
if (GetItemCount(itemid, true) < qinfo->RequiredSourceItemCount[j])
16687+
if (GetItemCount(itemid, true) < qinfo->ItemDropQuantity[j])
1668816688
return true;
1668916689
} else if (GetItemCount(itemid, true) < pProto->GetMaxStackSize())
1669016690
return true;

0 commit comments

Comments
 (0)
⚡