Start on step events/conditions

DREDGE-Mods · Sep 14, 2024 · 3ead9d6 · 3ead9d6
1 parent 611e111
commit 3ead9d6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/Winch/Data/POI/Dock/CustomDockPOI.cs b/Winch/Data/POI/Dock/CustomDockPOI.cs
@@ -4,7 +4,6 @@
 
 namespace Winch.Data.POI.Dock;
 
-// TODO: actually implement this
 public class CustomDockPOI : CustomPOI
 {
     /// <summary>

diff --git a/Winch/Serialization/DredgeTypeHelpers.cs b/Winch/Serialization/DredgeTypeHelpers.cs
@@ -842,4 +842,28 @@ internal static List<CompletedGridCondition> ParseCompletedGridConditions(JArray
         }
         return parsed;
     }
+
+    //TODO: implement
+    internal static QuestStepCondition ParseQuestStepCondition(JToken questStepCondition) => throw new NotImplementedException();
+    internal static List<QuestStepCondition> ParseQuestStepConditions(JArray o)
+    {
+        var parsed = new List<QuestStepCondition>();
+        foreach (var questStepCondition in o)
+        {
+            parsed.Add(ParseQuestStepCondition(questStepCondition));
+        }
+        return parsed;
+    }
+
+    //TODO: implement
+    internal static QuestStepEvent ParseQuestStepEvent(JToken questStepEvent) => throw new NotImplementedException();
+    internal static List<QuestStepEvent> ParseQuestStepEvents(JArray o)
+    {
+        var parsed = new List<QuestStepEvent>();
+        foreach (var questStepEvent in o)
+        {
+            parsed.Add(ParseQuestStepEvent(questStepEvent));
+        }
+        return parsed;
+    }
 }
diff --git a/Winch/Serialization/Quest/Grid/QuestGridConfigConverter.cs b/Winch/Serialization/Quest/Grid/QuestGridConfigConverter.cs
@@ -31,7 +31,7 @@ public class QuestGridConfigConverter : DredgeTypeConverter<DeferredQuestGridCon
         { "createWithDurabilityValue", new(false, o=> bool.Parse(o.ToString())) },
         { "startingDurabilityProportion", new(0f, o=> float.Parse(o.ToString())) },
         { "gridConfiguration", new(string.Empty, null) },
-        { "presetGrid", new(new SerializableGrid(), o => DredgeTypeHelpers.ParseSerializableGrid(o)) }, //TODO: implement better
+        { "presetGrid", new(new SerializableGrid(), o => DredgeTypeHelpers.ParseSerializableGrid(o)) },
         { "presetGridMode", new(PresetGridMode.NONE, o => DredgeTypeHelpers.GetEnumValue<PresetGridMode>(o)) },
         { "completeConditions", new(new List<CompletedGridCondition>{ new FullCondition() }, o=> DredgeTypeHelpers.ParseCompletedGridConditions((JArray)o)) },
     };

diff --git a/Winch/Serialization/Quest/QuestDataConverter.cs b/Winch/Serialization/Quest/QuestDataConverter.cs
@@ -22,7 +22,7 @@ public class QuestDataConverter : DredgeTypeConverter<DeferredQuestData>
         { "steps", new(new List<string>(), o=>DredgeTypeHelpers.ParseStringList((JArray)o)) },
         { "subquests", new(new List<string>(), o=>DredgeTypeHelpers.ParseStringList((JArray)o)) },
         { "onOfferedQuestStep", new(string.Empty, null) },
-        { "offerConditions", new(new List<QuestStepCondition>(), null) }, //TODO: implement
+        { "offerConditions", new(new List<QuestStepCondition>(), o=>DredgeTypeHelpers.ParseQuestStepConditions((JArray)o)) },
         { "canBeOfferedAutomatically", new(false, o=> bool.Parse(o.ToString())) },
     };
 

diff --git a/Winch/Serialization/Quest/Step/QuestStepDataConverter.cs b/Winch/Serialization/Quest/Step/QuestStepDataConverter.cs
@@ -26,12 +26,12 @@ public class QuestStepDataConverter : DredgeTypeConverter<DeferredQuestStepData>
         { "showAtSpeaker", new(false, o=> bool.Parse(o.ToString())) },
         { "stepSpeaker", new(string.Empty, null) },
         { "yarnRootNode", new(string.Empty, null) },
-        { "showConditions", new(new List<QuestStepCondition>(), null) }, //TODO: implement
+        { "showConditions", new(new List<QuestStepCondition>(), o=>DredgeTypeHelpers.ParseQuestStepConditions((JArray)o)) },
         { "canBeFailed", new(false, o=> bool.Parse(o.ToString())) },
-        { "failureEvents", new(new List<QuestStepEvent>(), null) }, //TODO: implement
+        { "failureEvents", new(new List<QuestStepEvent>(), o=>DredgeTypeHelpers.ParseQuestStepEvents((JArray)o)) },
         { "allowAutomaticCompletion", new(false, o=> bool.Parse(o.ToString())) },
         { "conditionMode", new(ConditionMode.NULL, o => DredgeTypeHelpers.GetEnumValue<ConditionMode>(o)) },
-        { "completeConditions", new(new List<QuestStepCondition>(), null) }, //TODO: implement
+        { "completeConditions", new(new List<QuestStepCondition>(), o=>DredgeTypeHelpers.ParseQuestStepConditions((JArray)o)) },
     };
 
     public QuestStepDataConverter()