Moonbase/jumpstart-games-reduxed
1
0
Fork 0
forked from SoDOff-Project/sodoff
Code Issues 1 Pull Requests Projects 1 Activity

fix premature completion of missions

Browse Source
This commit is contained in:
Spirtix 2023-07-10 20:10:51 +02:00
parent 4b2abbfb1e
commit 379b731f61
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Services/MissionService.cs
View File

@ -35,7 +35,7 @@ public class MissionService {
List<MissionCompletedResult> result = new(); List<MissionCompletedResult> result = new();
if (completed) { if (completed) {
Mission mission = GetMissionWithProgress(missionId, userId); Mission mission = GetMissionWithProgress(missionId, userId);
if (AllMissionsCompleted(mission) && AllTasksCompleted(mission)) { if (MissionCompleted(mission)) {
// Get mission rewards // Get mission rewards
result.Add(new MissionCompletedResult { result.Add(new MissionCompletedResult {
MissionID = missionId, MissionID = missionId,
@ -79,7 +79,7 @@ public class MissionService {
} }
} }
if (taskStatuses.Count == mission.Tasks.Count && AllMissionsCompleted(mission)) if (MissionCompleted(mission))
mission.Completed = 1; mission.Completed = 1;
} }
@ -119,11 +119,7 @@ public class MissionService {
ctx.SaveChanges(); ctx.SaveChanges();
} }
private bool AllMissionsCompleted(Mission mission) { private bool MissionCompleted(Mission mission) {
return mission.Missions.FindAll(x => x.Completed == 1).Count == mission.Missions.Count; return mission.MissionRule.Criteria.RuleItems.All(x => x.Complete == 1);
}
private bool AllTasksCompleted(Mission mission) {
return mission.Tasks.FindAll(x => x.Completed == 1).Count == mission.Tasks.Count;
} }
} }