From 97e802f9fb8e69e608657fe3bd1db11d534b2f65 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@liza.sh>
Date: Mon, 1 Jan 2024 03:59:52 +0100
Subject: [PATCH] Fix missing prev quests

---
 QuestMap/Node.cs   | 15 ++++++++++++---
 QuestMap/Quests.cs |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/QuestMap/Node.cs b/QuestMap/Node.cs
index a73f705..439cce2 100644
--- a/QuestMap/Node.cs
+++ b/QuestMap/Node.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Dalamud.Plugin.Services;
 using Lumina.Excel.GeneratedSheets;
 
 namespace QuestMap {
@@ -101,7 +102,8 @@ namespace QuestMap {
             }
         }
 
-        internal static (List<Node<Quest>>, Dictionary<uint, Node<Quest>>) BuildTree(Dictionary<uint, Quest> layouts) {
+        internal static (List<Node<Quest>>, Dictionary<uint, Node<Quest>>) BuildTree(Dictionary<uint, Quest> layouts,
+            IDataManager dataManager) {
             var lookup = new Dictionary<uint, Node<Quest>>();
             var rootNodes = new List<Node<Quest>>();
             var allNodes = new Dictionary<uint, Node<Quest>>();
@@ -115,7 +117,7 @@ namespace QuestMap {
                     allNodes[item.Key] = ourNode;
                 }
 
-                var previous = item.Value.PreviousQuests().ToList();
+                var previous = item.Value.PreviousQuests(dataManager).ToList();
                 if (previous.Count == 0) {
                     rootNodes.Add(ourNode);
                 } else {
@@ -150,12 +152,19 @@ namespace QuestMap {
             return null;
         }
 
-        internal static IEnumerable<Quest> PreviousQuests(this Quest quest) {
+        internal static IEnumerable<Quest> PreviousQuests(this Quest quest, IDataManager dataManager) {
             foreach (var previous in quest.PreviousQuest) {
                 if (previous != null && previous.Row != 0) {
                     yield return previous.Value!;
                 }
             }
+
+            if (quest.Unknown12 != 0)
+            {
+                var previous = dataManager.GetExcelSheet<Quest>()!.GetRow(quest.Unknown12);
+                if (previous != null)
+                    yield return previous;
+            }
         }
     }
 }
diff --git a/QuestMap/Quests.cs b/QuestMap/Quests.cs
index 9925bf3..0a3b264 100644
--- a/QuestMap/Quests.cs
+++ b/QuestMap/Quests.cs
@@ -112,7 +112,7 @@ namespace QuestMap {
             this.BeastRewards = beastRewards;
             this.JobRewards = jobRewards;
 
-            var (_, nodes) = Node<Quest>.BuildTree(allQuests);
+            var (_, nodes) = Node<Quest>.BuildTree(allQuests, this.Plugin.DataManager);
             this.AllNodes = nodes;
         }