Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-26 14:45:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unnecessary logic

Browse Source
This commit is contained in:
Kurt
2021-02-01 20:17:17 -08:00
parent 03940b54a5
commit 4e9908a53d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs
View File

@@ -25,7 +25,7 @@ public static CheckResult[] VerifyRelearn(PKM pkm, IEncounterable enc)
};
}
public static IReadOnlyList<int> GetSuggestedRelearn(PKM pkm, IEncounterable enc, CheckResult[] relearn)
public static IReadOnlyList<int> GetSuggestedRelearn(PKM pkm, IEncounterable enc)
{
if (enc.Generation < 6 || (pkm is IBattleVersion {BattleVersion: not 0}))
return Array.Empty<int>();
@@ -34,7 +34,6 @@ public static IReadOnlyList<int> GetSuggestedRelearn(PKM pkm, IEncounterable enc
{
IRelearn s when s.Relearn.Count > 0 => s.Relearn,
EncounterEgg e => MoveList.GetBaseEggMoves(pkm, e.Species, e.Form, e.Version, e.Level),
EncounterSlot6AO z when pkm.RelearnMove1 != 0 && z.CanDexNav => relearn.All(r => r.Valid) ? pkm.RelearnMoves : Array.Empty<int>(),
_ => Array.Empty<int>(),
};
}

2
PKHeX.Core/Legality/MoveListSuggest.cs
View File

@@ -115,7 +115,7 @@ public static IReadOnlyList<int> GetSuggestedRelearnMovesFromEncounter(this Lega
var pkm = analysis.pkm;
var enc = info.EncounterMatch;
var parsed = VerifyRelearnMoves.GetSuggestedRelearn(pkm, enc, info.Relearn);
var parsed = VerifyRelearnMoves.GetSuggestedRelearn(pkm, enc);
if (parsed.Count == 0) // Always true for Origins < 6 and encounters without relearn permitted.
return new int[4];