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

Core/Quests: Implemented quest popups

Browse Source
This commit is contained in:
hondacrx
2017-11-29 18:00:08 -05:00
parent 6b3533141e
commit 7d27eaad1a
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Gossip.cs
+7 -6
View File
@@ -394,7 +394,7 @@ namespace Game.Misc
_session.SendPacket(packet);
}
public void SendQuestGiverQuestDetails(Quest quest, ObjectGuid npcGUID, bool activateAccept)
public void SendQuestGiverQuestDetails(Quest quest, ObjectGuid npcGUID, bool autoLaunched, bool displayPopup)
{
QuestGiverQuestDetails packet = new QuestGiverQuestDetails();
@@ -427,7 +427,8 @@ namespace Game.Misc
packet.QuestID = quest.Id;
packet.PortraitGiver = quest.QuestGiverPortrait;
packet.PortraitTurnIn = quest.QuestTurnInPortrait;
packet.AutoLaunched = activateAccept;
packet.AutoLaunched = autoLaunched;
packet.DisplayPopup = displayPopup;
packet.QuestFlags[0] = (uint)quest.Flags;
packet.QuestFlags[1] = (uint)quest.FlagsEx;
packet.SuggestedPartyMembers = quest.SuggestedPlayers;
@@ -596,7 +597,7 @@ namespace Game.Misc
_session.SendPacket(packet);
}
public void SendQuestGiverOfferReward(Quest quest, ObjectGuid npcGUID, bool enableNext)
public void SendQuestGiverOfferReward(Quest quest, ObjectGuid npcGUID, bool autoLaunched)
{
QuestGiverOfferRewardMessage packet = new QuestGiverOfferRewardMessage();
@@ -636,7 +637,7 @@ namespace Game.Misc
offer.QuestGiverCreatureID = creature.GetCreatureTemplate().Entry;
offer.QuestID = quest.Id;
offer.AutoLaunched = enableNext;
offer.AutoLaunched = autoLaunched;
offer.SuggestedPartyMembers = quest.SuggestedPlayers;
for (uint i = 0; i < SharedConst.QuestEmoteCount && quest.OfferRewardEmote[i] != 0; ++i)
@@ -654,7 +655,7 @@ namespace Game.Misc
_session.SendPacket(packet);
}
public void SendQuestGiverRequestItems(Quest quest, ObjectGuid npcGUID, bool canComplete, bool closeOnCancel)
public void SendQuestGiverRequestItems(Quest quest, ObjectGuid npcGUID, bool canComplete, bool autoLaunched)
{
// We can always call to RequestItems, but this packet only goes out if there are actually
// items. Otherwise, we'll skip straight to the OfferReward
@@ -729,7 +730,7 @@ namespace Game.Misc
}
}
packet.AutoLaunched = closeOnCancel;
packet.AutoLaunched = autoLaunched;
_session.SendPacket(packet);
}
Source/Game/Entities/Player/Player.Quest.cs
+1 -1
View File
@@ -314,7 +314,7 @@ namespace Game.Entities
if (quest.IsAutoComplete() && quest.IsRepeatable() && !quest.IsDailyOrWeekly())
PlayerTalkClass.SendQuestGiverRequestItems(quest, guid, CanCompleteRepeatableQuest(quest), true);
else
PlayerTalkClass.SendQuestGiverQuestDetails(quest, guid, true);
PlayerTalkClass.SendQuestGiverQuestDetails(quest, guid, true, false);
return;
}
}