master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
Showing only changes of commit 619b5431d5 - Show all commits

View File

@ -92,17 +92,24 @@ internal sealed class QuestRegistry
foreach ((ElementId questId, QuestRoot questRoot) in AssemblyQuestLoader.GetQuests()) foreach ((ElementId questId, QuestRoot questRoot) in AssemblyQuestLoader.GetQuests())
{ {
var questInfo = _questData.GetQuestInfo(questId); try
if (questInfo is LeveInfo leveInfo)
_leveData.AddQuestSteps(leveInfo, questRoot);
Quest quest = new()
{ {
Id = questId, var questInfo = _questData.GetQuestInfo(questId);
Root = questRoot, if (questInfo is LeveInfo leveInfo)
Info = questInfo, _leveData.AddQuestSteps(leveInfo, questRoot);
Source = Quest.ESource.Assembly, Quest quest = new()
}; {
_quests[quest.Id] = quest; Id = questId,
Root = questRoot,
Info = questInfo,
Source = Quest.ESource.Assembly,
};
_quests[quest.Id] = quest;
}
catch (Exception e)
{
_logger.LogWarning("Not loading unknown quest {QuestId} from assembly: {Message}", questId, e.Message);
}
} }
_logger.LogInformation("Loaded {Count} quests from assembly", _quests.Count); _logger.LogInformation("Loaded {Count} quests from assembly", _quests.Count);