goatzone/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

sync with upstreaom #2

Open
goatzone wants to merge 545 commits from liza/Questionable:master into master
pull from: liza/Questionable:master
merge into: goatzone:master
Conversation 0 Commits 545 Files Changed 1083 +9 -4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 459b832ef2 - Show all commits

13
Questionable/Functions/QuestFunctions.cs
View File

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