Core|DB/Quests: Rename and re-order fields in `quest_template` table, for the sake of consistency

Order should match SMSG_QUEST_QUERY_RESPONSE

2 files changed, 191 insertions, 187 deletions

diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index 7cd442cd9f9..29bd95a73a3 100755
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -22,128 +22,132 @@
 
 Quest::Quest(Field* questRecord)
 {
-    QuestId = questRecord[0].GetUInt32();
-    QuestMethod = questRecord[1].GetUInt32();
-    ZoneOrSort = questRecord[2].GetInt32();
+    Id = questRecord[0].GetUInt32();
+    Method = questRecord[1].GetUInt32();
+    Level = questRecord[2].GetInt32();
     MinLevel = questRecord[3].GetUInt32();
     MaxLevel = questRecord[4].GetUInt32();
-    QuestLevel = questRecord[5].GetInt32();
+    ZoneOrSort = questRecord[5].GetInt32();
     Type = questRecord[6].GetUInt32();
-    RequiredClasses = questRecord[7].GetUInt32();
-    RequiredRaces = questRecord[8].GetUInt32();
-    RequiredSkill = questRecord[9].GetUInt32();
-    RequiredSkillValue = questRecord[10].GetUInt32();
-    RepObjectiveFaction = questRecord[11].GetUInt32();
-    RepObjectiveValue = questRecord[12].GetInt32();
-    RepObjectiveFaction2 = questRecord[13].GetUInt32();
-    RepObjectiveValue2 = questRecord[14].GetInt32();
-    RequiredMinRepFaction = questRecord[15].GetUInt32();
-    RequiredMinRepValue = questRecord[16].GetInt32();
-    RequiredMaxRepFaction = questRecord[17].GetUInt32();
-    RequiredMaxRepValue = questRecord[18].GetInt32();
-    SuggestedPlayers = questRecord[19].GetUInt32();
-    LimitTime = questRecord[20].GetUInt32();
-    QuestFlags = questRecord[21].GetUInt32();
-    uint32 SpecialFlags = questRecord[22].GetUInt16();
-    CharTitleId = questRecord[23].GetUInt32();
-    PlayersSlain = questRecord[24].GetUInt32();
-    BonusTalents = questRecord[25].GetUInt32();
-    RewArenaPoints = questRecord[26].GetInt32();
-    PrevQuestId = questRecord[27].GetInt32();
-    NextQuestId = questRecord[28].GetInt32();
-    ExclusiveGroup = questRecord[29].GetInt32();
-    NextQuestInChain = questRecord[30].GetUInt32();
-    XPId = questRecord[31].GetUInt32();
-    SrcItemId = questRecord[32].GetUInt32();
-    SrcItemCount = questRecord[33].GetUInt32();
-    SrcSpell = questRecord[34].GetUInt32();
-    Title = questRecord[35].GetString();
-    Details = questRecord[36].GetString();
-    Objectives = questRecord[37].GetString();
-    OfferRewardText = questRecord[38].GetString();
-    RequestItemsText = questRecord[39].GetString();
-    EndText = questRecord[40].GetString();
-    CompletedText = questRecord[41].GetString();
+    SuggestedPlayers = questRecord[7].GetUInt32();
+    LimitTime = questRecord[8].GetUInt32();
+    RequiredClasses = questRecord[9].GetUInt32();
+    RequiredRaces = questRecord[10].GetUInt32();
+    RequiredSkillId = questRecord[11].GetUInt32();
+    RequiredSkillPoints = questRecord[12].GetUInt32();
+    RequiredFactionId1 = questRecord[13].GetUInt32();
+    RequiredFactionId2 = questRecord[14].GetUInt32();
+    RequiredFactionValue1 = questRecord[15].GetInt32();
+    RequiredFactionValue2 = questRecord[16].GetInt32();
+    RequiredMinRepFaction = questRecord[17].GetUInt32();
+    RequiredMaxRepFaction = questRecord[18].GetUInt32();
+    RequiredMinRepValue = questRecord[19].GetInt32();
+    RequiredMaxRepValue = questRecord[20].GetInt32();
+    PrevQuestId = questRecord[21].GetInt32();
+    NextQuestId = questRecord[22].GetInt32();
+    ExclusiveGroup = questRecord[23].GetInt32();
+    NextQuestIdChain = questRecord[24].GetUInt32();
+    RewardXPId = questRecord[25].GetUInt32();
+    RewardOrRequiredMoney = questRecord[26].GetInt32();
+    RewardMoneyMaxLevel = questRecord[27].GetUInt32();
+    RewardSpell = questRecord[28].GetUInt32();
+    RewardSpellCast = questRecord[29].GetInt32();
+    RewardHonor = questRecord[30].GetUInt32();
+    RewardHonorMultiplier = questRecord[31].GetFloat();
+    RewardMailTemplateId = questRecord[32].GetUInt32();
+    RewardMailDelay = questRecord[33].GetUInt32();
+    SourceItemId = questRecord[34].GetUInt32();
+    SourceItemIdCount = questRecord[35].GetUInt32();
+    SourceSpellid = questRecord[36].GetUInt32();
+    Flags = questRecord[37].GetUInt32();
+    uint32 SpecialFlags = questRecord[38].GetUInt16();
+    RewardTitleId = questRecord[39].GetUInt32();
+    RequiredPlayerKills = questRecord[40].GetUInt32();
+    RewardTalents = questRecord[41].GetUInt32();
+    RewardArenaPoints = questRecord[42].GetInt32();
 
-    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
-        ObjectiveText[i] = questRecord[42+i].GetString();
+    for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
+        RewardItemId[i] = questRecord[43+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
-        ReqItemId[i] = questRecord[46+i].GetUInt32();
+    for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
+        RewardItemIdCount[i] = questRecord[47+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
-        ReqItemCount[i] = questRecord[52+i].GetUInt32();
+    for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
+        RewardChoiceItemId[i] = questRecord[51+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
-        ReqSourceId[i] = questRecord[58+i].GetUInt32();
+    for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
+        RewardChoiceItemCount[i] = questRecord[57+i].GetUInt32();
+    
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
+        RewardFactionId[i] = questRecord[63+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
-        ReqSourceCount[i] = questRecord[62+i].GetUInt32();
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
+        RewardFactionValueId[i] = questRecord[68+i].GetInt32();
 
-    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
-        ReqCreatureOrGOId[i] = questRecord[66+i].GetInt32();
+    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
+        RewardFactionValueIdOverride[i] = questRecord[73+i].GetInt32();
+    
+    PointMapId = questRecord[78].GetUInt32();
+    PointX = questRecord[79].GetFloat();
+    PointY = questRecord[80].GetFloat();
+    PointOption = questRecord[81].GetUInt32();
+    Title = questRecord[82].GetString();
+    Objectives = questRecord[83].GetString();
+    Details = questRecord[84].GetString();
+    EndText = questRecord[85].GetString();
+    OfferRewardText = questRecord[86].GetString();
+    RequestItemsText = questRecord[87].GetString();
+    CompletedText = questRecord[88].GetString();
 
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
-        ReqCreatureOrGOCount[i] = questRecord[70+i].GetUInt32();
+        RequiredNpcOrGo[i] = questRecord[89+i].GetInt32();
 
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
-        ReqSpell[i] = questRecord[74+i].GetUInt32();
+        RequiredNpcOrGoCount[i] = questRecord[93+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
-        RewChoiceItemId[i] = questRecord[78+i].GetUInt32();
+    for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
+        RequiredSourceItemid[i] = questRecord[97+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
-        RewChoiceItemCount[i] = questRecord[84+i].GetUInt32();
+    for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
+        RequiredSourceItemId[i] = questRecord[101+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
-        RewItemId[i] = questRecord[90+i].GetUInt32();
+    for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        RequiredItemId[i] = questRecord[105+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
-        RewItemCount[i] = questRecord[94+i].GetUInt32();
+    for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
+        RequiredItemCount[i] = questRecord[111+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
-        RewRepFaction[i] = questRecord[98+i].GetUInt32();
+    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
+        RequiredSpellCast[i] = questRecord[117+i].GetUInt32();
 
-    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
-        RewRepValueId[i] = questRecord[103+i].GetInt32();
+    // int8 Unknown0 = questRecord[121].GetUInt32();
 
-    for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
-        RewRepValue[i] = questRecord[108+i].GetInt32();
-
-    RewHonorAddition = questRecord[113].GetUInt32();
-    RewHonorMultiplier = questRecord[114].GetFloat();
-    RewOrReqMoney = questRecord[115].GetInt32();
-    RewMoneyMaxLevel = questRecord[116].GetUInt32();
-    RewSpell = questRecord[117].GetUInt32();
-    RewSpellCast = questRecord[118].GetInt32();
-    RewMailTemplateId = questRecord[119].GetUInt32();
-    RewMailDelaySecs = questRecord[120].GetUInt32();
-    PointMapId = questRecord[121].GetUInt32();
-    PointX = questRecord[122].GetFloat();
-    PointY = questRecord[123].GetFloat();
-    PointOpt = questRecord[124].GetUInt32();
+    for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
+        ObjectiveText[i] = questRecord[122+i].GetString();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
-        DetailsEmote[i] = questRecord[125+i].GetUInt32();
+        DetailsEmote[i] = questRecord[126+i].GetUInt32();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
-        DetailsEmoteDelay[i] = questRecord[129+i].GetUInt32();
+        DetailsEmoteDelay[i] = questRecord[130+i].GetUInt32();
 
-    IncompleteEmote = questRecord[133].GetUInt32();
-    CompleteEmote = questRecord[134].GetUInt32();
+    EmoteOnIncomplete = questRecord[134].GetUInt32();
+    EmoteOnComplete = questRecord[135].GetUInt32();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
-        OfferRewardEmote[i] = questRecord[135+i].GetInt32();
+        OfferRewardEmote[i] = questRecord[136+i].GetInt32();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
-        OfferRewardEmoteDelay[i] = questRecord[139+i].GetInt32();
+        OfferRewardEmoteDelay[i] = questRecord[140+i].GetInt32();
+
+    StartScript = questRecord[144].GetUInt32();
+    CompleteScript = questRecord[145].GetUInt32();
 
-    QuestStartScript = questRecord[143].GetUInt32();
-    QuestCompleteScript = questRecord[144].GetUInt32();
+    // int32 WDBVerified = questRecord[146].GetInt32();
 
-    QuestFlags |= SpecialFlags << 20;
-    if (QuestFlags & QUEST_TRINITY_FLAGS_AUTO_ACCEPT)
-        QuestFlags |= QUEST_FLAGS_AUTO_ACCEPT;
+    Flags |= SpecialFlags << 20;
+    if (Flags & QUEST_TRINITY_FLAGS_AUTO_ACCEPT)
+        Flags |= QUEST_FLAGS_AUTO_ACCEPT;
 
     m_reqitemscount = 0;
     m_reqCreatureOrGOcount = 0;
@@ -151,19 +155,19 @@ Quest::Quest(Field* questRecord)
     m_rewchoiceitemscount = 0;
 
     for (int i=0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
-        if (ReqItemId[i])
+        if (RequiredItemId[i])
             ++m_reqitemscount;
 
     for (int i=0; i < QUEST_OBJECTIVES_COUNT; ++i)
-        if (ReqCreatureOrGOId[i])
+        if (RequiredNpcOrGo[i])
             ++m_reqCreatureOrGOcount;
 
     for (int i=0; i < QUEST_REWARDS_COUNT; ++i)
-        if (RewItemId[i])
+        if (RewardItemId[i])
             ++m_rewitemscount;
 
     for (int i=0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
-        if (RewChoiceItemId[i])
+        if (RewardChoiceItemId[i])
             ++m_rewchoiceitemscount;
 }
 
@@ -171,7 +175,7 @@ uint32 Quest::XPValue(Player* player) const
 {
     if (player)
     {
-        int32 quest_level = (QuestLevel == -1 ? player->getLevel() : QuestLevel);
+        int32 quest_level = (Level == -1 ? player->getLevel() : Level);
         const QuestXPEntry* xpentry = sQuestXPStore.LookupEntry(quest_level);
         if (!xpentry)
             return 0;
@@ -182,7 +186,7 @@ uint32 Quest::XPValue(Player* player) const
         else if (diffFactor > 10)
             diffFactor = 10;
 
-        uint32 xp = diffFactor * xpentry->Exp[XPId] / 10;
+        uint32 xp = diffFactor * xpentry->Exp[RewardXPId] / 10;
         if (xp <= 100)
             xp = 5 * ((xp + 2) / 5);
         else if (xp <= 500)
@@ -200,15 +204,15 @@ uint32 Quest::XPValue(Player* player) const
 
 int32  Quest::GetRewOrReqMoney() const
 {
-    if (RewOrReqMoney <= 0)
-        return RewOrReqMoney;
+    if (RewardOrRequiredMoney <= 0)
+        return RewardOrRequiredMoney;
 
-    return int32(RewOrReqMoney * sWorld->getRate(RATE_DROP_MONEY));
+    return int32(RewardOrRequiredMoney * sWorld->getRate(RATE_DROP_MONEY));
 }
 
 bool Quest::IsAutoComplete() const
 {
-    return QuestMethod == 0 || HasFlag(QUEST_FLAGS_AUTOCOMPLETE);
+    return Method == 0 || HasFlag(QUEST_FLAGS_AUTOCOMPLETE);
 }
 
 bool Quest::IsAllowedInRaid() const
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 895b87f4465..fc9a432a11b 100755
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -141,7 +141,7 @@ enum __QuestFlags
     QUEST_FLAGS_UNAVAILABLE    = 0x00004000,                // Used on quests that are not generically available
     QUEST_FLAGS_WEEKLY         = 0x00008000,
     QUEST_FLAGS_AUTOCOMPLETE   = 0x00010000,                // auto complete
-    QUEST_FLAGS_SPECIAL_ITEM   = 0x00020000,                // has something to do with ReqItemId and SrcItemId
+    QUEST_FLAGS_SPECIAL_ITEM   = 0x00020000,                // has something to do with RequiredItemId and SourceItemId
     QUEST_FLAGS_OBJ_TEXT       = 0x00040000,                // use Objective text as Complete text
     QUEST_FLAGS_AUTO_ACCEPT    = 0x00080000,                // The client recognizes this flag as auto-accept. However, NONE of the current quests (3.3.5a) have this flag. Maybe blizz used to use it, or will use it in the future.
 
@@ -185,25 +185,25 @@ class Quest
         Quest(Field* questRecord);
         uint32 XPValue(Player* player) const;
 
-        bool HasFlag(uint32 flag) const { return (QuestFlags & flag) != 0; }
-        void SetFlag(uint32 flag) { QuestFlags |= flag; }
+        bool HasFlag(uint32 flag) const { return (Flags & flag) != 0; }
+        void SetFlag(uint32 flag) { Flags |= flag; }
 
         // table data accessors:
-        uint32 GetQuestId() const { return QuestId; }
-        uint32 GetQuestMethod() const { return QuestMethod; }
+        uint32 GetQuestId() const { return Id; }
+        uint32 GetQuestMethod() const { return Method; }
         int32  GetZoneOrSort() const { return ZoneOrSort; }
         uint32 GetMinLevel() const { return MinLevel; }
         uint32 GetMaxLevel() const { return MaxLevel; }
-        uint32 GetQuestLevel() const { return QuestLevel; }
+        uint32 GetQuestLevel() const { return Level; }
         uint32 GetType() const { return Type; }
         uint32 GetRequiredClasses() const { return RequiredClasses; }
         uint32 GetRequiredRaces() const { return RequiredRaces; }
-        uint32 GetRequiredSkill() const { return RequiredSkill; }
-        uint32 GetRequiredSkillValue() const { return RequiredSkillValue; }
-        uint32 GetRepObjectiveFaction() const { return RepObjectiveFaction; }
-        int32  GetRepObjectiveValue() const { return RepObjectiveValue; }
-        uint32 GetRepObjectiveFaction2() const { return RepObjectiveFaction2; }
-        int32  GetRepObjectiveValue2() const { return RepObjectiveValue2; }
+        uint32 GetRequiredSkill() const { return RequiredSkillId; }
+        uint32 GetRequiredSkillValue() const { return RequiredSkillPoints; }
+        uint32 GetRepObjectiveFaction() const { return RequiredFactionId1; }
+        int32  GetRepObjectiveValue() const { return RequiredFactionValue1; }
+        uint32 GetRepObjectiveFaction2() const { return RequiredFactionId2; }
+        int32  GetRepObjectiveValue2() const { return RequiredFactionValue2; }
         uint32 GetRequiredMinRepFaction() const { return RequiredMinRepFaction; }
         int32  GetRequiredMinRepValue() const { return RequiredMinRepValue; }
         uint32 GetRequiredMaxRepFaction() const { return RequiredMaxRepFaction; }
@@ -213,15 +213,15 @@ class Quest
         int32  GetPrevQuestId() const { return PrevQuestId; }
         int32  GetNextQuestId() const { return NextQuestId; }
         int32  GetExclusiveGroup() const { return ExclusiveGroup; }
-        uint32 GetNextQuestInChain() const { return NextQuestInChain; }
-        uint32 GetCharTitleId() const { return CharTitleId; }
-        uint32 GetPlayersSlain() const { return PlayersSlain; }
-        uint32 GetBonusTalents() const { return BonusTalents; }
-        int32  GetRewArenaPoints() const {return RewArenaPoints; }
-        uint32 GetXPId() const { return XPId; }
-        uint32 GetSrcItemId() const { return SrcItemId; }
-        uint32 GetSrcItemCount() const { return SrcItemCount; }
-        uint32 GetSrcSpell() const { return SrcSpell; }
+        uint32 GetNextQuestInChain() const { return NextQuestIdChain; }
+        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 GetSrcSpell() const { return SourceSpellid; }
         std::string GetTitle() const { return Title; }
         std::string GetDetails() const { return Details; }
         std::string GetObjectives() const { return Objectives; }
@@ -230,50 +230,50 @@ class Quest
         std::string GetEndText() const { return EndText; }
         std::string GetCompletedText() const { return CompletedText; }
         int32  GetRewOrReqMoney() const;
-        uint32 GetRewHonorAddition() const { return RewHonorAddition; }
-        float GetRewHonorMultiplier() const { return RewHonorMultiplier; }
-        uint32 GetRewMoneyMaxLevel() const { return RewMoneyMaxLevel; }
+        uint32 GetRewHonorAddition() const { return RewardHonor; }
+        float GetRewHonorMultiplier() const { return RewardHonorMultiplier; }
+        uint32 GetRewMoneyMaxLevel() const { return RewardMoneyMaxLevel; }
                                                             // use in XP calculation at client
-        uint32 GetRewSpell() const { return RewSpell; }
-        int32  GetRewSpellCast() const { return RewSpellCast; }
-        uint32 GetRewMailTemplateId() const { return RewMailTemplateId; }
-        uint32 GetRewMailDelaySecs() const { return RewMailDelaySecs; }
+        uint32 GetRewSpell() const { return RewardSpell; }
+        int32  GetRewSpellCast() const { return RewardSpellCast; }
+        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 PointOpt; }
-        uint32 GetIncompleteEmote() const { return IncompleteEmote; }
-        uint32 GetCompleteEmote() const { return CompleteEmote; }
-        uint32 GetQuestStartScript() const { return QuestStartScript; }
-        uint32 GetQuestCompleteScript() const { return QuestCompleteScript; }
-        bool   IsRepeatable() const { return QuestFlags & QUEST_TRINITY_FLAGS_REPEATABLE; }
+        uint32 GetPointOpt() const { return PointOption; }
+        uint32 GetIncompleteEmote() const { return EmoteOnIncomplete; }
+        uint32 GetCompleteEmote() const { return EmoteOnComplete; }
+        uint32 GetQuestStartScript() const { return StartScript; }
+        uint32 GetQuestCompleteScript() const { return CompleteScript; }
+        bool   IsRepeatable() const { return Flags & QUEST_TRINITY_FLAGS_REPEATABLE; }
         bool   IsAutoComplete() const;
-        uint32 GetFlags() const { return QuestFlags; }
-        bool   IsDaily() const { return QuestFlags & QUEST_FLAGS_DAILY; }
-        bool   IsWeekly() const { return QuestFlags & QUEST_FLAGS_WEEKLY; }
-        bool   IsDailyOrWeekly() const { return QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
-        bool   IsAutoAccept() const { return QuestFlags & QUEST_FLAGS_AUTO_ACCEPT; }
+        uint32 GetFlags() const { return Flags; }
+        bool   IsDaily() const { return Flags & QUEST_FLAGS_DAILY; }
+        bool   IsWeekly() const { return Flags & QUEST_FLAGS_WEEKLY; }
+        bool   IsDailyOrWeekly() const { return Flags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
+        bool   IsAutoAccept() const { return Flags & QUEST_FLAGS_AUTO_ACCEPT; }
         bool   IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; }
         bool   IsAllowedInRaid() const;
-        bool   IsDFQuest() const { return QuestFlags & QUEST_TRINITY_FLAGS_DF_QUEST; }
+        bool   IsDFQuest() const { return Flags & QUEST_TRINITY_FLAGS_DF_QUEST; }
         uint32 CalculateHonorGain(uint8 level) const;
 
         // multiple values
         std::string ObjectiveText[QUEST_OBJECTIVES_COUNT];
-        uint32 ReqItemId[QUEST_ITEM_OBJECTIVES_COUNT];
-        uint32 ReqItemCount[QUEST_ITEM_OBJECTIVES_COUNT];
-        uint32 ReqSourceId[QUEST_SOURCE_ITEM_IDS_COUNT];
-        uint32 ReqSourceCount[QUEST_SOURCE_ITEM_IDS_COUNT];
-        int32  ReqCreatureOrGOId[QUEST_OBJECTIVES_COUNT];   // >0 Creature <0 Gameobject
-        uint32 ReqCreatureOrGOCount[QUEST_OBJECTIVES_COUNT];
-        uint32 ReqSpell[QUEST_OBJECTIVES_COUNT];
-        uint32 RewChoiceItemId[QUEST_REWARD_CHOICES_COUNT];
-        uint32 RewChoiceItemCount[QUEST_REWARD_CHOICES_COUNT];
-        uint32 RewItemId[QUEST_REWARDS_COUNT];
-        uint32 RewItemCount[QUEST_REWARDS_COUNT];
-        uint32 RewRepFaction[QUEST_REPUTATIONS_COUNT];
-        int32  RewRepValueId[QUEST_REPUTATIONS_COUNT];
-        int32  RewRepValue[QUEST_REPUTATIONS_COUNT];
+        uint32 RequiredItemId[QUEST_ITEM_OBJECTIVES_COUNT];
+        uint32 RequiredItemCount[QUEST_ITEM_OBJECTIVES_COUNT];
+        uint32 RequiredSourceItemid[QUEST_SOURCE_ITEM_IDS_COUNT];
+        uint32 RequiredSourceItemId[QUEST_SOURCE_ITEM_IDS_COUNT];
+        int32  RequiredNpcOrGo[QUEST_OBJECTIVES_COUNT];   // >0 Creature <0 Gameobject
+        uint32 RequiredNpcOrGoCount[QUEST_OBJECTIVES_COUNT];
+        uint32 RequiredSpellCast[QUEST_OBJECTIVES_COUNT];
+        uint32 RewardChoiceItemId[QUEST_REWARD_CHOICES_COUNT];
+        uint32 RewardChoiceItemCount[QUEST_REWARD_CHOICES_COUNT];
+        uint32 RewardItemId[QUEST_REWARDS_COUNT];
+        uint32 RewardItemIdCount[QUEST_REWARDS_COUNT];
+        uint32 RewardFactionId[QUEST_REPUTATIONS_COUNT];
+        int32  RewardFactionValueId[QUEST_REPUTATIONS_COUNT];
+        int32  RewardFactionValueIdOverride[QUEST_REPUTATIONS_COUNT];
         uint32 DetailsEmote[QUEST_EMOTE_COUNT];
         uint32 DetailsEmoteDelay[QUEST_EMOTE_COUNT];
         uint32 OfferRewardEmote[QUEST_EMOTE_COUNT];
@@ -298,40 +298,40 @@ class Quest
 
         // table data
     protected:
-        uint32 QuestId;
-        uint32 QuestMethod;
+        uint32 Id;
+        uint32 Method;
         int32  ZoneOrSort;
         uint32 MinLevel;
         uint32 MaxLevel;
-        int32  QuestLevel;
+        int32  Level;
         uint32 Type;
         uint32 RequiredClasses;
         uint32 RequiredRaces;
-        uint32 RequiredSkill;
-        uint32 RequiredSkillValue;
-        uint32 RepObjectiveFaction;
-        int32  RepObjectiveValue;
-        uint32 RepObjectiveFaction2;
-        int32  RepObjectiveValue2;
+        uint32 RequiredSkillId;
+        uint32 RequiredSkillPoints;
+        uint32 RequiredFactionId1;
+        int32  RequiredFactionValue1;
+        uint32 RequiredFactionId2;
+        int32  RequiredFactionValue2;
         uint32 RequiredMinRepFaction;
         int32  RequiredMinRepValue;
         uint32 RequiredMaxRepFaction;
         int32  RequiredMaxRepValue;
         uint32 SuggestedPlayers;
         uint32 LimitTime;
-        uint32 QuestFlags;
-        uint32 CharTitleId;
-        uint32 PlayersSlain;
-        uint32 BonusTalents;
-        int32  RewArenaPoints;
+        uint32 Flags;
+        uint32 RewardTitleId;
+        uint32 RequiredPlayerKills;
+        uint32 RewardTalents;
+        int32  RewardArenaPoints;
         int32  PrevQuestId;
         int32  NextQuestId;
         int32  ExclusiveGroup;
-        uint32 NextQuestInChain;
-        uint32 XPId;
-        uint32 SrcItemId;
-        uint32 SrcItemCount;
-        uint32 SrcSpell;
+        uint32 NextQuestIdChain;
+        uint32 RewardXPId;
+        uint32 SourceItemId;
+        uint32 SourceItemIdCount;
+        uint32 SourceSpellid;
         std::string Title;
         std::string Details;
         std::string Objectives;
@@ -339,22 +339,22 @@ class Quest
         std::string RequestItemsText;
         std::string EndText;
         std::string CompletedText;
-        uint32 RewHonorAddition;
-        float RewHonorMultiplier;
-        int32  RewOrReqMoney;
-        uint32 RewMoneyMaxLevel;
-        uint32 RewSpell;
-        int32  RewSpellCast;
-        uint32 RewMailTemplateId;
-        uint32 RewMailDelaySecs;
+        uint32 RewardHonor;
+        float RewardHonorMultiplier;
+        int32  RewardOrRequiredMoney;
+        uint32 RewardMoneyMaxLevel;
+        uint32 RewardSpell;
+        int32  RewardSpellCast;
+        uint32 RewardMailTemplateId;
+        uint32 RewardMailDelay;
         uint32 PointMapId;
         float  PointX;
         float  PointY;
-        uint32 PointOpt;
-        uint32 IncompleteEmote;
-        uint32 CompleteEmote;
-        uint32 QuestStartScript;
-        uint32 QuestCompleteScript;
+        uint32 PointOption;
+        uint32 EmoteOnIncomplete;
+        uint32 EmoteOnComplete;
+        uint32 StartScript;
+        uint32 CompleteScript;
 };
 
 struct QuestStatusData