sync with upstreaom #2

Open
goatzone wants to merge 541 commits from liza/Questionable:master into master
Showing only changes of commit 459b832ef2 - Show all commits

View File

@ -450,14 +450,19 @@ internal sealed unsafe class QuestFunctions
if (IsQuestAccepted(questId))
return false;
if (quest.Info.AlliedSociety != EAlliedSociety.None)
if (questId is QuestId qId && IsDailyAlliedSocietyQuest(qId))
{
if (QuestManager.Instance()->IsDailyQuestCompleted(questId.Value))
return false;
}
if (IsQuestComplete(questId))
return false;
if (!IsDailyAlliedSocietyQuestAndAvailableToday(qId))
return false;
}
else
{
if (IsQuestComplete(questId))
return false;
}
}
else
{