diff --git a/Source/Framework/Constants/ItemConst.cs b/Source/Framework/Constants/ItemConst.cs index e0e625934..c250cea27 100644 --- a/Source/Framework/Constants/ItemConst.cs +++ b/Source/Framework/Constants/ItemConst.cs @@ -1141,6 +1141,9 @@ namespace Framework.Constants NoSalvage = 0x800000, Recraftable = 0x1000000, CcTrinket = 0x2000000, + KeepThroughFactionChange = 0x4000000, + NotMulticraftable = 0x8000000, + DontReportLootLogToSelf = 0x10000000, } [Flags] diff --git a/Source/Framework/Constants/QuestConst.cs b/Source/Framework/Constants/QuestConst.cs index ee65d409f..ec5ff18f8 100644 --- a/Source/Framework/Constants/QuestConst.cs +++ b/Source/Framework/Constants/QuestConst.cs @@ -40,7 +40,9 @@ namespace Framework.Constants HideCreditMsg = 0x10, // Skip Showing Item Objective Progress PreserveQuestItems = 0x20, PartOfProgressBar = 0x40, // Hidden Objective Used To Calculate Progress Bar Percent (Quests Are Limited To A Single Progress Bar Objective) - KillPlayersSameFaction = 0x80 + KillPlayersSameFaction = 0x80, + NoShareProgress = 0x0100, + IgnoreSoulboundItems = 0x0200, } public enum QuestCompleteSpellType @@ -430,12 +432,13 @@ namespace Framework.Constants FutureLegendaryQuest = 0x800000, LegendaryReward = 0x1000000, ImportantQuest = 0x2000000, - ImportantQuestReward = 0x4000000, + ImportantReward = 0x4000000, TrivialImportantQuest = 0x8000000, + FutureImportantQuest = 0x010000000, ImportantQuestRewardCompleteNoPOI = 0x20000000, ImportantQuestRewardCompletePOI = 0x40000000, TrivialJourneyQuest = 0x80000000, - TrivialCovenantCallingQuest = 0x100000000, + FutureJourneyQuest = 0x100000000, } [Flags] @@ -536,7 +539,10 @@ namespace Framework.Constants DisplayTimeRemaining = 0x20000, ClearTaskProgressWhenAbandoned = 0x40000, SuppressGreetingsOnComplete = 0x80000, - HideRequiredItemsOnTurnIn = 0x100000 + HideRequiredItemsOnTurnIn = 0x100000, + IgnoreSoulboundItems = 0x00200000, + DontDeferStartEffects = 0x00400000, + HideRequiredItemsPreTurnIn = 0x00800000, } public enum QuestSpecialFlags diff --git a/Source/Game/Entities/Player/Player.Quest.cs b/Source/Game/Entities/Player/Player.Quest.cs index a18671bf9..3c89ffbbf 100644 --- a/Source/Game/Entities/Player/Player.Quest.cs +++ b/Source/Game/Entities/Player/Player.Quest.cs @@ -2074,7 +2074,7 @@ namespace Game.Entities break; case QuestStatus.Incomplete: if (quest.IsImportant()) - result |= QuestGiverStatus.ImportantQuestReward; + result |= QuestGiverStatus.ImportantReward; else if (quest.GetQuestTag() == QuestTagType.CovenantCalling) result |= QuestGiverStatus.CovenantCallingReward; else if (quest.HasFlagEx(QuestFlagsEx.Legendary)) @@ -2114,7 +2114,7 @@ namespace Game.Entities if (quest.IsImportant()) result |= isTrivial ? QuestGiverStatus.TrivialImportantQuest : QuestGiverStatus.ImportantQuest; else if (quest.GetQuestTag() == QuestTagType.CovenantCalling) - result |= isTrivial ? QuestGiverStatus.TrivialCovenantCallingQuest : QuestGiverStatus.CovenantCallingQuest; + result |= QuestGiverStatus.CovenantCallingQuest; else if (quest.HasFlagEx(QuestFlagsEx.Legendary)) result |= isTrivial ? QuestGiverStatus.TrivialLegendaryQuest : QuestGiverStatus.LegendaryQuest; else if (quest.IsDaily()) @@ -2122,6 +2122,8 @@ namespace Game.Entities else result |= isTrivial ? QuestGiverStatus.Trivial : QuestGiverStatus.Quest; } + else if (quest.IsImportant()) + result |= QuestGiverStatus.FutureImportantQuest; else if (quest.HasFlagEx(QuestFlagsEx.Legendary)) result |= QuestGiverStatus.FutureLegendaryQuest; else