From 780899e1d1f659fa5dee6ea6885990706487c9ec Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 20 Sep 2017 00:28:57 -0400 Subject: [PATCH] Sync QuestFlags with WPP --- Framework/Constants/QuestConst.cs | 22 ++++++++++++++-------- Game/Entities/Player/Player.Quest.cs | 2 +- Game/Entities/Unit/Unit.cs | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Framework/Constants/QuestConst.cs b/Framework/Constants/QuestConst.cs index f6d02eb2f..575759d45 100644 --- a/Framework/Constants/QuestConst.cs +++ b/Framework/Constants/QuestConst.cs @@ -246,7 +246,7 @@ namespace Framework.Constants } [Flags] - public enum QuestFlags + public enum QuestFlags : uint { None = 0x00, StayAlive = 0x01, // Not Used Currently @@ -268,13 +268,19 @@ namespace Framework.Constants AutoComplete = 0x10000, // Quests with this flag player submit automatically by special button in player gui DisplayItemInTracker = 0x20000, // Displays Usable Item In Quest Tracker ObjText = 0x40000, // Use Objective Text As Complete Text - AutoAccept = 0x80000, // 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. - Unk1 = 0x100000, // - AutoTake = 0x200000, // Automatically Suggestion Of Accepting Quest. Not From Npc. - //Unk2 = 0x400000, - //Unk3 = 0x800000, // Found In Quest 14069 - //Unk4 = 0x1000000, - // ... 4.X Added Flags Up To 0x80000000 - All Unknown For Now + AutoAccept = 0x80000, // The client recognizes this flag as auto-accept. + PlayerCastOnAccept = 0x100000, + PlayerCastOnComplete = 0x200000, + UpdatePhaseShift = 0x400000, + SorWhitelist = 0x800000, + LaunchGossipComplete = 0x1000000, + RemoveExtraGetItems = 0x2000000, + HideUntilDiscovered = 0x4000000, + PortraitInQuestLog = 0x8000000, + ShowItemWhenCompleted = 0x10000000, + LaunchGossipAccept = 0x20000000, + ItemsGlowWhenDone = 0x40000000, + FailOnLogout = 0x80000000 } // last checked in 19802 diff --git a/Game/Entities/Player/Player.Quest.cs b/Game/Entities/Player/Player.Quest.cs index 3cbcb07ec..b9b283ffd 100644 --- a/Game/Entities/Player/Player.Quest.cs +++ b/Game/Entities/Player/Player.Quest.cs @@ -337,7 +337,7 @@ namespace Game.Entities switch (guid.GetHigh()) { case HighGuid.Player: - Contract.Assert(quest.HasFlag(QuestFlags.Unk1)); + Contract.Assert(quest.HasFlag(QuestFlags.AutoComplete)); return Global.ObjectMgr.GetQuestTemplate(nextQuestID); case HighGuid.Creature: case HighGuid.Pet: diff --git a/Game/Entities/Unit/Unit.cs b/Game/Entities/Unit/Unit.cs index 46106de9a..e984c0465 100644 --- a/Game/Entities/Unit/Unit.cs +++ b/Game/Entities/Unit/Unit.cs @@ -2207,7 +2207,7 @@ namespace Game.Entities return Global.ObjAccessor.GetUnit(this, charmerid); return null; } - Unit GetCharmerOrOwnerOrSelf() + public Unit GetCharmerOrOwnerOrSelf() { Unit u = GetCharmerOrOwner(); if (u != null)