Core: Updated to 10.0.2
Port From (https://github.com/TrinityCore/TrinityCore/commit/e98e1283ea0034baf6be9aa2ffb386eb5582801b)
This commit is contained in:
@@ -197,6 +197,10 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteInt32(Info.Expansion);
|
||||
_worldPacket.WriteInt32(Info.ManagedWorldStateID);
|
||||
_worldPacket.WriteInt32(Info.QuestSessionBonus);
|
||||
_worldPacket.WriteInt32(Info.QuestGiverCreatureID);
|
||||
|
||||
_worldPacket.WriteInt32(Info.ConditionalQuestDescription.Count);
|
||||
_worldPacket.WriteInt32(Info.ConditionalQuestCompletionLog.Count);
|
||||
|
||||
foreach (QuestCompleteDisplaySpell rewardDisplaySpell in Info.RewardDisplaySpell)
|
||||
rewardDisplaySpell.Write(_worldPacket);
|
||||
@@ -243,6 +247,12 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteString(Info.PortraitTurnInText);
|
||||
_worldPacket.WriteString(Info.PortraitTurnInName);
|
||||
_worldPacket.WriteString(Info.QuestCompletionLog);
|
||||
|
||||
foreach (ConditionalQuestText conditionalQuestText in Info.ConditionalQuestDescription)
|
||||
conditionalQuestText.Write(_worldPacket);
|
||||
|
||||
foreach (ConditionalQuestText conditionalQuestText in Info.ConditionalQuestCompletionLog)
|
||||
conditionalQuestText.Write(_worldPacket);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -315,6 +325,8 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteUInt32(PortraitGiverMount);
|
||||
_worldPacket.WriteInt32(PortraitGiverModelSceneID);
|
||||
_worldPacket.WriteUInt32(PortraitTurnIn);
|
||||
_worldPacket.WriteUInt32(QuestGiverCreatureID);
|
||||
_worldPacket.WriteInt32(ConditionalRewardText.Count);
|
||||
|
||||
_worldPacket.WriteBits(QuestTitle.GetByteCount(), 9);
|
||||
_worldPacket.WriteBits(RewardText.GetByteCount(), 12);
|
||||
@@ -322,6 +334,10 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteBits(PortraitGiverName.GetByteCount(), 8);
|
||||
_worldPacket.WriteBits(PortraitTurnInText.GetByteCount(), 10);
|
||||
_worldPacket.WriteBits(PortraitTurnInName.GetByteCount(), 8);
|
||||
_worldPacket.FlushBits();
|
||||
|
||||
foreach (ConditionalQuestText conditionalQuestText in ConditionalRewardText)
|
||||
conditionalQuestText.Write(_worldPacket);
|
||||
|
||||
_worldPacket.WriteString(QuestTitle);
|
||||
_worldPacket.WriteString(RewardText);
|
||||
@@ -335,12 +351,14 @@ namespace Game.Networking.Packets
|
||||
public uint PortraitGiver;
|
||||
public uint PortraitGiverMount;
|
||||
public int PortraitGiverModelSceneID;
|
||||
public uint QuestGiverCreatureID;
|
||||
public string QuestTitle = "";
|
||||
public string RewardText = "";
|
||||
public string PortraitGiverText = "";
|
||||
public string PortraitGiverName = "";
|
||||
public string PortraitTurnInText = "";
|
||||
public string PortraitTurnInName = "";
|
||||
public List<ConditionalQuestText> ConditionalRewardText = new();
|
||||
public QuestGiverOfferReward QuestData;
|
||||
public uint QuestPackageID;
|
||||
}
|
||||
@@ -437,12 +455,15 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteUInt32(PortraitTurnIn);
|
||||
_worldPacket.WriteUInt32(QuestFlags[0]); // Flags
|
||||
_worldPacket.WriteUInt32(QuestFlags[1]); // FlagsEx
|
||||
_worldPacket.WriteUInt32(QuestFlags[2]); // FlagsEx
|
||||
_worldPacket.WriteUInt32(SuggestedPartyMembers);
|
||||
_worldPacket.WriteInt32(LearnSpells.Count);
|
||||
_worldPacket.WriteInt32(DescEmotes.Count);
|
||||
_worldPacket.WriteInt32(Objectives.Count);
|
||||
_worldPacket.WriteInt32(QuestStartItemID);
|
||||
_worldPacket.WriteInt32(QuestSessionBonus);
|
||||
_worldPacket.WriteInt32(QuestGiverCreatureID);
|
||||
_worldPacket.WriteInt32(ConditionalDescriptionText.Count);
|
||||
|
||||
foreach (uint spell in LearnSpells)
|
||||
_worldPacket.WriteUInt32(spell);
|
||||
@@ -483,13 +504,16 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteString(PortraitGiverName);
|
||||
_worldPacket.WriteString(PortraitTurnInText);
|
||||
_worldPacket.WriteString(PortraitTurnInName);
|
||||
|
||||
foreach (ConditionalQuestText conditionalQuestText in ConditionalDescriptionText)
|
||||
conditionalQuestText.Write(_worldPacket);
|
||||
}
|
||||
|
||||
public ObjectGuid QuestGiverGUID;
|
||||
public ObjectGuid InformUnit;
|
||||
public uint QuestID;
|
||||
public int QuestPackageID;
|
||||
public uint[] QuestFlags = new uint[2];
|
||||
public uint[] QuestFlags = new uint[3];
|
||||
public uint SuggestedPartyMembers;
|
||||
public QuestRewards Rewards = new();
|
||||
public List<QuestObjectiveSimple> Objectives = new();
|
||||
@@ -501,6 +525,7 @@ namespace Game.Networking.Packets
|
||||
public int PortraitGiverModelSceneID;
|
||||
public int QuestStartItemID;
|
||||
public int QuestSessionBonus;
|
||||
public int QuestGiverCreatureID;
|
||||
public string PortraitGiverText = "";
|
||||
public string PortraitGiverName = "";
|
||||
public string PortraitTurnInText = "";
|
||||
@@ -508,6 +533,7 @@ namespace Game.Networking.Packets
|
||||
public string QuestTitle = "";
|
||||
public string LogDescription = "";
|
||||
public string DescriptionText = "";
|
||||
public List<ConditionalQuestText> ConditionalDescriptionText = new();
|
||||
public bool DisplayPopup;
|
||||
public bool StartCheat;
|
||||
public bool AutoLaunched;
|
||||
@@ -526,6 +552,7 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteUInt32(CompEmoteType);
|
||||
_worldPacket.WriteUInt32(QuestFlags[0]);
|
||||
_worldPacket.WriteUInt32(QuestFlags[1]);
|
||||
_worldPacket.WriteUInt32(QuestFlags[2]);
|
||||
_worldPacket.WriteUInt32(SuggestPartyMembers);
|
||||
_worldPacket.WriteInt32(MoneyToGet);
|
||||
_worldPacket.WriteInt32(Collect.Count);
|
||||
@@ -547,8 +574,15 @@ namespace Game.Networking.Packets
|
||||
_worldPacket.WriteBit(AutoLaunched);
|
||||
_worldPacket.FlushBits();
|
||||
|
||||
_worldPacket.WriteUInt32(QuestGiverCreatureID);
|
||||
_worldPacket.WriteInt32(ConditionalCompletionText.Count);
|
||||
|
||||
_worldPacket.WriteBits(QuestTitle.GetByteCount(), 9);
|
||||
_worldPacket.WriteBits(CompletionText.GetByteCount(), 12);
|
||||
_worldPacket.FlushBits();
|
||||
|
||||
foreach (ConditionalQuestText conditionalQuestText in ConditionalCompletionText)
|
||||
conditionalQuestText.Write(_worldPacket);
|
||||
|
||||
_worldPacket.WriteString(QuestTitle);
|
||||
_worldPacket.WriteString(CompletionText);
|
||||
@@ -565,9 +599,10 @@ namespace Game.Networking.Packets
|
||||
public List<QuestObjectiveCollect> Collect = new();
|
||||
public List<QuestCurrency> Currency = new();
|
||||
public int StatusFlags;
|
||||
public uint[] QuestFlags = new uint[2];
|
||||
public uint[] QuestFlags = new uint[3];
|
||||
public string QuestTitle = "";
|
||||
public string CompletionText = "";
|
||||
public List<ConditionalQuestText> ConditionalCompletionText = new();
|
||||
}
|
||||
|
||||
public class QuestGiverRequestReward : ClientPacket
|
||||
@@ -937,6 +972,30 @@ namespace Game.Networking.Packets
|
||||
}
|
||||
}
|
||||
|
||||
public class ConditionalQuestText
|
||||
{
|
||||
public int PlayerConditionID;
|
||||
public int QuestGiverCreatureID;
|
||||
public string Text = "";
|
||||
|
||||
public ConditionalQuestText(int playerConditionID, int questGiverCreatureID, string text)
|
||||
{
|
||||
PlayerConditionID = playerConditionID;
|
||||
QuestGiverCreatureID = questGiverCreatureID;
|
||||
Text = text;
|
||||
}
|
||||
|
||||
public void Write(WorldPacket data)
|
||||
{
|
||||
data.WriteInt32(PlayerConditionID);
|
||||
data.WriteInt32(QuestGiverCreatureID);
|
||||
data.WriteBits(Text.GetByteCount(), 12);
|
||||
data.FlushBits();
|
||||
|
||||
data.WriteString(Text);
|
||||
}
|
||||
}
|
||||
|
||||
public class QuestInfo
|
||||
{
|
||||
public QuestInfo()
|
||||
@@ -1008,7 +1067,10 @@ namespace Game.Networking.Packets
|
||||
public int Expansion;
|
||||
public int ManagedWorldStateID;
|
||||
public int QuestSessionBonus;
|
||||
public int QuestGiverCreatureID; // used to select ConditionalQuestText
|
||||
public List<QuestObjective> Objectives = new();
|
||||
public List<ConditionalQuestText> ConditionalQuestDescription = new();
|
||||
public List<ConditionalQuestText> ConditionalQuestCompletionLog = new();
|
||||
public uint[] RewardItems = new uint[SharedConst.QuestRewardItemCount];
|
||||
public uint[] RewardAmount = new uint[SharedConst.QuestRewardItemCount];
|
||||
public int[] ItemDrop = new int[SharedConst.QuestItemDropCount];
|
||||
@@ -1144,6 +1206,7 @@ namespace Game.Networking.Packets
|
||||
data.WriteUInt32(QuestID);
|
||||
data.WriteUInt32(QuestFlags[0]); // Flags
|
||||
data.WriteUInt32(QuestFlags[1]); // FlagsEx
|
||||
data.WriteUInt32(QuestFlags[2]); // FlagsEx2
|
||||
data.WriteUInt32(SuggestedPartyMembers);
|
||||
|
||||
data.WriteInt32(Emotes.Count);
|
||||
@@ -1167,7 +1230,7 @@ namespace Game.Networking.Packets
|
||||
public uint SuggestedPartyMembers = 0;
|
||||
public QuestRewards Rewards = new();
|
||||
public List<QuestDescEmote> Emotes = new();
|
||||
public uint[] QuestFlags = new uint[2]; // Flags and FlagsEx
|
||||
public uint[] QuestFlags = new uint[3]; // Flags and FlagsEx
|
||||
}
|
||||
|
||||
public struct QuestObjectiveSimple
|
||||
|
||||
Reference in New Issue
Block a user