Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-11 03:36:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further relearn tweaks

Browse Source
This commit is contained in:
Kaphotics
2016-03-12 14:07:57 -08:00
parent cc9cee5d1a
commit 74f02eb16f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Legality/Checks.cs
View File

@@ -237,13 +237,18 @@ public static LegalityCheck[] verifyRelearn(PK6 pk6)
int gameSource = !checkAllGames ? -1 : i % iterate / (splitBreed ? 2 : 1);
int skipOption = splitBreed && iterate / 2 <= i ? 1 : 0;
// Fetch moves - Sliding Window
// Obtain level1 moves
List<int> baseMoves = new List<int>(Legal.getBaseEggMoves(pk6, skipOption, gameSource));
int baseCt = baseMoves.Count;
if (baseCt > 4) baseCt = 4;
// Obtain Nonstandard moves
var relearn = pk6.RelearnMoves.Where(move => move != 0 && !baseMoves.Contains(move)).ToArray();
var relearnMoves = Legal.getValidRelearn(pk6, skipOption).ToArray();
var relearn = pk6.RelearnMoves.Where(move => move != 0
&& (!baseMoves.Contains(move) || relearnMoves.Contains(move))
).ToArray();
int relearnCt = relearn.Length;
// Get Move Window
List<int> window = new List<int>(baseMoves);
window.AddRange(relearn);
@@ -259,9 +264,6 @@ public static LegalityCheck[] verifyRelearn(PK6 pk6)
req = baseCt;
// Movepool finalized! Check validity.
var relearnMoves = Legal.getValidRelearn(pk6, skipOption).ToArray();
if (Legal.LightBall.Contains(pk6.Species))
relearnMoves = relearnMoves.Concat(new[] { 344 }).ToArray();
int[] rl = pk6.RelearnMoves;
string em = string.Join(", ", baseMoves);
@@ -272,6 +274,8 @@ public static LegalityCheck[] verifyRelearn(PK6 pk6)
: new LegalityCheck(Severity.Valid, "Base egg move.");
// Non-Base
if (Legal.LightBall.Contains(pk6.Species))
relearnMoves = relearnMoves.Concat(new[] { 344 }).ToArray();
for (int j = req; j < 4; j++)
res[j] = !relearnMoves.Contains(rl[j])
? new LegalityCheck(Severity.Invalid, "Not an expected relearn move.")