Core/Quests: Add new field RequiredClasses for quest_template Credits to
NoFantasy. * SkillOrClass is converted to RequiredSkill (and then field can contain skill id only) * Field ZoneOrSort has no longer a function in quest requirement, and RequiredClasses must be used instead where class limits are expected. To restrict a quest to one class or more, use bitmask of class in RequiredClasses. RequiredSkill works like before. Signed-off-by: NoFantasy <[email protected]> Signed-off-by: Stalker_Riddick <[email protected]>
This commit is contained in:
Stalker_Riddick
@@ -3691,41 +3691,41 @@ void ObjectMgr::LoadQuests()
|
||||
|
||||
mExclusiveQuestGroups.clear();
|
||||
|
||||
// 0 1 2 3 4 5 6 7 8 9
|
||||
QueryResult result = WorldDatabase.Query("SELECT entry, Method, ZoneOrSort, SkillOrClassMask, MinLevel, MaxLevel, QuestLevel, Type, RequiredRaces, RequiredSkillValue, "
|
||||
// 10 11 12 13 14 15 16 17 18 19
|
||||
// 0 1 2 3 4 5 6 7 8 9 10
|
||||
QueryResult result = WorldDatabase.Query("SELECT entry, Method, ZoneOrSort, MinLevel, MaxLevel, QuestLevel, Type, RequiredClasses, RequiredRaces, RequiredSkill, RequiredSkillValue, "
|
||||
// 11 12 13 14 15 16 17 18 19 20
|
||||
"RepObjectiveFaction, RepObjectiveValue, RepObjectiveFaction2, RepObjectiveValue2, RequiredMinRepFaction, RequiredMinRepValue, RequiredMaxRepFaction, RequiredMaxRepValue, SuggestedPlayers, LimitTime, "
|
||||
// 20 21 22 23 24 25 26 27 28 29 30 31 32 33
|
||||
// 21 22 23 24 25 26 27 28 29 30 31 32 33 34
|
||||
"QuestFlags, SpecialFlags, CharTitleId, PlayersSlain, BonusTalents, RewardArenaPoints, PrevQuestId, NextQuestId, ExclusiveGroup, NextQuestInChain, RewXPId, SrcItemId, SrcItemCount, SrcSpell, "
|
||||
// 34 35 36 37 38 39 40 41 42 43 44
|
||||
// 35 36 37 38 39 40 41 42 43 44 45
|
||||
"Title, Details, Objectives, OfferRewardText, RequestItemsText, EndText, CompletedText, ObjectiveText1, ObjectiveText2, ObjectiveText3, ObjectiveText4, "
|
||||
// 45 46 47 48 49 50 51 52 53 54 55 56
|
||||
// 46 47 48 49 50 51 52 53 54 55 56 57
|
||||
"ReqItemId1, ReqItemId2, ReqItemId3, ReqItemId4, ReqItemId5, ReqItemId6, ReqItemCount1, ReqItemCount2, ReqItemCount3, ReqItemCount4, ReqItemCount5, ReqItemCount6, "
|
||||
// 57 58 59 60 61 62 63 64
|
||||
// 58 59 60 61 62 63 64 65
|
||||
"ReqSourceId1, ReqSourceId2, ReqSourceId3, ReqSourceId4, ReqSourceCount1, ReqSourceCount2, ReqSourceCount3, ReqSourceCount4, "
|
||||
// 65 66 67 68 69 70 71 72
|
||||
// 66 67 68 69 70 71 72 73
|
||||
"ReqCreatureOrGOId1, ReqCreatureOrGOId2, ReqCreatureOrGOId3, ReqCreatureOrGOId4, ReqCreatureOrGOCount1, ReqCreatureOrGOCount2, ReqCreatureOrGOCount3, ReqCreatureOrGOCount4, "
|
||||
// 73 74 75 76
|
||||
// 74 75 76 77
|
||||
"ReqSpellCast1, ReqSpellCast2, ReqSpellCast3, ReqSpellCast4, "
|
||||
// 77 78 79 80 81 82
|
||||
// 78 79 80 81 82 83
|
||||
"RewChoiceItemId1, RewChoiceItemId2, RewChoiceItemId3, RewChoiceItemId4, RewChoiceItemId5, RewChoiceItemId6, "
|
||||
// 83 84 85 86 87 88
|
||||
// 84 85 86 87 88 89
|
||||
"RewChoiceItemCount1, RewChoiceItemCount2, RewChoiceItemCount3, RewChoiceItemCount4, RewChoiceItemCount5, RewChoiceItemCount6, "
|
||||
// 89 90 91 92 93 94 95 96
|
||||
// 90 91 92 93 94 95 96 97
|
||||
"RewItemId1, RewItemId2, RewItemId3, RewItemId4, RewItemCount1, RewItemCount2, RewItemCount3, RewItemCount4, "
|
||||
// 97 98 99 100 101 102 103 104 105 106
|
||||
// 98 99 100 101 102 103 104 105 106 107
|
||||
"RewRepFaction1, RewRepFaction2, RewRepFaction3, RewRepFaction4, RewRepFaction5, RewRepValueId1, RewRepValueId2, RewRepValueId3, RewRepValueId4, RewRepValueId5, "
|
||||
// 107 108 109 110 111
|
||||
// 108 109 110 111 112
|
||||
"RewRepValue1, RewRepValue2, RewRepValue3, RewRepValue4, RewRepValue5, "
|
||||
// 112 113 114 115 116 117 118 119 120 121 122 123
|
||||
// 113 114 115 116 117 118 119 120 121 122 123 124
|
||||
"RewHonorAddition, RewHonorMultiplier, RewOrReqMoney, RewMoneyMaxLevel, RewSpell, RewSpellCast, RewMailTemplateId, RewMailDelaySecs, PointMapId, PointX, PointY, PointOpt, "
|
||||
// 124 125 126 127 128 129 130 131
|
||||
// 125 126 127 128 129 130 131 132
|
||||
"DetailsEmote1, DetailsEmote2, DetailsEmote3, DetailsEmote4, DetailsEmoteDelay1, DetailsEmoteDelay2, DetailsEmoteDelay3, DetailsEmoteDelay4, "
|
||||
// 132 133 134 135 136 137
|
||||
// 133 134 135 136 137 138
|
||||
"IncompleteEmote, CompleteEmote, OfferRewardEmote1, OfferRewardEmote2, OfferRewardEmote3, OfferRewardEmote4, "
|
||||
// 138 139 140 141
|
||||
// 139 140 141 142
|
||||
"OfferRewardEmoteDelay1, OfferRewardEmoteDelay2, OfferRewardEmoteDelay3, OfferRewardEmoteDelay4, "
|
||||
// 142 143
|
||||
// 143 144
|
||||
"StartScript, CompleteScript"
|
||||
" FROM quest_template");
|
||||
if (!result)
|
||||
@@ -3829,45 +3829,43 @@ void ObjectMgr::LoadQuests()
|
||||
qinfo->GetQuestId(), qinfo->ZoneOrSort);
|
||||
// no changes, quest not dependent from this value but can have problems at client (note some may be 0, we must allow this so no check)
|
||||
}
|
||||
//check SkillOrClass value (class case).
|
||||
if (ClassByQuestSort(-int32(qinfo->ZoneOrSort)))
|
||||
{
|
||||
// SkillOrClass should not have class case when class case already set in ZoneOrSort.
|
||||
if (qinfo->SkillOrClassMask < 0)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `ZoneOrSort` = %i (class sort case) and `SkillOrClassMask` = %i (class case), redundant.",
|
||||
qinfo->GetQuestId(), qinfo->ZoneOrSort, qinfo->SkillOrClassMask);
|
||||
}
|
||||
}
|
||||
//check for proper SkillOrClass value (skill case)
|
||||
//check for proper RequiredSkill value (skill case)
|
||||
if (int32 skill_id = SkillByQuestSort(-int32(qinfo->ZoneOrSort)))
|
||||
{
|
||||
// skill is positive value in SkillOrClass
|
||||
if (qinfo->SkillOrClassMask != skill_id)
|
||||
if (qinfo->RequiredSkill != skill_id)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `ZoneOrSort` = %i (skill sort case) but `SkillOrClassMask` does not have a corresponding value (%i).",
|
||||
sLog->outErrorDb("Quest %u has `ZoneOrSort` = %i but `RequiredSkill` does not have a corresponding value (%i).",
|
||||
qinfo->GetQuestId(), qinfo->ZoneOrSort, skill_id);
|
||||
//override, and force proper value here?
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// SkillOrClassMask (class case)
|
||||
if (qinfo->SkillOrClassMask < 0)
|
||||
// RequiredClasses, can be 0/CLASSMASK_ALL_PLAYABLE to allow any class
|
||||
if (qinfo->RequiredClasses)
|
||||
{
|
||||
if (!(-int32(qinfo->SkillOrClassMask) & CLASSMASK_ALL_PLAYABLE))
|
||||
if (!(qinfo->RequiredClasses & CLASSMASK_ALL_PLAYABLE))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `SkillOrClassMask` = %i (class case) but classmask does not have valid class",
|
||||
qinfo->GetQuestId(), qinfo->SkillOrClassMask);
|
||||
sLog->outErrorDb("Quest %u does not contain any playable classes in `RequiredClasses` (%u), value set to 0 (all classes).", qinfo->GetQuestId(), qinfo->RequiredClasses);
|
||||
qinfo->RequiredClasses = 0;
|
||||
}
|
||||
}
|
||||
// SkillOrClassMask (skill case)
|
||||
if (qinfo->SkillOrClassMask > 0)
|
||||
{
|
||||
if (!sSkillLineStore.LookupEntry(qinfo->SkillOrClassMask))
|
||||
// RequiredRaces, can be 0/RACEMASK_ALL_PLAYABLE to allow any race
|
||||
if (qinfo->RequiredRaces)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `SkillOrClass` = %u (skill case) but skill (%i) does not exist",
|
||||
qinfo->GetQuestId(), qinfo->SkillOrClassMask, qinfo->SkillOrClassMask);
|
||||
if (!(qinfo->RequiredRaces & 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;
|
||||
}
|
||||
}
|
||||
// RequiredSkill, can be 0
|
||||
if (qinfo->RequiredSkill)
|
||||
{
|
||||
if (!sSkillLineStore.LookupEntry(qinfo->RequiredSkill))
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RequiredSkill` = %u but this skill does not exist",
|
||||
qinfo->GetQuestId(), qinfo->RequiredSkill);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3879,13 +3877,6 @@ void ObjectMgr::LoadQuests()
|
||||
qinfo->GetQuestId(), qinfo->RequiredSkillValue, sWorld->GetConfigMaxSkillValue());
|
||||
// no changes, quest can't be done for this requirement
|
||||
}
|
||||
|
||||
if (qinfo->SkillOrClassMask <= 0)
|
||||
{
|
||||
sLog->outErrorDb("Quest %u has `RequiredSkillValue` = %u but `SkillOrClass` = %i (class case), value ignored.",
|
||||
qinfo->GetQuestId(), qinfo->RequiredSkillValue, qinfo->SkillOrClassMask);
|
||||
// no changes, quest can't be done for this requirement (fail at wrong skill id)
|
||||
}
|
||||
}
|
||||
// else Skill quests can have 0 skill level, this is ok
|
||||
|
||||
|
||||
Reference in New Issue
Block a user