Merge pull request #314 from JonathanFeenstra/fix-sorting-and-skipping

[Fix]: Sequential ordering of mod patches
Monitor221hz · Oct 18, 2024 · d8227c6 · d8227c6
2 parents ffa8444 + a03a20f
commit d8227c6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Pandora Behaviour Engine/ViewModels/EngineViewModel.cs b/Pandora Behaviour Engine/ViewModels/EngineViewModel.cs
@@ -170,7 +170,7 @@ public string LogText {
 
  public void SortMods()
  {
- Mods = Mods.OrderBy(m => m.Code == "pandora").OrderBy(m => m.Priority == 0).ThenBy(m => m.Priority).ToList(); 
+ Mods = Mods.OrderBy(m => m.Code == "pandora").ThenBy(m => m.Priority == 0).ThenBy(m => m.Priority).ToList(); 
  }
  private IEnumerable<ModInfoViewModel> SearchModViewModels(string searchText, IEnumerable<ModInfoViewModel> modViewModels)
  {
@@ -251,7 +251,7 @@ public async Task LoadAsync()
 
  modInfoCache = LoadActiveMods(modInfoList);
 
- modInfoList = modInfoList.OrderBy(m => m.Code == "pandora").OrderBy(m => m.Priority == 0).ThenBy(m => m.Priority).ThenBy(m => m.Name).ToList();
+ modInfoList = modInfoList.OrderBy(m => m.Code == "pandora").ThenBy(m => m.Priority == 0).ThenBy(m => m.Priority).ThenBy(m => m.Name).ToList();
 
  foreach (var modInfo in modInfoList)
  {
@@ -384,7 +384,7 @@ private List<IModInfo> AssignModPriorities(List<IModInfo> mods)
  return mods; 
  }
 
- private List<IModInfo> GetActiveModsByPriority() => Mods.Where(m => m.Active).OrderBy(m => m.Code == "pandora").OrderBy(m => m.Priority == 0).ThenBy(m => m.Priority).ToList();
+ private List<IModInfo> GetActiveModsByPriority() => Mods.Where(m => m.Active).OrderBy(m => m.Code == "pandora").ThenBy(m => m.Priority == 0).ThenBy(m => m.Priority).ToList();
  private async void SetEngineConfiguration(object? config)
  {
  if (config == null) { return; }