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

Core/Quests: Un-deprecate QUEST_SPECIAL_FLAGS_EXPLORATION_OR_EVENT

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3ad389efee4a24e2f94c9eb39aeddf83d320eaf0)
This commit is contained in:
hondacrx
2021-05-11 12:55:00 -04:00
parent 5915e1a9a0
commit a762465675
6 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.DB.cs
+5 -2
View File
@@ -692,7 +692,9 @@ namespace Game.Entities
GetName(), GetGUID().ToString(), quest_id, qstatus);
}
long quest_time = result.Read<long>(2);
questStatusData.Explored = (result.Read<byte>(2) > 0);
long quest_time = result.Read<long>(3);
if (quest.LimitTime != 0 && !GetQuestRewardStatus(quest_id))
{
@@ -1948,7 +1950,8 @@ namespace Game.Entities
stmt.AddValue(0, GetGUID().GetCounter());
stmt.AddValue(1, save.Key);
stmt.AddValue(2, (byte)data.Status);
stmt.AddValue(3, data.Timer / Time.InMilliseconds + GameTime.GetGameTime());
stmt.AddValue(3, data.Explored);
stmt.AddValue(4, data.Timer / Time.InMilliseconds + GameTime.GetGameTime());
trans.Append(stmt);
// Save objectives
Source/Game/Entities/Player/Player.Quest.cs
+17 -21
View File
@@ -494,6 +494,9 @@ namespace Game.Entities
}
}
if (qInfo.HasSpecialFlag(QuestSpecialFlags.ExplorationOrEvent) && !q_status.Explored)
return false;
if (qInfo.LimitTime != 0 && q_status.Timer == 0)
return false;
@@ -741,7 +744,9 @@ namespace Game.Entities
QuestStatus oldStatus = questStatusData.Status;
// check for repeatable quests status reset
questStatusData.Slot = log_slot;
questStatusData.Status = QuestStatus.Incomplete;
questStatusData.Explored = false;
GiveQuestSourceItem(quest);
AdjustQuestObjectiveProgress(quest);
@@ -800,7 +805,6 @@ namespace Game.Entities
caster.CastSpell(this, spellInfo.Id, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetCastDifficulty(spellInfo.Difficulty));
}
questStatusData.Slot = log_slot;
SetQuestSlot(log_slot, quest_id, qtime);
m_QuestStatusSave[quest_id] = QuestSaveType.Default;
@@ -2127,25 +2131,17 @@ namespace Game.Entities
{
if (questId != 0)
{
ushort log_slot = FindQuestSlot(questId);
if (log_slot < SharedConst.MaxQuestLogSize)
QuestStatusData status = m_QuestStatus.LookupByKey(questId);
if (status != null)
{
Log.outError(LogFilter.Player, "Deprecated function AreaExploredOrEventHappens called for quest {0}", questId);
/* @todo
This function was previously used for area triggers but now those are a part of quest objective system
Currently this function is used to complete quests with no objectives (needs verifying) so probably rename it?
QuestStatusData& q_status = m_QuestStatus[questId];
if (!q_status.Explored)
// Dont complete failed quest
if (!status.Explored && status.Status != QuestStatus.Failed)
{
q_status.Explored = true;
m_QuestStatusSave[questId] = QUEST_DEFAULT_SAVE_TYPE;
// if we cannot complete quest send exploration succeded (to mark exploration on client)
if (!CanCompleteQuest(questId))
SendQuestComplete(questId)
}*/
status.Explored = true;
m_QuestStatusSave[questId] = QuestSaveType.Default;
SendQuestComplete(questId);
}
}
if (CanCompleteQuest(questId))
CompleteQuest(questId);
@@ -2618,12 +2614,12 @@ namespace Game.Entities
return false;
}
public void SendQuestComplete(Quest quest)
public void SendQuestComplete(uint questId)
{
if (quest != null)
if (questId != 0)
{
QuestUpdateComplete data = new();
data.QuestID = quest.Id;
data.QuestID = questId;
SendPacket(data);
}
}