sync with upstreaom #2

Open
goatzone wants to merge 610 commits from liza/Questionable:master into master
Showing only changes of commit 69e05722c8 - Show all commits

View File

@ -60,8 +60,7 @@ internal sealed class QuestInfo : IQuestInfo
_ => quest.JournalGenre.ValueNullable?.RowId, _ => quest.JournalGenre.ValueNullable?.RowId,
}; };
SortKey = quest.SortKey; SortKey = quest.SortKey;
IsMainScenarioQuest = quest.JournalGenre.ValueNullable?.JournalCategory.ValueNullable?.JournalSection IsMainScenarioQuest = quest.JournalGenre.ValueNullable?.Icon == 61412;
.ValueNullable?.RowId is 0 or 1;
CompletesInstantly = quest.TodoParams[0].ToDoCompleteSeq == 0; CompletesInstantly = quest.TodoParams[0].ToDoCompleteSeq == 0;
PreviousInstanceContent = quest.InstanceContent.Select(x => (ushort)x.RowId).Where(x => x != 0).ToList(); PreviousInstanceContent = quest.InstanceContent.Select(x => (ushort)x.RowId).Where(x => x != 0).ToList();
PreviousInstanceContentJoin = (EQuestJoin)quest.InstanceContentJoin; PreviousInstanceContentJoin = (EQuestJoin)quest.InstanceContentJoin;