mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-13 01:08:35 +00:00
Refactored quest_template table structure
This commit is contained in:
Nefertumm
committed by
Francesco Borzì
Francesco Borzì
parent
4255b986d6
commit
468faa3ead
111
data/sql/updates/pending_db_world/rev_1545103816876885600.sql
Normal file
111
data/sql/updates/pending_db_world/rev_1545103816876885600.sql
Normal file
@@ -0,0 +1,111 @@
|
||||
INSERT INTO version_db_world (`sql_rev`) VALUES ('1545103816876885600');
|
||||
|
||||
-- quest_details
|
||||
DROP TABLE IF EXISTS `quest_details`;
|
||||
CREATE TABLE `quest_details` (
|
||||
`ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote3` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote4` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`VerifiedBuild` SMALLINT(5) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`ID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`)
|
||||
SELECT `ID`, `DetailsEmote1`, `DetailsEmote2`, `DetailsEmote3`, `DetailsEmote4`, `DetailsEmoteDelay1`, `DetailsEmoteDelay2`, `DetailsEmoteDelay3`, `DetailsEmoteDelay4`, `VerifiedBuild` FROM `quest_template`
|
||||
WHERE `DetailsEmote1`!=0 OR `DetailsEmote2`!=0 OR `DetailsEmote3`!=0 OR `DetailsEmote4`!=0 OR `DetailsEmoteDelay1`!=0 OR `DetailsEmoteDelay2`!=0 OR `DetailsEmoteDelay3`!=0 OR `DetailsEmoteDelay4`!=0;
|
||||
|
||||
|
||||
-- quest_request_items
|
||||
DROP TABLE IF EXISTS `quest_request_items`;
|
||||
CREATE TABLE `quest_request_items` (
|
||||
`ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteOnComplete` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteOnIncomplete` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`CompletionText` TEXT,
|
||||
`VerifiedBuild` SMALLINT(5) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`ID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
INSERT INTO `quest_request_items` (`ID`, `EmoteOnComplete`, `EmoteOnIncomplete`, `CompletionText`, `VerifiedBuild`)
|
||||
SELECT `ID`, `EmoteOnComplete`, `EmoteOnIncomplete`, `RequestItemsText`, `VerifiedBuild` FROM `quest_template`
|
||||
WHERE `EmoteOnComplete`!=0 OR `EmoteOnIncomplete`!=0 OR `RequestItemsText`!='';
|
||||
|
||||
|
||||
-- quest_offer_reward
|
||||
DROP TABLE IF EXISTS `quest_offer_reward`;
|
||||
CREATE TABLE `quest_offer_reward` (
|
||||
`ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote3` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`Emote4` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`EmoteDelay4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`RewardText` TEXT,
|
||||
`VerifiedBuild` SMALLINT(5) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`ID`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
INSERT INTO `quest_offer_reward` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `RewardText`, `VerifiedBuild`)
|
||||
SELECT `ID`, `OfferRewardEmote1`, `OfferRewardEmote2`, `OfferRewardEmote3`, `OfferRewardEmote4`, `OfferRewardEmoteDelay1`, `OfferRewardEmoteDelay2`, `OfferRewardEmoteDelay3`, `OfferRewardEmoteDelay4`, `OfferRewardText`, `VerifiedBuild` FROM `quest_template`
|
||||
WHERE `OfferRewardEmote1`!=0 OR `OfferRewardEmote2`!=0 OR `OfferRewardEmote3`!=0 OR `OfferRewardEmote4`!=0 OR `OfferRewardEmoteDelay1`!=0 OR `OfferRewardEmoteDelay2`!=0 OR `OfferRewardEmoteDelay3`!=0 OR `OfferRewardEmoteDelay4`!=0 OR `OfferRewardText`!='';
|
||||
|
||||
-- delete old fields
|
||||
ALTER TABLE `quest_template`
|
||||
DROP `DetailsEmote1`,
|
||||
DROP `DetailsEmote2`,
|
||||
DROP `DetailsEmote3`,
|
||||
DROP `DetailsEmote4`,
|
||||
DROP `DetailsEmoteDelay1`,
|
||||
DROP `DetailsEmoteDelay2`,
|
||||
DROP `DetailsEmoteDelay3`,
|
||||
DROP `DetailsEmoteDelay4`,
|
||||
DROP `EmoteOnIncomplete`,
|
||||
DROP `EmoteOnComplete`,
|
||||
DROP `RequestItemsText`,
|
||||
DROP `OfferRewardEmote1`,
|
||||
DROP `OfferRewardEmote2`,
|
||||
DROP `OfferRewardEmote3`,
|
||||
DROP `OfferRewardEmote4`,
|
||||
DROP `OfferRewardEmoteDelay1`,
|
||||
DROP `OfferRewardEmoteDelay2`,
|
||||
DROP `OfferRewardEmoteDelay3`,
|
||||
DROP `OfferRewardEmoteDelay4`,
|
||||
DROP `OfferRewardText`;
|
||||
|
||||
-- RewardItem(s) and RewardAmount(s) [4x2 fields]
|
||||
ALTER TABLE `quest_template`
|
||||
CHANGE COLUMN `RewardAmount1` `RewardAmount1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardItem1`,
|
||||
CHANGE COLUMN `RewardAmount2` `RewardAmount2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardItem2`,
|
||||
CHANGE COLUMN `RewardAmount3` `RewardAmount3` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardItem3`,
|
||||
CHANGE COLUMN `RewardAmount4` `RewardAmount4` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardItem4`;
|
||||
|
||||
-- RewardChoiceItemID(s) and RewardChoiceItemQuantity(s) [6x2 fields]
|
||||
ALTER TABLE `quest_template`
|
||||
CHANGE COLUMN `RewardChoiceItemQuantity1` `RewardChoiceItemQuantity1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemID1`,
|
||||
CHANGE COLUMN `RewardChoiceItemQuantity2` `RewardChoiceItemQuantity2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemID2`,
|
||||
CHANGE COLUMN `RewardChoiceItemQuantity3` `RewardChoiceItemQuantity3` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemID3`,
|
||||
CHANGE COLUMN `RewardChoiceItemQuantity4` `RewardChoiceItemQuantity4` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemID4`,
|
||||
CHANGE COLUMN `RewardChoiceItemQuantity5` `RewardChoiceItemQuantity5` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemID5`,
|
||||
CHANGE COLUMN `RewardChoiceItemQuantity6` `RewardChoiceItemQuantity6` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemID6`;
|
||||
|
||||
-- RewardFactionID(s), RewardFactionValue(s) and RewardFactionOverride(s) [5x3 fields]
|
||||
ALTER TABLE `quest_template`
|
||||
CHANGE COLUMN `RewardFactionValue1` `RewardFactionValue1` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionID1`,
|
||||
CHANGE COLUMN `RewardFactionOverride1` `RewardFactionOverride1` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionValue1`,
|
||||
CHANGE COLUMN `RewardFactionValue2` `RewardFactionValue2` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionID2`,
|
||||
CHANGE COLUMN `RewardFactionOverride2` `RewardFactionOverride2` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionValue2`,
|
||||
CHANGE COLUMN `RewardFactionValue3` `RewardFactionValue3` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionID3`,
|
||||
CHANGE COLUMN `RewardFactionOverride3` `RewardFactionOverride3` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionValue3`,
|
||||
CHANGE COLUMN `RewardFactionValue4` `RewardFactionValue4` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionID4`,
|
||||
CHANGE COLUMN `RewardFactionOverride4` `RewardFactionOverride4` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionValue4`,
|
||||
CHANGE COLUMN `RewardFactionValue5` `RewardFactionValue5` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionID5`,
|
||||
CHANGE COLUMN `RewardFactionOverride5` `RewardFactionOverride5` MEDIUMINT(8) NOT NULL DEFAULT '0' AFTER `RewardFactionValue5`;
|
||||
@@ -344,10 +344,10 @@ void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, uint64 npcGUID) const
|
||||
|
||||
void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID, bool activateAccept) const
|
||||
{
|
||||
std::string questTitle = quest->GetTitle();
|
||||
std::string questDetails = quest->GetDetails();
|
||||
std::string questObjectives = quest->GetObjectives();
|
||||
std::string questEndText = quest->GetEndText();
|
||||
std::string questTitle = quest->GetTitle();
|
||||
std::string questDetails = quest->GetDetails();
|
||||
std::string questObjectives = quest->GetObjectives();
|
||||
std::string questAreaDescription = quest->GetAreaDescription();
|
||||
|
||||
int32 locale = _session->GetSessionDbLocaleIndex();
|
||||
if (locale >= 0)
|
||||
@@ -357,7 +357,7 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID,
|
||||
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
|
||||
ObjectMgr::GetLocaleString(localeData->Details, locale, questDetails);
|
||||
ObjectMgr::GetLocaleString(localeData->Objectives, locale, questObjectives);
|
||||
ObjectMgr::GetLocaleString(localeData->EndText, locale, questEndText);
|
||||
ObjectMgr::GetLocaleString(localeData->AreaDescription, locale, questAreaDescription);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -451,11 +451,11 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, uint64 npcGUID,
|
||||
|
||||
void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
|
||||
{
|
||||
std::string questTitle = quest->GetTitle();
|
||||
std::string questDetails = quest->GetDetails();
|
||||
std::string questObjectives = quest->GetObjectives();
|
||||
std::string questEndText = quest->GetEndText();
|
||||
std::string questCompletedText = quest->GetCompletedText();
|
||||
std::string questTitle = quest->GetTitle();
|
||||
std::string questDetails = quest->GetDetails();
|
||||
std::string questObjectives = quest->GetObjectives();
|
||||
std::string questAreaDescription = quest->GetAreaDescription();
|
||||
std::string questCompletedText = quest->GetCompletedText();
|
||||
|
||||
std::string questObjectiveText[QUEST_OBJECTIVES_COUNT];
|
||||
for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
@@ -469,7 +469,7 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
|
||||
ObjectMgr::GetLocaleString(localeData->Title, locale, questTitle);
|
||||
ObjectMgr::GetLocaleString(localeData->Details, locale, questDetails);
|
||||
ObjectMgr::GetLocaleString(localeData->Objectives, locale, questObjectives);
|
||||
ObjectMgr::GetLocaleString(localeData->EndText, locale, questEndText);
|
||||
ObjectMgr::GetLocaleString(localeData->AreaDescription, locale, questAreaDescription);
|
||||
ObjectMgr::GetLocaleString(localeData->CompletedText, locale, questCompletedText);
|
||||
|
||||
for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
@@ -547,15 +547,15 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
|
||||
for (uint8 i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // unk (0)
|
||||
data << int32(quest->RewardFactionValueIdOverride[i]);
|
||||
|
||||
data << uint32(quest->GetPointMapId());
|
||||
data << float(quest->GetPointX());
|
||||
data << float(quest->GetPointY());
|
||||
data << uint32(quest->GetPOIContinent());
|
||||
data << float(quest->GetPOIx());
|
||||
data << float(quest->GetPOIy());
|
||||
data << uint32(quest->GetPointOpt());
|
||||
|
||||
data << questTitle;
|
||||
data << questObjectives;
|
||||
data << questDetails;
|
||||
data << questEndText;
|
||||
data << questAreaDescription;
|
||||
data << questCompletedText; // display in quest objectives window once all objectives are completed
|
||||
|
||||
for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
@@ -566,7 +566,7 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
|
||||
data << uint32(quest->RequiredNpcOrGo[i]);
|
||||
|
||||
data << uint32(quest->RequiredNpcOrGoCount[i]);
|
||||
data << uint32(quest->RequiredSourceItemId[i]);
|
||||
data << uint32(quest->ItemDrop[i]);
|
||||
data << uint32(0); // req source count?
|
||||
}
|
||||
|
||||
|
||||
@@ -15635,15 +15635,15 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
|
||||
uint32 qtime = 0;
|
||||
if (quest->HasSpecialFlag(QUEST_SPECIAL_FLAGS_TIMED))
|
||||
{
|
||||
uint32 limittime = quest->GetLimitTime();
|
||||
uint32 timeAllowed = quest->GetTimeAllowed();
|
||||
|
||||
// shared timed quest
|
||||
if (questGiver && questGiver->GetTypeId() == TYPEID_PLAYER)
|
||||
limittime = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].Timer / IN_MILLISECONDS;
|
||||
timeAllowed = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].Timer / IN_MILLISECONDS;
|
||||
|
||||
AddTimedQuest(quest_id);
|
||||
questStatusData.Timer = limittime * IN_MILLISECONDS;
|
||||
qtime = static_cast<uint32>(time(NULL)) + limittime;
|
||||
questStatusData.Timer = timeAllowed * IN_MILLISECONDS;
|
||||
qtime = static_cast<uint32>(time(NULL)) + timeAllowed;
|
||||
}
|
||||
else
|
||||
questStatusData.Timer = 0;
|
||||
@@ -15723,10 +15723,10 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver,
|
||||
|
||||
for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
|
||||
{
|
||||
if (quest->RequiredSourceItemId[i])
|
||||
if (quest->ItemDrop[i])
|
||||
{
|
||||
uint32 count = quest->RequiredSourceItemCount[i];
|
||||
DestroyItemCount(quest->RequiredSourceItemId[i], count ? count : 9999, true);
|
||||
uint32 count = quest->ItemDropQuantity[i];
|
||||
DestroyItemCount(quest->ItemDrop[i], count ? count : 9999, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15962,9 +15962,9 @@ void Player::FailQuest(uint32 questId)
|
||||
// Destroy items received on starting the quest.
|
||||
DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true, true);
|
||||
for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
|
||||
if (quest->RequiredSourceItemId[i] > 0 && quest->RequiredSourceItemCount[i] > 0)
|
||||
if (quest->ItemDrop[i] > 0 && quest->ItemDropQuantity[i] > 0)
|
||||
// Destroy items received during the quest.
|
||||
DestroyItemCount(quest->RequiredSourceItemId[i], quest->RequiredSourceItemCount[i], true, true);
|
||||
DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16128,7 +16128,7 @@ bool Player::SatisfyQuestClass(Quest const* qInfo, bool msg) const
|
||||
|
||||
bool Player::SatisfyQuestRace(Quest const* qInfo, bool msg) const
|
||||
{
|
||||
uint32 reqraces = qInfo->GetRequiredRaces();
|
||||
uint32 reqraces = qInfo->GetAllowableRaces();
|
||||
if (reqraces == 0)
|
||||
return true;
|
||||
if ((reqraces & getRaceMask()) == 0)
|
||||
@@ -17228,7 +17228,7 @@ bool Player::HasQuestForItem(uint32 itemid) const
|
||||
for (uint8 j = 0; j < QUEST_SOURCE_ITEM_IDS_COUNT; ++j)
|
||||
{
|
||||
// examined item is a source item
|
||||
if (qinfo->RequiredSourceItemId[j] == itemid)
|
||||
if (qinfo->ItemDrop[j] == itemid)
|
||||
{
|
||||
ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(itemid);
|
||||
|
||||
@@ -17237,9 +17237,9 @@ bool Player::HasQuestForItem(uint32 itemid) const
|
||||
return true;
|
||||
|
||||
// allows custom amount drop when not 0
|
||||
if (qinfo->RequiredSourceItemCount[j])
|
||||
if (qinfo->ItemDropQuantity[j])
|
||||
{
|
||||
if (GetItemCount(itemid, true) < qinfo->RequiredSourceItemCount[j])
|
||||
if (GetItemCount(itemid, true) < qinfo->ItemDropQuantity[j])
|
||||
return true;
|
||||
} else if (GetItemCount(itemid, true) < pProto->GetMaxStackSize())
|
||||
return true;
|
||||
|
||||
@@ -3822,27 +3822,23 @@ void ObjectMgr::LoadQuests()
|
||||
// 21 22 23 24 25 26
|
||||
"StartItem, Flags, RewardTitle, RequiredPlayerKills, RewardTalents, RewardArenaPoints, "
|
||||
// 27 28 29 30 31 32 33 34
|
||||
"RewardItem1, RewardItem2, RewardItem3, RewardItem4, RewardAmount1, RewardAmount2, RewardAmount3, RewardAmount4, "
|
||||
// 35 36 37 38 39 40 41 42 43 44 45 46
|
||||
"RewardChoiceItemID1, RewardChoiceItemID2, RewardChoiceItemID3, RewardChoiceItemID4, RewardChoiceItemID5, RewardChoiceItemID6, RewardChoiceItemQuantity1, RewardChoiceItemQuantity2, RewardChoiceItemQuantity3, RewardChoiceItemQuantity4, RewardChoiceItemQuantity5, RewardChoiceItemQuantity6, "
|
||||
// 47 48 49 50 51 52 53 54 55 56
|
||||
"RewardFactionID1, RewardFactionID2, RewardFactionID3, RewardFactionID4, RewardFactionID5, RewardFactionValue1, RewardFactionValue2, RewardFactionValue3, RewardFactionValue4, RewardFactionValue5, "
|
||||
// 57 58 59 60 61
|
||||
"RewardFactionOverride1, RewardFactionOverride2, RewardFactionOverride3, RewardFactionOverride4, RewardFactionOverride5, "
|
||||
"RewardItem1, RewardAmount1, RewardItem2, RewardAmount2, RewardItem3, RewardAmount3, RewardItem4, RewardAmount4, "
|
||||
// 35 36 37 38 39 40 41 42 43 44 45 46
|
||||
"RewardChoiceItemID1, RewardChoiceItemQuantity1, RewardChoiceItemID2, RewardChoiceItemQuantity2, RewardChoiceItemID3, RewardChoiceItemQuantity3, RewardChoiceItemID4, RewardChoiceItemQuantity4, RewardChoiceItemID5, RewardChoiceItemQuantity5, RewardChoiceItemID6, RewardChoiceItemQuantity6, "
|
||||
// 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
|
||||
"RewardFactionID1, RewardFactionValue1, RewardFactionOverride1, RewardFactionID2, RewardFactionValue2, RewardFactionOverride2, RewardFactionID3, RewardFactionValue3, RewardFactionOverride3, RewardFactionID4, RewardFactionValue4, RewardFactionOverride4, RewardFactionID5, RewardFactionValue5, RewardFactionOverride5,"
|
||||
// 62 63 64 65
|
||||
"POIContinent, POIx, POIy, POIPriority, "
|
||||
// 66 67 68 69 70 71 72
|
||||
"LogTitle, LogDescription, QuestDescription, AreaDescription, OfferRewardText, RequestItemsText, QuestCompletionLog, "
|
||||
// 73 74 75 76 77 78 79 80
|
||||
// 66 67 68 69 70
|
||||
"LogTitle, LogDescription, QuestDescription, AreaDescription, QuestCompletionLog, "
|
||||
// 71 72 73 74 75 76 77 78
|
||||
"RequiredNpcOrGo1, RequiredNpcOrGo2, RequiredNpcOrGo3, RequiredNpcOrGo4, RequiredNpcOrGoCount1, RequiredNpcOrGoCount2, RequiredNpcOrGoCount3, RequiredNpcOrGoCount4, "
|
||||
// 81 82 83 84 85 86 87 88
|
||||
// 79 80 81 82 83 84 85 86
|
||||
"ItemDrop1, ItemDrop2, ItemDrop3, ItemDrop4, ItemDropQuantity1, ItemDropQuantity2, ItemDropQuantity3, ItemDropQuantity4, "
|
||||
// 89 90 91 92 93 94 95 96 97 98 99 100
|
||||
// 87 88 89 90 91 92 93 94 95 96 97 98
|
||||
"RequiredItemId1, RequiredItemId2, RequiredItemId3, RequiredItemId4, RequiredItemId5, RequiredItemId6, RequiredItemCount1, RequiredItemCount2, RequiredItemCount3, RequiredItemCount4, RequiredItemCount5, RequiredItemCount6, "
|
||||
// 101 102 103 104 105 106 107 108 109 110 111 112 113
|
||||
"Unknown0, ObjectiveText1, ObjectiveText2, ObjectiveText3, ObjectiveText4, DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4, DetailsEmoteDelay1, DetailsEmoteDelay2, DetailsEmoteDelay3, DetailsEmoteDelay4, "
|
||||
// 114 115 116 117 118 119 120 121 122 123
|
||||
"EmoteOnIncomplete, EmoteOnComplete, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4, OfferRewardEmoteDelay1, OfferRewardEmoteDelay2, OfferRewardEmoteDelay3, OfferRewardEmoteDelay4"
|
||||
// 99 100 101 102 103
|
||||
"Unknown0, ObjectiveText1, ObjectiveText2, ObjectiveText3, ObjectiveText4"
|
||||
" FROM quest_template");
|
||||
if (!result)
|
||||
{
|
||||
@@ -3882,6 +3878,75 @@ void ObjectMgr::LoadQuests()
|
||||
|
||||
std::map<uint32, uint32> usedMailTemplates;
|
||||
|
||||
// Load `quest_details`
|
||||
// 0 1 2 3 4 5 6 7 8
|
||||
result = WorldDatabase.Query("SELECT ID, Emote1, Emote2, Emote3, Emote4, EmoteDelay1, EmoteDelay2, EmoteDelay3, EmoteDelay4 FROM quest_details");
|
||||
|
||||
if (!result)
|
||||
{
|
||||
sLog->outError(">> Loaded 0 quest details. DB table `quest_details` is empty.");
|
||||
}
|
||||
else
|
||||
{
|
||||
do
|
||||
{
|
||||
Field* fields = result->Fetch();
|
||||
uint32 questId = fields[0].GetUInt32();
|
||||
|
||||
auto itr = _questTemplates.find(questId);
|
||||
if (itr != _questTemplates.end())
|
||||
itr->second->LoadQuestDetails(fields);
|
||||
else
|
||||
sLog->outError("Table `quest_details` has data for quest %u but such quest does not exist", questId);
|
||||
} while (result->NextRow());
|
||||
}
|
||||
|
||||
// Load `quest_request_items`
|
||||
// 0 1 2 3
|
||||
result = WorldDatabase.Query("SELECT ID, EmoteOnComplete, EmoteOnIncomplete, CompletionText FROM quest_request_items");
|
||||
|
||||
if (!result)
|
||||
{
|
||||
sLog->outError(">> Loaded 0 quest request items. DB table `quest_request_items` is empty.");
|
||||
}
|
||||
else
|
||||
{
|
||||
do
|
||||
{
|
||||
Field* fields = result->Fetch();
|
||||
uint32 questId = fields[0].GetUInt32();
|
||||
|
||||
auto itr = _questTemplates.find(questId);
|
||||
if (itr != _questTemplates.end())
|
||||
itr->second->LoadQuestRequestItems(fields);
|
||||
else
|
||||
sLog->outError("Table `quest_request_items` has data for quest %u but such quest does not exist", questId);
|
||||
} while (result->NextRow());
|
||||
}
|
||||
|
||||
// Load `quest_offer_reward`
|
||||
// 0 1 2 3 4 5 6 7 8 9
|
||||
result = WorldDatabase.Query("SELECT ID, Emote1, Emote2, Emote3, Emote4, EmoteDelay1, EmoteDelay2, EmoteDelay3, EmoteDelay4, RewardText FROM quest_offer_reward");
|
||||
|
||||
if (!result)
|
||||
{
|
||||
sLog->outError(">> Loaded 0 quest reward emotes. DB table `quest_offer_reward` is empty.");
|
||||
}
|
||||
else
|
||||
{
|
||||
do
|
||||
{
|
||||
Field* fields = result->Fetch();
|
||||
uint32 questId = fields[0].GetUInt32();
|
||||
|
||||
auto itr = _questTemplates.find(questId);
|
||||
if (itr != _questTemplates.end())
|
||||
itr->second->LoadQuestOfferReward(fields);
|
||||
else
|
||||
sLog->outError("Table `quest_offer_reward` has data for quest %u but such quest does not exist", questId);
|
||||
} while (result->NextRow());
|
||||
}
|
||||
|
||||
// Load `quest_template_addon`
|
||||
// 0 1 2 3 4 5 6 7 8
|
||||
result = WorldDatabase.Query("SELECT ID, MaxLevel, AllowableClasses, SourceSpellID, PrevQuestID, NextQuestID, ExclusiveGroup, RewardMailTemplateID, RewardMailDelay, "
|
||||
@@ -4013,12 +4078,12 @@ void ObjectMgr::LoadQuests()
|
||||
}
|
||||
}
|
||||
// AllowableRaces, can be 0/RACEMASK_ALL_PLAYABLE to allow any race
|
||||
if (qinfo->RequiredRaces)
|
||||
if (qinfo->AllowableRaces)
|
||||
{
|
||||
if (!(qinfo->RequiredRaces & RACEMASK_ALL_PLAYABLE))
|
||||
if (!(qinfo->AllowableRaces & RACEMASK_ALL_PLAYABLE))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u does not contain any playable races in `RequiredRaces` (%u), value set to 0 (all races).", qinfo->GetQuestId(), qinfo->RequiredRaces);
|
||||
qinfo->RequiredRaces = 0;
|
||||
sLog->outErrorDb("Quest %u does not contain any playable races in `AllowableRaces` (%u), value set to 0 (all races).", qinfo->GetQuestId(), qinfo->AllowableRaces);
|
||||
qinfo->AllowableRaces = 0;
|
||||
}
|
||||
}
|
||||
// RequiredSkillId, can be 0
|
||||
@@ -4120,26 +4185,26 @@ void ObjectMgr::LoadQuests()
|
||||
// quest can't reward this title
|
||||
}
|
||||
|
||||
if (qinfo->SourceItemId)
|
||||
if (qinfo->StartItem)
|
||||
{
|
||||
if (!sObjectMgr->GetItemTemplate(qinfo->SourceItemId))
|
||||
if (!sObjectMgr->GetItemTemplate(qinfo->StartItem))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `SourceItemId` = %u but item with entry %u does not exist, quest can't be done.",
|
||||
qinfo->GetQuestId(), qinfo->SourceItemId, qinfo->SourceItemId);
|
||||
qinfo->SourceItemId = 0; // quest can't be done for this requirement
|
||||
sLog->outErrorDb("Quest %u has `StartItem` = %u but item with entry %u does not exist, quest can't be done.",
|
||||
qinfo->GetQuestId(), qinfo->StartItem, qinfo->StartItem);
|
||||
qinfo->StartItem = 0; // quest can't be done for this requirement
|
||||
}
|
||||
else if (qinfo->SourceItemIdCount == 0)
|
||||
else if (qinfo->StartItemCount == 0)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `SourceItemId` = %u but `SourceItemIdCount` = 0, set to 1 but need fix in DB.",
|
||||
qinfo->GetQuestId(), qinfo->SourceItemId);
|
||||
qinfo->SourceItemIdCount = 1; // update to 1 for allow quest work for backward compatibility with DB
|
||||
sLog->outErrorDb("Quest %u has `StartItem` = %u but `StartItemCount` = 0, set to 1 but need fix in DB.",
|
||||
qinfo->GetQuestId(), qinfo->StartItem);
|
||||
qinfo->StartItemCount = 1; // update to 1 for allow quest work for backward compatibility with DB
|
||||
}
|
||||
}
|
||||
else if (qinfo->SourceItemIdCount>0)
|
||||
else if (qinfo->StartItemCount > 0)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `SourceItemId` = 0 but `SourceItemIdCount` = %u, useless value.",
|
||||
qinfo->GetQuestId(), qinfo->SourceItemIdCount);
|
||||
qinfo->SourceItemIdCount=0; // no quest work changes in fact
|
||||
sLog->outErrorDb("Quest %u has `StartItem` = 0 but `StartItemCount` = %u, useless value.",
|
||||
qinfo->GetQuestId(), qinfo->StartItemCount);
|
||||
qinfo->StartItemCount = 0; // no quest work changes in fact
|
||||
}
|
||||
|
||||
if (qinfo->SourceSpellid)
|
||||
@@ -4190,22 +4255,22 @@ void ObjectMgr::LoadQuests()
|
||||
|
||||
for (uint8 j = 0; j < QUEST_SOURCE_ITEM_IDS_COUNT; ++j)
|
||||
{
|
||||
uint32 id = qinfo->RequiredSourceItemId[j];
|
||||
uint32 id = qinfo->ItemDrop[j];
|
||||
if (id)
|
||||
{
|
||||
if (!sObjectMgr->GetItemTemplate(id))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RequiredSourceItemId%d` = %u but item with entry %u does not exist, quest can't be done.",
|
||||
sLog->outErrorDb("Quest %u has `ItemDrop%d` = %u but item with entry %u does not exist, quest can't be done.",
|
||||
qinfo->GetQuestId(), j+1, id, id);
|
||||
// no changes, quest can't be done for this requirement
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (qinfo->RequiredSourceItemCount[j]>0)
|
||||
if (qinfo->ItemDropQuantity[j]>0)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RequiredSourceItemId%d` = 0 but `RequiredSourceItemCount%d` = %u.",
|
||||
qinfo->GetQuestId(), j+1, j+1, qinfo->RequiredSourceItemCount[j]);
|
||||
sLog->outErrorDb("Quest %u has `ItemDrop%d` = 0 but `ItemDropQuantity%d` = %u.",
|
||||
qinfo->GetQuestId(), j+1, j+1, qinfo->ItemDropQuantity[j]);
|
||||
// no changes, quest ignore this data
|
||||
}
|
||||
}
|
||||
@@ -4326,55 +4391,55 @@ void ObjectMgr::LoadQuests()
|
||||
}
|
||||
}
|
||||
|
||||
if (qinfo->RewardSpell)
|
||||
if (qinfo->RewardDisplaySpell)
|
||||
{
|
||||
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(qinfo->RewardDisplaySpell);
|
||||
|
||||
if (!spellInfo)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardDisplaySpell` = %u but spell %u does not exist, spell removed as display reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardDisplaySpell, qinfo->RewardDisplaySpell);
|
||||
qinfo->RewardDisplaySpell = 0; // no spell reward will display for this quest
|
||||
}
|
||||
|
||||
else if (!SpellMgr::ComputeIsSpellValid(spellInfo))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardDisplaySpell` = %u but spell %u is broken, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardDisplaySpell, qinfo->RewardDisplaySpell);
|
||||
qinfo->RewardDisplaySpell = 0; // no spell reward will display for this quest
|
||||
}
|
||||
|
||||
else if (GetTalentSpellCost(qinfo->RewardDisplaySpell))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardDisplaySpell` = %u but spell %u is talent, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardDisplaySpell, qinfo->RewardDisplaySpell);
|
||||
qinfo->RewardDisplaySpell = 0; // no spell reward will display for this quest
|
||||
}
|
||||
}
|
||||
|
||||
if (qinfo->RewardSpell > 0)
|
||||
{
|
||||
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(qinfo->RewardSpell);
|
||||
|
||||
if (!spellInfo)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardSpell` = %u but spell %u does not exist, spell removed as display reward.",
|
||||
sLog->outErrorDb("Quest %u has `RewardSpell` = %u but spell %u does not exist, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardSpell, qinfo->RewardSpell);
|
||||
qinfo->RewardSpell = 0; // no spell reward will display for this quest
|
||||
qinfo->RewardSpell = 0; // no spell will be casted on player
|
||||
}
|
||||
|
||||
else if (!SpellMgr::ComputeIsSpellValid(spellInfo))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardSpell` = %u but spell %u is broken, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardSpell, qinfo->RewardSpell);
|
||||
qinfo->RewardSpell = 0; // no spell reward will display for this quest
|
||||
qinfo->RewardSpell = 0; // no spell will be casted on player
|
||||
}
|
||||
|
||||
else if (GetTalentSpellCost(qinfo->RewardSpell))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardSpell` = %u but spell %u is talent, quest will not have a spell reward.",
|
||||
sLog->outErrorDb("Quest %u has `RewardDisplaySpell` = %u but spell %u is talent, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardSpell, qinfo->RewardSpell);
|
||||
qinfo->RewardSpell = 0; // no spell reward will display for this quest
|
||||
}
|
||||
}
|
||||
|
||||
if (qinfo->RewardSpellCast > 0)
|
||||
{
|
||||
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(qinfo->RewardSpellCast);
|
||||
|
||||
if (!spellInfo)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardSpellCast` = %u but spell %u does not exist, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardSpellCast, qinfo->RewardSpellCast);
|
||||
qinfo->RewardSpellCast = 0; // no spell will be casted on player
|
||||
}
|
||||
|
||||
else if (!SpellMgr::ComputeIsSpellValid(spellInfo))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardSpellCast` = %u but spell %u is broken, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardSpellCast, qinfo->RewardSpellCast);
|
||||
qinfo->RewardSpellCast = 0; // no spell will be casted on player
|
||||
}
|
||||
|
||||
else if (GetTalentSpellCost(qinfo->RewardSpellCast))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RewardSpell` = %u but spell %u is talent, quest will not have a spell reward.",
|
||||
qinfo->GetQuestId(), qinfo->RewardSpellCast, qinfo->RewardSpellCast);
|
||||
qinfo->RewardSpellCast = 0; // no spell will be casted on player
|
||||
qinfo->RewardSpell = 0; // no spell will be casted on player
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4399,14 +4464,14 @@ void ObjectMgr::LoadQuests()
|
||||
usedMailTemplates[qinfo->RewardMailTemplateId] = qinfo->GetQuestId();
|
||||
}
|
||||
|
||||
if (qinfo->NextQuestIdChain)
|
||||
if (qinfo->RewardNextQuest)
|
||||
{
|
||||
QuestMap::iterator qNextItr = _questTemplates.find(qinfo->NextQuestIdChain);
|
||||
QuestMap::iterator qNextItr = _questTemplates.find(qinfo->RewardNextQuest);
|
||||
if (qNextItr == _questTemplates.end())
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `NextQuestIdChain` = %u but quest %u does not exist, quest chain will not work.",
|
||||
qinfo->GetQuestId(), qinfo->NextQuestIdChain, qinfo->NextQuestIdChain);
|
||||
qinfo->NextQuestIdChain = 0;
|
||||
sLog->outErrorDb("Quest %u has `RewardNextQuest` = %u but quest %u does not exist, quest chain will not work.",
|
||||
qinfo->GetQuestId(), qinfo->RewardNextQuest, qinfo->RewardNextQuest);
|
||||
qinfo->RewardNextQuest = 0;
|
||||
}
|
||||
else
|
||||
qNextItr->second->prevChainQuests.push_back(qinfo->GetQuestId());
|
||||
@@ -4441,7 +4506,7 @@ void ObjectMgr::LoadQuests()
|
||||
|
||||
if (qinfo->ExclusiveGroup)
|
||||
mExclusiveQuestGroups.insert(std::pair<int32, uint32>(qinfo->ExclusiveGroup, qinfo->GetQuestId()));
|
||||
if (qinfo->LimitTime)
|
||||
if (qinfo->TimeAllowed)
|
||||
qinfo->SetSpecialFlag(QUEST_SPECIAL_FLAGS_TIMED);
|
||||
if (qinfo->RequiredPlayerKills)
|
||||
qinfo->SetSpecialFlag(QUEST_SPECIAL_FLAGS_PLAYER_KILL);
|
||||
@@ -4519,7 +4584,7 @@ void ObjectMgr::LoadQuestLocales()
|
||||
AddLocaleString(fields[1 + 11 * (i - 1) + 2].GetString(), locale, data.Objectives);
|
||||
AddLocaleString(fields[1 + 11 * (i - 1) + 3].GetString(), locale, data.OfferRewardText);
|
||||
AddLocaleString(fields[1 + 11 * (i - 1) + 4].GetString(), locale, data.RequestItemsText);
|
||||
AddLocaleString(fields[1 + 11 * (i - 1) + 5].GetString(), locale, data.EndText);
|
||||
AddLocaleString(fields[1 + 11 * (i - 1) + 5].GetString(), locale, data.AreaDescription);
|
||||
AddLocaleString(fields[1 + 11 * (i - 1) + 6].GetString(), locale, data.CompletedText);
|
||||
|
||||
for (uint8 k = 0; k < 4; ++k)
|
||||
|
||||
@@ -2562,7 +2562,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData)
|
||||
{
|
||||
Quest const* quest = iter->second;
|
||||
uint32 newRaceMask = (team == TEAM_ALLIANCE) ? RACEMASK_ALLIANCE : RACEMASK_HORDE;
|
||||
if (quest->GetRequiredRaces() && !(quest->GetRequiredRaces() & newRaceMask))
|
||||
if (quest->GetAllowableRaces() && !(quest->GetAllowableRaces() & newRaceMask))
|
||||
{
|
||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHAR_QUESTSTATUS_REWARDED_ACTIVE_BY_QUEST);
|
||||
stmt->setUInt32(0, quest->GetQuestId());
|
||||
|
||||
@@ -12,6 +12,13 @@
|
||||
|
||||
Quest::Quest(Field* questRecord)
|
||||
{
|
||||
EmoteOnIncomplete = 0;
|
||||
EmoteOnComplete = 0;
|
||||
_reqItemsCount = 0;
|
||||
_reqCreatureOrGOcount = 0;
|
||||
_rewItemsCount = 0;
|
||||
_rewChoiceItemsCount = 0;
|
||||
|
||||
Id = questRecord[0].GetUInt32();
|
||||
Method = questRecord[1].GetUInt8();
|
||||
Level = questRecord[2].GetInt16();
|
||||
@@ -19,21 +26,21 @@ Quest::Quest(Field* questRecord)
|
||||
ZoneOrSort = questRecord[4].GetInt16();
|
||||
Type = questRecord[5].GetUInt16();
|
||||
SuggestedPlayers = questRecord[6].GetUInt8();
|
||||
LimitTime = questRecord[7].GetUInt32();
|
||||
RequiredRaces = questRecord[8].GetUInt16();
|
||||
TimeAllowed = questRecord[7].GetUInt32();
|
||||
AllowableRaces = questRecord[8].GetUInt16();
|
||||
RequiredFactionId1 = questRecord[9].GetUInt16();
|
||||
RequiredFactionId2 = questRecord[10].GetUInt16();
|
||||
RequiredFactionValue1 = questRecord[11].GetInt32();
|
||||
RequiredFactionValue2 = questRecord[12].GetInt32();
|
||||
NextQuestIdChain = questRecord[13].GetUInt32();
|
||||
RewardXPId = questRecord[14].GetUInt8();
|
||||
RewardOrRequiredMoney = questRecord[15].GetInt32();
|
||||
RewardMoneyMaxLevel = questRecord[16].GetUInt32();
|
||||
RewardSpell = questRecord[17].GetUInt32();
|
||||
RewardSpellCast = questRecord[18].GetInt32();
|
||||
RewardNextQuest = questRecord[13].GetUInt32();
|
||||
RewardXPDifficulty = questRecord[14].GetUInt8();
|
||||
RewardMoney = questRecord[15].GetInt32();
|
||||
RewardBonusMoney = questRecord[16].GetUInt32();
|
||||
RewardDisplaySpell = questRecord[17].GetUInt32();
|
||||
RewardSpell = questRecord[18].GetInt32();
|
||||
RewardHonor = questRecord[19].GetUInt32();
|
||||
RewardHonorMultiplier = questRecord[20].GetFloat();
|
||||
SourceItemId = questRecord[21].GetUInt32();
|
||||
RewardKillHonor = questRecord[20].GetFloat();
|
||||
StartItem = questRecord[21].GetUInt32();
|
||||
Flags = questRecord[22].GetUInt32();
|
||||
RewardTitleId = questRecord[23].GetUInt8();
|
||||
RequiredPlayerKills = questRecord[24].GetUInt8();
|
||||
@@ -41,102 +48,106 @@ Quest::Quest(Field* questRecord)
|
||||
RewardArenaPoints = questRecord[26].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
|
||||
RewardItemId[i] = questRecord[27+i].GetUInt32();
|
||||
{
|
||||
RewardItemId[i] = questRecord[27+i*2].GetUInt32();
|
||||
RewardItemIdCount[i] = questRecord[28+i*2].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
|
||||
RewardItemIdCount[i] = questRecord[31+i].GetUInt16();
|
||||
if (RewardItemId[i])
|
||||
++_rewItemsCount;
|
||||
}
|
||||
|
||||
for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
|
||||
RewardChoiceItemId[i] = questRecord[35+i].GetUInt32();
|
||||
{
|
||||
RewardChoiceItemId[i] = questRecord[35+i*2].GetUInt32();
|
||||
RewardChoiceItemCount[i] = questRecord[36+i*2].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
|
||||
RewardChoiceItemCount[i] = questRecord[41+i].GetUInt16();
|
||||
if (RewardChoiceItemId[i])
|
||||
++_rewChoiceItemsCount;
|
||||
}
|
||||
|
||||
for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
|
||||
RewardFactionId[i] = questRecord[47+i].GetUInt16();
|
||||
{
|
||||
RewardFactionId[i] = questRecord[47+i*3].GetUInt16();
|
||||
RewardFactionValueId[i] = questRecord[48+i*3].GetInt32();
|
||||
RewardFactionValueIdOverride[i] = questRecord[49+i*3].GetInt32();
|
||||
}
|
||||
|
||||
for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
|
||||
RewardFactionValueId[i] = questRecord[52+i].GetInt32();
|
||||
|
||||
for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
|
||||
RewardFactionValueIdOverride[i] = questRecord[57+i].GetInt32();
|
||||
|
||||
PointMapId = questRecord[62].GetUInt16();
|
||||
PointX = questRecord[63].GetFloat();
|
||||
PointY = questRecord[64].GetFloat();
|
||||
PointOption = questRecord[65].GetUInt32();
|
||||
POIContinent = questRecord[62].GetUInt16();
|
||||
POIx = questRecord[63].GetFloat();
|
||||
POIy = questRecord[64].GetFloat();
|
||||
POIPriority = questRecord[65].GetUInt32();
|
||||
Title = questRecord[66].GetString();
|
||||
Objectives = questRecord[67].GetString();
|
||||
Details = questRecord[68].GetString();
|
||||
EndText = questRecord[69].GetString();
|
||||
OfferRewardText = questRecord[70].GetString();
|
||||
RequestItemsText = questRecord[71].GetString();
|
||||
CompletedText = questRecord[72].GetString();
|
||||
AreaDescription = questRecord[69].GetString();
|
||||
CompletedText = questRecord[70].GetString();
|
||||
|
||||
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
RequiredNpcOrGo[i] = questRecord[73+i].GetInt32();
|
||||
{
|
||||
RequiredNpcOrGo[i] = questRecord[71+i].GetInt32();
|
||||
RequiredNpcOrGoCount[i] = questRecord[75+i].GetUInt16();
|
||||
ObjectiveText[i] = questRecord[100 + i].GetString();
|
||||
|
||||
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
RequiredNpcOrGoCount[i] = questRecord[77+i].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
|
||||
RequiredSourceItemId[i] = questRecord[81+i].GetUInt32();
|
||||
|
||||
for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
|
||||
RequiredSourceItemCount[i] = questRecord[85+i].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
|
||||
RequiredItemId[i] = questRecord[89+i].GetUInt32();
|
||||
|
||||
for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
|
||||
RequiredItemCount[i] = questRecord[95+i].GetUInt16();
|
||||
|
||||
// int8 Unknown0 = questRecord[101].GetUInt8();
|
||||
|
||||
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
ObjectiveText[i] = questRecord[102+i].GetString();
|
||||
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
DetailsEmote[i] = questRecord[106+i].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
DetailsEmoteDelay[i] = questRecord[110+i].GetUInt32();
|
||||
|
||||
EmoteOnIncomplete = questRecord[114].GetUInt16();
|
||||
EmoteOnComplete = questRecord[115].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
OfferRewardEmote[i] = questRecord[116+i].GetInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
OfferRewardEmoteDelay[i] = questRecord[120+i].GetInt32();
|
||||
|
||||
//int32 VerifiedBuild = questRecord[124].GetInt32();
|
||||
|
||||
_reqItemsCount = 0;
|
||||
_reqCreatureOrGOcount = 0;
|
||||
_rewItemsCount = 0;
|
||||
_rewChoiceItemsCount = 0;
|
||||
|
||||
for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
|
||||
if (RequiredItemId[i])
|
||||
++_reqItemsCount;
|
||||
|
||||
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
if (RequiredNpcOrGo[i])
|
||||
++_reqCreatureOrGOcount;
|
||||
}
|
||||
|
||||
for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
|
||||
if (RewardItemId[i])
|
||||
++_rewItemsCount;
|
||||
for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
|
||||
{
|
||||
ItemDrop[i] = questRecord[79+i].GetUInt32();
|
||||
ItemDropQuantity[i] = questRecord[83+i].GetUInt16();
|
||||
}
|
||||
|
||||
for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
|
||||
if (RewardChoiceItemId[i])
|
||||
++_rewChoiceItemsCount;
|
||||
for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
|
||||
{
|
||||
RequiredItemId[i] = questRecord[87 + i].GetUInt32();
|
||||
RequiredItemCount[i] = questRecord[93 + i].GetUInt16();
|
||||
|
||||
if (RequiredItemId[i])
|
||||
++_reqItemsCount;
|
||||
}
|
||||
|
||||
// int8 Unknown0 = questRecord[99].GetUInt8();
|
||||
// int32 VerifiedBuild = questRecord[104].GetInt32();
|
||||
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
{
|
||||
DetailsEmote[i] = 0;
|
||||
DetailsEmoteDelay[i] = 0;
|
||||
OfferRewardEmote[i] = 0;
|
||||
OfferRewardEmoteDelay[i] = 0;
|
||||
}
|
||||
|
||||
_eventIdForQuest = 0;
|
||||
}
|
||||
|
||||
void Quest::LoadQuestDetails(Field* fields)
|
||||
{
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
DetailsEmote[i] = fields[1+i].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
DetailsEmoteDelay[i] = fields[5+i].GetUInt32();
|
||||
}
|
||||
|
||||
void Quest::LoadQuestRequestItems(Field* fields)
|
||||
{
|
||||
EmoteOnComplete = fields[1].GetUInt16();
|
||||
EmoteOnIncomplete = fields[2].GetUInt16();
|
||||
RequestItemsText = fields[3].GetString();
|
||||
}
|
||||
|
||||
void Quest::LoadQuestOfferReward(Field* fields)
|
||||
{
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
OfferRewardEmote[i] = fields[1 + i].GetUInt16();
|
||||
|
||||
for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
|
||||
OfferRewardEmoteDelay[i] = fields[5 + i].GetUInt32();
|
||||
|
||||
OfferRewardText = fields[9].GetString();
|
||||
}
|
||||
|
||||
void Quest::LoadQuestTemplateAddon(Field* fields)
|
||||
{
|
||||
MaxLevel = fields[1].GetUInt8();
|
||||
@@ -153,7 +164,7 @@ void Quest::LoadQuestTemplateAddon(Field* fields)
|
||||
RequiredMaxRepFaction = fields[12].GetUInt16();
|
||||
RequiredMinRepValue = fields[13].GetInt32();
|
||||
RequiredMaxRepValue = fields[14].GetInt32();
|
||||
SourceItemIdCount = fields[15].GetUInt8();
|
||||
StartItemCount = fields[15].GetUInt8();
|
||||
SpecialFlags = fields[16].GetUInt8();
|
||||
|
||||
if (SpecialFlags & QUEST_SPECIAL_FLAGS_AUTO_ACCEPT)
|
||||
@@ -175,7 +186,7 @@ uint32 Quest::XPValue(Player* player) const
|
||||
else if (diffFactor > 10)
|
||||
diffFactor = 10;
|
||||
|
||||
uint32 xp = diffFactor * xpentry->Exp[RewardXPId] / 10;
|
||||
uint32 xp = diffFactor * xpentry->Exp[RewardXPDifficulty] / 10;
|
||||
if (xp <= 100)
|
||||
xp = 5 * ((xp + 2) / 5);
|
||||
else if (xp <= 500)
|
||||
@@ -193,10 +204,10 @@ uint32 Quest::XPValue(Player* player) const
|
||||
|
||||
int32 Quest::GetRewOrReqMoney() const
|
||||
{
|
||||
if (RewardOrRequiredMoney <= 0)
|
||||
return RewardOrRequiredMoney;
|
||||
if (RewardMoney <= 0)
|
||||
return RewardMoney;
|
||||
|
||||
return int32(RewardOrRequiredMoney * sWorld->getRate(RATE_DROP_MONEY));
|
||||
return int32(RewardMoney * sWorld->getRate(RATE_DROP_MONEY));
|
||||
}
|
||||
|
||||
uint32 Quest::GetRewMoneyMaxLevel() const
|
||||
@@ -204,7 +215,7 @@ uint32 Quest::GetRewMoneyMaxLevel() const
|
||||
if (HasFlag(QUEST_FLAGS_NO_MONEY_FROM_XP))
|
||||
return 0;
|
||||
|
||||
return RewardMoneyMaxLevel;
|
||||
return RewardBonusMoney;
|
||||
}
|
||||
|
||||
bool Quest::IsAutoAccept() const
|
||||
@@ -337,15 +348,15 @@ void Quest::InitializeQueryData()
|
||||
for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i) // unk (0)
|
||||
queryData << int32(RewardFactionValueIdOverride[i]);
|
||||
|
||||
queryData << GetPointMapId();
|
||||
queryData << GetPointX();
|
||||
queryData << GetPointY();
|
||||
queryData << GetPOIContinent();
|
||||
queryData << GetPOIx();
|
||||
queryData << GetPOIy();
|
||||
queryData << GetPointOpt();
|
||||
|
||||
queryData << GetTitle();
|
||||
queryData << GetObjectives();
|
||||
queryData << GetDetails();
|
||||
queryData << GetEndText();
|
||||
queryData << GetAreaDescription();
|
||||
queryData << GetCompletedText(); // display in quest objectives window once all objectives are completed
|
||||
|
||||
for (uint32 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
|
||||
@@ -356,7 +367,7 @@ void Quest::InitializeQueryData()
|
||||
queryData << uint32(RequiredNpcOrGo[i]);
|
||||
|
||||
queryData << uint32(RequiredNpcOrGoCount[i]);
|
||||
queryData << uint32(RequiredSourceItemId[i]);
|
||||
queryData << uint32(ItemDrop[i]);
|
||||
queryData << uint32(0); // req source count?
|
||||
}
|
||||
|
||||
|
||||
@@ -171,7 +171,7 @@ struct QuestLocale
|
||||
StringVector Objectives;
|
||||
StringVector OfferRewardText;
|
||||
StringVector RequestItemsText;
|
||||
StringVector EndText;
|
||||
StringVector AreaDescription;
|
||||
StringVector CompletedText;
|
||||
std::vector< StringVector > ObjectiveText;
|
||||
};
|
||||
@@ -184,6 +184,9 @@ class Quest
|
||||
friend class ObjectMgr;
|
||||
public:
|
||||
Quest(Field* questRecord);
|
||||
void LoadQuestDetails(Field* fields);
|
||||
void LoadQuestRequestItems(Field* fields);
|
||||
void LoadQuestOfferReward(Field* fields);
|
||||
void LoadQuestTemplateAddon(Field* fields);
|
||||
|
||||
uint32 XPValue(Player* player) const;
|
||||
@@ -203,7 +206,7 @@ class Quest
|
||||
int32 GetQuestLevel() const { return Level; }
|
||||
uint32 GetType() const { return Type; }
|
||||
uint32 GetRequiredClasses() const { return RequiredClasses; }
|
||||
uint32 GetRequiredRaces() const { return RequiredRaces; }
|
||||
uint32 GetAllowableRaces() const { return AllowableRaces; }
|
||||
uint32 GetRequiredSkill() const { return RequiredSkillId; }
|
||||
uint32 GetRequiredSkillValue() const { return RequiredSkillPoints; }
|
||||
uint32 GetRepObjectiveFaction() const { return RequiredFactionId1; }
|
||||
@@ -215,38 +218,38 @@ class Quest
|
||||
uint32 GetRequiredMaxRepFaction() const { return RequiredMaxRepFaction; }
|
||||
int32 GetRequiredMaxRepValue() const { return RequiredMaxRepValue; }
|
||||
uint32 GetSuggestedPlayers() const { return SuggestedPlayers; }
|
||||
uint32 GetLimitTime() const { return LimitTime; }
|
||||
uint32 GetTimeAllowed() const { return TimeAllowed; }
|
||||
int32 GetPrevQuestId() const { return PrevQuestId; }
|
||||
int32 GetNextQuestId() const { return NextQuestId; }
|
||||
int32 GetExclusiveGroup() const { return ExclusiveGroup; }
|
||||
uint32 GetNextQuestInChain() const { return NextQuestIdChain; }
|
||||
uint32 GetNextQuestInChain() const { return RewardNextQuest; }
|
||||
uint32 GetCharTitleId() const { return RewardTitleId; }
|
||||
uint32 GetPlayersSlain() const { return RequiredPlayerKills; }
|
||||
uint32 GetBonusTalents() const { return RewardTalents; }
|
||||
int32 GetRewArenaPoints() const {return RewardArenaPoints; }
|
||||
uint32 GetXPId() const { return RewardXPId; }
|
||||
uint32 GetSrcItemId() const { return SourceItemId; }
|
||||
uint32 GetSrcItemCount() const { return SourceItemIdCount; }
|
||||
uint32 GetXPId() const { return RewardXPDifficulty; }
|
||||
uint32 GetSrcItemId() const { return StartItem; }
|
||||
uint32 GetSrcItemCount() const { return StartItemCount; }
|
||||
uint32 GetSrcSpell() const { return SourceSpellid; }
|
||||
std::string const& GetTitle() const { return Title; }
|
||||
std::string const& GetDetails() const { return Details; }
|
||||
std::string const& GetObjectives() const { return Objectives; }
|
||||
std::string const& GetOfferRewardText() const { return OfferRewardText; }
|
||||
std::string const& GetRequestItemsText() const { return RequestItemsText; }
|
||||
std::string const& GetEndText() const { return EndText; }
|
||||
std::string const& GetAreaDescription() const { return AreaDescription; }
|
||||
std::string const& GetCompletedText() const { return CompletedText; }
|
||||
int32 GetRewOrReqMoney() const;
|
||||
uint32 GetRewHonorAddition() const { return RewardHonor; }
|
||||
float GetRewHonorMultiplier() const { return RewardHonorMultiplier; }
|
||||
float GetRewHonorMultiplier() const { return RewardKillHonor; }
|
||||
uint32 GetRewMoneyMaxLevel() const; // use in XP calculation at client
|
||||
uint32 GetRewSpell() const { return RewardSpell; }
|
||||
int32 GetRewSpellCast() const { return RewardSpellCast; }
|
||||
uint32 GetRewSpell() const { return RewardDisplaySpell; }
|
||||
int32 GetRewSpellCast() const { return RewardSpell; }
|
||||
uint32 GetRewMailTemplateId() const { return RewardMailTemplateId; }
|
||||
uint32 GetRewMailDelaySecs() const { return RewardMailDelay; }
|
||||
uint32 GetPointMapId() const { return PointMapId; }
|
||||
float GetPointX() const { return PointX; }
|
||||
float GetPointY() const { return PointY; }
|
||||
uint32 GetPointOpt() const { return PointOption; }
|
||||
uint32 GetPOIContinent() const { return POIContinent; }
|
||||
float GetPOIx() const { return POIx; }
|
||||
float GetPOIy() const { return POIy; }
|
||||
uint32 GetPointOpt() const { return POIPriority; }
|
||||
uint32 GetIncompleteEmote() const { return EmoteOnIncomplete; }
|
||||
uint32 GetCompleteEmote() const { return EmoteOnComplete; }
|
||||
bool IsRepeatable() const { return SpecialFlags & QUEST_SPECIAL_FLAGS_REPEATABLE; }
|
||||
@@ -268,8 +271,8 @@ class Quest
|
||||
std::string ObjectiveText[QUEST_OBJECTIVES_COUNT];
|
||||
uint32 RequiredItemId[QUEST_ITEM_OBJECTIVES_COUNT];
|
||||
uint32 RequiredItemCount[QUEST_ITEM_OBJECTIVES_COUNT];
|
||||
uint32 RequiredSourceItemId[QUEST_SOURCE_ITEM_IDS_COUNT];
|
||||
uint32 RequiredSourceItemCount[QUEST_SOURCE_ITEM_IDS_COUNT];
|
||||
uint32 ItemDrop[QUEST_SOURCE_ITEM_IDS_COUNT];
|
||||
uint32 ItemDropQuantity[QUEST_SOURCE_ITEM_IDS_COUNT];
|
||||
int32 RequiredNpcOrGo[QUEST_OBJECTIVES_COUNT]; // >0 Creature <0 Gameobject
|
||||
uint32 RequiredNpcOrGoCount[QUEST_OBJECTIVES_COUNT];
|
||||
uint32 RewardChoiceItemId[QUEST_REWARD_CHOICES_COUNT];
|
||||
@@ -317,38 +320,38 @@ class Quest
|
||||
uint32 MinLevel;
|
||||
int32 Level;
|
||||
uint32 Type;
|
||||
uint32 RequiredRaces;
|
||||
uint32 AllowableRaces;
|
||||
uint32 RequiredFactionId1;
|
||||
int32 RequiredFactionValue1;
|
||||
uint32 RequiredFactionId2;
|
||||
int32 RequiredFactionValue2;
|
||||
uint32 SuggestedPlayers;
|
||||
uint32 LimitTime;
|
||||
uint32 TimeAllowed;
|
||||
uint32 Flags;
|
||||
uint32 RewardTitleId;
|
||||
uint32 RequiredPlayerKills;
|
||||
uint32 RewardTalents;
|
||||
int32 RewardArenaPoints;
|
||||
uint32 NextQuestIdChain;
|
||||
uint32 RewardXPId;
|
||||
uint32 SourceItemId;
|
||||
uint32 RewardNextQuest;
|
||||
uint32 RewardXPDifficulty;
|
||||
uint32 StartItem;
|
||||
std::string Title;
|
||||
std::string Details;
|
||||
std::string Objectives;
|
||||
std::string OfferRewardText;
|
||||
std::string RequestItemsText;
|
||||
std::string EndText;
|
||||
std::string AreaDescription;
|
||||
std::string CompletedText;
|
||||
uint32 RewardHonor;
|
||||
float RewardHonorMultiplier;
|
||||
int32 RewardOrRequiredMoney;
|
||||
uint32 RewardMoneyMaxLevel;
|
||||
uint32 RewardSpell;
|
||||
int32 RewardSpellCast;
|
||||
uint32 PointMapId;
|
||||
float PointX;
|
||||
float PointY;
|
||||
uint32 PointOption;
|
||||
float RewardKillHonor;
|
||||
int32 RewardMoney;
|
||||
uint32 RewardBonusMoney;
|
||||
uint32 RewardDisplaySpell;
|
||||
int32 RewardSpell;
|
||||
uint32 POIContinent;
|
||||
float POIx;
|
||||
float POIy;
|
||||
uint32 POIPriority;
|
||||
uint32 EmoteOnIncomplete;
|
||||
uint32 EmoteOnComplete;
|
||||
|
||||
@@ -367,7 +370,7 @@ class Quest
|
||||
int32 RequiredMinRepValue = 0;
|
||||
uint32 RequiredMaxRepFaction = 0;
|
||||
int32 RequiredMaxRepValue = 0;
|
||||
uint32 SourceItemIdCount = 0;
|
||||
uint32 StartItemCount = 0;
|
||||
uint32 SpecialFlags = 0; // custom flags, not sniffed/WDB
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user