copy from modded grid config if grid key not set

DREDGE-Mods · Sep 14, 2024 · 1c2ac2b · 1c2ac2b
1 parent dc9e284
commit 1c2ac2b
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Winch/Util/QuestUtil.cs b/Winch/Util/QuestUtil.cs
@@ -3,6 +3,7 @@
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using Winch.Core;
+using Winch.Data.GridConfig;
 using Winch.Data.Quest;
 using Winch.Data.Quest.Grid;
 using Winch.Data.Quest.Step;
@@ -410,16 +411,24 @@ internal static void AddQuestGridConfigFromMeta(string metaPath)
         }
         if (PopulateQuestGridConfigFromMetaWithConverter(questGridConfig, meta))
         {
+            questGridConfig.Populate();
+            var gridConfig = questGridConfig.GridConfiguration;
+            if (gridConfig != null)
+            {
+                if (questGridConfig.gridKey != GridKey.NONE)
+                    GameManager.Instance.GameConfigData.gridConfigs.SafeAdd(questGridConfig.gridKey, gridConfig);
+                else if (gridConfig is DeferredGridConfiguration deferredGridConfig)
+                    questGridConfig.gridKey = deferredGridConfig.gridKey;
+            }
+
             if (questGridConfig.isSaved && questGridConfig.gridKey == GridKey.NONE)
             {
                 WinchCore.Log.Error($"Savable quest grid config {id} at {metaPath} failed to load because \"gridKey\" is required");
                 return;
             }
+
             ModdedQuestGridConfigDict.Add(id, questGridConfig);
             AddressablesUtil.AddResourceAtLocation("QuestGridConfig", id, id, questGridConfig);
-            questGridConfig.Populate();
-            if (questGridConfig.gridKey != GridKey.NONE && questGridConfig.GridConfiguration != null)
-                GameManager.Instance.GameConfigData.gridConfigs.SafeAdd(questGridConfig.gridKey, questGridConfig.GridConfiguration);
         }
         else
         {