Core/DataStores: Updated to 11.0.0
Port From (https://github.com/TrinityCore/TrinityCore/commit/df511503815b7798c83acbffbb1ce5208f189ce7)
This commit is contained in:
@@ -182,6 +182,7 @@ namespace Game.Achievements
|
||||
case CriteriaType.HighestHealReceived:
|
||||
case CriteriaType.AnyArtifactPowerRankPurchased:
|
||||
case CriteriaType.AzeriteLevelReached:
|
||||
case CriteriaType.ReachRenownLevel:
|
||||
SetCriteriaProgress(criteria, miscValue1, referencePlayer, ProgressType.Highest);
|
||||
break;
|
||||
case CriteriaType.ReachLevel:
|
||||
@@ -3698,6 +3699,40 @@ namespace Game.Achievements
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
case ModifierTreeType.PlayerHasActiveTraitSubTree: // 385
|
||||
{
|
||||
int traitConfigWithSubtree = referencePlayer.m_activePlayerData.TraitConfigs.FindIndexIf(traitConfig =>
|
||||
{
|
||||
if (traitConfig.Type == (int)TraitConfigType.Combat
|
||||
&& (referencePlayer.m_activePlayerData.ActiveCombatTraitConfigID != traitConfig.ID
|
||||
|| !traitConfig.CombatConfigFlags.GetValue().HasAnyFlag((int)TraitCombatConfigFlags.ActiveForSpec)))
|
||||
return false;
|
||||
|
||||
return traitConfig.SubTrees.FindIndexIf(traitSubTree =>
|
||||
{
|
||||
return traitSubTree.TraitSubTreeID == reqValue && traitSubTree.Active != 0;
|
||||
}) >= 0;
|
||||
});
|
||||
if (traitConfigWithSubtree < 0)
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
case ModifierTreeType.TargetCreatureClassificationEqual: // 389
|
||||
{
|
||||
Creature targetCreature = refe?.ToCreature();
|
||||
if (targetCreature == null)
|
||||
return false;
|
||||
if (targetCreature.GetCreatureClassification() != (CreatureClassifications)reqValue)
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
case ModifierTreeType.PlayerHasCompletedQuestOrIsReadyToTurnIn: // 392
|
||||
{
|
||||
QuestStatus status = referencePlayer.GetQuestStatus(reqValue);
|
||||
if (status != QuestStatus.Complete && status != QuestStatus.Rewarded)
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user