Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIx mana circles not respecting the grow material period #316

Merged
merged 3 commits into from
Jul 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions DragaliaAPI.Shared.Test/Unit/MasterAssetTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -105,6 +107,7 @@ public void CharaData_GetManaNode_ReturnsNode()
UniqueGrowMaterialCount2: 0,
GrowMaterialCount: 1,
MC_0: 4032,
Step: 1,
ManaCircleName: "MC_0403"
)
);
Expand Down Expand Up @@ -212,6 +215,7 @@ public void ManaNode_Get_ReturnsExpectedProperties()
UniqueGrowMaterialCount2: 0,
GrowMaterialCount: 1,
MC_0: 5045,
Step: 3,
ManaCircleName: "MC_0504"
)
);
Expand Down
4 changes: 4 additions & 0 deletions DragaliaAPI.Shared/MasterAsset/Models/CharaData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion DragaliaAPI.Shared/MasterAsset/Models/ManaCircle/ManaNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ public record ManaNode(
int UniqueGrowMaterialCount2,
int GrowMaterialCount,
[property: JsonPropertyName("MC_0")] int MC_0,
string ManaCircleName
string ManaCircleName,
int Step
);
Loading
Loading