From 10fff124e5c4d649433eab7aa9822327aefbaa39 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 4 Feb 2022 22:19:04 -0800 Subject: [PATCH] Minor clean --- PKHeX.Core/Editing/Saves/BoxManip/BoxManipBase.cs | 4 ++-- PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Editing/Saves/BoxManip/BoxManipBase.cs b/PKHeX.Core/Editing/Saves/BoxManip/BoxManipBase.cs index 926a07893..56156e480 100644 --- a/PKHeX.Core/Editing/Saves/BoxManip/BoxManipBase.cs +++ b/PKHeX.Core/Editing/Saves/BoxManip/BoxManipBase.cs @@ -54,7 +54,7 @@ protected BoxManipBase(BoxManipType type, Func usable) public static readonly IReadOnlyList ClearCommon = new List { new BoxManipClear(BoxManipType.DeleteAll, _ => true), - new BoxManipClear(BoxManipType.DeleteEggs, pk => pk.IsEgg, s => s.Generation >= 2 & s is not SAV8LA), + new BoxManipClear(BoxManipType.DeleteEggs, pk => pk.IsEgg, s => s.Generation >= 2 && s is not SAV8LA), new BoxManipClearComplex(BoxManipType.DeletePastGen, (pk, sav) => pk.Generation != sav.Generation, s => s.Generation >= 4), new BoxManipClearComplex(BoxManipType.DeleteForeign, (pk, sav) => !sav.IsOriginalHandler(pk, pk.Format > 2)), new BoxManipClear(BoxManipType.DeleteUntrained, pk => pk.EVTotal == 0, s => s is not SAV8LA), @@ -66,7 +66,7 @@ protected BoxManipBase(BoxManipType type, Func usable) public static readonly IReadOnlyList ModifyCommon = new List { - new(BoxManipType.ModifyHatchEggs, pk => pk.ForceHatchPKM(), s => s.Generation >= 2 & s is not SAV8LA), + new(BoxManipType.ModifyHatchEggs, pk => pk.ForceHatchPKM(), s => s.Generation >= 2 && s is not SAV8LA), new(BoxManipType.ModifyMaxFriendship, pk => pk.MaximizeFriendship()), new(BoxManipType.ModifyMaxLevel, pk => pk.MaximizeLevel()), new(BoxManipType.ModifyResetMoves, pk => pk.SetMoves(pk.GetMoveSet()), s => s.Generation >= 3), diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs index 9cc772bcc..77fa5583d 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs @@ -211,7 +211,7 @@ private static CheckResult VerifyEncounterEgg8BDSP(PKM pkm) private static CheckResult VerifyEncounterEggLevelLoc(PKM pkm, int eggLevel, ICollection MetLocations) { - return VerifyEncounterEggLevelLoc(pkm, eggLevel, (location, version) => MetLocations.Contains(location)); + return VerifyEncounterEggLevelLoc(pkm, eggLevel, (location, _) => MetLocations.Contains(location)); } // (hatch location, hatch version, bool result)