Corrected issue regarding the "Only X" buttons

DewGaming · Jun 9, 2024 · 9032596 · 9032596
1 parent 2fd7168
commit 9032596
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Pokedex/Pokedex/Controllers/AjaxController.cs b/Pokedex/Pokedex/Controllers/AjaxController.cs
@@ -596,7 +596,7 @@ public TeamRandomizerViewModel GetPokemonTeam(int pokemonCount, List<int> select
                     }
 
                     pokemonTypeDetails = pokemonTypeDetails.GroupBy(x => new { x.PokemonId }).Select(x => x.LastOrDefault()).ToList();
-                    if (selectedLegendaries.Count() < legendaryTypeCount && !onlyLegendaries)
+                    if (selectedLegendaries.Count() < legendaryTypeCount || onlyLegendaries)
                     {
                         allPokemon = this.FilterLegendaries(allPokemon, selectedLegendaries, onlyLegendaries);
                     }
@@ -606,7 +606,7 @@ public TeamRandomizerViewModel GetPokemonTeam(int pokemonCount, List<int> select
                         allPokemon = this.FilterEvolutions(allPokemon, selectedEvolutions, selectedGame);
                     }
 
-                    if (selectedForms.Count() < 7 && !onlyAltForms)
+                    if (selectedForms.Count() < 7 || onlyAltForms)
                     {
                         allPokemon = this.FilterForms(allPokemon, selectedForms, selectedGame, onlyAltForms, multipleMegas, multipleGMax);
                     }
@@ -3292,7 +3292,7 @@ private List<Pokemon> FilterForms(List<Pokemon> pokemonList, List<string> formLi
                 List<PokemonFormDetail> altFormList = this.dataService.GetObjects<PokemonFormDetail>(includes: "AltFormPokemon, AltFormPokemon.Game, OriginalPokemon, OriginalPokemon.Game, Form");
                 altFormList.ForEach(x => x.AltFormPokemon.Name = string.Concat(x.AltFormPokemon.Name, " (", x.Form.Name, ")"));
 
-                if (formList.Count() != 0)
+                if (formList.Count() != 0 && formList.Count() < 7)
                 {
                     List<PokemonFormDetail> altForm = new List<PokemonFormDetail>();
                     List<Pokemon> allAltForms = new List<Pokemon>();