From 0fe42a1db3645311f8c4ea5fc1bc84da3bff7ef0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 14 Sep 2019 11:48:07 -0700 Subject: [PATCH] Minor tweaks no functional change --- PKHeX.Core/Editing/Bulk/BatchEditing.cs | 2 +- PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs | 8 ++++---- PKHeX.Core/Legality/Checks.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PKHeX.Core/Editing/Bulk/BatchEditing.cs b/PKHeX.Core/Editing/Bulk/BatchEditing.cs index 97823e9dd..ecbad975e 100644 --- a/PKHeX.Core/Editing/Bulk/BatchEditing.cs +++ b/PKHeX.Core/Editing/Bulk/BatchEditing.cs @@ -93,7 +93,7 @@ public static string GetPropertyType(string propertyName, int typeIndex = 0) return null; } - int index = typeIndex -1 >= Props.Length ? 0 : typeIndex - 1; // All vs Specific + int index = typeIndex - 1 >= Props.Length ? 0 : typeIndex - 1; // All vs Specific var pr = Props[index]; if (!pr.TryGetValue(propertyName, out var info)) return null; diff --git a/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs b/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs index 4c8367044..5ae6c45cc 100644 --- a/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs +++ b/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs @@ -40,13 +40,13 @@ private static IEnumerable GetFilteredSpecies(IGameValueLimit sav, Ga if (HaX) return source.SpeciesDataSource.Where(s => s.Value <= sav.MaxSpeciesID); - // Games cannot acquire every Species that exists. Some can only acquire a subset. + // Some games cannot acquire every Species that exists. Some can only acquire a subset. switch (sav) { case SAV7b _: // LGPE: Kanto 151, Meltan/Melmetal - return source.SpeciesDataSource.Where(s => s.Value <= sav.MaxSpeciesID - && (s.Value <= (int)Core.Species.Mew || s.Value >= (int)Core.Species.Meltan)); - + return source.SpeciesDataSource.Where(s => s.Value <= (int)Core.Species.Mew + || s.Value == (int)Core.Species.Meltan + || s.Value == (int)Core.Species.Melmetal); default: return source.SpeciesDataSource.Where(s => s.Value <= sav.MaxSpeciesID); } diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs index 343a8985c..42e28ab09 100644 --- a/PKHeX.Core/Legality/Checks.cs +++ b/PKHeX.Core/Legality/Checks.cs @@ -32,6 +32,6 @@ public partial class LegalityAnalysis public static string[] MoveStrings { internal get; set; } = Util.GetMovesList("en"); public static string[] SpeciesStrings { internal get; set; } = Util.GetSpeciesList("en"); - internal static IEnumerable GetMoveNames(IEnumerable moves) => moves.Select(m => m >= MoveStrings.Length ? L_AError : MoveStrings[m]); + internal static IEnumerable GetMoveNames(IEnumerable moves) => moves.Select(m => (uint)m >= MoveStrings.Length ? L_AError : MoveStrings[m]); } }