Fix codegen

diff --git a/QuestPathGenerator/QuestSourceGenerator.cs b/QuestPathGenerator/QuestSourceGenerator.cs
index d30a0fa68e72096013477bacdb877f38f6bb9b27..8bb37b7368c2201ed59faf313a4117cf6fa0d2ae 100644 (file)
--- a/QuestPathGenerator/QuestSourceGenerator.cs
+++ b/QuestPathGenerator/QuestSourceGenerator.cs
@@ -141,7 +141,7 @@ public class QuestSourceGenerator : ISourceGenerator
                                                                                         Token(SyntaxKind
                                                                                             .UShortKeyword)),
                                                                                     Token(SyntaxKind.CommaToken),
-                                                                                    IdentifierName("QuestData")
+                                                                                    IdentifierName("QuestRoot")
                                                                                 }))))
                                                             .WithVariables(
                                                                 SingletonSeparatedList(
@@ -169,7 +169,7 @@ public class QuestSourceGenerator : ISourceGenerator
                                                                                                                     SyntaxKind
                                                                                                                         .CommaToken),
                                                                                                                 IdentifierName(
-                                                                                                                    "QuestData")
+                                                                                                                    "QuestRoot")
                                                                                                             }))))
                                                                                     .WithArgumentList(
                                                                                         ArgumentList())

diff --git a/QuestPaths/AssemblyQuestLoader.cs b/QuestPaths/AssemblyQuestLoader.cs
index 9601c4dcb2165d3dcb71811825f6e30243079698..4abfb4c7c20da404d315eb64d7d655240d2826d0 100644 (file)
--- a/QuestPaths/AssemblyQuestLoader.cs
+++ b/QuestPaths/AssemblyQuestLoader.cs
@@ -6,6 +6,6 @@ namespace Questionable.QuestPaths;
 
 public static partial class AssemblyQuestLoader
 {
-    public static IReadOnlyDictionary<ushort, QuestData> GetQuests() => Quests;
+    public static IReadOnlyDictionary<ushort, QuestRoot> GetQuests() => Quests;
 }
 #endif

diff --git a/Questionable/Controller/QuestRegistry.cs b/Questionable/Controller/QuestRegistry.cs
index 779c525828119d393f4c77344ac5d12aed507fdf..89748fbcd96764025187a2ed3f1b1e7938d5c085 100644 (file)
--- a/Questionable/Controller/QuestRegistry.cs
+++ b/Questionable/Controller/QuestRegistry.cs
@@ -37,13 +37,13 @@ internal sealed class QuestRegistry
 #if RELEASE
         _logger.LogInformation("Loading quests from assembly");
 
-        foreach ((ushort questId, QuestData questData) in QuestPaths.AssemblyQuestLoader.GetQuests())
+        foreach ((ushort questId, QuestRoot questRoot) in QuestPaths.AssemblyQuestLoader.GetQuests())
         {
             Quest quest = new()
             {
                 QuestId = questId,
-                Name = string.Empty,
-                Data = questData,
+                Root = questRoot,
+                Info = _questData.GetQuestInfo(questId),
             };
             _quests[questId] = quest;
         }