Skip to content
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
7 changes: 5 additions & 2 deletions src/Helldivers-2-Core/Mapping/V1/AssignmentMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private Assignment MapToV1(Dictionary<string, Models.ArrowHead.Assignment> trans
Description: LocalizedMessage.FromStrings(descriptions),
Tasks: invariant.Setting.Tasks.Select(MapToV1).ToList(),
Reward: MapToV1(invariant.Setting.Reward),
Rewards: invariant.Setting.Rewards.Select(MapToV1).ToList(),
Rewards: invariant.Setting.Rewards.Select(MapToV1).Where(reward => reward is not null).ToList()!,
Expiration: expiration,
Flags: invariant.Setting.Flags
);
Expand All @@ -69,8 +69,11 @@ private Task MapToV1(Models.ArrowHead.Assignments.Task task)
);
}

private Reward MapToV1(Models.ArrowHead.Assignments.Reward reward)
private Reward? MapToV1(Models.ArrowHead.Assignments.Reward? reward)
{
if (reward is null)
return null;

return new Reward(
Type: reward.Type,
Amount: reward.Amount
Expand Down
4 changes: 2 additions & 2 deletions src/Helldivers-2-Models/ArrowHead/Assignments/Setting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public sealed record Setting(
string OverrideBrief,
string TaskDescription,
List<Task> Tasks,
Reward Reward,
List<Reward> Rewards,
Reward? Reward,
List<Reward?> Rewards,
int Flags
);
2 changes: 1 addition & 1 deletion src/Helldivers-2-Models/V1/Assignment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public sealed record Assignment(
LocalizedMessage Briefing,
LocalizedMessage Description,
List<Task> Tasks,
Reward Reward,
Reward? Reward,
List<Reward> Rewards,
DateTime Expiration,
int Flags
Expand Down