FIx mana circles not respecting the grow material period (#316)

SapiensAnatis · Jul 23, 2023 · 5f99cc2 · 5f99cc2
1 parent 9694a1f
commit 5f99cc2
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 121 deletions.
diff --git a/DragaliaAPI.Shared.Test/Unit/MasterAssetTest.cs b/DragaliaAPI.Shared.Test/Unit/MasterAssetTest.cs
@@ -64,6 +64,8 @@ public void CharaData_Get_ReturnsExpectedProperties()
                     AwakeNeedEntityType5: EntityTypes.Dew,
                     AwakeNeedEntityId5: 0,
                     AwakeNeedEntityQuantity5: 25000,
+                    GrowMaterialOnlyStartDate: DateTimeOffset.UnixEpoch,
+                    GrowMaterialOnlyEndDate: DateTimeOffset.UnixEpoch,
                     UniqueGrowMaterialId1: Materials.GalaLaxisConviction,
                     UniqueGrowMaterialId2: Materials.GalaLaxisDevotion,
                     GrowMaterialId: Materials.Empty,
@@ -105,6 +107,7 @@ public void CharaData_GetManaNode_ReturnsNode()
                     UniqueGrowMaterialCount2: 0,
                     GrowMaterialCount: 1,
                     MC_0: 4032,
+                    Step: 1,
                     ManaCircleName: "MC_0403"
                 )
             );
@@ -212,6 +215,7 @@ public void ManaNode_Get_ReturnsExpectedProperties()
                     UniqueGrowMaterialCount2: 0,
                     GrowMaterialCount: 1,
                     MC_0: 5045,
+                    Step: 3,
                     ManaCircleName: "MC_0504"
                 )
             );

diff --git a/DragaliaAPI.Shared/MasterAsset/Models/CharaData.cs b/DragaliaAPI.Shared/MasterAsset/Models/CharaData.cs
@@ -56,6 +56,10 @@ public record CharaData(
     Materials UniqueGrowMaterialId1,
     Materials UniqueGrowMaterialId2,
     Materials GrowMaterialId,
+    [property: JsonConverter(typeof(MasterAssetDateTimeOffsetConverter))]
+        DateTimeOffset GrowMaterialOnlyStartDate,
+    [property: JsonConverter(typeof(MasterAssetDateTimeOffsetConverter))]
+        DateTimeOffset GrowMaterialOnlyEndDate,
     int DefaultAbility1Level,
     int DefaultAbility2Level,
     int DefaultAbility3Level,

diff --git a/DragaliaAPI.Shared/MasterAsset/Models/ManaCircle/ManaNode.cs b/DragaliaAPI.Shared/MasterAsset/Models/ManaCircle/ManaNode.cs
@@ -11,5 +11,6 @@ public record ManaNode(
     int UniqueGrowMaterialCount2,
     int GrowMaterialCount,
     [property: JsonPropertyName("MC_0")] int MC_0,
-    string ManaCircleName
+    string ManaCircleName,
+    int Step
 );