SoDOff-Project/sodoff
1
0
Fork 1
mirror of https://github.com/SoDOff-Project/sodoff.git synced 2025-10-11 08:18:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: SoDOff-Project:fb6c935e7e88403aa9f6e14d1384ce88cbbfbe5d
Branches Tags
SoDOff-Project:master
SoDOff-Project:bugfixes
SoDOff-Project:importexport
SoDOff-Project:async
SoDOff-Project:dotnet9
SoDOff-Project:mmo_auth_update
..
compare: SoDOff-Project:1a6db72d7a542c424f16d93b8f68f40ab5ea23de
Branches Tags
SoDOff-Project:master
SoDOff-Project:bugfixes
SoDOff-Project:importexport
SoDOff-Project:async
SoDOff-Project:dotnet9
SoDOff-Project:mmo_auth_update

No commits in common. "fb6c935e7e88403aa9f6e14d1384ce88cbbfbe5d" and "1a6db72d7a542c424f16d93b8f68f40ab5ea23de" have entirely different histories.
fb6c935e7e ... 1a6db72d7a

2 changed files with 3 additions and 8 deletions
Show Stats Expand all files Collapse all files

9
src/Controllers/Common/ContentController.cs
View File

@ -1109,17 +1109,14 @@ public class ContentController : Controller {
foreach (var m in filterV2.MissionPair)
if (m.MissionID != null)
result.Missions.Add(missionService.GetMissionWithProgress((int)m.MissionID, viking.Id, gameVersion));
// TODO: probably should also check for mission based on filterV2.ProductGroupID vs mission.GroupID
} else {
if (filterV2.GetCompletedMission ?? false) {
foreach (var mission in viking.MissionStates.Where(x => x.MissionStatus == MissionStatus.Completed))
result.Missions.Add(missionService.GetMissionWithProgress(mission.MissionId, viking.Id, gameVersion));
} else {
var missionStatesById = viking.MissionStates.Where(x => x.MissionStatus != MissionStatus.Completed).ToDictionary(ms => ms.MissionId);
HashSet<int> upcomingMissionIds = new(missionStore.GetUpcomingMissions(gameVersion));
var combinedMissionIds = new HashSet<int>(missionStatesById.Keys);
combinedMissionIds.UnionWith(upcomingMissionIds);
foreach (var missionId in combinedMissionIds)
result.Missions.Add(missionService.GetMissionWithProgress(missionId, viking.Id, gameVersion));
foreach (var mission in viking.MissionStates.Where(x => x.MissionStatus != MissionStatus.Completed))
result.Missions.Add(missionService.GetMissionWithProgress(mission.MissionId, viking.Id, gameVersion));
}
}

2
src/sodoff.csproj
View File

@ -8,8 +8,6 @@
<DefineConstants>USE_SQLITE;$(DefineConstants)</DefineConstants>
<DefineConstants>USE_POSTGRESQL;$(DefineConstants)</DefineConstants>
<DefineConstants>USE_MYSQL;$(DefineConstants)</DefineConstants>
<NoWarn>8600,8601,8602,8603,8604,8618,8625,8629</NoWarn>
</PropertyGroup>
<ItemGroup>