Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Gossip: Track started interaction types and reset only questgiver on quest accept

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/c02e311eef9e635738b9e48559d5455ef016d8b4)
This commit is contained in:
Hondacrx
2025-08-19 21:29:25 -04:00
parent bd71d172da
commit 068c3c7ce5
13 changed files with 176 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Gossip.cs
+41 -12
View File
@@ -207,24 +207,45 @@ namespace Game.Misc
public class InteractionData
{
public ObjectGuid SourceGuid;
public PlayerInteractionType InteractionType;
public bool IsLaunchedByQuest;
ushort _playerChoiceResponseIdentifierGenerator = 0; // not reset between interactions
uint trainerId;
TrainerData trainerData;
PlayerChoiceData playerChoiceData;
public void StartInteraction(ObjectGuid target, PlayerInteractionType type)
{
SourceGuid = target;
InteractionType = type;
IsLaunchedByQuest = false;
switch (type)
{
case PlayerInteractionType.Trainer:
trainerData = new();
break;
case PlayerInteractionType.PlayerChoice:
playerChoiceData = new();
break;
default:
break;
}
}
public bool IsInteractingWith(ObjectGuid target, PlayerInteractionType type) { return SourceGuid == target && InteractionType == type; }
public void Reset()
{
SourceGuid.Clear();
InteractionType = PlayerInteractionType.None;
IsLaunchedByQuest = false;
trainerId = 0;
trainerData = null;
playerChoiceData = null;
}
public uint? GetTrainerId() { return trainerId; }
public void SetTrainerId(uint _trainerId) { trainerId = _trainerId; }
public TrainerData GetTrainer() { return trainerData; }
public PlayerChoiceData GetPlayerChoice() { return playerChoiceData; }
public void SetPlayerChoice(uint choiceId) { playerChoiceData = new PlayerChoiceData(choiceId); }
public ushort AddPlayerChoiceResponse(uint responseId)
{
@@ -250,8 +271,7 @@ namespace Game.Misc
public void SendGossipMenu(uint titleTextId, ObjectGuid objectGUID)
{
_interactionData.Reset();
_interactionData.SourceGuid = objectGUID;
_interactionData.StartInteraction(objectGUID, PlayerInteractionType.Gossip);
GossipMessagePkt packet = new();
packet.GossipGUID = objectGUID;
@@ -362,6 +382,9 @@ namespace Game.Misc
public void SendQuestGiverQuestListMessage(WorldObject questgiver)
{
ObjectGuid guid = questgiver.GetGUID();
GetInteractionData().StartInteraction(guid, PlayerInteractionType.QuestGiver);
Locale localeConstant = _session.GetSessionDbLocaleIndex();
QuestGiverQuestListMessage questList = new();
@@ -429,6 +452,8 @@ namespace Game.Misc
public void SendQuestGiverQuestDetails(Quest quest, ObjectGuid npcGUID, bool autoLaunched, bool displayPopup)
{
GetInteractionData().StartInteraction(npcGUID, PlayerInteractionType.QuestGiver);
QuestGiverQuestDetails packet = new();
packet.QuestTitle = quest.LogTitle;
@@ -532,6 +557,8 @@ namespace Game.Misc
public void SendQuestGiverOfferReward(Quest quest, ObjectGuid npcGUID, bool autoLaunched)
{
GetInteractionData().StartInteraction(npcGUID, PlayerInteractionType.QuestGiver);
QuestGiverOfferRewardMessage packet = new();
packet.QuestTitle = quest.LogTitle;
@@ -616,6 +643,8 @@ namespace Game.Misc
return;
}
GetInteractionData().StartInteraction(npcGUID, PlayerInteractionType.QuestGiver);
QuestGiverRequestItems packet = new();
packet.QuestTitle = quest.LogTitle;
@@ -852,17 +881,17 @@ namespace Game.Misc
public ConditionsReference Conditions;
}
public class TrainerData
{
public uint Id;
}
public class PlayerChoiceData
{
uint _choiceId;
List<Response> _responses = new();
DateTime? _expireTime;
public PlayerChoiceData(uint choiceId)
{
_choiceId = choiceId;
}
public uint? FindIdByClientIdentifier(ushort clientIdentifier)
{
var itr = _responses.Find(p => p.ClientIdentifier == clientIdentifier);